[evmbin] fix build (#11095)

* Update CHANGELOG.md and version

.cargo/config

@@ -1,3 +1,27 @@
+# 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]
-# Link the C runtime statically ; https://github.com/openethereum/parity-ethereum/issues/6643
-rustflags = ["-Ctarget-feature=+crt-static"]
+# Enables the aes-ni instructions for RustCrypto dependency.
+# Link the C runtime statically ; https://github.com/paritytech/parity-ethereum/issues/6643
+rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3", "-Ctarget-feature=+crt-static"]
+
+[target.x86_64-apple-darwin]
+# Enables the aes-ni instructions for RustCrypto dependency.
+rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
+

.git-blame-ignore-revs

@@ -1,2 +0,0 @@
-# Reformat the source code
-610d9baba4af83b5767c659ca2ccfed337af1056

.github/CODE_OF_CONDUCT.md

@@ -2,11 +2,11 @@
 
 ## 1. Purpose
 
-A primary goal of OpenEthereum 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
 
@@ -63,7 +63,7 @@ Additionally, community organizers are available to help community members engag
 
 ## 7. Addressing Grievances
 
-If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify OpenEthereum Technologies with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
+If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify Parity Technologies with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
 
 ## 8. Scope
 
@@ -73,7 +73,7 @@ This code of conduct and its related procedures also applies to unacceptable beh
 
 ## 9. Contact info
 
-You can contact OpenEthereum via Email: community@parity.io
+You can contact Parity via Email: community@parity.io
 
 ## 10. License and attribution
 

.github/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## Do you have a question?
 
-Check out our [Beginner Introduction](https://openethereum.github.io/Beginner-Introduction), [Configuration](https://openethereum.github.io//Configuring-OpenEthereum), and [FAQ](https://openethereum.github.io/FAQ) articles on our [wiki](https://openethereum.github.io/)!
+Check out our [Basic Usage](https://wiki.parity.io/Basic-Usage), [Configuration](https://wiki.parity.io/Configuring-Parity-Ethereum), and [FAQ](https://wiki.parity.io/FAQ) articles on our [wiki](https://wiki.parity.io/)!
 
 See also frequently asked questions [tagged with `parity`](https://ethereum.stackexchange.com/questions/tagged/parity?sort=votes&pageSize=50) on Stack Exchange.
 
@@ -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,11 +22,11 @@ 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.
+We use [labels](https://github.com/paritytech/parity-ethereum/labels) to manage PRs and issues and communicate the state of a PR. Please familiarize yourself with them. Furthermore we are organizing issues in [milestones](https://github.com/paritytech/parity-ethereum/milestones). Best way to get started is to a pick a ticket from the current milestone tagged [`easy`](https://github.com/paritytech/parity-ethereum/labels/Q2-easy%20%F0%9F%92%83) and get going, or [`mentor`](https://github.com/paritytech/parity-ethereum/labels/Q1-mentor%20%F0%9F%95%BA) and get in contact with the mentor offering their support on that larger task.
 
 ### Rules
 
@@ -35,22 +35,22 @@ There are a few basic ground-rules for contributors (including the maintainer(s)
 * **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.
-* All code changed should be formated by running `cargo fmt -- --config=merge_imports=true`
+* Contributors should adhere to the [Parity Ethereum Style Guide](https://wiki.parity.io/Parity-Ethereum-Style-Guide).
 
 ### Recommendations
 
-* **Non-master branch names** *should* be prefixed with a short name moniker, followed by the associated Github Issue ID (if any), and a brief description of the task using the format `<GITHUB_USERNAME>-<ISSUE_ID>-<BRIEF_DESCRIPTION>` (e.g. `gavin-123-readme`). The name moniker helps people to inquiry about their unfinished work, and the GitHub Issue ID helps your future self and other developers (particularly those who are onboarding) find out about and understand the original scope of the task, and where it fits into Parity Ethereum [Projects](https://github.com/openethereum/openethereum/projects).
+* **Non-master branch names** *should* be prefixed with a short name moniker, followed by the associated Github Issue ID (if any), and a brief description of the task using the format `<GITHUB_USERNAME>-<ISSUE_ID>-<BRIEF_DESCRIPTION>` (e.g. `gavin-123-readme`). The name moniker helps people to inquiry about their unfinished work, and the GitHub Issue ID helps your future self and other developers (particularly those who are onboarding) find out about and understand the original scope of the task, and where it fits into Parity Ethereum [Projects](https://github.com/paritytech/parity-ethereum/projects).
 * **Remove stale branches periodically**
 
 ### Preparing Pull Requests
 
-* If your PR does not alter any logic (e.g. comments, dependencies, docs), then it may be tagged [`insubstantial`](https://github.com/openethereum/openethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22).
+* If your PR does not alter any logic (e.g. comments, dependencies, docs), then it may be tagged [`insubstantial`](https://github.com/paritytech/parity-ethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22).
 
-* Once a PR is ready for review please add the [`pleasereview`](https://github.com/openethereum/openethereum/pulls?utf8=%E2%9C%93&q=is%3Aopen+is%3Apr+label%3A%22A0-pleasereview+%F0%9F%A4%93%22+) label.
+* Once a PR is ready for review please add the [`pleasereview`](https://github.com/paritytech/parity-ethereum/pulls?utf8=%E2%9C%93&q=is%3Aopen+is%3Apr+label%3A%22A0-pleasereview+%F0%9F%A4%93%22+) label.
 
 ### Reviewing Pull Requests*:
 
-* At least two reviewers are required to review PRs (even for PRs tagged [`insubstantial`](https://github.com/openethereum/openethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22)).
+* At least two reviewers are required to review PRs (even for PRs tagged [`insubstantial`](https://github.com/paritytech/parity-ethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22)).
 
 When doing a review, make sure to look for any:
 

.github/ISSUE_TEMPLATE.md

@@ -1,12 +1,14 @@
-For questions please use https://discord.io/openethereum, issues are for bugs and feature requests.
-
 _Before filing a new issue, please **provide the following information**._
 
-- **OpenEthereum version (>=3.1.0)**: 0.0.0
+_If you think that your issue is an exploitable security vulnerability, please mail your bugreport to security@parity.io instead; your submission might be eligible for our Bug Bounty._
+_You can find mode info on the reporting process in [SECURITY.md](https://github.com/paritytech/parity-ethereum/blob/master/SECURITY.md)_
+
+
+- **Parity Ethereum version**: 0.0.0
 - **Operating system**: Windows / MacOS / Linux
 - **Installation**: homebrew / one-line installer / built from source
 - **Fully synchronized**: no / yes
-- **Network**: ethereum / ropsten / kovan / ...
+- **Network**: ethereum / ropsten / goerli / ...
 - **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

@@ -0,0 +1,21 @@
+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/build-test-windows.yml

@@ -1,33 +0,0 @@
-name:                           Build and Test Suite on Windows
-
-on:
-  push:
-    branches:
-      - main
-      - dev
-jobs:
-  build-tests:
-    name:                       Test and Build
-    strategy:
-      matrix:
-        platform:
-          - windows2019 # custom runner
-        toolchain:
-          - 1.52.1
-    runs-on:                    ${{ matrix.platform }}
-    steps:
-      - name:                   Checkout sources
-        uses:                   actions/checkout@main
-        with:
-          submodules:           true
-      - name:                   Install toolchain
-        uses:                   actions-rs/toolchain@v1
-        with:
-          toolchain:            ${{ matrix.toolchain }}
-          profile:              minimal
-          override:             true
-      - name:                   Build tests
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              test
-          args:                 --locked --all --release --features "json-tests" --verbose --no-run

.github/workflows/build-test.yml

@@ -1,40 +0,0 @@
-name:                           Build and Test Suite
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-      - dev
-jobs:
-  build-tests:
-    name:                       Test and Build
-    strategy:
-      matrix:
-        platform:
-          - ubuntu-16.04
-          - macos-latest
-        toolchain:
-          - 1.52.1
-    runs-on:                    ${{ matrix.platform }}
-    steps:
-      - name:                   Checkout sources
-        uses:                   actions/checkout@main
-        with:
-          submodules:           true
-      - name:                   Install toolchain
-        uses:                   actions-rs/toolchain@v1
-        with:
-          toolchain:            ${{ matrix.toolchain }}
-          profile:              minimal
-          override:             true
-      - 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 }}	
-        uses:                   actions-rs/cargo@v1	
-        with:	
-          command:              test	
-          args:                 --locked --all --release --features "json-tests" --verbose

.github/workflows/build.yml

@@ -1,285 +0,0 @@
-name:                           Build Release Suite
-
-on:
-  push:
-    tags:
-      - v*
-
-# Global vars
-env:
-  AWS_REGION:                   "us-east-1"
-  AWS_S3_ARTIFACTS_BUCKET:      "openethereum-releases"
-  ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-
-jobs:
-  build:
-    name:                       Build Release
-    strategy:
-      matrix:
-        platform:
-          - ubuntu-16.04
-          - macos-latest
-        toolchain:
-          - 1.52.1
-    runs-on:                    ${{ matrix.platform }}
-    steps:
-      - name:                   Checkout sources
-        uses:                   actions/checkout@main
-      - name:                   Install toolchain
-        uses:                   actions-rs/toolchain@v1
-        with:
-          toolchain:            ${{ matrix.toolchain }}
-          profile:              minimal
-          override:             true
-
-      # ==============================
-      #       Windows Build
-      # ==============================
-
-      # - name:                   Install LLVM for Windows
-      #   if:                     matrix.platform == 'windows2019'
-      #   run:                    choco install llvm
-
-      # - name:                   Build OpenEthereum for Windows
-      #   if:                     matrix.platform == 'windows2019'
-      #   run:                    sh scripts/actions/build-windows.sh ${{matrix.platform}}
-
-      # - name:                   Upload Windows build
-      #   uses:                   actions/upload-artifact@v2
-      #   if:                     matrix.platform == 'windows2019'
-      #   with:
-      #     name:                 windows-artifacts
-      #     path:                 artifacts
-
-      # ==============================
-      #       Linux/Macos Build
-      # ==============================
-    
-      - name:                   Build OpenEthereum for ${{matrix.platform}}
-        if:                     matrix.platform != 'windows2019'
-        run:                    sh scripts/actions/build-linux.sh ${{matrix.platform}}
-
-      - name:                   Upload Linux build
-        uses:                   actions/upload-artifact@v2
-        if:                     matrix.platform == 'ubuntu-16.04'
-        with:
-          name:                 linux-artifacts
-          path:                 artifacts
-
-      - name:                   Upload MacOS build
-        uses:                   actions/upload-artifact@v2
-        if:                     matrix.platform == 'macos-latest'
-        with:
-          name:                 macos-artifacts
-          path:                 artifacts
-
-  zip-artifacts-creator:
-    name:                       Create zip artifacts
-    needs:                      build
-    runs-on:                    ubuntu-16.04
-    steps:
-      - name:                   Set env
-        run:                    echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-      # ==============================
-      #       Create ZIP files
-      # ==============================
-
-      # - name:                   Download Windows artifacts
-      #   uses:                   actions/download-artifact@v2
-      #   with:
-      #     name:                 windows-artifacts
-      #     path:                 windows-artifacts
-
-      - name:                   Download Linux artifacts
-        uses:                   actions/download-artifact@v2
-        with:
-          name:                 linux-artifacts
-          path:                 linux-artifacts
-
-      - name:                   Download MacOS artifacts
-        uses:                   actions/download-artifact@v2
-        with:
-          name:                 macos-artifacts
-          path:                 macos-artifacts
-
-      - name:                   Display structure of downloaded files
-        run:                    ls
-
-      - name:                   Create zip Linux
-        id:                     create_zip_linux
-        run: |
-          cd linux-artifacts/
-          zip -rT openethereum-linux-${{ env.RELEASE_VERSION }}.zip *
-          ls openethereum-linux-${{ env.RELEASE_VERSION }}.zip
-          cd ..
-          mv linux-artifacts/openethereum-linux-${{ env.RELEASE_VERSION }}.zip .
-
-          echo "Setting outputs..."
-          echo ::set-output name=LINUX_ARTIFACT::openethereum-linux-${{ env.RELEASE_VERSION }}.zip
-          echo ::set-output name=LINUX_SHASUM::$(shasum -a 256 openethereum-linux-${{ env.RELEASE_VERSION }}.zip | awk '{print $1}')
-
-      - name:                   Create zip MacOS
-        id:                     create_zip_macos
-        run: |
-          cd macos-artifacts/
-          zip -rT openethereum-macos-${{ env.RELEASE_VERSION }}.zip *
-          ls openethereum-macos-${{ env.RELEASE_VERSION }}.zip
-          cd ..
-          mv macos-artifacts/openethereum-macos-${{ env.RELEASE_VERSION }}.zip .
-
-          echo "Setting outputs..."
-          echo ::set-output name=MACOS_ARTIFACT::openethereum-macos-${{ env.RELEASE_VERSION }}.zip
-          echo ::set-output name=MACOS_SHASUM::$(shasum -a 256 openethereum-macos-${{ env.RELEASE_VERSION }}.zip | awk '{print $1}')
-
-      # - name:                   Create zip Windows
-      #   id:                     create_zip_windows
-      #   run: |
-      #     cd windows-artifacts/
-      #     zip -rT openethereum-windows-${{ env.RELEASE_VERSION }}.zip *
-      #     ls openethereum-windows-${{ env.RELEASE_VERSION }}.zip
-      #     cd ..
-      #     mv windows-artifacts/openethereum-windows-${{ env.RELEASE_VERSION }}.zip .
-
-      #     echo "Setting outputs..."
-      #     echo ::set-output name=WINDOWS_ARTIFACT::openethereum-windows-${{ env.RELEASE_VERSION }}.zip
-      #     echo ::set-output name=WINDOWS_SHASUM::$(shasum -a 256 openethereum-windows-${{ env.RELEASE_VERSION }}.zip | awk '{print $1}')
-
-      # =======================================================================
-      # Upload artifacts
-      # This is required to share artifacts between different jobs
-      # =======================================================================
-
-      - name:                   Upload artifacts
-        uses:                   actions/upload-artifact@v2
-        with:
-          name:                 openethereum-linux-${{ env.RELEASE_VERSION }}.zip
-          path:                 openethereum-linux-${{ env.RELEASE_VERSION }}.zip
-
-      - name:                   Upload artifacts
-        uses:                   actions/upload-artifact@v2
-        with:
-          name:                 openethereum-macos-${{ env.RELEASE_VERSION }}.zip
-          path:                 openethereum-macos-${{ env.RELEASE_VERSION }}.zip
-
-      # - name:                   Upload artifacts
-      #   uses:                   actions/upload-artifact@v2
-      #   with:
-      #     name:                 openethereum-windows-${{ env.RELEASE_VERSION }}.zip
-      #     path:                 openethereum-windows-${{ env.RELEASE_VERSION }}.zip
-
-      # =======================================================================
-      # Upload artifacts to S3
-      # This is required by some software distribution systems which require
-      # artifacts to be downloadable, like Brew on MacOS.
-      # =======================================================================
-      - name:                   Configure AWS credentials
-        uses:                   aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id:     ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region:            ${{ env.AWS_REGION }}
-
-      - name:                   Copy files to S3 with the AWS CLI
-        run: |
-          # Deploy zip artifacts to S3 bucket to a directory whose name is the tagged release version.
-          # Deploy macos binary artifact (if required, add more `aws s3 cp` commands to deploy specific OS versions)
-          aws s3 cp macos-artifacts/openethereum s3://${{ env.AWS_S3_ARTIFACTS_BUCKET }}/${{ env.RELEASE_VERSION }}/macos/ --region ${{ env.AWS_REGION }}
-
-    outputs:
-      linux-artifact:           ${{ steps.create_zip_linux.outputs.LINUX_ARTIFACT }}
-      linux-shasum:             ${{ steps.create_zip_linux.outputs.LINUX_SHASUM }}
-      macos-artifact:           ${{ steps.create_zip_macos.outputs.MACOS_ARTIFACT }}
-      macos-shasum:             ${{ steps.create_zip_macos.outputs.MACOS_SHASUM }}
-      # windows-artifact:         ${{ steps.create_zip_windows.outputs.WINDOWS_ARTIFACT }}
-      # windows-shasum:           ${{ steps.create_zip_windows.outputs.WINDOWS_SHASUM }}
-
-  draft-release:
-    name:                       Draft Release
-    needs:                      zip-artifacts-creator
-    runs-on:                    ubuntu-16.04
-    steps:
-      - name:                   Set env
-        run:                    echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-      # ==============================
-      #       Download artifacts
-      # ==============================
-
-      - name:                   Download artifacts
-        uses:                   actions/download-artifact@v2
-        with:
-          name:                 openethereum-linux-${{ env.RELEASE_VERSION }}.zip
-
-      - name:                   Download artifacts
-        uses:                   actions/download-artifact@v2
-        with:
-          name:                 openethereum-macos-${{ env.RELEASE_VERSION }}.zip
-
-      # - name:                   Download artifacts
-      #   uses:                   actions/download-artifact@v2
-      #   with:
-      #     name:                 openethereum-windows-${{ env.RELEASE_VERSION }}.zip
-
-      - name:                   Display structure of downloaded files
-        run:                    ls
-
-      # ==============================
-      #       Create release draft
-      # ==============================
-
-      - name:                   Create Release Draft
-        id:                     create_release_draft
-        uses:                   actions/create-release@v1
-        env:
-          GITHUB_TOKEN:         ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        with:
-          tag_name:             ${{ github.ref }}
-          release_name:         OpenEthereum ${{ github.ref }}
-          body: |
-            This release contains <ADD_TEXT>
-
-            | System | Architecture | Binary | Sha256 Checksum |
-            |:---:|:---:|:---:|:---|
-            | <img src="https://gist.github.com/5chdn/1fce888fde1d773761f809b607757f76/raw/44c4f0fc63f1ea8e61a9513af5131ef65eaa6c75/apple.png" alt="Apple Icon by Pixel Perfect from https://www.flaticon.com/authors/pixel-perfect" style="width: 32px;"/> | x64 | [${{ needs.zip-artifacts-creator.outputs.macos-artifact }}](https://github.com/openethereum/openethereum/releases/download/${{ env.RELEASE_VERSION }}/${{ needs.zip-artifacts-creator.outputs.macos-artifact }}) | `${{ needs.zip-artifacts-creator.outputs.macos-shasum }}` |
-            | <img src="https://gist.github.com/5chdn/1fce888fde1d773761f809b607757f76/raw/44c4f0fc63f1ea8e61a9513af5131ef65eaa6c75/linux.png" alt="Linux Icon by Pixel Perfect from https://www.flaticon.com/authors/pixel-perfect" style="width: 32px;"/> | x64 | [${{ needs.zip-artifacts-creator.outputs.linux-artifact }}](https://github.com/openethereum/openethereum/releases/download/${{ env.RELEASE_VERSION }}/${{ needs.zip-artifacts-creator.outputs.linux-artifact }}) | `${{ needs.zip-artifacts-creator.outputs.linux-shasum }}` |
-            | <img src="https://gist.github.com/5chdn/1fce888fde1d773761f809b607757f76/raw/44c4f0fc63f1ea8e61a9513af5131ef65eaa6c75/windows.png" alt="Windows Icon by Pixel Perfect from https://www.flaticon.com/authors/pixel-perfect" style="width: 32px;"/> | x64 | [${{ needs.zip-artifacts-creator.outputs.windows-artifact }}](https://github.com/openethereum/openethereum/releases/download/${{ env.RELEASE_VERSION }}/${{ needs.zip-artifacts-creator.outputs.windows-artifact }}) | `${{ needs.zip-artifacts-creator.outputs.windows-shasum }}` |
-            | | | | |
-            | **System** | **Option** | - | **Resource** |
-            | <img src="https://gist.github.com/5chdn/1fce888fde1d773761f809b607757f76/raw/44c4f0fc63f1ea8e61a9513af5131ef65eaa6c75/settings.png" alt="Settings Icon by Pixel Perfect from https://www.flaticon.com/authors/pixel-perfect" style="width: 32px;"/> | Docker | - | [hub.docker.com/r/openethereum/openethereum](https://hub.docker.com/r/openethereum/openethereum) |
-
-          draft:                true
-          prerelease:           true
-
-      - name:                   Upload Release Asset - Linux
-        id:                     upload_release_asset_linux
-        uses:                   actions/upload-release-asset@v1.0.1
-        env:
-          GITHUB_TOKEN:         ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url:           ${{ steps.create_release_draft.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path:           ./openethereum-linux-${{ env.RELEASE_VERSION }}.zip
-          asset_name:           openethereum-linux-${{ env.RELEASE_VERSION }}.zip
-          asset_content_type:   application/zip
-
-      - name:                   Upload Release Asset - MacOS
-        id:                     upload_release_asset_macos
-        uses:                   actions/upload-release-asset@v1.0.1
-        env:
-          GITHUB_TOKEN:         ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url:           ${{ steps.create_release_draft.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path:           ./openethereum-macos-${{ env.RELEASE_VERSION }}.zip
-          asset_name:           openethereum-macos-${{ env.RELEASE_VERSION }}.zip
-          asset_content_type:   application/zip
-
-      # - name:                   Upload Release Asset - Windows
-      #   id:                     upload_release_asset_windows
-      #   uses:                   actions/upload-release-asset@v1
-      #   env:
-      #     GITHUB_TOKEN:         ${{ secrets.GITHUB_TOKEN }}
-      #   with:
-      #     upload_url:           ${{ steps.create_release_draft.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-      #     asset_path:           ./openethereum-windows-${{ env.RELEASE_VERSION }}.zip
-      #     asset_name:           openethereum-windows-${{ env.RELEASE_VERSION }}.zip
-      #     asset_content_type:   application/zip

.github/workflows/check.yml

@@ -1,50 +0,0 @@
-name:                           Check
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-      - dev
-jobs:
-  check:
-    name:                       Check
-    runs-on:                    ubuntu-16.04
-    steps:
-      - name:                   Checkout sources
-        uses:                   actions/checkout@main
-        with:
-          submodules:           true
-      - name:                   Install 1.52.1 toolchain
-        uses:                   actions-rs/toolchain@v1
-        with:
-          toolchain:            1.52.1
-          profile:              minimal
-          override:             true
-      - 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 crates/runtime/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 crates/runtime/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

.github/workflows/deploy-docker-nightly.yml

@@ -1,29 +0,0 @@
-name:                           Docker Image Nightly Release
-
-# Run "nightly" build on each commit to "dev" branch.
-on:
-  push:
-    branches:
-      - dev
-
-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:            1.52.1
-          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
-          tags: "nightly"

.github/workflows/deploy-docker-tag.yml

@@ -1,30 +0,0 @@
-name:                           Docker Image Tag and Latest Release
-
-on:
-  push:
-    tags:
-      - v*
-
-jobs:
-  deploy-docker:
-    name:                       Build Release
-    runs-on:                    ubuntu-latest
-    steps:
-      - name:                   Checkout sources
-        uses:                   actions/checkout@master
-      - name:                   Set env
-        run:                    echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-      - name:                   Install toolchain
-        uses:                   actions-rs/toolchain@v1
-        with:
-          toolchain:            1.52.1
-          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
-          tags: "latest,${{ env.RELEASE_VERSION }}"

.github/workflows/deploy-docker.yml

@@ -1,30 +0,0 @@
-name:                           Docker Image Release
-
-on:
-  push:
-    branches:
-      - main
-    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:            1.52.1
-          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

.github/workflows/fmt.yml

@@ -1,20 +0,0 @@
-on: [push, pull_request]
-
-name: rustfmt
-
-jobs:
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: 1.52.1
-          override: true
-      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check --config merge_imports=true

.gitignore

@@ -38,10 +38,8 @@ node_modules
 
 # Build artifacts
 out/
+parity-clib-examples/cpp/build/
 
 .vscode
 rls/
 /parity.*
-
-# cargo remote artifacts
-remote-target

.gitlab-ci.yml

@@ -0,0 +1,372 @@
+stages:
+  - test
+  - build
+  - publish
+  - optional
+
+image:                             parity/parity-ci-linux:latest
+variables:
+  GIT_STRATEGY:                    fetch
+  GIT_SUBMODULE_STRATEGY:          recursive
+  CI_SERVER_NAME:                  "GitLab CI"
+  CARGO_HOME:                      "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}"
+  SCCACHE_DIR:                     "/ci-cache/${CI_PROJECT_NAME}/sccache"
+  CARGO_TARGET:                    x86_64-unknown-linux-gnu
+
+
+.releaseable_branches:             # list of git refs for building GitLab artifacts (think "pre-release binaries")
+  only:                            &releaseable_branches
+    - stable
+    - beta
+    - tags
+    - schedules
+
+.collect_artifacts:                &collect_artifacts
+  artifacts:
+    name:                          "${CI_JOB_NAME}_${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}"
+    when:                          on_success
+    expire_in:                     1 mos
+    paths:
+      - artifacts/
+      - tools/
+
+.docker-cache-status:              &docker-cache-status
+  variables:
+    CARGO_HOME:                    "/ci-cache/parity-ethereum/cargo/${CI_JOB_NAME}"
+  dependencies:                    []
+  before_script:
+    - rustup show
+    - cargo --version
+    - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_debug.log
+        RUST_LOG=sccache=debug
+        sccache --start-server
+    - sccache -s
+  after_script:
+    # sccache debug info 
+    - if test -e sccache_debug.log;
+      then
+        echo "_____All crate-types:_____";
+        grep 'parse_arguments.*--crate-type' sccache_debug.log | sed -re 's/.*"--crate-type", "([^"]+)".*/\1/' | sort | uniq -c;
+        echo "_____Non-cacheable reasons:_____";
+        grep CannotCache sccache_debug.log | sed -re 's/.*CannotCache\((.+)\).*/\1/' | sort | uniq -c;
+      else
+        echo "_____No logs from sccache_____";
+        exit 0;
+      fi
+  tags:
+    - linux-docker
+
+.build-on-linux:                   &build-on-linux
+  stage:                           build
+  <<:                              *docker-cache-status
+  <<:                              *collect_artifacts
+  script:
+    - scripts/gitlab/build-linux.sh
+    - sccache -s
+  after_script:
+    - mkdir -p tools
+    - cp -r scripts/docker/hub/* ./tools
+    - cp scripts/gitlab/publish-snap.sh ./tools
+    - cp scripts/gitlab/publish-onchain.sh ./tools
+    - cp scripts/gitlab/safe-curl.sh ./tools
+    - echo v"$(sed -r -n '1,/^version/s/^version\s*=\s*"([^"]+)".*$/\1/p' Cargo.toml)" |
+      tee ./tools/VERSION
+    - echo "$(sed -r -n '1,/^track/s/^track\s*=\s*"([^"]+)".*$/\1/p' ./util/version/Cargo.toml)" |
+      tee ./tools/TRACK
+
+
+cargo-check 0 3:
+  stage:                           test
+  <<:                              *docker-cache-status
+  script:
+    - time cargo check --target $CARGO_TARGET --locked --no-default-features --verbose --color=always
+    - sccache -s
+
+cargo-check 1 3:
+  stage:                           test
+  <<:                              *docker-cache-status
+  script:
+    - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --no-default-features --verbose --color=always
+    - sccache -s
+
+cargo-check 2 3:
+  stage:                           test
+  <<:                              *docker-cache-status
+  script:
+    - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose --color=always
+    - sccache -s
+
+cargo-audit:
+  stage:                           test
+  <<:                              *docker-cache-status
+  script:
+    - cargo audit
+  allow_failure:                   true # failed cargo audit shouldn't prevent a PR from being merged
+
+validate-chainspecs:
+  stage:                           test
+  <<:                              *docker-cache-status
+  script:
+    - ./scripts/gitlab/validate-chainspecs.sh
+    - sccache -s
+
+test-cpp:
+  stage:                           build
+  <<:                              *docker-cache-status
+  script:
+    - ./scripts/gitlab/test-cpp.sh
+    - sccache -s
+
+test-linux:
+  stage:                           build
+  <<:                              *docker-cache-status
+  script:
+    - ./scripts/gitlab/test-linux.sh stable
+    - sccache -s
+
+test-linux-beta:
+  stage:                           build
+  only:                            *releaseable_branches
+  <<:                              *docker-cache-status
+  script:
+    - ./scripts/gitlab/test-linux.sh beta
+    - sccache -s
+
+test-linux-nightly:
+  stage:                           build
+  only:                            *releaseable_branches
+  <<:                              *docker-cache-status
+  script:
+    - ./scripts/gitlab/test-linux.sh nightly
+    - sccache -s
+  allow_failure:                   true
+
+build-android:
+  <<:                              *build-on-linux
+  image:                           parity/parity-ci-android:stretch
+  variables:
+    CARGO_TARGET:                  armv7-linux-androideabi
+
+build-linux:
+  <<:                              *build-on-linux
+  only:                            *releaseable_branches
+
+build-linux-i386:
+  <<:                              *build-on-linux
+  only:                            *releaseable_branches
+  image:                           parity/parity-ci-i386:latest
+  variables:
+    CARGO_TARGET:                  i686-unknown-linux-gnu
+
+build-linux-arm64:
+  <<:                              *build-on-linux
+  only:                            *releaseable_branches
+  image:                           parity/parity-ci-arm64:latest
+  variables:
+    CARGO_TARGET:                  aarch64-unknown-linux-gnu
+
+build-linux-armhf:
+  <<:                              *build-on-linux
+  only:                            *releaseable_branches
+  image:                           parity/parity-ci-armhf:latest
+  variables:
+    CARGO_TARGET:                  armv7-unknown-linux-gnueabihf
+
+build-darwin:
+  stage:                           build
+  <<:                              *collect_artifacts
+  only:                            *releaseable_branches
+  variables:
+    CARGO_TARGET:                  x86_64-apple-darwin
+    CARGO_HOME:                    "${CI_PROJECT_DIR}/.cargo"
+    CC:                            gcc
+    CXX:                           g++
+  script:
+    - scripts/gitlab/build-linux.sh
+  tags:
+    - rust-osx
+
+build-windows:
+  stage:                           build
+  <<:                              *collect_artifacts
+  only:                            *releaseable_branches
+  variables:
+    CARGO_TARGET:                  x86_64-pc-windows-msvc
+    CARGO_HOME:                    "C:/ci-cache/parity-ethereum/cargo/$CI_JOB_NAME"
+    GIT_SUBMODULE_STRATEGY:        none
+  script:
+    - sh scripts/gitlab/build-windows.sh
+  tags:
+    - rust-windows
+
+publish-docker:
+  stage:                           publish
+  only:                            *releaseable_branches
+  except:
+    - nightly
+  when:                            manual
+  dependencies:
+    - build-linux
+  environment:
+    name: parity-build
+  cache:                           {}
+  image:                           docker:stable
+  services:
+    - docker:dind
+  variables:
+    GIT_STRATEGY:                  none
+    DOCKER_HOST:                   tcp://localhost:2375
+    DOCKER_DRIVER:                 overlay2
+    GIT_STRATEGY:                  none
+    # DOCKERFILE:                  tools/Dockerfile
+    # CONTAINER_IMAGE:             parity/parity 
+  script:
+    - ./tools/publish-docker.sh
+  tags:
+    - kubernetes-parity-build
+
+publish-snap-nightly:              &publish-snap
+  stage:                           publish
+  only:
+    - nightly
+  image:                           snapcore/snapcraft
+  variables:
+    GIT_STRATEGY:                  none
+    BUILD_ARCH:                    amd64
+  cache:                           {}
+  dependencies:
+    - build-linux
+  tags:
+    - linux-docker
+  script:
+    - ./tools/publish-snap.sh
+
+publish-snap-manually:
+  <<:                              *publish-snap
+  only:                            *releaseable_branches
+  when:                            manual
+
+publish-snap-i386-nightly:         &publish-snap-i386
+  <<:                              *publish-snap
+  variables:
+    BUILD_ARCH:                    i386
+    CARGO_TARGET:                  i686-unknown-linux-gnu
+  dependencies:
+    - build-linux-i386
+
+publish-snap-i386-manually:
+  <<:                              *publish-snap-i386
+  only:                            *releaseable_branches
+  when:                            manual
+
+publish-snap-arm64-nightly:        &publish-snap-arm64
+  <<:                              *publish-snap
+  variables:
+    BUILD_ARCH:                    arm64
+    CARGO_TARGET:                  aarch64-unknown-linux-gnu
+  dependencies:
+    - build-linux-arm64
+
+publish-snap-arm64-manually:
+  <<:                              *publish-snap-arm64
+  only:                            *releaseable_branches
+  when:                            manual
+
+publish-snap-armhf-nightly:        &publish-snap-armhf
+  <<:                              *publish-snap
+  variables:
+    BUILD_ARCH:                    armhf
+    CARGO_TARGET:                  armv7-unknown-linux-gnueabihf
+  dependencies:
+    - build-linux-armhf
+
+publish-snap-armhf-manually:
+  <<:                              *publish-snap-armhf
+  only:                            *releaseable_branches
+  when:                            manual
+
+publish-onchain-nightly:           &publish-onchain
+  stage:                           publish
+  only:
+    - nightly
+  cache:                           {}
+  variables:
+    GIT_STRATEGY:                  none
+  dependencies:
+    - build-linux
+    - build-darwin
+    - build-windows
+  script:
+    - ./tools/publish-onchain.sh
+  tags:
+    - linux-docker
+
+publish-onchain-manually:
+  <<:                              *publish-onchain
+  only:                            *releaseable_branches
+  when:                            manual
+
+publish-release-awss3-nightly:     &publish-release-awss3
+  image:                           parity/awscli:latest
+  stage:                           publish
+  only:
+    - nightly
+  variables:
+    GIT_STRATEGY:                  none
+  cache:                           {}
+  dependencies:
+    - build-linux
+    - build-darwin
+    - build-windows
+  script:
+    - echo "__________Push binaries to AWS S3____________"
+    - case "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" in
+       (beta|stable|nightly)
+         export BUCKET=releases.parity.io/ethereum;
+         ;;
+       (*)
+         export BUCKET=builds-parity;
+         ;;
+     esac
+    - aws s3 sync ./artifacts s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}/
+    - echo "__________Read from S3____________"
+    - aws s3 ls s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}} --recursive --human-readable --summarize
+  tags:
+    - linux-docker
+
+publish-release-awss3-manually:
+  <<:                              *publish-release-awss3  
+  only:                            *releaseable_branches
+  when:                            manual
+
+publish-docs:
+  stage:                           publish
+  image:                           parity/parity-ci-docs:latest
+  only:
+    - tags
+  except:
+    - nightly
+  when:                            manual
+  cache:                           {}
+  dependencies:                    []
+  script:
+    - scripts/gitlab/publish-docs.sh
+  tags:
+    - linux-docker
+  allow_failure:                   true
+
+publish-av-whitelist:
+  stage:                          publish
+  variables:
+    GIT_STRATEGY:                  none
+  only:                           *releaseable_branches
+  except:
+    - nightly
+  when:                           manual
+  cache:                          {}
+  dependencies:
+    - build-windows
+  script:
+    - scripts/gitlab/publish-av-whitelists.sh
+  tags:
+    - linux-docker

.gitmodules

@@ -1,3 +1,7 @@
-[submodule "crates/ethcore/res/json_tests"]
-	path = crates/ethcore/res/json_tests
+[submodule "ethcore/res/ethereum/tests"]
+	path = ethcore/res/ethereum/tests
 	url = https://github.com/ethereum/tests.git
+	branch = develop
+[submodule "ethcore/res/wasm-tests"]
+	path = ethcore/res/wasm-tests
+	url = https://github.com/paritytech/wasm-tests

CHANGELOG.md

@@ -1,208 +1,229 @@
-## OpenEthereum v3.3.3
+## Parity-Ethereum [v2.6.4](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.3)
 
-Enhancements:
-* Implement eip-3607 (#593)
+Parity Ethereum v2.6.4-stable is a patch release that adds the block numbers for activating the Istanbul hardfork on test networks: Ropsten, Görli, Rinkeby and Kovan.
 
-Bug fixes:
-* Add type field for legacy transactions in RPC calls (#580)
-* Makes eth_mining to return False if not is not allowed to seal (#581)
-* Made nodes data concatenate as RLP sequences instead of bytes (#598)
+A full list of included changes:
 
-## OpenEthereum v3.3.2
+* ethcore/res: activate Istanbul on Ropsten, Görli, Rinkeby, Kovan (#11068)
+* cleanup json crate (#11027)
+* [json-spec] make blake2 pricing spec more readable (#11034)
+* Update JSON tests to d4f86ecf4aa7c (#11054)
 
-Enhancements:
-* London hardfork block: Sokol (24114400)
+## Parity-Ethereum [v2.6.3](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.3)
 
-Bug fixes:
-* Fix for maxPriorityFeePerGas overflow
+Parity Ethereum v2.6.3-stable is a patch release that improves security, stability and performance.
 
-## OpenEthereum v3.3.1
+* The most noteworthy improvement in this release is incorporating all the EIPs required for the Istanbul hard fork.
+* This release also fixes certain security and performance issues, one of which was suspected to be consensus-threatening but turned out to be benign. Thanks to Martin Holst Swende and Felix Lange from the Ethereum Foundation for bringing the suspicious issue to our attention.
 
-Enhancements:
-* Add eth_maxPriorityFeePerGas implementation (#570)
-* Add a bootnode for Kovan
+The full list of included changes:
 
-Bug fixes:
-* Fix for modexp overflow in debug mode (#578)
+* add more tx tests (#11038)
+* Fix parallel transactions race-condition (#10995)
+* Add blake2_f precompile (#11017)
+* [trace] introduce trace failed to Ext (#11019)
+* Edit publish-onchain.sh to use https (#11016)
+* Fix deadlock in network-devp2p (#11013)
+* EIP 1108: Reduce alt_bn128 precompile gas costs (#11008)
+* xDai chain support and nodes list update (#10989)
+* EIP 2028: transaction gas lowered from 68 to 16 (#10987)
+* EIP-1344 Add CHAINID op-code (#10983)
+* manual publish jobs for releases, no changes for nightlies (#10977)
+* [blooms-db] Fix benchmarks (#10974)
+* Verify transaction against its block during import (#10954)
+* Better error message for rpc gas price errors (#10931)
+* Fix fork choice (#10837)
+* Fix compilation on recent nightlies (#10991)
+* Don't build rpc with ethcore test-helpers (#11048) 
+* EIP 1884 Re-pricing of trie-size dependent operations  (#10992)
+* Implement EIP-1283 reenable transition, EIP-1706 and EIP-2200  (#10191)
 
-## OpenEthereum v3.3.0
+## Parity-Ethereum [v2.6.2](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.2)
 
-Enhancements:
-* Add `validateServiceTransactionsTransition` spec option to be able to enable additional checking of zero gas price transactions by block verifier
+Parity Ethereum v2.6.2-stable is a bugfix release that fixes a potential DoS attack in the trace_call RPC method. This is a critical upgrade for anyone running Parity nodes with RPC exposed to the public internet (and highly recommended for anyone else). For details see this blog post.
 
-## OpenEthereum v3.3.0-rc.15
+## Parity-Ethereum [v2.6.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.1)
 
-* Revert eip1559BaseFeeMinValue activation on xDai at London hardfork block
+Parity-Ethereum 2.6.1-beta is a patch release that improves stability.
 
-## OpenEthereum v3.3.0-rc.14
+This release includes:
+  * Allow specifying hostnames for node URLs
+  * Fix a bug where archive nodes were losing peers
+  * Add support for Energy Web Foundations new chains 'Volta' and 'EWC', and remove their deprecated 'Tobalaba' chain.
 
-Enhancements:
-* Add eip1559BaseFeeMinValue and eip1559BaseFeeMinValueTransition spec options
-* Activate eip1559BaseFeeMinValue on xDai at London hardfork block (19040000), set it to 20 GWei
-* Activate eip1559BaseFeeMinValue on POA Core at block 24199500 (November 8, 2021), set it to 10 GWei
-* Delay difficulty bomb to June 2022 for Ethereum Mainnet (EIP-4345)
+The full list of included changes:
+  * Add support for Energy Web Foundation's new chains (#10957)
+  * Kaspersky AV whitelisting (#10919)
+  * Avast whitelist script (#10900)
+  * Docker images renaming (#10863)
+  * Remove excessive warning (#10831)
+  * Allow --nat extip:your.host.here.org (#10830)
+  * When updating the client or when called from RPC, sleep should mean sleep (#10814)
+  * added new ropsten-bootnode and removed old one (#10794)
+  * ethkey no longer uses byteorder (#10786)
+  * docs: Update Readme with TOC, Contributor Guideline. Update Cargo package descriptions (#10652)
 
-## OpenEthereum v3.3.0-rc.13
+## Parity-Ethereum [v2.6.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.0)
 
-Enhancements:
-* London hardfork block: POA Core (24090200)
+Parity-Ethereum 2.6.0-beta is a minor release that stabilizes the 2.6 branch by
+marking it as a beta release.
 
-## OpenEthereum v3.3.0-rc.12
+This release includes:
+  * Major refactoring of the codebase
+  * Many bugfixes
+  * Significant improvements to logging, error and warning message clarity.
+  * SecretStore: remove support of old database formats (#10757)
+      * This is a potentially breaking change if you have not upgraded for
+          quite some time.
 
-Enhancements:
-* London hardfork block: xDai (19040000)
+ As of today, Parity-Ethereum 2.4 reaches end of life, and everyone is
+ encouraged to upgrade.
 
-## OpenEthereum v3.3.0-rc.11
+The full list of included changes:
+* update jsonrpc to 12.0 ([#10841](https://github.com/paritytech/parity-ethereum/pull/10841))
+* Move more code into state-account ([#10840](https://github.com/paritytech/parity-ethereum/pull/10840))
+* Extract AccountDB to account-db ([#10839](https://github.com/paritytech/parity-ethereum/pull/10839))
+* Extricate PodAccount and state Account to own crates ([#10838](https://github.com/paritytech/parity-ethereum/pull/10838))
+* Fix fork choice ([#10837](https://github.com/paritytech/parity-ethereum/pull/10837))
+* tests: Relates to #10655: Test instructions for Readme ([#10835](https://github.com/paritytech/parity-ethereum/pull/10835))
+* idiomatic changes to PodState ([#10834](https://github.com/paritytech/parity-ethereum/pull/10834))
+* Break circular dependency between Client and Engine (part 1) ([#10833](https://github.com/paritytech/parity-ethereum/pull/10833))
+* Remove excessive warning ([#10831](https://github.com/paritytech/parity-ethereum/pull/10831))
+* Allow --nat extip:your.host.here.org ([#10830](https://github.com/paritytech/parity-ethereum/pull/10830))
+* ethcore does not use byteorder ([#10829](https://github.com/paritytech/parity-ethereum/pull/10829))
+* Fix typo in README.md ([#10828](https://github.com/paritytech/parity-ethereum/pull/10828))
+* Update wordlist to v1.3 ([#10823](https://github.com/paritytech/parity-ethereum/pull/10823))
+* bump `smallvec 0.6.10` to fix vulnerability ([#10822](https://github.com/paritytech/parity-ethereum/pull/10822))
+* removed additional_params method ([#10818](https://github.com/paritytech/parity-ethereum/pull/10818))
+* Improve logging when remote peer is unknown ([#10817](https://github.com/paritytech/parity-ethereum/pull/10817))
+* replace memzero with zeroize crate ([#10816](https://github.com/paritytech/parity-ethereum/pull/10816))
+* When updating the client or when called from RPC, sleep should mean sleep ([#10814](https://github.com/paritytech/parity-ethereum/pull/10814))
+* Don't reimplement the logic from the Default impl ([#10813](https://github.com/paritytech/parity-ethereum/pull/10813))
+* refactor: whisper: Add type aliases and update rustdocs in message.rs ([#10812](https://github.com/paritytech/parity-ethereum/pull/10812))
+* test: whisper/cli `add invalid pool size test depending on processor` ([#10811](https://github.com/paritytech/parity-ethereum/pull/10811))
+* Add Constantinople EIPs to the dev (instant_seal) config ([#10809](https://github.com/paritytech/parity-ethereum/pull/10809))
+* fix spurious test failure ([#10808](https://github.com/paritytech/parity-ethereum/pull/10808))
+* revert temp changes to .gitlab-ci.yml ([#10807](https://github.com/paritytech/parity-ethereum/pull/10807))
+* removed redundant fmt::Display implementations ([#10806](https://github.com/paritytech/parity-ethereum/pull/10806))
+* removed EthEngine alias ([#10805](https://github.com/paritytech/parity-ethereum/pull/10805))
+* ethcore-bloom-journal updated to 2018 ([#10804](https://github.com/paritytech/parity-ethereum/pull/10804))
+* Fix a few typos and unused warnings. ([#10803](https://github.com/paritytech/parity-ethereum/pull/10803))
+* updated price-info to edition 2018 ([#10801](https://github.com/paritytech/parity-ethereum/pull/10801))
+* updated parity-local-store to edition 2018 ([#10800](https://github.com/paritytech/parity-ethereum/pull/10800))
+* updated project to ansi_term 0.11 ([#10799](https://github.com/paritytech/parity-ethereum/pull/10799))
+* ethcore-light uses bincode 1.1 ([#10798](https://github.com/paritytech/parity-ethereum/pull/10798))
+* ethcore-network-devp2p uses igd 0.9 ([#10797](https://github.com/paritytech/parity-ethereum/pull/10797))
+* Better logging when backfilling ancient blocks fail ([#10796](https://github.com/paritytech/parity-ethereum/pull/10796))
+* added new ropsten-bootnode and removed old one ([#10794](https://github.com/paritytech/parity-ethereum/pull/10794))
+* Removed machine abstraction from ethcore ([#10791](https://github.com/paritytech/parity-ethereum/pull/10791))
+* Removed redundant ethcore-service error type ([#10788](https://github.com/paritytech/parity-ethereum/pull/10788))
+* Cleanup unused vm dependencies ([#10787](https://github.com/paritytech/parity-ethereum/pull/10787))
+* ethkey no longer uses byteorder ([#10786](https://github.com/paritytech/parity-ethereum/pull/10786))
+* Updated blooms-db to rust 2018 and removed redundant deps ([#10785](https://github.com/paritytech/parity-ethereum/pull/10785))
+* Treat empty account the same as non-exist accounts in EIP-1052 ([#10775](https://github.com/paritytech/parity-ethereum/pull/10775))
+* Do not drop the peer with None difficulty ([#10772](https://github.com/paritytech/parity-ethereum/pull/10772))
+* EIP-1702: Generalized Account Versioning Scheme ([#10771](https://github.com/paritytech/parity-ethereum/pull/10771))
+* Move Engine::register_client to be before other I/O handler registration ([#10767](https://github.com/paritytech/parity-ethereum/pull/10767))
+* ethcore/res: activate atlantis classic hf on block 8772000 ([#10766](https://github.com/paritytech/parity-ethereum/pull/10766))
+* Updated Bn128PairingImpl to use optimized batch pairing  ([#10765](https://github.com/paritytech/parity-ethereum/pull/10765))
+* Remove unused code ([#10762](https://github.com/paritytech/parity-ethereum/pull/10762))
+* Initialize private tx logger only if private tx functionality is enabled ([#10758](https://github.com/paritytech/parity-ethereum/pull/10758))
+* SecretStore: remove support of old database formats ([#10757](https://github.com/paritytech/parity-ethereum/pull/10757))
+* Enable aesni ([#10756](https://github.com/paritytech/parity-ethereum/pull/10756))
+* updater: fix static id hashes initialization ([#10755](https://github.com/paritytech/parity-ethereum/pull/10755))
+* Use fewer threads for snapshotting ([#10752](https://github.com/paritytech/parity-ethereum/pull/10752))
+* Die error_chain, die ([#10747](https://github.com/paritytech/parity-ethereum/pull/10747))
+* Fix deprectation warnings on nightly ([#10746](https://github.com/paritytech/parity-ethereum/pull/10746))
+* Improve logging and cleanup in miner around block sealing ([#10745](https://github.com/paritytech/parity-ethereum/pull/10745))
+* Add a way to signal shutdown to snapshotting threads ([#10744](https://github.com/paritytech/parity-ethereum/pull/10744))
+* fix docker tags for publishing ([#10741](https://github.com/paritytech/parity-ethereum/pull/10741))
+* refactor: Fix indentation in ethjson ([#10740](https://github.com/paritytech/parity-ethereum/pull/10740))
+* Log validator set changes in EpochManager ([#10734](https://github.com/paritytech/parity-ethereum/pull/10734))
+* Print warnings when using dangerous settings for ValidatorSet ([#10733](https://github.com/paritytech/parity-ethereum/pull/10733))
+* ethcore: enable ECIP-1054 for classic ([#10731](https://github.com/paritytech/parity-ethereum/pull/10731))
+* Stop breaking out of loop if a non-canonical hash is found ([#10729](https://github.com/paritytech/parity-ethereum/pull/10729))
+* Removed secret_store folder ([#10722](https://github.com/paritytech/parity-ethereum/pull/10722))
+* Revert "enable lto for release builds (#10717)" ([#10721](https://github.com/paritytech/parity-ethereum/pull/10721))
+* fix: aura don't add `SystemTime::now()` ([#10720](https://github.com/paritytech/parity-ethereum/pull/10720))
+* Use RUSTFLAGS to set the optimization level ([#10719](https://github.com/paritytech/parity-ethereum/pull/10719))
+* enable lto for release builds ([#10717](https://github.com/paritytech/parity-ethereum/pull/10717))
+* [devp2p] Update to 2018 edition ([#10716](https://github.com/paritytech/parity-ethereum/pull/10716))
+* [devp2p] Don't use `rust-crypto` ([#10714](https://github.com/paritytech/parity-ethereum/pull/10714))
+* [devp2p] Fix warnings and re-org imports ([#10710](https://github.com/paritytech/parity-ethereum/pull/10710))
+* DevP2p: Get node IP address and udp port from Socket, if not included in PING packet ([#10705](https://github.com/paritytech/parity-ethereum/pull/10705))
+* introduce MissingParent Error, fixes #10699 ([#10700](https://github.com/paritytech/parity-ethereum/pull/10700))
+* Refactor Clique stepping ([#10691](https://github.com/paritytech/parity-ethereum/pull/10691))
+* add_sync_notifier in EthPubSubClient holds on to a Client for too long ([#10689](https://github.com/paritytech/parity-ethereum/pull/10689))
+* Fix compiler warning (that will become an error) ([#10683](https://github.com/paritytech/parity-ethereum/pull/10683))
+* Don't panic if extra_data is longer than VANITY_LENGTH ([#10682](https://github.com/paritytech/parity-ethereum/pull/10682))
+* Remove annoying compiler warnings ([#10679](https://github.com/paritytech/parity-ethereum/pull/10679))
+* Remove support for hardware wallets ([#10678](https://github.com/paritytech/parity-ethereum/pull/10678))
+* [CI] allow cargo audit to fail ([#10676](https://github.com/paritytech/parity-ethereum/pull/10676))
+* new image ([#10673](https://github.com/paritytech/parity-ethereum/pull/10673))
+* Upgrade ethereum types ([#10670](https://github.com/paritytech/parity-ethereum/pull/10670))
+* Reset blockchain properly ([#10669](https://github.com/paritytech/parity-ethereum/pull/10669))
+* fix: Move PR template into .github/ folder ([#10663](https://github.com/paritytech/parity-ethereum/pull/10663))
+* docs: evmbin - Update Rust docs ([#10658](https://github.com/paritytech/parity-ethereum/pull/10658))
+* refactor: Related #9459 - evmbin: replace untyped json! macro with fully typed serde serialization using Rust structs ([#10657](https://github.com/paritytech/parity-ethereum/pull/10657))
+* docs: Add PR template ([#10654](https://github.com/paritytech/parity-ethereum/pull/10654))
+* docs: Add ProgPoW Rust docs to ethash module ([#10653](https://github.com/paritytech/parity-ethereum/pull/10653))
+* docs: Update Readme with TOC, Contributor Guideline. Update Cargo package descriptions ([#10652](https://github.com/paritytech/parity-ethereum/pull/10652))
+* Upgrade to parity-crypto 0.4 ([#10650](https://github.com/paritytech/parity-ethereum/pull/10650))
+* fix(compilation warnings) ([#10649](https://github.com/paritytech/parity-ethereum/pull/10649))
+* [whisper] Move needed aes_gcm crypto in-crate ([#10647](https://github.com/paritytech/parity-ethereum/pull/10647))
+* Update publishing ([#10644](https://github.com/paritytech/parity-ethereum/pull/10644))
+* ci: publish docs debug ([#10638](https://github.com/paritytech/parity-ethereum/pull/10638))
+* Fix publish docs ([#10635](https://github.com/paritytech/parity-ethereum/pull/10635))
+* Fix rinkeby petersburg fork ([#10632](https://github.com/paritytech/parity-ethereum/pull/10632))
+* Update kovan.json to switch Kovan validator set to POA Consensus Contracts ([#10628](https://github.com/paritytech/parity-ethereum/pull/10628))
+* [ethcore] remove error_chain ([#10616](https://github.com/paritytech/parity-ethereum/pull/10616))
+* Remove unused import ([#10615](https://github.com/paritytech/parity-ethereum/pull/10615))
+* Adds parity_getRawBlockByNumber, parity_submitRawBlock ([#10609](https://github.com/paritytech/parity-ethereum/pull/10609))
+* adds rpc error message for --no-ancient-blocks ([#10608](https://github.com/paritytech/parity-ethereum/pull/10608))
+* Constantinople HF on POA Core ([#10606](https://github.com/paritytech/parity-ethereum/pull/10606))
+* Clique: zero-fill extradata when the supplied value is less than 32 bytes in length ([#10605](https://github.com/paritytech/parity-ethereum/pull/10605))
+* evm: add some mulmod benches ([#10600](https://github.com/paritytech/parity-ethereum/pull/10600))
+* sccache logs to stdout ([#10596](https://github.com/paritytech/parity-ethereum/pull/10596))
+* update bootnodes ([#10595](https://github.com/paritytech/parity-ethereum/pull/10595))
+* Merge `Notifier` and `TransactionsPoolNotifier` ([#10591](https://github.com/paritytech/parity-ethereum/pull/10591))
+* fix(whisper): change expiry `unix_time + ttl + work` ([#10587](https://github.com/paritytech/parity-ethereum/pull/10587))
+* fix(evmbin): make benches compile again ([#10586](https://github.com/paritytech/parity-ethereum/pull/10586))
+* fix issue with compilation when 'slow-blocks' feature enabled ([#10585](https://github.com/paritytech/parity-ethereum/pull/10585))
+* Allow CORS requests in Secret Store API ([#10584](https://github.com/paritytech/parity-ethereum/pull/10584))
+* CI improvements ([#10579](https://github.com/paritytech/parity-ethereum/pull/10579))
+* ethcore: improve timestamp handling ([#10574](https://github.com/paritytech/parity-ethereum/pull/10574))
+* Update Issue Template to direct security issue to email ([#10562](https://github.com/paritytech/parity-ethereum/pull/10562))
+* version: bump master to 2.6 ([#10560](https://github.com/paritytech/parity-ethereum/pull/10560))
+* fix(light cull): poll light cull instead of timer ([#10559](https://github.com/paritytech/parity-ethereum/pull/10559))
+* Watch transactions pool ([#10558](https://github.com/paritytech/parity-ethereum/pull/10558))
+* Add SealingState; don't prepare block when not ready. ([#10529](https://github.com/paritytech/parity-ethereum/pull/10529))
+* Explicitly enable or disable Stratum in config file (Issue 9785) ([#10521](https://github.com/paritytech/parity-ethereum/pull/10521))
+* Add filtering capability to `parity_pendingTransactions` (issue 8269) ([#10506](https://github.com/paritytech/parity-ethereum/pull/10506))
+* Remove calls to heapsize ([#10432](https://github.com/paritytech/parity-ethereum/pull/10432))
+* RPC: Implements eth_subscribe("syncing") ([#10311](https://github.com/paritytech/parity-ethereum/pull/10311))
+* SecretStore: non-blocking wait of session completion ([#10303](https://github.com/paritytech/parity-ethereum/pull/10303))
+* Node table limiting and cache for node filter ([#10288](https://github.com/paritytech/parity-ethereum/pull/10288))
+* SecretStore: expose restore_key_public in HTTP API ([#10241](https://github.com/paritytech/parity-ethereum/pull/10241))
+* Trivial journal for private transactions ([#10056](https://github.com/paritytech/parity-ethereum/pull/10056))
 
-Bug fixes:
-* Ignore GetNodeData requests only for non-AuRa chains
+## Previous releases
 
-## OpenEthereum v3.3.0-rc.10
-
-Enhancements:
-* Add eip1559FeeCollector and eip1559FeeCollectorTransition spec options
-
-## OpenEthereum v3.3.0-rc.9
-
-Bug fixes:
-* Add service transactions support for EIP-1559
-* Fix MinGasPrice config option for POSDAO and EIP-1559
-
-Enhancements:
-* min_gas_price becomes min_effective_priority_fee
-* added version 4 for TxPermission contract
-
-## OpenEthereum v3.3.0-rc.8
-
-Bug fixes:
-* Ignore GetNodeData requests (#519)
-
-## OpenEthereum v3.3.0-rc.7
-
-Bug fixes:
-* GetPooledTransactions is sent in invalid form (wrong packet id)
-
-## OpenEthereum v3.3.0-rc.6
-
-Enhancements:
-* London hardfork block: kovan (26741100) (#502)
-
-## OpenEthereum v3.3.0-rc.4
-
-Enhancements:
-* London hardfork block: mainnet (12,965,000) (#475)
-* Support for eth/66 protocol version (#465)
-* Bump ethereum/tests to v9.0.3
-* Add eth_feeHistory
-
-Bug fixes:
-* GetNodeData from eth63 is missing (#466)
-* Effective gas price not omitting (#477)
-* London support in openethereum-evm (#479)
-* gasPrice is required field for Transaction object (#481)
-
-## OpenEthereum v3.3.0-rc.3
-
-Bug fixes:
-* Add effective_gas_price to eth_getTransactionReceipt #445 (#450)
-* Update eth_gasPrice to support EIP-1559 #449 (#458)
-* eth_estimateGas returns "Requires higher than upper limit of X" after London Ropsten Hard Fork #459 (#460)
-
-## OpenEthereum v3.3.0-rc.2
-
-Enhancements:
-* EIP-1559: Fee market change for ETH 1.0 chain
-* EIP-3198: BASEFEE opcode
-* EIP-3529: Reduction in gas refunds
-* EIP-3541: Reject new contracts starting with the 0xEF byte
-* Delay difficulty bomb to December 2021 (EIP-3554)
-* London hardfork blocks: goerli (5,062,605), rinkeby (8,897,988), ropsten (10,499,401)
-* Add chainspecs for aleut and baikal
-* Bump ethereum/tests to v9.0.2
-
-## OpenEthereum v3.2.6
-
-Enhancement:
-* Berlin hardfork blocks: poacore (21,364,900), poasokol (21,050,600)
-
-## OpenEthereum v3.2.5
-
-Bug fixes:
-* Backport: Block sync stopped without any errors. #277 (#286)
-* Strict memory order (#306)
-
-Enhancements:
-* Executable queue for ancient blocks inclusion (#208)
-* Backport AuRa commits for xdai (#330)
-* Add Nethermind to clients that accept service transactions (#324)
-* Implement the filter argument in parity_pendingTransactions (#295)
-* Ethereum-types and various libs upgraded (#315)
-* [evmbin] Omit storage output, now for std-json (#311)
-* Freeze pruning while creating snapshot (#205)
-* AuRa multi block reward (#290)
-* Improved metrics. DB read/write. prometheus prefix config (#240)
-* Send RLPx auth in EIP-8 format (#287)
-* rpc module reverted for RPC JSON api (#284)
-* Revert "Remove eth/63 protocol version (#252)"
-* Support for eth/65 protocol version (#366)
-* Berlin hardfork blocks: kovan (24,770,900), xdai (16,101,500)
-* Bump ethereum/tests to v8.0.3
-
-devops:
-* Upgrade docker alpine to `v1.13.2`. for rust `v1.47`.
-* Send SIGTERM instead of SIGHUP to OE daemon (#317)
-
-## OpenEthereum v3.2.4
-
-* Fix for Typed transaction broadcast.
-
-## OpenEthereum v3.2.3
-
-* Hotfix for berlin consensus error.
-
-## OpenEthereum v3.2.2-rc.1
-
-Bug fixes:
-* Backport: Block sync stopped without any errors. #277 (#286)
-* Strict memory order (#306)
-
-Enhancements:
-* Executable queue for ancient blocks inclusion (#208)
-* Backport AuRa commits for xdai (#330)
-* Add Nethermind to clients that accept service transactions (#324)
-* Implement the filter argument in parity_pendingTransactions (#295) 
-* Ethereum-types and various libs upgraded (#315)
-* Bump ethereum/tests to v8.0.2
-* [evmbin] Omit storage output, now for std-json (#311)
-* Freeze pruning while creating snapshot (#205)
-* AuRa multi block reward (#290)
-* Improved metrics. DB read/write. prometheus prefix config (#240)
-* Send RLPx auth in EIP-8 format (#287)
-* rpc module reverted for RPC JSON api (#284)
-* Revert "Remove eth/63 protocol version (#252)"
-
-devops:
-* Upgrade docker alpine to `v1.13.2`. for rust `v1.47`.
-* Send SIGTERM instead of SIGHUP to OE daemon (#317)
-
-## OpenEthereum v3.2.1
-
-Hot fix issue, related to initial sync:
-* Initial sync gets stuck. (#318)
-
-## OpenEthereum v3.2.0
-
-Bug fixes:
-* Update EWF's chains with Istanbul transition block numbers (#11482) (#254)
-* fix Supplied instant is later than self (#169)
-* ethcore/snapshot: fix double-lock in Service::feed_chunk (#289)
-
-Enhancements:
-* Berlin hardfork blocks: mainnet (12,244,000), goerli (4,460,644), rinkeby (8,290,928) and ropsten (9,812,189)
-* yolo3x spec (#241)
-* EIP-2930 RPC support
-* Remove eth/63 protocol version (#252)
-* Snapshot manifest block added to prometheus (#232)
-* EIP-1898: Allow default block parameter to be blockHash
-* Change ProtocolId to U64
-* Update ethereum/tests
+- [CHANGELOG-2.5](docs/CHANGELOG-2.5.md) (_stable_)
+- [CHANGELOG-2.4](docs/CHANGELOG-2.4.md) (EOL: 2019-07-08)
+- [CHANGELOG-2.3](docs/CHANGELOG-2.3.md) (EOL: 2019-04-09)
+- [CHANGELOG-2.2](docs/CHANGELOG-2.2.md) (EOL: 2019-02-25)
+- [CHANGELOG-2.1](docs/CHANGELOG-2.1.md) (EOL: 2019-01-16)
+- [CHANGELOG-2.0](docs/CHANGELOG-2.0.md) (EOL: 2018-11-15)
+- [CHANGELOG-1.11](docs/CHANGELOG-1.11.md) (EOL: 2018-09-19)
+- [CHANGELOG-1.10](docs/CHANGELOG-1.10.md) (EOL: 2018-07-18)
+- [CHANGELOG-1.9](docs/CHANGELOG-1.9.md) (EOL: 2018-05-09)
+- [CHANGELOG-1.8](docs/CHANGELOG-1.8.md) (EOL: 2018-03-22)
+- [CHANGELOG-1.7](docs/CHANGELOG-1.7.md) (EOL: 2018-01-25)
+- [CHANGELOG-1.6](docs/CHANGELOG-1.6.md) (EOL: 2017-10-15)
+- [CHANGELOG-1.5](docs/CHANGELOG-1.5.md) (EOL: 2017-07-28)
+- [CHANGELOG-1.4](docs/CHANGELOG-1.4.md) (EOL: 2017-03-13)
+- [CHANGELOG-1.3](docs/CHANGELOG-1.3.md) (EOL: 2017-01-19)
+- [CHANGELOG-1.2](docs/CHANGELOG-1.2.md) (EOL: 2016-11-07)
+- [CHANGELOG-1.1](docs/CHANGELOG-1.1.md) (EOL: 2016-08-12)
+- [CHANGELOG-1.0](docs/CHANGELOG-1.0.md) (EOL: 2016-06-24)
+- [CHANGELOG-0.9](docs/CHANGELOG-0.9.md) (EOL: 2016-05-02)

Cargo.toml

@@ -1,16 +1,13 @@
 [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.3.3"
+version = "2.6.4"
 license = "GPL-3.0"
-authors = [
-	"OpenEthereum developers",
-	"Parity Technologies <admin@parity.io>"
-]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-blooms-db = { path = "crates/db/blooms-db" }
+blooms-db = { path = "util/blooms-db" }
 log = "0.4"
 rustc-hex = "1.0"
 docopt = "1.0"
@@ -21,8 +18,8 @@ num_cpus = "1.2"
 number_prefix = "0.2"
 rpassword = "1.0"
 semver = "0.9"
-ansi_term = "0.10"
-parking_lot = "0.11.1"
+ansi_term = "0.11"
+parking_lot = "0.7"
 regex = "1.0"
 atty = "0.2.8"
 toml = "0.4"
@@ -30,48 +27,53 @@ serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
 futures = "0.1"
-hyper = { version = "0.12" }
 fdlimit = "0.1"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
-jsonrpc-core = "15.0.0"
+jsonrpc-core = "12.0.0"
 parity-bytes = "0.1"
-common-types = { path = "crates/ethcore/types" }
-ethcore = { path = "crates/ethcore", features = ["parity"] }
-ethcore-accounts = { path = "crates/accounts", optional = true }
-ethcore-blockchain = { path = "crates/ethcore/blockchain" }
-ethcore-call-contract = { path = "crates/vm/call-contract"}
-ethcore-db = { path = "crates/db/db" }
-ethcore-io = { path = "crates/runtime/io" }
-ethcore-logger = { path = "bin/oe/logger" }
-ethcore-miner = { path = "crates/concensus/miner" }
-ethcore-network = { path = "crates/net/network" }
-ethcore-service = { path = "crates/ethcore/service" }
-ethcore-sync = { path = "crates/ethcore/sync" }
-ethereum-types = "0.9.2"
-ethkey = { path = "crates/accounts/ethkey" }
-ethstore = { path = "crates/accounts/ethstore" }
-fetch = { path = "crates/net/fetch" }
-node-filter = { path = "crates/net/node-filter" }
-parity-crypto = { version = "0.6.2", features = [ "publickey" ] }
-rlp = { version = "0.4.6" }
-cli-signer= { path = "crates/util/cli-signer" }
+common-types = { path = "ethcore/types" }
+ethcore = { path = "ethcore", features = ["parity"] }
+ethcore-accounts = { path = "accounts", optional = true }
+ethcore-blockchain = { path = "ethcore/blockchain" }
+ethcore-call-contract = { path = "ethcore/call-contract"}
+ethcore-db = { path = "ethcore/db" }
+ethcore-io = { path = "util/io" }
+ethcore-light = { path = "ethcore/light" }
+ethcore-logger = { path = "parity/logger" }
+ethcore-miner = { path = "miner" }
+ethcore-network = { path = "util/network" }
+ethcore-private-tx = { path = "ethcore/private-tx" }
+ethcore-service = { path = "ethcore/service" }
+ethcore-sync = { path = "ethcore/sync" }
+ethereum-types = "0.6.0"
+ethkey = { path = "accounts/ethkey" }
+ethstore = { path = "accounts/ethstore" }
+node-filter = { path = "ethcore/node-filter" }
+rlp = "0.4.0"
+cli-signer= { path = "cli-signer" }
 parity-daemonize = "0.3"
-parity-local-store = { path = "crates/concensus/miner/local-store" }
-parity-runtime = { path = "crates/runtime/runtime" }
-parity-rpc = { path = "crates/rpc" }
-parity-version = { path = "crates/util/version" }
+parity-hash-fetch = { path = "updater/hash-fetch" }
+parity-ipfs-api = { path = "ipfs" }
+parity-local-store = { path = "miner/local-store" }
+parity-runtime = { path = "util/runtime" }
+parity-rpc = { path = "rpc" }
+parity-updater = { path = "updater" }
+parity-version = { path = "util/version" }
+parity-whisper = { path = "whisper" }
 parity-path = "0.1"
-dir = { path = "crates/util/dir" }
-panic_hook = { path = "crates/util/panic-hook" }
-keccak-hash = "0.5.0"
-migration-rocksdb = { path = "crates/db/migration-rocksdb" }
+dir = { path = "util/dir" }
+panic_hook = { path = "util/panic-hook" }
+keccak-hash = "0.2.0"
+migration-rocksdb = { path = "util/migration-rocksdb" }
 kvdb = "0.1"
 kvdb-rocksdb = "0.1.3"
-journaldb = { path = "crates/db/journaldb" }
-stats = { path = "crates/util/stats" }
-prometheus = "0.9.0"
+journaldb = { path = "util/journaldb" }
 
-# ethcore-secretstore = { path = "crates/util/secret-store", optional = true }
+ethcore-secretstore = { path = "secret-store", optional = true }
+
+registrar = { path = "util/registrar" }
+
+parity-util-mem = { version = "0.1", features = ["jemalloc-global"] }
 
 [build-dependencies]
 rustc_version = "0.2"
@@ -80,8 +82,7 @@ rustc_version = "0.2"
 pretty_assertions = "0.1"
 ipnetwork = "0.12.6"
 tempdir = "0.3"
-fake-fetch = { path = "crates/net/fake-fetch" }
-lazy_static = "1.2.0"
+fake-fetch = { path = "util/fake-fetch" }
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3.4", features = ["winsock2", "winuser", "shellapi"] }
@@ -91,11 +92,11 @@ default = ["accounts"]
 accounts = ["ethcore-accounts", "parity-rpc/accounts"]
 miner-debug = ["ethcore/miner-debug"]
 json-tests = ["ethcore/json-tests"]
-ci-skip-tests = ["ethcore/ci-skip-tests"]
 test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
+secretstore = ["ethcore-secretstore", "ethcore-secretstore/accounts"]
 final = ["parity-version/final"]
 deadlock_detection = ["parking_lot/deadlock_detection"]
 # to create a memory profile (requires nightly rust), use e.g.
@@ -105,17 +106,17 @@ deadlock_detection = ["parking_lot/deadlock_detection"]
 # `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
+test-updater = ["parity-updater/test-updater"]
 
 [lib]
-path = "bin/oe/lib.rs"
+path = "parity/lib.rs"
 
 [[bin]]
-path = "bin/oe/main.rs"
-name = "openethereum"
-
-[profile.test]
-lto = false
-opt-level = 3 # makes tests slower to compile, but faster to run
+path = "parity/main.rs"
+name = "parity"
 
 [profile.release]
 debug = false
@@ -126,8 +127,16 @@ lto = true
 # in the dependency tree in any other way
 # (i.e. pretty much only standalone CLI tools)
 members = [
-	"bin/ethkey",
-	"bin/ethstore",
-	"bin/evmbin",
-	"bin/chainspec"
+	"accounts/ethkey/cli",
+	"accounts/ethstore/cli",
+	"chainspec",
+	"ethcore/wasm/run",
+	"evmbin",
+	"parity-clib",
+	"whisper/cli",
+	"util/triehash-ethereum",
+	"util/keccak-hasher",
+	"util/patricia-trie-ethereum",
+	"util/fastmap",
+	"util/time-utils",
 ]

README.md

@@ -1,19 +1,11 @@
-# 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]
-
-[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
+<p align="center"><a href="https://gitlab.parity.io/parity/parity-ethereum/commits/master" target="_blank"><img src="https://gitlab.parity.io/parity/parity-ethereum/badges/master/build.svg" /></a>
+<a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank"><img src="https://img.shields.io/badge/license-GPL%20v3-green.svg" /></a></p>
 
 ## Table of Contents
 
@@ -22,17 +14,19 @@ Fast and feature-rich multi-network Ethereum client.
 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)
+  3.3 [Simple One-Line Installer for Mac and Linux](#chapter-0033)<br>
+  3.4 [Starting Parity Ethereum](#chapter-0034)
 4. [Testing](#chapter-004)
 5. [Documentation](#chapter-005)
 6. [Toolchain](#chapter-006)
-7. [Contributing](#chapter-008)
-8. [License](#chapter-009)
+7. [Community](#chapter-007)
+8. [Contributing](#chapter-008)
+9. [License](#chapter-009)
 
 
 ## 1. Description <a id="chapter-001"></a>
 
-**Built for mission-critical use**: Miners, service providers, and exchanges need fast synchronisation and maximum uptime. 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
@@ -42,19 +36,19 @@ Fast and feature-rich multi-network Ethereum client.
 
 ## 2. Technical Overview <a id="chapter-002"></a>
 
-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://openethereum.github.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>
 
 ### 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 +57,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++`, `pkg-config`, `file`, `make`, and `cmake` packages to be installed.
 
 - OSX:
   ```bash
@@ -83,14 +77,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>
 
 ```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,36 +104,54 @@ 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>
+or
+
+```bash
+$ git checkout beta
+```
+
+### 3.3 Simple One-Line Installer for Mac and Linux <a id="chapter-0033"></a>
+
+```bash
+bash <(curl https://get.parity.io -L)
+```
+
+The one-line installer always defaults to the latest beta release. To install a stable release, run:
+
+```bash
+bash <(curl https://get.parity.io -L) -r stable
+```
+
+### 3.4 Starting Parity Ethereum <a id="chapter-0034"></a>
 
 #### Manually
 
-To start OpenEthereum manually, just run
+To start Parity Ethereum manually, just run
 
 ```bash
-$ ./target/release/openethereum
+$ ./target/release/parity
 ```
 
-so OpenEthereum begins syncing the Ethereum blockchain.
+so Parity Ethereum begins syncing the Ethereum blockchain.
 
 #### Using `systemd` service file
 
-To start OpenEthereum as a regular user using `systemd` init:
+To start Parity Ethereum as a regular user using `systemd` init:
 
-1. Copy `./scripts/openethereum.service` to your
+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 wiki](https://openethereum.github.io/Configuring-OpenEthereum) for details.
+2. Copy release to bin folder, write `sudo install ./target/release/parity /usr/bin/parity`
+3. To configure Parity Ethereum, write a `/etc/parity/config.toml` config file, see [Configuring Parity Ethereum](https://paritytech.github.io/wiki/Configuring-Parity) for details.
 
 ## 4. Testing <a id="chapter-004"></a>
 
-Download the required test files: `git submodule update --init --recursive`. You can run tests with the following commands:
+You can run tests with the following commands:
 
 * **All** packages
   ```
@@ -157,11 +169,13 @@ You can show your logs in the test output by passing `--nocapture` (i.e. `cargo
 
 ## 5. Documentation <a id="chapter-005"></a>
 
-Be sure to [check out our wiki](https://openethereum.github.io/) for more information.
+Official website: https://parity.io
 
-### Viewing documentation for OpenEthereum packages
+Be sure to [check out our wiki](https://wiki.parity.io) for more information.
 
-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:
+### Viewing documentation for Parity Ethereum packages
+
+You can generate documentation for Parity Ethereum Rust packages that automatically opens in your web browser using [rustdoc with Cargo](https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html#using-rustdoc-with-cargo) (of the The Rustdoc Book), by running the the following commands:
 
 * **All** packages
   ```
@@ -175,137 +189,196 @@ You can generate documentation for OpenEthereum Rust packages that automatically
 
 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`):
+Replacing `<spec>` with one of the following from the details section below (i.e. `cargo doc --package parity-ethereum --open`):
 
 <a id="package-list"></a>
 **Package List**
 <details><p>
 
-* OpenEthereum Client Application
+* Parity Ethereum (EthCore) Client Application
   ```bash
-  openethereum
+  parity-ethereum
   ```
-* OpenEthereum Account Management, Key Management Tool, and Keys Generator
+* Parity Ethereum Account Management, Key Management Tool, and Keys Generator
   ```bash
   ethcore-accounts, ethkey-cli, ethstore, ethstore-cli
   ```
-* OpenEthereum Chain Specification
+* Parity Chain Specification
   ```bash
   chainspec
   ```
-* OpenEthereum CLI Signer Tool & RPC Client
+* Parity CLI Signer Tool & RPC Client
   ```bash
   cli-signer parity-rpc-client
   ```
-* OpenEthereum Ethash & ProgPoW Implementations
+* Parity Ethereum Ethash & ProgPoW Implementations
   ```bash
   ethash
   ```
-* EthCore Library
+* Parity (EthCore) Library
   ```bash
   ethcore
   ```
-  * OpenEthereum Blockchain Database, Test Generator, Configuration,
+  * Parity Ethereum Blockchain Database, Test Generator, Configuration,
 Caching, Importing Blocks, and Block Information
     ```bash
     ethcore-blockchain
     ```
-  * OpenEthereum Contract Calls and Blockchain Service & Registry Information
+  * Parity Ethereum (EthCore) Contract Calls and Blockchain Service & Registry Information
     ```bash
     ethcore-call-contract
     ```
-  * OpenEthereum Database Access & Utilities, Database Cache Manager
+  * Parity Ethereum (EthCore) Database Access & Utilities, Database Cache Manager
     ```bash
     ethcore-db
     ```
-  * OpenEthereum Virtual Machine (EVM) Rust Implementation
+  * Parity Ethereum Virtual Machine (EVM) Rust Implementation
     ```bash
     evm
     ```
-  * OpenEthereum Light Client Implementation
+  * Parity Ethereum (EthCore) Light Client Implementation
     ```bash
     ethcore-light
     ```
-  * Smart Contract based Node Filter, Manage Permissions of Network Connections
+  * Parity Smart Contract based Node Filter, Manage Permissions of Network Connections
     ```bash
     node-filter
     ```
-  * OpenEthereum Client & Network Service Creation & Registration with the I/O Subsystem
+  * Parity Private Transactions
+    ```bash
+    ethcore-private-tx
+    ```
+  * Parity Ethereum (EthCore) Client & Network Service Creation & Registration with the I/O Subsystem
     ```bash
     ethcore-service
     ```
-  * OpenEthereum Blockchain Synchronization
+  * Parity Ethereum (EthCore) Blockchain Synchronization
     ```bash
     ethcore-sync
     ```
-  * OpenEthereum Common Types
+  * Parity Ethereum Common Types
     ```bash
     common-types
     ```
-  * OpenEthereum Virtual Machines (VM) Support Library
+  * Parity Ethereum Virtual Machines (VM) Support Library
     ```bash
     vm
     ```
-  * OpenEthereum WASM Interpreter
+  * Parity Ethereum WASM Interpreter
     ```bash
     wasm
     ```
-  * OpenEthereum WASM Test Runner
+  * Parity Ethereum WASM Test Runner
     ```bash
     pwasm-run-test
     ```
-  * OpenEthereum EVM Implementation
+  * Parity EVM Implementation
     ```bash
     evmbin
     ```
-  * OpenEthereum JSON Deserialization
+  * Parity Ethereum IPFS-compatible API
+    ```bash
+    parity-ipfs-api
+    ```
+  * Parity Ethereum JSON Deserialization
     ```bash
     ethjson
     ```
-  * OpenEthereum State Machine Generalization for Consensus Engines
+  * Parity Ethereum State Machine Generalization for Consensus Engines
     ```bash
     parity-machine
     ```
-* OpenEthereum Miner Interface
+* Parity Ethereum (EthCore) Miner Interface
   ```bash
   ethcore-miner parity-local-store price-info ethcore-stratum using_queue
   ```
-* OpenEthereum Logger Implementation
+* Parity Ethereum (EthCore) Logger Implementation
   ```bash
   ethcore-logger
   ```
-* OpenEthereum JSON-RPC Servers
+* C bindings library for the Parity Ethereum client
+  ```bash
+  parity-clib
+  ```
+* Parity Ethereum JSON-RPC Servers
   ```bash
   parity-rpc
   ```
-* OpenEthereum Updater Service
+* Parity Ethereum (EthCore) Secret Store
+  ```bash
+  ethcore-secretstore
+  ```
+* Parity Updater Service
   ```bash
   parity-updater parity-hash-fetch
   ```
-* OpenEthereum Core Libraries (`util`)
+* Parity Core Libraries (Parity Util)
   ```bash
-  accounts-bloom blooms-db dir eip-712 fake-fetch fastmap fetch ethcore-io
-  journaldb keccak-hasher len-caching-lock memory-cache memzero
+  ethcore-bloom-journal blooms-db dir eip-712 fake-fetch fastmap fetch ethcore-io
+  journaldb keccak-hasher len-caching-lock macros memory-cache memzero
   migration-rocksdb ethcore-network ethcore-network-devp2p panic_hook
-  patricia-trie-ethereum registrar rlp_compress stats
+  patricia-trie-ethereum registrar rlp_compress rlp_derive parity-runtime stats
   time-utils triehash-ethereum unexpected parity-version
   ```
+* Parity Whisper Protocol Implementation
+  ```bash
+  parity-whisper whisper-cli
+  ```
 
 </p></details>
 
+### Contributing to documentation for Parity Ethereum packages
+
+[Document source code](https://doc.rust-lang.org/1.9.0/book/documentation.html) for Parity Ethereum packages by annotating the source code with documentation comments.
+
+Example (generic documentation comment):
+```markdown
+/// Summary
+///
+/// Description
+///
+/// # Panics
+///
+/// # Errors
+///
+/// # Safety
+///
+/// # Examples
+///
+/// Summary of Example 1
+///
+/// ```rust
+/// // insert example 1 code here for use with documentation as tests
+/// ```
+///
+```
+
 ## 6. Toolchain <a id="chapter-006"></a>
 
-In addition to the OpenEthereum client, there are additional tools in this repository available:
+In addition to the Parity Ethereum client, there are additional tools in this repository available:
 
-- [evmbin](./bin/evmbin) - OpenEthereum EVM Implementation.
-- [ethstore](./crates/accounts/ethstore) - OpenEthereum Key Management.
-- [ethkey](./crates/accounts/ethkey) - OpenEthereum Keys Generator.
+- [evmbin](./evmbin) - Parity Ethereum EVM Implementation.
+- [ethstore](./accounts/ethstore) - Parity Ethereum Key Management.
+- [ethkey](./accounts/ethkey) - Parity Ethereum Keys Generator.
+- [whisper](./whisper) - Parity Ethereum Whisper-v2 PoC Implementation.
 
-The following 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.
+The following tool is available in a separate repository:
+- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum Encoding of Function Calls. [Docs here](https://crates.io/crates/ethabi)
 
-## 7. Contributing <a id="chapter-007"></a>
+## 7. Community <a id="chapter-007"></a>
+
+### Join the chat!
+
+Questions? Get in touch with us on Gitter:
+[![Gitter: Parity](https://img.shields.io/badge/gitter-parity-4AB495.svg)](https://gitter.im/paritytech/parity)
+[![Gitter: Parity.js](https://img.shields.io/badge/gitter-parity.js-4AB495.svg)](https://gitter.im/paritytech/parity.js)
+[![Gitter: Parity/Miners](https://img.shields.io/badge/gitter-parity/miners-4AB495.svg)](https://gitter.im/paritytech/parity/miners)
+[![Gitter: Parity-PoA](https://img.shields.io/badge/gitter-parity--poa-4AB495.svg)](https://gitter.im/paritytech/parity-poa)
+
+Alternatively, join our community on Matrix:
+[![Riot: +Parity](https://img.shields.io/badge/riot-%2Bparity%3Amatrix.parity.io-orange.svg)](https://riot.im/app/#/group/+parity:matrix.parity.io)
+
+## 8. Contributing <a id="chapter-008"></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).
 
@@ -313,6 +386,6 @@ An introduction has been provided in the ["So You Want to be a Core Developer" p
 
 [CODE_OF_CONDUCT](./.github/CODE_OF_CONDUCT.md)
 
-## 8. License <a id="chapter-008"></a>
+## 9. License <a id="chapter-009"></a>
 
 [LICENSE](./LICENSE)

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-----
+```

accounts/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-description = "OpenEthereum Account Management"
-homepage = "https://github.com/openethereum/openethereum"
+description = "Parity Ethereum Account Management"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-accounts"
 version = "0.1.0"
@@ -8,16 +8,14 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-common-types = { path = "../ethcore/types" }
 ethkey = { path = "ethkey" }
 ethstore = { path = "ethstore" }
 log = "0.4"
-parity-crypto = { version = "0.6.2", features = [ "publickey" ] }
-parking_lot = "0.11.1"
+parking_lot = "0.7"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 
 [dev-dependencies]
-ethereum-types = "0.9.2"
+ethereum-types = "0.6.0"
 tempdir = "0.3"

accounts/ethkey/Cargo.toml

@@ -6,16 +6,16 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 edit-distance = "2.0"
-parity-crypto = { version = "0.6.2", features = ["publickey"] }
-eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1", rev = "9791e79f21a5309dcb6e0bd254b1ef88fca2f1f4" }
-ethereum-types = "0.9.2"
+parity-crypto = "0.4.0"
+eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
+ethereum-types = "0.6.0"
 lazy_static = "1.0"
 log = "0.4"
-memzero = { path = "../../../crates/util/memzero" }
 parity-wordlist = "1.3"
 quick-error = "1.2.2"
-rand = "0.7.3"
+rand = "0.6"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
 tiny-keccak = "1.4"
+zeroize = "0.9.1"

accounts/ethkey/README.md

@@ -218,3 +218,4 @@ _This project is a part of the Parity Ethereum toolchain._
 - [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding.
 - [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethstore) - Parity Ethereum key management.
 - [ethkey](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethkey) - Parity Ethereum keys generator.
+- [whisper](https://github.com/paritytech/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.

accounts/ethkey/cli/Cargo.toml

@@ -7,10 +7,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 docopt = "1.0"
 env_logger = "0.5"
-ethkey = { path = "../../crates/accounts/ethkey" }
-panic_hook = { path = "../../crates/util/panic-hook" }
-parity-crypto = { version = "0.6.2", features = [ "publickey" ] }
-parity-wordlist="1.3"
+ethkey = { path = "../" }
+panic_hook = { path = "../../../util/panic-hook" }
+parity-wordlist="1.2"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"

accounts/ethkey/cli/src/main.rs

@@ -0,0 +1,451 @@
+// 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/>.
+
+extern crate docopt;
+extern crate env_logger;
+extern crate ethkey;
+extern crate panic_hook;
+extern crate parity_wordlist;
+extern crate rustc_hex;
+extern crate serde;
+extern crate threadpool;
+
+#[macro_use]
+extern crate serde_derive;
+
+use std::num::ParseIntError;
+use std::{env, fmt, process, io, sync};
+
+use docopt::Docopt;
+use ethkey::{KeyPair, Random, Brain, BrainPrefix, Prefix, Error as EthkeyError, Generator, sign, verify_public, verify_address, brain_recover};
+use rustc_hex::{FromHex, FromHexError};
+
+const USAGE: &'static str = r#"
+Parity Ethereum keys generator.
+  Copyright 2015-2019 Parity Technologies (UK) Ltd.
+
+Usage:
+    ethkey info <secret-or-phrase> [options]
+    ethkey generate random [options]
+    ethkey generate prefix <prefix> [options]
+    ethkey sign <secret> <message>
+    ethkey verify public <public> <signature> <message>
+    ethkey verify address <address> <signature> <message>
+    ethkey recover <address> <known-phrase>
+    ethkey [-h | --help]
+
+Options:
+    -h, --help         Display this message and exit.
+    -s, --secret       Display only the secret key.
+    -p, --public       Display only the public key.
+    -a, --address      Display only the address.
+    -b, --brain        Use parity brain wallet algorithm. Not recommended.
+
+Commands:
+    info               Display public key and address of the secret.
+    generate random    Generates new random Ethereum key.
+    generate prefix    Random generation, but address must start with a prefix ("vanity address").
+    sign               Sign message using a secret key.
+    verify             Verify signer of the signature by public key or address.
+    recover            Try to find brain phrase matching given address from partial phrase.
+"#;
+
+#[derive(Debug, Deserialize)]
+struct Args {
+	cmd_info: bool,
+	cmd_generate: bool,
+	cmd_random: bool,
+	cmd_prefix: bool,
+	cmd_sign: bool,
+	cmd_verify: bool,
+	cmd_public: bool,
+	cmd_address: bool,
+	cmd_recover: bool,
+	arg_prefix: String,
+	arg_secret: String,
+	arg_secret_or_phrase: String,
+	arg_known_phrase: String,
+	arg_message: String,
+	arg_public: String,
+	arg_address: String,
+	arg_signature: String,
+	flag_secret: bool,
+	flag_public: bool,
+	flag_address: bool,
+	flag_brain: bool,
+}
+
+#[derive(Debug)]
+enum Error {
+	Ethkey(EthkeyError),
+	FromHex(FromHexError),
+	ParseInt(ParseIntError),
+	Docopt(docopt::Error),
+	Io(io::Error),
+}
+
+impl From<EthkeyError> for Error {
+	fn from(err: EthkeyError) -> Self {
+		Error::Ethkey(err)
+	}
+}
+
+impl From<FromHexError> for Error {
+	fn from(err: FromHexError) -> Self {
+		Error::FromHex(err)
+	}
+}
+
+impl From<ParseIntError> for Error {
+	fn from(err: ParseIntError) -> Self {
+		Error::ParseInt(err)
+	}
+}
+
+impl From<docopt::Error> for Error {
+	fn from(err: docopt::Error) -> Self {
+		Error::Docopt(err)
+	}
+}
+
+impl From<io::Error> for Error {
+	fn from(err: io::Error) -> Self {
+		Error::Io(err)
+	}
+}
+
+impl fmt::Display for Error {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		match *self {
+			Error::Ethkey(ref e) => write!(f, "{}", e),
+			Error::FromHex(ref e) => write!(f, "{}", e),
+			Error::ParseInt(ref e) => write!(f, "{}", e),
+			Error::Docopt(ref e) => write!(f, "{}", e),
+			Error::Io(ref e) => write!(f, "{}", e),
+		}
+	}
+}
+
+enum DisplayMode {
+	KeyPair,
+	Secret,
+	Public,
+	Address,
+}
+
+impl DisplayMode {
+	fn new(args: &Args) -> Self {
+		if args.flag_secret {
+			DisplayMode::Secret
+		} else if args.flag_public {
+			DisplayMode::Public
+		} else if args.flag_address {
+			DisplayMode::Address
+		} else {
+			DisplayMode::KeyPair
+		}
+	}
+}
+
+fn main() {
+	panic_hook::set_abort();
+	env_logger::try_init().expect("Logger initialized only once.");
+
+	match execute(env::args()) {
+		Ok(ok) => println!("{}", ok),
+		Err(Error::Docopt(ref e)) => e.exit(),
+		Err(err) => {
+			eprintln!("{}", err);
+			process::exit(1);
+		}
+	}
+}
+
+fn display(result: (KeyPair, Option<String>), mode: DisplayMode) -> String {
+	let keypair = result.0;
+	match mode {
+		DisplayMode::KeyPair => match result.1 {
+			Some(extra_data) => format!("{}\n{}", extra_data, keypair),
+			None => format!("{}", keypair)
+		},
+		DisplayMode::Secret => format!("{:x}", keypair.secret()),
+		DisplayMode::Public => format!("{:x}", keypair.public()),
+		DisplayMode::Address => format!("{:x}", keypair.address()),
+	}
+}
+
+fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item=S>, S: AsRef<str> {
+	let args: Args = Docopt::new(USAGE)
+		.and_then(|d| d.argv(command).deserialize())?;
+
+	return if args.cmd_info {
+		let display_mode = DisplayMode::new(&args);
+
+		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().expect("Brain wallet generator is infallible; qed");
+			(keypair, Some(phrase_info))
+		} else {
+			let secret = args.arg_secret_or_phrase.parse().map_err(|_| EthkeyError::InvalidSecret)?;
+			(KeyPair::from_secret(secret)?, None)
+		};
+		Ok(display(result, display_mode))
+	} else if args.cmd_generate {
+		let display_mode = DisplayMode::new(&args);
+		let result = if args.cmd_random {
+			if args.flag_brain {
+				let mut brain = BrainPrefix::new(vec![0], usize::max_value(), BRAIN_WORDS);
+				let keypair = brain.generate()?;
+				let phrase = format!("recovery phrase: {}", brain.phrase());
+				(keypair, Some(phrase))
+			} else {
+				(Random.generate()?, None)
+			}
+		} else if args.cmd_prefix {
+			let prefix = args.arg_prefix.from_hex()?;
+			let brain = args.flag_brain;
+			in_threads(move || {
+				let iterations = 1024;
+				let prefix = prefix.clone();
+				move || {
+					let prefix = prefix.clone();
+					let res = if brain {
+						let mut brain = BrainPrefix::new(prefix, iterations, BRAIN_WORDS);
+						let result = brain.generate();
+						let phrase = format!("recovery phrase: {}", brain.phrase());
+						result.map(|keypair| (keypair, Some(phrase)))
+					} else {
+						let result = Prefix::new(prefix, iterations).generate();
+						result.map(|res| (res, None))
+					};
+
+					Ok(res.map(Some).unwrap_or(None))
+				}
+			})?
+		} else {
+			return Ok(format!("{}", USAGE))
+		};
+		Ok(display(result, display_mode))
+	} else if args.cmd_sign {
+		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))
+	} else if args.cmd_verify {
+		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::InvalidPublic)?;
+			verify_public(&public, &signature, &message)?
+		} else if args.cmd_address {
+			let address = args.arg_address.parse().map_err(|_| EthkeyError::InvalidAddress)?;
+			verify_address(&address, &signature, &message)?
+		} else {
+			return Ok(format!("{}", USAGE))
+		};
+		Ok(format!("{}", ok))
+	} else if args.cmd_recover {
+		let display_mode = DisplayMode::new(&args);
+		let known_phrase = args.arg_known_phrase;
+		let address = args.arg_address.parse().map_err(|_| EthkeyError::InvalidAddress)?;
+		let (phrase, keypair) = in_threads(move || {
+			let mut it = brain_recover::PhrasesIterator::from_known_phrase(&known_phrase, BRAIN_WORDS);
+			move || {
+				let mut i = 0;
+				while let Some(phrase) = it.next() {
+					i += 1;
+
+					let keypair = Brain::new(phrase.clone()).generate().unwrap();
+					if keypair.address() == address {
+						return Ok(Some((phrase, keypair)))
+					}
+
+					if i >= 1024 {
+						return Ok(None)
+					}
+				}
+
+				Err(EthkeyError::Custom("Couldn't find any results.".into()))
+			}
+		})?;
+		Ok(display((keypair, Some(phrase)), display_mode))
+	} else {
+		Ok(format!("{}", USAGE))
+	}
+}
+
+const BRAIN_WORDS: usize = 12;
+
+fn validate_phrase(phrase: &str) -> String {
+	match Brain::validate_phrase(phrase, BRAIN_WORDS) {
+		Ok(()) => format!("The recovery phrase looks correct.\n"),
+		Err(err) => format!("The recover phrase was not generated by Parity: {}", err)
+	}
+}
+
+fn in_threads<F, X, O>(prepare: F) -> Result<O, EthkeyError> where
+	O: Send + 'static,
+	X: Send + 'static,
+	F: Fn() -> X,
+	X: FnMut() -> Result<Option<O>, EthkeyError>,
+{
+	let pool = threadpool::Builder::new().build();
+
+	let (tx, rx) = sync::mpsc::sync_channel(1);
+	let is_done = sync::Arc::new(sync::atomic::AtomicBool::default());
+
+	for _ in 0..pool.max_count() {
+		let is_done = is_done.clone();
+		let tx = tx.clone();
+		let mut task = prepare();
+		pool.execute(move || {
+			loop {
+				if is_done.load(sync::atomic::Ordering::SeqCst) {
+					return;
+				}
+
+				let res = match task() {
+					Ok(None) => continue,
+					Ok(Some(v)) => Ok(v),
+					Err(err) => Err(err),
+				};
+
+				// We are interested only in the first response.
+				let _ = tx.send(res);
+			}
+		});
+	}
+
+	if let Ok(solution) = rx.recv() {
+		is_done.store(true, sync::atomic::Ordering::SeqCst);
+		return solution;
+	}
+
+	Err(EthkeyError::Custom("No results found.".into()))
+}
+
+#[cfg(test)]
+mod tests {
+	use super::execute;
+
+	#[test]
+	fn info() {
+		let command = vec!["ethkey", "info", "17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55"]
+			.into_iter()
+			.map(Into::into)
+			.collect::<Vec<String>>();
+
+		let expected =
+"secret:  17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55
+public:  689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124
+address: 26d1ec50b4e62c1d1a40d16e7cacc6a6580757d5".to_owned();
+		assert_eq!(execute(command).unwrap(), expected);
+	}
+
+	#[test]
+	fn brain() {
+		let command = vec!["ethkey", "info", "--brain", "this is sparta"]
+			.into_iter()
+			.map(Into::into)
+			.collect::<Vec<String>>();
+
+		let expected =
+"The recover phrase was not generated by Parity: The word 'this' does not come from the dictionary.
+
+secret:  aa22b54c0cb43ee30a014afe5ef3664b1cde299feabca46cd3167a85a57c39f2
+public:  c4c5398da6843632c123f543d714d2d2277716c11ff612b2a2f23c6bda4d6f0327c31cd58c55a9572c3cc141dade0c32747a13b7ef34c241b26c84adbb28fcf4
+address: 006e27b6a72e1f34c626762f3c4761547aff1421".to_owned();
+		assert_eq!(execute(command).unwrap(), expected);
+	}
+
+	#[test]
+	fn secret() {
+		let command = vec!["ethkey", "info", "--brain", "this is sparta", "--secret"]
+			.into_iter()
+			.map(Into::into)
+			.collect::<Vec<String>>();
+
+		let expected = "aa22b54c0cb43ee30a014afe5ef3664b1cde299feabca46cd3167a85a57c39f2".to_owned();
+		assert_eq!(execute(command).unwrap(), expected);
+	}
+
+	#[test]
+	fn public() {
+		let command = vec!["ethkey", "info", "--brain", "this is sparta", "--public"]
+			.into_iter()
+			.map(Into::into)
+			.collect::<Vec<String>>();
+
+		let expected = "c4c5398da6843632c123f543d714d2d2277716c11ff612b2a2f23c6bda4d6f0327c31cd58c55a9572c3cc141dade0c32747a13b7ef34c241b26c84adbb28fcf4".to_owned();
+		assert_eq!(execute(command).unwrap(), expected);
+	}
+
+	#[test]
+	fn address() {
+		let command = vec!["ethkey", "info", "-b", "this is sparta", "--address"]
+			.into_iter()
+			.map(Into::into)
+			.collect::<Vec<String>>();
+
+		let expected = "006e27b6a72e1f34c626762f3c4761547aff1421".to_owned();
+		assert_eq!(execute(command).unwrap(), expected);
+	}
+
+	#[test]
+	fn sign() {
+		let command = vec!["ethkey", "sign", "17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987"]
+			.into_iter()
+			.map(Into::into)
+			.collect::<Vec<String>>();
+
+		let expected = "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200".to_owned();
+		assert_eq!(execute(command).unwrap(), expected);
+	}
+
+	#[test]
+	fn verify_valid_public() {
+		let command = vec!["ethkey", "verify", "public", "689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124", "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987"]
+			.into_iter()
+			.map(Into::into)
+			.collect::<Vec<String>>();
+
+		let expected = "true".to_owned();
+		assert_eq!(execute(command).unwrap(), expected);
+	}
+
+	#[test]
+	fn verify_valid_address() {
+		let command = vec!["ethkey", "verify", "address", "26d1ec50b4e62c1d1a40d16e7cacc6a6580757d5", "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987"]
+			.into_iter()
+			.map(Into::into)
+			.collect::<Vec<String>>();
+
+		let expected = "true".to_owned();
+		assert_eq!(execute(command).unwrap(), expected);
+	}
+
+	#[test]
+	fn verify_invalid() {
+		let command = vec!["ethkey", "verify", "public", "689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124", "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec986"]
+			.into_iter()
+			.map(Into::into)
+			.collect::<Vec<String>>();
+
+		let expected = "false".to_owned();
+		assert_eq!(execute(command).unwrap(), expected);
+	}
+}

accounts/ethkey/src/brain.rs

@@ -0,0 +1,73 @@
+// 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 keccak::Keccak256;
+use super::{KeyPair, Generator, Secret};
+use parity_wordlist;
+
+/// Simple brainwallet.
+pub struct Brain(String);
+
+impl Brain {
+	pub fn new(s: String) -> Self {
+		Brain(s)
+	}
+
+	pub fn validate_phrase(phrase: &str, expected_words: usize) -> Result<(), ::WordlistError> {
+		parity_wordlist::validate_phrase(phrase, expected_words)
+	}
+}
+
+impl Generator for Brain {
+    type Error = ::Void;
+
+	fn generate(&mut self) -> Result<KeyPair, Self::Error> {
+		let seed = self.0.clone();
+		let mut secret = seed.into_bytes().keccak256();
+
+		let mut i = 0;
+		loop {
+			secret = secret.keccak256();
+
+			match i > 16384 {
+				false => i += 1,
+				true => {
+					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 Ok(pair)
+						}
+					}
+				},
+			}
+		}
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use {Brain, Generator};
+
+	#[test]
+	fn test_brain() {
+		let words = "this is sparta!".to_owned();
+		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

@@ -0,0 +1,70 @@
+// 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::{Generator, KeyPair, Error, Brain};
+use parity_wordlist as wordlist;
+
+/// Tries to find brain-seed keypair with address starting with given prefix.
+pub struct BrainPrefix {
+	prefix: Vec<u8>,
+	iterations: usize,
+	no_of_words: usize,
+	last_phrase: String,
+}
+
+impl BrainPrefix {
+	pub fn new(prefix: Vec<u8>, iterations: usize, no_of_words: usize) -> Self {
+		BrainPrefix {
+			prefix,
+			iterations,
+			no_of_words,
+			last_phrase: String::new(),
+		}
+	}
+
+	pub fn phrase(&self) -> &str {
+		&self.last_phrase
+	}
+}
+
+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().unwrap();
+			if keypair.address().as_ref().starts_with(&self.prefix) {
+				self.last_phrase = phrase;
+				return Ok(keypair)
+			}
+		}
+
+		Err(Error::Custom("Could not find keypair".into()))
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	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));
+	}
+}

accounts/ethkey/src/brain_recover.rs

@@ -0,0 +1,173 @@
+// 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::collections::HashSet;
+
+use edit_distance::edit_distance;
+use parity_wordlist;
+
+use super::{Address, Brain, Generator};
+
+/// Tries to find a phrase for address, given the number
+/// of expected words and a partial phrase.
+///
+/// Returns `None` if phrase couldn't be found.
+pub fn brain_recover(
+	address: &Address,
+	known_phrase: &str,
+	expected_words: usize,
+) -> Option<String> {
+	let it = PhrasesIterator::from_known_phrase(known_phrase, expected_words);
+	for phrase in it {
+		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);
+		}
+	}
+
+	None
+}
+
+fn generate_substitutions(word: &str) -> Vec<&'static str> {
+	let mut words = parity_wordlist::WORDS.iter().cloned()
+		.map(|w| (edit_distance(w, word), w))
+		.collect::<Vec<_>>();
+	words.sort_by(|a, b| a.0.cmp(&b.0));
+
+	words.into_iter()
+		.map(|pair| pair.1)
+		.collect()
+}
+
+/// Iterator over possible
+pub struct PhrasesIterator {
+	words: Vec<Vec<&'static str>>,
+	combinations: u64,
+	indexes: Vec<usize>,
+	has_next: bool,
+}
+
+impl PhrasesIterator {
+	pub fn from_known_phrase(known_phrase: &str, expected_words: usize) -> Self {
+		let known_words = parity_wordlist::WORDS.iter().cloned().collect::<HashSet<_>>();
+		let mut words = known_phrase.split(' ')
+			.map(|word| match known_words.get(word) {
+				None => {
+					info!("Invalid word '{}', looking for potential substitutions.", word);
+					let substitutions = generate_substitutions(word);
+					info!("Closest words: {:?}", &substitutions[..10]);
+					substitutions
+				},
+				Some(word) => vec![*word],
+			})
+		.collect::<Vec<_>>();
+
+		// add missing words
+		if words.len() < expected_words {
+			let to_add = expected_words - words.len();
+			info!("Number of words is insuficcient adding {} more.", to_add);
+			for _ in 0..to_add {
+				words.push(parity_wordlist::WORDS.iter().cloned().collect());
+			}
+		}
+
+		// start searching
+		PhrasesIterator::new(words)
+	}
+
+	pub fn new(words: Vec<Vec<&'static str>>) -> Self {
+		let combinations = words.iter().fold(1u64, |acc, x| acc * x.len() as u64);
+		let indexes = words.iter().map(|_| 0).collect();
+		info!("Starting to test {} possible combinations.", combinations);
+
+		PhrasesIterator {
+			words,
+			combinations,
+			indexes,
+			has_next: combinations > 0,
+		}
+	}
+
+	pub fn combinations(&self) -> u64 {
+		self.combinations
+	}
+
+	fn current(&self) -> String {
+		let mut s = self.words[0][self.indexes[0]].to_owned();
+		for i in 1..self.indexes.len() {
+			s.push(' ');
+			s.push_str(self.words[i][self.indexes[i]]);
+		}
+		s
+	}
+
+	fn next_index(&mut self) -> bool {
+		let mut pos = self.indexes.len();
+		while pos > 0 {
+			pos -= 1;
+			self.indexes[pos] += 1;
+			if self.indexes[pos] >= self.words[pos].len() {
+				self.indexes[pos] = 0;
+			} else {
+				return true;
+			}
+		}
+
+		false
+	}
+}
+
+impl Iterator for PhrasesIterator {
+	type Item = String;
+
+	fn next(&mut self) -> Option<String> {
+		if !self.has_next {
+			return None;
+		}
+
+		let phrase = self.current();
+		self.has_next = self.next_index();
+		Some(phrase)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::PhrasesIterator;
+
+	#[test]
+	fn should_generate_possible_combinations() {
+		let mut it = PhrasesIterator::new(vec![
+			vec!["1", "2", "3"],
+			vec!["test"],
+			vec!["a", "b", "c"],
+		]);
+
+		assert_eq!(it.combinations(), 9);
+		assert_eq!(it.next(), Some("1 test a".to_owned()));
+		assert_eq!(it.next(), Some("1 test b".to_owned()));
+		assert_eq!(it.next(), Some("1 test c".to_owned()));
+		assert_eq!(it.next(), Some("2 test a".to_owned()));
+		assert_eq!(it.next(), Some("2 test b".to_owned()));
+		assert_eq!(it.next(), Some("2 test c".to_owned()));
+		assert_eq!(it.next(), Some("3 test a".to_owned()));
+		assert_eq!(it.next(), Some("3 test b".to_owned()));
+		assert_eq!(it.next(), Some("3 test c".to_owned()));
+		assert_eq!(it.next(), None);
+	}
+
+}

accounts/ethkey/src/crypto.rs

@@ -0,0 +1,189 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use secp256k1;
+use std::io;
+use parity_crypto::error::SymmError;
+
+quick_error! {
+	#[derive(Debug)]
+	pub enum Error {
+		Secp(e: secp256k1::Error) {
+			display("secp256k1 error: {}", e)
+			cause(e)
+			from()
+		}
+		Io(e: io::Error) {
+			display("i/o error: {}", e)
+			cause(e)
+			from()
+		}
+		InvalidMessage {
+			display("invalid message")
+		}
+		Symm(e: SymmError) {
+			cause(e)
+			from()
+		}
+	}
+}
+
+/// ECDH functions
+pub mod ecdh {
+	use secp256k1::{self, ecdh, key};
+	use super::Error;
+	use {Secret, Public, SECP256K1};
+
+	/// Agree on a shared secret
+	pub fn agree(secret: &Secret, public: &Public) -> Result<Secret, Error> {
+		let context = &SECP256K1;
+		let pdata = {
+			let mut temp = [4u8; 65];
+			(&mut temp[1..65]).copy_from_slice(&public[0..64]);
+			temp
+		};
+
+		let publ = key::PublicKey::from_slice(context, &pdata)?;
+		let sec = key::SecretKey::from_slice(context, secret.as_bytes())?;
+		let shared = ecdh::SharedSecret::new_raw(context, &publ, &sec);
+
+		Secret::from_unsafe_slice(&shared[0..32])
+			.map_err(|_| Error::Secp(secp256k1::Error::InvalidSecretKey))
+	}
+}
+
+/// ECIES function
+pub mod ecies {
+	use parity_crypto::{aes, digest, hmac, is_equal};
+	use ethereum_types::H128;
+	use super::{ecdh, Error};
+	use {Random, Generator, Public, Secret};
+
+	/// Encrypt a message with a public key, writing an HMAC covering both
+	/// the plaintext and authenticated data.
+	///
+	/// Authenticated data may be empty.
+	pub fn encrypt(public: &Public, auth_data: &[u8], plain: &[u8]) -> Result<Vec<u8>, Error> {
+		let r = Random.generate()?;
+		let z = ecdh::agree(r.secret(), public)?;
+		let mut key = [0u8; 32];
+		kdf(&z, &[0u8; 0], &mut key);
+
+		let ekey = &key[0..16];
+		let mkey = hmac::SigKey::sha256(&digest::sha256(&key[16..32]));
+
+		let mut msg = vec![0u8; 1 + 64 + 16 + plain.len() + 32];
+		msg[0] = 0x04u8;
+		{
+			let msgd = &mut msg[1..];
+			msgd[0..64].copy_from_slice(r.public().as_bytes());
+			let iv = H128::random();
+			msgd[64..80].copy_from_slice(iv.as_bytes());
+			{
+				let cipher = &mut msgd[(64 + 16)..(64 + 16 + plain.len())];
+				aes::encrypt_128_ctr(ekey, iv.as_bytes(), plain, cipher)?;
+			}
+			let mut hmac = hmac::Signer::with(&mkey);
+			{
+				let cipher_iv = &msgd[64..(64 + 16 + plain.len())];
+				hmac.update(cipher_iv);
+			}
+			hmac.update(auth_data);
+			let sig = hmac.sign();
+			msgd[(64 + 16 + plain.len())..].copy_from_slice(&sig);
+		}
+		Ok(msg)
+	}
+
+	/// Decrypt a message with a secret key, checking HMAC for ciphertext
+	/// and authenticated data validity.
+	pub fn decrypt(secret: &Secret, auth_data: &[u8], encrypted: &[u8]) -> Result<Vec<u8>, Error> {
+		let meta_len = 1 + 64 + 16 + 32;
+		if encrypted.len() < meta_len  || encrypted[0] < 2 || encrypted[0] > 4 {
+			return Err(Error::InvalidMessage); //invalid message: publickey
+		}
+
+		let e = &encrypted[1..];
+		let p = Public::from_slice(&e[0..64]);
+		let z = ecdh::agree(secret, &p)?;
+		let mut key = [0u8; 32];
+		kdf(&z, &[0u8; 0], &mut key);
+
+		let ekey = &key[0..16];
+		let mkey = hmac::SigKey::sha256(&digest::sha256(&key[16..32]));
+
+		let clen = encrypted.len() - meta_len;
+		let cipher_with_iv = &e[64..(64+16+clen)];
+		let cipher_iv = &cipher_with_iv[0..16];
+		let cipher_no_iv = &cipher_with_iv[16..];
+		let msg_mac = &e[(64+16+clen)..];
+
+		// Verify tag
+		let mut hmac = hmac::Signer::with(&mkey);
+		hmac.update(cipher_with_iv);
+		hmac.update(auth_data);
+		let mac = hmac.sign();
+
+		if !is_equal(&mac.as_ref()[..], msg_mac) {
+			return Err(Error::InvalidMessage);
+		}
+
+		let mut msg = vec![0u8; clen];
+		aes::decrypt_128_ctr(ekey, cipher_iv, cipher_no_iv, &mut msg[..])?;
+		Ok(msg)
+	}
+
+	fn kdf(secret: &Secret, s1: &[u8], dest: &mut [u8]) {
+		// SEC/ISO/Shoup specify counter size SHOULD be equivalent
+		// to size of hash output, however, it also notes that
+		// the 4 bytes is okay. NIST specifies 4 bytes.
+		let mut ctr = 1u32;
+		let mut written = 0usize;
+		while written < dest.len() {
+			let mut hasher = digest::Hasher::sha256();
+			let ctrs = [(ctr >> 24) as u8, (ctr >> 16) as u8, (ctr >> 8) as u8, ctr as u8];
+			hasher.update(&ctrs);
+			hasher.update(secret.as_bytes());
+			hasher.update(s1);
+			let d = hasher.finish();
+			&mut dest[written..(written + 32)].copy_from_slice(&d);
+			written += 32;
+			ctr += 1;
+		}
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::ecies;
+	use {Random, Generator};
+
+	#[test]
+	fn ecies_shared() {
+		let kp = Random.generate().unwrap();
+		let message = b"So many books, so little time";
+
+		let shared = b"shared";
+		let wrong_shared = b"incorrect";
+		let encrypted = ecies::encrypt(kp.public(), shared, message).unwrap();
+		assert!(encrypted[..] != message[..]);
+		assert_eq!(encrypted[0], 0x04);
+
+		assert!(ecies::decrypt(kp.secret(), wrong_shared, &encrypted).is_err());
+		let decrypted = ecies::decrypt(kp.secret(), shared, &encrypted).unwrap();
+		assert_eq!(decrypted[..message.len()], message[..]);
+	}
+}

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,517 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Extended keys
+
+use secret::Secret;
+use Public;
+use ethereum_types::H256;
+pub use self::derivation::Error as DerivationError;
+
+/// Represents label that can be stored as a part of key derivation
+pub trait Label {
+	/// Length of the data that label occupies
+	fn len() -> usize;
+
+	/// Store label data to the key derivation sequence
+	/// Must not use more than `len()` bytes from slice
+	fn store(&self, target: &mut [u8]);
+}
+
+impl Label for u32 {
+	fn len() -> usize { 4 }
+
+	fn store(&self, target: &mut [u8]) {
+		let bytes = self.to_be_bytes();
+		target[0..4].copy_from_slice(&bytes);
+	}
+}
+
+/// Key derivation over generic label `T`
+pub enum Derivation<T: Label> {
+	/// Soft key derivation (allow proof of parent)
+	Soft(T),
+	/// Hard key derivation (does not allow proof of parent)
+	Hard(T),
+}
+
+impl From<u32> for Derivation<u32> {
+	fn from(index: u32) -> Self {
+		if index < (2 << 30) {
+			Derivation::Soft(index)
+		}
+		else {
+			Derivation::Hard(index)
+		}
+	}
+}
+
+impl Label for H256 {
+	fn len() -> usize { 32 }
+
+	fn store(&self, target: &mut [u8]) {
+		(&mut target[0..32]).copy_from_slice(self.as_bytes());
+	}
+}
+
+/// Extended secret key, allows deterministic derivation of subsequent keys.
+pub struct ExtendedSecret {
+	secret: Secret,
+	chain_code: H256,
+}
+
+impl ExtendedSecret {
+	/// New extended key from given secret and chain code.
+	pub fn with_code(secret: Secret, chain_code: H256) -> ExtendedSecret {
+		ExtendedSecret {
+			secret: secret,
+			chain_code: chain_code,
+		}
+	}
+
+	/// New extended key from given secret with the random chain code.
+	pub fn new_random(secret: Secret) -> ExtendedSecret {
+		ExtendedSecret::with_code(secret, H256::random())
+	}
+
+	/// New extended key from given secret.
+	/// Chain code will be derived from the secret itself (in a deterministic way).
+	pub fn new(secret: Secret) -> ExtendedSecret {
+		let chain_code = derivation::chain_code(*secret);
+		ExtendedSecret::with_code(secret, chain_code)
+	}
+
+	/// Derive new private key
+	pub fn derive<T>(&self, index: Derivation<T>) -> ExtendedSecret where T: Label {
+		let (derived_key, next_chain_code) = derivation::private(*self.secret, self.chain_code, index);
+
+		let derived_secret = Secret::from(derived_key.0);
+
+		ExtendedSecret::with_code(derived_secret, next_chain_code)
+	}
+
+	/// Private key component of the extended key.
+	pub fn as_raw(&self) -> &Secret {
+		&self.secret
+	}
+}
+
+/// Extended public key, allows deterministic derivation of subsequent keys.
+pub struct ExtendedPublic {
+	public: Public,
+	chain_code: H256,
+}
+
+impl ExtendedPublic {
+	/// New extended public key from known parent and chain code
+	pub fn new(public: Public, chain_code: H256) -> Self {
+		ExtendedPublic { public: public, chain_code: chain_code }
+	}
+
+	/// Create new extended public key from known secret
+	pub fn from_secret(secret: &ExtendedSecret) -> Result<Self, DerivationError> {
+		Ok(
+			ExtendedPublic::new(
+				derivation::point(**secret.as_raw())?,
+				secret.chain_code.clone(),
+			)
+		)
+	}
+
+	/// Derive new public key
+	/// Operation is defined only for index belongs [0..2^31)
+	pub fn derive<T>(&self, index: Derivation<T>) -> Result<Self, DerivationError> where T: Label {
+		let (derived_key, next_chain_code) = derivation::public(self.public, self.chain_code, index)?;
+		Ok(ExtendedPublic::new(derived_key, next_chain_code))
+	}
+
+	pub fn public(&self) -> &Public {
+		&self.public
+	}
+}
+
+pub struct ExtendedKeyPair {
+	secret: ExtendedSecret,
+	public: ExtendedPublic,
+}
+
+impl ExtendedKeyPair {
+	pub fn new(secret: Secret) -> Self {
+		let extended_secret = ExtendedSecret::new(secret);
+		let extended_public = ExtendedPublic::from_secret(&extended_secret)
+			.expect("Valid `Secret` always produces valid public; qed");
+		ExtendedKeyPair {
+			secret: extended_secret,
+			public: extended_public,
+		}
+	}
+
+	pub fn with_code(secret: Secret, public: Public, chain_code: H256) -> Self {
+		ExtendedKeyPair {
+			secret: ExtendedSecret::with_code(secret, chain_code.clone()),
+			public: ExtendedPublic::new(public, chain_code),
+		}
+	}
+
+	pub fn with_secret(secret: Secret, chain_code: H256) -> Self {
+		let extended_secret = ExtendedSecret::with_code(secret, chain_code);
+		let extended_public = ExtendedPublic::from_secret(&extended_secret)
+			.expect("Valid `Secret` always produces valid public; qed");
+		ExtendedKeyPair {
+			secret: extended_secret,
+			public: extended_public,
+		}
+	}
+
+	pub fn with_seed(seed: &[u8]) -> Result<ExtendedKeyPair, DerivationError> {
+		let (master_key, chain_code) = derivation::seed_pair(seed);
+		Ok(ExtendedKeyPair::with_secret(
+			Secret::from_unsafe_slice(master_key.as_bytes()).map_err(|_| DerivationError::InvalidSeed)?,
+			chain_code,
+		))
+	}
+
+	pub fn secret(&self) -> &ExtendedSecret {
+		&self.secret
+	}
+
+	pub fn public(&self) -> &ExtendedPublic {
+		&self.public
+	}
+
+	pub fn derive<T>(&self, index: Derivation<T>) -> Result<Self, DerivationError> where T: Label {
+		let derived = self.secret.derive(index);
+
+		Ok(ExtendedKeyPair {
+			public: ExtendedPublic::from_secret(&derived)?,
+			secret: derived,
+		})
+	}
+}
+
+// Derivation functions for private and public keys
+// Work is based on BIP0032
+// https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki
+mod derivation {
+	use parity_crypto::hmac;
+	use ethereum_types::{BigEndianHash, U256, U512, H512, H256};
+	use secp256k1::key::{SecretKey, PublicKey};
+	use SECP256K1;
+	use keccak;
+	use math::curve_order;
+	use super::{Label, Derivation};
+	use std::convert::TryInto;
+
+	#[derive(Debug)]
+	pub enum Error {
+		InvalidHardenedUse,
+		InvalidPoint,
+		MissingIndex,
+		InvalidSeed,
+	}
+
+	// Deterministic derivation of the key using secp256k1 elliptic curve.
+	// Derivation can be either hardened or not.
+	// For hardened derivation, pass u32 index at least 2^31 or custom Derivation::Hard(T) enum
+	//
+	// Can panic if passed `private_key` is not a valid secp256k1 private key
+	// (outside of (0..curve_order()]) field
+	pub fn private<T>(private_key: H256, chain_code: H256, index: Derivation<T>) -> (H256, H256) where T: Label {
+		match index {
+			Derivation::Soft(index) => private_soft(private_key, chain_code, index),
+			Derivation::Hard(index) => private_hard(private_key, chain_code, index),
+		}
+	}
+
+	fn hmac_pair(data: &[u8], private_key: H256, chain_code: H256) -> (H256, H256) {
+		let private: U256 = private_key.into_uint();
+
+		// produces 512-bit derived hmac (I)
+		let skey = hmac::SigKey::sha512(chain_code.as_bytes());
+		let i_512 = hmac::sign(&skey, &data[..]);
+
+		// left most 256 bits are later added to original private key
+		let hmac_key: U256 = H256::from_slice(&i_512[0..32]).into_uint();
+		// right most 256 bits are new chain code for later derivations
+		let next_chain_code = H256::from_slice(&i_512[32..64]);
+
+		let child_key = BigEndianHash::from_uint(&private_add(hmac_key, private));
+		(child_key, next_chain_code)
+	}
+
+	// Can panic if passed `private_key` is not a valid secp256k1 private key
+	// (outside of (0..curve_order()]) field
+	fn private_soft<T>(private_key: H256, chain_code: H256, index: T) -> (H256, H256) where T: Label {
+		let mut data = vec![0u8; 33 + T::len()];
+
+		let sec_private = SecretKey::from_slice(&SECP256K1, private_key.as_bytes())
+			.expect("Caller should provide valid private key");
+		let sec_public = PublicKey::from_secret_key(&SECP256K1, &sec_private)
+			.expect("Caller should provide valid private key");
+		let public_serialized = sec_public.serialize_vec(&SECP256K1, true);
+
+		// curve point (compressed public key) --  index
+		//             0.33                    --  33..end
+		data[0..33].copy_from_slice(&public_serialized);
+		index.store(&mut data[33..]);
+
+		hmac_pair(&data, private_key, chain_code)
+	}
+
+	// Deterministic derivation of the key using secp256k1 elliptic curve
+	// This is hardened derivation and does not allow to associate
+	// corresponding public keys of the original and derived private keys
+	fn private_hard<T>(private_key: H256, chain_code: H256, index: T) -> (H256, H256) where T: Label {
+		let mut data: Vec<u8> = vec![0u8; 33 + T::len()];
+		let private: U256 = private_key.into_uint();
+
+		// 0x00 (padding) -- private_key --  index
+		//  0             --    1..33    -- 33..end
+		private.to_big_endian(&mut data[1..33]);
+		index.store(&mut data[33..(33 + T::len())]);
+
+		hmac_pair(&data, private_key, chain_code)
+	}
+
+	fn private_add(k1: U256, k2: U256) -> U256 {
+		let sum = U512::from(k1) + U512::from(k2);
+		modulo(sum, curve_order())
+	}
+
+	// todo: surely can be optimized
+	fn modulo(u1: U512, u2: U256) -> U256 {
+		let m = u1 % U512::from(u2);
+		m.try_into().expect("U512 modulo U256 should fit into U256; qed")
+	}
+
+	pub fn public<T>(public_key: H512, chain_code: H256, derivation: Derivation<T>) -> Result<(H512, H256), Error> where T: Label {
+		let index = match derivation {
+			Derivation::Soft(index) => index,
+			Derivation::Hard(_) => { return Err(Error::InvalidHardenedUse); }
+		};
+
+		let mut public_sec_raw = [0u8; 65];
+		public_sec_raw[0] = 4;
+		public_sec_raw[1..65].copy_from_slice(public_key.as_bytes());
+		let public_sec = PublicKey::from_slice(&SECP256K1, &public_sec_raw).map_err(|_| Error::InvalidPoint)?;
+		let public_serialized = public_sec.serialize_vec(&SECP256K1, true);
+
+		let mut data = vec![0u8; 33 + T::len()];
+		// curve point (compressed public key) --  index
+		//             0.33                    --  33..end
+		data[0..33].copy_from_slice(&public_serialized);
+		index.store(&mut data[33..(33 + T::len())]);
+
+		// HMAC512SHA produces [derived private(256); new chain code(256)]
+		let skey = hmac::SigKey::sha512(chain_code.as_bytes());
+		let i_512 = hmac::sign(&skey, &data[..]);
+
+		let new_private = H256::from_slice(&i_512[0..32]);
+		let new_chain_code = H256::from_slice(&i_512[32..64]);
+
+		// Generated private key can (extremely rarely) be out of secp256k1 key field
+		if curve_order() <= new_private.into_uint() { return Err(Error::MissingIndex); }
+		let new_private_sec = SecretKey::from_slice(&SECP256K1, new_private.as_bytes())
+			.expect("Private key belongs to the field [0..CURVE_ORDER) (checked above); So initializing can never fail; qed");
+		let mut new_public = PublicKey::from_secret_key(&SECP256K1, &new_private_sec)
+			.expect("Valid private key produces valid public key");
+
+		// Adding two points on the elliptic curves (combining two public keys)
+		new_public.add_assign(&SECP256K1, &public_sec)
+			.expect("Addition of two valid points produce valid point");
+
+		let serialized = new_public.serialize_vec(&SECP256K1, false);
+
+		Ok((
+			H512::from_slice(&serialized[1..65]),
+			new_chain_code,
+		))
+	}
+
+	fn sha3(slc: &[u8]) -> H256 {
+		keccak::Keccak256::keccak256(slc).into()
+	}
+
+	pub fn chain_code(secret: H256) -> H256 {
+		// 10,000 rounds of sha3
+		let mut running_sha3 = sha3(secret.as_bytes());
+		for _ in 0..99999 { running_sha3 = sha3(running_sha3.as_bytes()); }
+		running_sha3
+	}
+
+	pub fn point(secret: H256) -> Result<H512, Error> {
+		let sec = SecretKey::from_slice(&SECP256K1, secret.as_bytes())
+			.map_err(|_| Error::InvalidPoint)?;
+		let public_sec = PublicKey::from_secret_key(&SECP256K1, &sec)
+			.map_err(|_| Error::InvalidPoint)?;
+		let serialized = public_sec.serialize_vec(&SECP256K1, false);
+		Ok(H512::from_slice(&serialized[1..65]))
+	}
+
+	pub fn seed_pair(seed: &[u8]) -> (H256, H256) {
+		let skey = hmac::SigKey::sha512(b"Bitcoin seed");
+		let i_512 = hmac::sign(&skey, seed);
+
+		let master_key = H256::from_slice(&i_512[0..32]);
+		let chain_code = H256::from_slice(&i_512[32..64]);
+
+		(master_key, chain_code)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::{ExtendedSecret, ExtendedPublic, ExtendedKeyPair};
+	use secret::Secret;
+	use std::str::FromStr;
+	use ethereum_types::{H128, H256, H512};
+	use super::{derivation, Derivation};
+
+	fn master_chain_basic() -> (H256, H256) {
+		let seed = H128::from_str("000102030405060708090a0b0c0d0e0f")
+			.expect("Seed should be valid H128")
+			.as_bytes()
+			.to_vec();
+
+		derivation::seed_pair(&*seed)
+	}
+
+	fn test_extended<F>(f: F, test_private: H256) where F: Fn(ExtendedSecret) -> ExtendedSecret {
+		let (private_seed, chain_code) = master_chain_basic();
+		let extended_secret = ExtendedSecret::with_code(Secret::from(private_seed.0), chain_code);
+		let derived = f(extended_secret);
+		assert_eq!(**derived.as_raw(), test_private);
+	}
+
+	#[test]
+	fn smoky() {
+		let secret = Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap();
+		let extended_secret = ExtendedSecret::with_code(secret.clone(), H256::zero());
+
+		// hardened
+		assert_eq!(&**extended_secret.as_raw(), &*secret);
+		assert_eq!(
+			**extended_secret.derive(2147483648.into()).as_raw(),
+			H256::from_str("0927453daed47839608e414a3738dfad10aed17c459bbd9ab53f89b026c834b6").unwrap(),
+		);
+		assert_eq!(
+			**extended_secret.derive(2147483649.into()).as_raw(),
+			H256::from_str("44238b6a29c6dcbe9b401364141ba11e2198c289a5fed243a1c11af35c19dc0f").unwrap(),
+		);
+
+		// normal
+		assert_eq!(**extended_secret.derive(0.into()).as_raw(), H256::from_str("bf6a74e3f7b36fc4c96a1e12f31abc817f9f5904f5a8fc27713163d1f0b713f6").unwrap());
+		assert_eq!(**extended_secret.derive(1.into()).as_raw(), H256::from_str("bd4fca9eb1f9c201e9448c1eecd66e302d68d4d313ce895b8c134f512205c1bc").unwrap());
+		assert_eq!(**extended_secret.derive(2.into()).as_raw(), H256::from_str("86932b542d6cab4d9c65490c7ef502d89ecc0e2a5f4852157649e3251e2a3268").unwrap());
+
+		let extended_public = ExtendedPublic::from_secret(&extended_secret).expect("Extended public should be created");
+		let derived_public = extended_public.derive(0.into()).expect("First derivation of public should succeed");
+		assert_eq!(
+			*derived_public.public(),
+			H512::from_str("f7b3244c96688f92372bfd4def26dc4151529747bab9f188a4ad34e141d47bd66522ff048bc6f19a0a4429b04318b1a8796c000265b4fa200dae5f6dda92dd94").unwrap(),
+		);
+
+		let keypair = ExtendedKeyPair::with_secret(
+			Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap(),
+			H256::from_low_u64_be(64),
+		);
+		assert_eq!(
+			**keypair.derive(2147483648u32.into()).expect("Derivation of keypair should succeed").secret().as_raw(),
+			H256::from_str("edef54414c03196557cf73774bc97a645c9a1df2164ed34f0c2a78d1375a930c").unwrap(),
+		);
+	}
+
+	#[test]
+	fn h256_soft_match() {
+		let secret = Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap();
+		let derivation_secret = H256::from_str("51eaf04f9dbbc1417dc97e789edd0c37ecda88bac490434e367ea81b71b7b015").unwrap();
+
+		let extended_secret = ExtendedSecret::with_code(secret.clone(), H256::zero());
+		let extended_public = ExtendedPublic::from_secret(&extended_secret).expect("Extended public should be created");
+
+		let derived_secret0 = extended_secret.derive(Derivation::Soft(derivation_secret));
+		let derived_public0 = extended_public.derive(Derivation::Soft(derivation_secret)).expect("First derivation of public should succeed");
+
+		let public_from_secret0 = ExtendedPublic::from_secret(&derived_secret0).expect("Extended public should be created");
+
+		assert_eq!(public_from_secret0.public(), derived_public0.public());
+	}
+
+	#[test]
+	fn h256_hard() {
+		let secret = Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap();
+		let derivation_secret = H256::from_str("51eaf04f9dbbc1417dc97e789edd0c37ecda88bac490434e367ea81b71b7b015").unwrap();
+		let extended_secret = ExtendedSecret::with_code(secret.clone(), H256::from_low_u64_be(1));
+
+		assert_eq!(
+			**extended_secret.derive(Derivation::Hard(derivation_secret)).as_raw(),
+			H256::from_str("2bc2d696fb744d77ff813b4a1ef0ad64e1e5188b622c54ba917acc5ebc7c5486").unwrap(),
+		);
+	}
+
+	#[test]
+	fn match_() {
+		let secret = Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap();
+		let extended_secret = ExtendedSecret::with_code(secret.clone(), H256::from_low_u64_be(1));
+		let extended_public = ExtendedPublic::from_secret(&extended_secret).expect("Extended public should be created");
+
+		let derived_secret0 = extended_secret.derive(0.into());
+		let derived_public0 = extended_public.derive(0.into()).expect("First derivation of public should succeed");
+
+		let public_from_secret0 = ExtendedPublic::from_secret(&derived_secret0).expect("Extended public should be created");
+
+		assert_eq!(public_from_secret0.public(), derived_public0.public());
+	}
+
+	#[test]
+	fn test_seeds() {
+		let seed = H128::from_str("000102030405060708090a0b0c0d0e0f")
+			.expect("Seed should be valid H128")
+			.as_bytes()
+			.to_vec();
+
+		// private key from bitcoin test vector
+		// xprv9wTYmMFdV23N2TdNG573QoEsfRrWKQgWeibmLntzniatZvR9BmLnvSxqu53Kw1UmYPxLgboyZQaXwTCg8MSY3H2EU4pWcQDnRnrVA1xe8fs
+		let test_private = H256::from_str("e8f32e723decf4051aefac8e2c93c9c5b214313817cdb01a1494b917c8436b35")
+			.expect("Private should be decoded ok");
+
+		let (private_seed, _) = derivation::seed_pair(&*seed);
+
+		assert_eq!(private_seed, test_private);
+	}
+
+	#[test]
+	fn test_vector_1() {
+		// xprv9uHRZZhk6KAJC1avXpDAp4MDc3sQKNxDiPvvkX8Br5ngLNv1TxvUxt4cV1rGL5hj6KCesnDYUhd7oWgT11eZG7XnxHrnYeSvkzY7d2bhkJ7
+		// H(0)
+		test_extended(
+			|secret| secret.derive(2147483648.into()),
+			H256::from_str("edb2e14f9ee77d26dd93b4ecede8d16ed408ce149b6cd80b0715a2d911a0afea")
+				.expect("Private should be decoded ok")
+		);
+	}
+
+	#[test]
+	fn test_vector_2() {
+		// xprv9wTYmMFdV23N2TdNG573QoEsfRrWKQgWeibmLntzniatZvR9BmLnvSxqu53Kw1UmYPxLgboyZQaXwTCg8MSY3H2EU4pWcQDnRnrVA1xe8fs
+		// H(0)/1
+		test_extended(
+			|secret| secret.derive(2147483648.into()).derive(1.into()),
+			H256::from_str("3c6cb8d0f6a264c91ea8b5030fadaa8e538b020f0a387421a12de9319dc93368")
+				.expect("Private should be decoded ok")
+		);
+	}
+}

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

accounts/ethkey/src/lib.rs

@@ -0,0 +1,87 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+// #![warn(missing_docs)]
+
+extern crate edit_distance;
+extern crate parity_crypto;
+extern crate ethereum_types;
+extern crate parity_wordlist;
+#[macro_use]
+extern crate quick_error;
+extern crate rand;
+extern crate rustc_hex;
+extern crate secp256k1;
+extern crate serde;
+extern crate tiny_keccak;
+extern crate zeroize;
+
+#[macro_use]
+extern crate lazy_static;
+#[macro_use]
+extern crate log;
+#[macro_use]
+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::{BigEndianHash as _, U256, H256};
+
+/// Whether the public key is valid.
+pub fn public_is_valid(public: &Public) -> bool {
+	to_secp256k1_public(public).ok()
+		.map_or(false, |p| p.is_valid())
+}
+
+/// Inplace multiply public key by secret key (EC point * scalar)
+pub fn public_mul_secret(public: &mut Public, secret: &Secret) -> Result<(), Error> {
+	let key_secret = secret.to_secp256k1_secret()?;
+	let mut key_public = to_secp256k1_public(public)?;
+	key_public.mul_assign(&SECP256K1, &key_secret)?;
+	set_public(public, &key_public);
+	Ok(())
+}
+
+/// Inplace add one public key to another (EC point + EC point)
+pub fn public_add(public: &mut Public, other: &Public) -> Result<(), Error> {
+	let mut key_public = to_secp256k1_public(public)?;
+	let other_public = to_secp256k1_public(other)?;
+	key_public.add_assign(&SECP256K1, &other_public)?;
+	set_public(public, &key_public);
+	Ok(())
+}
+
+/// Inplace sub one public key from another (EC point - EC point)
+pub fn public_sub(public: &mut Public, other: &Public) -> Result<(), Error> {
+	let mut key_neg_other = to_secp256k1_public(other)?;
+	key_neg_other.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
+
+	let mut key_public = to_secp256k1_public(public)?;
+	key_public.add_assign(&SECP256K1, &key_neg_other)?;
+	set_public(public, &key_public);
+	Ok(())
+}
+
+/// Replace public key with its negation (EC point = - EC point)
+pub fn public_negate(public: &mut Public) -> Result<(), Error> {
+	let mut key_public = to_secp256k1_public(public)?;
+	key_public.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
+	set_public(public, &key_public);
+	Ok(())
+}
+
+/// Return base point of secp256k1
+pub fn generation_point() -> Public {
+	let mut public_sec_raw = [0u8; 65];
+	public_sec_raw[0] = 4;
+	public_sec_raw[1..33].copy_from_slice(&GENERATOR_X);
+	public_sec_raw[33..65].copy_from_slice(&GENERATOR_Y);
+
+	let public_key = key::PublicKey::from_slice(&SECP256K1, &public_sec_raw)
+		.expect("constructing using predefined constants; qed");
+	let mut public = Public::default();
+	set_public(&mut public, &public_key);
+	public
+}
+
+/// Return secp256k1 elliptic curve order
+pub fn curve_order() -> U256 {
+	H256::from_slice(&CURVE_ORDER).into_uint()
+}
+
+fn to_secp256k1_public(public: &Public) -> Result<key::PublicKey, Error> {
+	let public_data = {
+		let mut temp = [4u8; 65];
+		(&mut temp[1..65]).copy_from_slice(&public[0..64]);
+		temp
+	};
+
+	Ok(key::PublicKey::from_slice(&SECP256K1, &public_data)?)
+}
+
+fn set_public(public: &mut Public, key_public: &key::PublicKey) {
+	let key_public_serialized = key_public.serialize_vec(&SECP256K1, false);
+	public.as_bytes_mut().copy_from_slice(&key_public_serialized[1..65]);
+}
+
+#[cfg(test)]
+mod tests {
+	use super::super::{Random, Generator};
+	use super::{public_add, public_sub};
+
+	#[test]
+	fn public_addition_is_commutative() {
+		let public1 = Random.generate().unwrap().public().clone();
+		let public2 = Random.generate().unwrap().public().clone();
+
+		let mut left = public1.clone();
+		public_add(&mut left, &public2).unwrap();
+
+		let mut right = public2.clone();
+		public_add(&mut right, &public1).unwrap();
+
+		assert_eq!(left, right);
+	}
+
+	#[test]
+	fn public_addition_is_reversible_with_subtraction() {
+		let public1 = Random.generate().unwrap().public().clone();
+		let public2 = Random.generate().unwrap().public().clone();
+
+		let mut sum = public1.clone();
+		public_add(&mut sum, &public2).unwrap();
+		public_sub(&mut sum, &public2).unwrap();
+
+		assert_eq!(sum, public1);
+	}
+}

accounts/ethkey/src/password.rs

@@ -0,0 +1,59 @@
+// 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, ptr};
+
+#[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct Password(String);
+
+impl fmt::Debug for Password {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "Password(******)")
+    }
+}
+
+impl Password {
+	pub fn as_bytes(&self) -> &[u8] {
+		self.0.as_bytes()
+	}
+
+	pub fn as_str(&self) -> &str {
+		self.0.as_str()
+	}
+}
+
+// Custom drop impl to zero out memory.
+impl Drop for Password {
+	fn drop(&mut self) {
+		unsafe {
+			for byte_ref in self.0.as_mut_vec() {
+				ptr::write_volatile(byte_ref, 0)
+			}
+		}
+	}
+}
+
+impl From<String> for Password {
+	fn from(s: String) -> Password {
+		Password(s)
+	}
+}
+
+impl<'a> From<&'a str> for Password {
+	fn from(s: &'a str) -> Password {
+		Password::from(String::from(s))
+	}
+}

accounts/ethkey/src/prefix.rs

@@ -0,0 +1,59 @@
+// 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::{Random, Generator, KeyPair, Error};
+
+/// Tries to find keypair with address starting with given prefix.
+pub struct Prefix {
+	prefix: Vec<u8>,
+	iterations: usize,
+}
+
+impl Prefix {
+	pub fn new(prefix: Vec<u8>, iterations: usize) -> Self {
+		Prefix {
+			prefix: prefix,
+			iterations: iterations,
+		}
+	}
+}
+
+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) {
+				return Ok(keypair)
+			}
+		}
+
+		Err(Error::Custom("Could not find keypair".into()))
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	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));
+	}
+}

accounts/ethkey/src/random.rs

@@ -0,0 +1,44 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use rand::rngs::OsRng;
+use super::{Generator, KeyPair, SECP256K1};
+
+/// Randomly generates new keypair, instantiating the RNG each time.
+pub struct Random;
+
+impl Generator for Random {
+	type Error = ::std::io::Error;
+
+	fn generate(&mut self) -> Result<KeyPair, Self::Error> {
+		let mut rng = OsRng::new()?;
+		match rng.generate() {
+			Ok(pair) => Ok(pair),
+			Err(void) => match void {}, // LLVM unreachable
+		}
+	}
+}
+
+impl Generator for OsRng {
+	type Error = ::Void;
+
+	fn generate(&mut self) -> Result<KeyPair, Self::Error> {
+		let (sec, publ) = SECP256K1.generate_keypair(self)
+			.expect("context always created with full capabilities; qed");
+
+		Ok(KeyPair::from_keypair(sec, publ))
+	}
+}

accounts/ethkey/src/secret.rs

@@ -0,0 +1,304 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::fmt;
+use std::ops::Deref;
+use std::str::FromStr;
+use rustc_hex::ToHex;
+use secp256k1::constants::{SECRET_KEY_SIZE as SECP256K1_SECRET_KEY_SIZE};
+use secp256k1::key;
+use ethereum_types::H256;
+use zeroize::Zeroize;
+use {Error, SECP256K1};
+
+#[derive(Clone, PartialEq, Eq)]
+pub struct Secret {
+	inner: H256,
+}
+
+impl Drop for Secret {
+	fn drop(&mut self) {
+		self.inner.0.zeroize()
+	}
+}
+
+impl ToHex for Secret {
+	fn to_hex(&self) -> String {
+		format!("{:x}", self.inner)
+	}
+}
+
+impl fmt::LowerHex for Secret {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		self.inner.fmt(fmt)
+	}
+}
+
+impl fmt::Debug for Secret {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		self.inner.fmt(fmt)
+	}
+}
+
+impl fmt::Display for Secret {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		write!(fmt, "Secret: 0x{:x}{:x}..{:x}{:x}", self.inner[0], self.inner[1], self.inner[30], self.inner[31])
+	}
+}
+
+impl Secret {
+	/// Creates a `Secret` from the given slice, returning `None` if the slice length != 32.
+	pub fn from_slice(key: &[u8]) -> Option<Self> {
+		if key.len() != 32 {
+			return None
+		}
+		let mut h = H256::zero();
+		h.as_bytes_mut().copy_from_slice(&key[0..32]);
+		Some(Secret { inner: h })
+	}
+
+	/// Creates zero key, which is invalid for crypto operations, but valid for math operation.
+	pub fn zero() -> Self {
+		Secret { inner: H256::zero() }
+	}
+
+	/// Imports and validates the key.
+	pub fn from_unsafe_slice(key: &[u8]) -> Result<Self, Error> {
+		let secret = key::SecretKey::from_slice(&super::SECP256K1, key)?;
+		Ok(secret.into())
+	}
+
+	/// Checks validity of this key.
+	pub fn check_validity(&self) -> Result<(), Error> {
+		self.to_secp256k1_secret().map(|_| ())
+	}
+
+	/// Inplace add one secret key to another (scalar + scalar)
+	pub fn add(&mut self, other: &Secret) -> Result<(), Error> {
+		match (self.is_zero(), other.is_zero()) {
+			(true, true) | (false, true) => Ok(()),
+			(true, false) => {
+				*self = other.clone();
+				Ok(())
+			},
+			(false, false) => {
+				let mut key_secret = self.to_secp256k1_secret()?;
+				let other_secret = other.to_secp256k1_secret()?;
+				key_secret.add_assign(&SECP256K1, &other_secret)?;
+
+				*self = key_secret.into();
+				Ok(())
+			},
+		}
+	}
+
+	/// Inplace subtract one secret key from another (scalar - scalar)
+	pub fn sub(&mut self, other: &Secret) -> Result<(), Error> {
+		match (self.is_zero(), other.is_zero()) {
+			(true, true) | (false, true) => Ok(()),
+			(true, false) => {
+				*self = other.clone();
+				self.neg()
+			},
+			(false, false) => {
+				let mut key_secret = self.to_secp256k1_secret()?;
+				let mut other_secret = other.to_secp256k1_secret()?;
+				other_secret.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
+				key_secret.add_assign(&SECP256K1, &other_secret)?;
+
+				*self = key_secret.into();
+				Ok(())
+			},
+		}
+	}
+
+	/// Inplace decrease secret key (scalar - 1)
+	pub fn dec(&mut self) -> Result<(), Error> {
+		match self.is_zero() {
+			true => {
+				*self = key::MINUS_ONE_KEY.into();
+				Ok(())
+			},
+			false => {
+				let mut key_secret = self.to_secp256k1_secret()?;
+				key_secret.add_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
+
+				*self = key_secret.into();
+				Ok(())
+			},
+		}
+	}
+
+	/// Inplace multiply one secret key to another (scalar * scalar)
+	pub fn mul(&mut self, other: &Secret) -> Result<(), Error> {
+		match (self.is_zero(), other.is_zero()) {
+			(true, true) | (true, false) => Ok(()),
+			(false, true) => {
+				*self = Self::zero();
+				Ok(())
+			},
+			(false, false) => {
+				let mut key_secret = self.to_secp256k1_secret()?;
+				let other_secret = other.to_secp256k1_secret()?;
+				key_secret.mul_assign(&SECP256K1, &other_secret)?;
+
+				*self = key_secret.into();
+				Ok(())
+			},
+		}
+	}
+
+	/// Inplace negate secret key (-scalar)
+	pub fn neg(&mut self) -> Result<(), Error> {
+		match self.is_zero() {
+			true => Ok(()),
+			false => {
+				let mut key_secret = self.to_secp256k1_secret()?;
+				key_secret.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
+
+				*self = key_secret.into();
+				Ok(())
+			},
+		}
+	}
+
+	/// Inplace inverse secret key (1 / scalar)
+	pub fn inv(&mut self) -> Result<(), Error> {
+		let mut key_secret = self.to_secp256k1_secret()?;
+		key_secret.inv_assign(&SECP256K1)?;
+
+		*self = key_secret.into();
+		Ok(())
+	}
+
+	/// Compute power of secret key inplace (secret ^ pow).
+	/// This function is not intended to be used with large powers.
+	pub fn pow(&mut self, pow: usize) -> Result<(), Error> {
+		if self.is_zero() {
+			return Ok(());
+		}
+
+		match pow {
+			0 => *self = key::ONE_KEY.into(),
+			1 => (),
+			_ => {
+				let c = self.clone();
+				for _ in 1..pow {
+					self.mul(&c)?;
+				}
+			},
+		}
+
+		Ok(())
+	}
+
+	/// Create `secp256k1::key::SecretKey` based on this secret
+	pub fn to_secp256k1_secret(&self) -> Result<key::SecretKey, Error> {
+		Ok(key::SecretKey::from_slice(&SECP256K1, &self[..])?)
+	}
+}
+
+impl FromStr for Secret {
+	type Err = Error;
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		Ok(H256::from_str(s).map_err(|e| Error::Custom(format!("{:?}", e)))?.into())
+	}
+}
+
+impl From<[u8; 32]> for Secret {
+	fn from(k: [u8; 32]) -> Self {
+		Secret { inner: H256(k) }
+	}
+}
+
+impl From<H256> for Secret {
+	fn from(s: H256) -> Self {
+		s.0.into()
+	}
+}
+
+impl From<&'static str> for Secret {
+	fn from(s: &'static str) -> Self {
+		s.parse().expect(&format!("invalid string literal for {}: '{}'", stringify!(Self), s))
+	}
+}
+
+impl From<key::SecretKey> for Secret {
+	fn from(key: key::SecretKey) -> Self {
+		let mut a = [0; SECP256K1_SECRET_KEY_SIZE];
+		a.copy_from_slice(&key[0 .. SECP256K1_SECRET_KEY_SIZE]);
+		a.into()
+	}
+}
+
+impl Deref for Secret {
+	type Target = H256;
+
+	fn deref(&self) -> &Self::Target {
+		&self.inner
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use std::str::FromStr;
+	use super::super::{Random, Generator};
+	use super::Secret;
+
+	#[test]
+	fn multiplicating_secret_inversion_with_secret_gives_one() {
+		let secret = Random.generate().unwrap().secret().clone();
+		let mut inversion = secret.clone();
+		inversion.inv().unwrap();
+		inversion.mul(&secret).unwrap();
+		assert_eq!(inversion, Secret::from_str("0000000000000000000000000000000000000000000000000000000000000001").unwrap());
+	}
+
+	#[test]
+	fn secret_inversion_is_reversible_with_inversion() {
+		let secret = Random.generate().unwrap().secret().clone();
+		let mut inversion = secret.clone();
+		inversion.inv().unwrap();
+		inversion.inv().unwrap();
+		assert_eq!(inversion, secret);
+	}
+
+	#[test]
+	fn secret_pow() {
+		let secret = Random.generate().unwrap().secret().clone();
+
+		let mut pow0 = secret.clone();
+		pow0.pow(0).unwrap();
+		assert_eq!(pow0, Secret::from_str("0000000000000000000000000000000000000000000000000000000000000001").unwrap());
+
+		let mut pow1 = secret.clone();
+		pow1.pow(1).unwrap();
+		assert_eq!(pow1, secret);
+
+		let mut pow2 = secret.clone();
+		pow2.pow(2).unwrap();
+		let mut pow2_expected = secret.clone();
+		pow2_expected.mul(&secret).unwrap();
+		assert_eq!(pow2, pow2_expected);
+
+		let mut pow3 = secret.clone();
+		pow3.pow(3).unwrap();
+		let mut pow3_expected = secret.clone();
+		pow3_expected.mul(&secret).unwrap();
+		pow3_expected.mul(&secret).unwrap();
+		assert_eq!(pow3, pow3_expected);
+	}
+}

accounts/ethkey/src/signature.rs

@@ -0,0 +1,314 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::ops::{Deref, DerefMut};
+use std::cmp::PartialEq;
+use std::fmt;
+use std::str::FromStr;
+use std::hash::{Hash, Hasher};
+use secp256k1::{Message as SecpMessage, RecoverableSignature, RecoveryId, Error as SecpError};
+use secp256k1::key::{SecretKey, PublicKey};
+use rustc_hex::{ToHex, FromHex};
+use ethereum_types::{H520, H256};
+use {Secret, Public, SECP256K1, Error, Message, public_to_address, Address};
+
+/// Signature encoded as RSV components
+#[repr(C)]
+pub struct Signature([u8; 65]);
+
+impl Signature {
+	/// Get a slice into the 'r' portion of the data.
+	pub fn r(&self) -> &[u8] {
+		&self.0[0..32]
+	}
+
+	/// Get a slice into the 's' portion of the data.
+	pub fn s(&self) -> &[u8] {
+		&self.0[32..64]
+	}
+
+	/// Get the recovery byte.
+	pub fn v(&self) -> u8 {
+		self.0[64]
+	}
+
+	/// Encode the signature into RSV array (V altered to be in "Electrum" notation).
+	pub fn into_electrum(mut self) -> [u8; 65] {
+		self.0[64] += 27;
+		self.0
+	}
+
+	/// Parse bytes as a signature encoded as RSV (V in "Electrum" notation).
+	/// May return empty (invalid) signature if given data has invalid length.
+	pub fn from_electrum(data: &[u8]) -> Self {
+		if data.len() != 65 || data[64] < 27 {
+			// fallback to empty (invalid) signature
+			return Signature::default();
+		}
+
+		let mut sig = [0u8; 65];
+		sig.copy_from_slice(data);
+		sig[64] -= 27;
+		Signature(sig)
+	}
+
+	/// Create a signature object from the sig.
+	pub fn from_rsv(r: &H256, s: &H256, v: u8) -> Self {
+		let mut sig = [0u8; 65];
+		sig[0..32].copy_from_slice(r.as_ref());
+		sig[32..64].copy_from_slice(s.as_ref());
+		sig[64] = v;
+		Signature(sig)
+	}
+
+	/// Check if this is a "low" signature.
+	pub fn is_low_s(&self) -> bool {
+		// "7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5D576E7357A4501DDFE92F46681B20A0"
+		const MASK: H256 = H256([
+			0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+			0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+			0x5D, 0x57, 0x6E, 0x73, 0x57, 0xA4, 0x50, 0x1D,
+			0xDF, 0xE9, 0x2F, 0x46, 0x68, 0x1B, 0x20, 0xA0,
+		]);
+		H256::from_slice(self.s()) <= MASK
+	}
+
+	/// Check if each component of the signature is in range.
+	pub fn is_valid(&self) -> bool {
+		// "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"
+		const MASK: H256 = H256([
+			0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+			0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+			0xba, 0xae, 0xdc, 0xe6, 0xaf, 0x48, 0xa0, 0x3b,
+			0xbf, 0xd2, 0x5e, 0x8c, 0xd0, 0x36, 0x41, 0x41,
+		]);
+		const ONE: H256 = H256([
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+		]);
+		let r = H256::from_slice(self.r());
+		let s = H256::from_slice(self.s());
+		self.v() <= 1 &&
+			r < MASK && r >= ONE &&
+			s < MASK && s >= ONE
+	}
+}
+
+// manual implementation large arrays don't have trait impls by default.
+// remove when integer generics exist
+impl PartialEq for Signature {
+	fn eq(&self, other: &Self) -> bool {
+		&self.0[..] == &other.0[..]
+	}
+}
+
+// manual implementation required in Rust 1.13+, see `std::cmp::AssertParamIsEq`.
+impl Eq for Signature { }
+
+// also manual for the same reason, but the pretty printing might be useful.
+impl fmt::Debug for Signature {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		f.debug_struct("Signature")
+			.field("r", &self.0[0..32].to_hex())
+			.field("s", &self.0[32..64].to_hex())
+			.field("v", &self.0[64..65].to_hex())
+		.finish()
+	}
+}
+
+impl fmt::Display for Signature {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		write!(f, "{}", self.to_hex())
+	}
+}
+
+impl FromStr for Signature {
+	type Err = Error;
+
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		match s.from_hex() {
+			Ok(ref hex) if hex.len() == 65 => {
+				let mut data = [0; 65];
+				data.copy_from_slice(&hex[0..65]);
+				Ok(Signature(data))
+			},
+			_ => Err(Error::InvalidSignature)
+		}
+	}
+}
+
+impl Default for Signature {
+	fn default() -> Self {
+		Signature([0; 65])
+	}
+}
+
+impl Hash for Signature {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+    	H520::from(self.0).hash(state);
+    }
+}
+
+impl Clone for Signature {
+    fn clone(&self) -> Self {
+		Signature(self.0)
+    }
+}
+
+impl From<[u8; 65]> for Signature {
+	fn from(s: [u8; 65]) -> Self {
+		Signature(s)
+	}
+}
+
+impl Into<[u8; 65]> for Signature {
+	fn into(self) -> [u8; 65] {
+		self.0
+	}
+}
+
+impl From<Signature> for H520 {
+	fn from(s: Signature) -> Self {
+		H520::from(s.0)
+	}
+}
+
+impl From<H520> for Signature {
+	fn from(bytes: H520) -> Self {
+		Signature(bytes.into())
+	}
+}
+
+impl Deref for Signature {
+	type Target = [u8; 65];
+
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
+impl DerefMut for Signature {
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		&mut self.0
+	}
+}
+
+pub fn sign(secret: &Secret, message: &Message) -> Result<Signature, Error> {
+	let context = &SECP256K1;
+	let sec = SecretKey::from_slice(context, secret.as_ref())?;
+	let s = context.sign_recoverable(&SecpMessage::from_slice(&message[..])?, &sec)?;
+	let (rec_id, data) = s.serialize_compact(context);
+	let mut data_arr = [0; 65];
+
+	// no need to check if s is low, it always is
+	data_arr[0..64].copy_from_slice(&data[0..64]);
+	data_arr[64] = rec_id.to_i32() as u8;
+	Ok(Signature(data_arr))
+}
+
+pub fn verify_public(public: &Public, signature: &Signature, message: &Message) -> Result<bool, Error> {
+	let context = &SECP256K1;
+	let rsig = RecoverableSignature::from_compact(context, &signature[0..64], RecoveryId::from_i32(signature[64] as i32)?)?;
+	let sig = rsig.to_standard(context);
+
+	let pdata: [u8; 65] = {
+		let mut temp = [4u8; 65];
+		temp[1..65].copy_from_slice(public.as_bytes());
+		temp
+	};
+
+	let publ = PublicKey::from_slice(context, &pdata)?;
+	match context.verify(&SecpMessage::from_slice(&message[..])?, &sig, &publ) {
+		Ok(_) => Ok(true),
+		Err(SecpError::IncorrectSignature) => Ok(false),
+		Err(x) => Err(Error::from(x))
+	}
+}
+
+pub fn verify_address(address: &Address, signature: &Signature, message: &Message) -> Result<bool, Error> {
+	let public = recover(signature, message)?;
+	let recovered_address = public_to_address(&public);
+	Ok(address == &recovered_address)
+}
+
+pub fn recover(signature: &Signature, message: &Message) -> Result<Public, Error> {
+	let context = &SECP256K1;
+	let rsig = RecoverableSignature::from_compact(context, &signature[0..64], RecoveryId::from_i32(signature[64] as i32)?)?;
+	let pubkey = context.recover(&SecpMessage::from_slice(&message[..])?, &rsig)?;
+	let serialized = pubkey.serialize_vec(context, false);
+
+	let mut public = Public::default();
+	public.as_bytes_mut().copy_from_slice(&serialized[1..65]);
+	Ok(public)
+}
+
+#[cfg(test)]
+mod tests {
+	use std::str::FromStr;
+	use {Generator, Random, Message};
+	use super::{sign, verify_public, verify_address, recover, Signature};
+
+	#[test]
+	fn vrs_conversion() {
+		// given
+		let keypair = Random.generate().unwrap();
+		let message = Message::default();
+		let signature = sign(keypair.secret(), &message).unwrap();
+
+		// when
+		let vrs = signature.clone().into_electrum();
+		let from_vrs = Signature::from_electrum(&vrs);
+
+		// then
+		assert_eq!(signature, from_vrs);
+	}
+
+	#[test]
+	fn signature_to_and_from_str() {
+		let keypair = Random.generate().unwrap();
+		let message = Message::default();
+		let signature = sign(keypair.secret(), &message).unwrap();
+		let string = format!("{}", signature);
+		let deserialized = Signature::from_str(&string).unwrap();
+		assert_eq!(signature, deserialized);
+	}
+
+	#[test]
+	fn sign_and_recover_public() {
+		let keypair = Random.generate().unwrap();
+		let message = Message::default();
+		let signature = sign(keypair.secret(), &message).unwrap();
+		assert_eq!(keypair.public(), &recover(&signature, &message).unwrap());
+	}
+
+	#[test]
+	fn sign_and_verify_public() {
+		let keypair = Random.generate().unwrap();
+		let message = Message::default();
+		let signature = sign(keypair.secret(), &message).unwrap();
+		assert!(verify_public(keypair.public(), &signature, &message).unwrap());
+	}
+
+	#[test]
+	fn sign_and_verify_address() {
+		let keypair = Random.generate().unwrap();
+		let message = Message::default();
+		let signature = sign(keypair.secret(), &message).unwrap();
+		assert!(verify_address(&keypair.address(), &signature, &message).unwrap());
+	}
+}

accounts/ethstore/Cargo.toml

@@ -7,21 +7,22 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 log = "0.4"
 libc = "0.2"
-rand = "0.7.3"
+rand = "0.6"
 ethkey = { path = "../ethkey" }
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
 rustc-hex = "1.0"
+tiny-keccak = "1.4"
 time = "0.1.34"
 itertools = "0.5"
-parking_lot = "0.11.1"
-parity-crypto = { version = "0.6.2", features = [ "publickey"] }
-ethereum-types = "0.9.2"
+parking_lot = "0.7"
+parity-crypto = "0.4.0"
+ethereum-types = "0.6.0"
+dir = { path = "../../util/dir" }
 smallvec = "0.6"
-parity-wordlist = "1.3"
+parity-wordlist = "1.0"
 tempdir = "0.3"
-lazy_static = "1.2.0"
 
 [dev-dependencies]
 matches = "0.1"

accounts/ethstore/README.md

@@ -337,3 +337,4 @@ _This project is a part of the Parity Ethereum toolchain._
 - [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding.
 - [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethstore) - Parity Ethereum key management.
 - [ethkey](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethkey) - Parity Ethereum keys generator.
+- [whisper](https://github.com/paritytech/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.

accounts/ethstore/cli/Cargo.toml

@@ -11,10 +11,10 @@ num_cpus = "1.6"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
-parking_lot = "0.11.1"
-ethstore = { path = "../../crates/accounts/ethstore" }
-dir = { path = '../../crates/util/dir' }
-panic_hook = { path = "../../crates/util/panic-hook" }
+parking_lot = "0.7"
+ethstore = { path = "../" }
+dir = { path = '../../../util/dir' }
+panic_hook = { path = "../../../util/panic-hook" }
 
 [[bin]]
 name = "ethstore"
@@ -22,4 +22,4 @@ path = "src/main.rs"
 doc = false
 
 [dev-dependencies]
-tempdir = "0.3.5"
+tempdir = "0.3"

accounts/ethstore/cli/src/crack.rs

@@ -0,0 +1,66 @@
+// 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::{cmp, thread};
+use std::sync::Arc;
+use std::collections::VecDeque;
+use parking_lot::Mutex;
+
+use ethstore::{ethkey::Password, PresaleWallet, Error};
+use num_cpus;
+
+pub fn run(passwords: VecDeque<Password>, wallet_path: &str) -> Result<(), Error> {
+	let passwords = Arc::new(Mutex::new(passwords));
+
+	let mut handles = Vec::new();
+
+	for _ in 0..num_cpus::get() {
+		let passwords = passwords.clone();
+		let wallet = PresaleWallet::open(&wallet_path)?;
+		handles.push(thread::spawn(move || {
+			look_for_password(passwords, wallet);
+		}));
+	}
+
+	for handle in handles {
+		handle.join().map_err(|err| Error::Custom(format!("Error finishing thread: {:?}", err)))?;
+	}
+
+	Ok(())
+}
+
+fn look_for_password(passwords: Arc<Mutex<VecDeque<Password>>>, wallet: PresaleWallet) {
+	let mut counter = 0;
+	while !passwords.lock().is_empty() {
+		let package = {
+			let mut passwords = passwords.lock();
+			let len = passwords.len();
+			passwords.split_off(cmp::min(len, 32))
+		};
+		for pass in package {
+			counter += 1;
+			match wallet.decrypt(&pass) {
+				Ok(_) => {
+					println!("Found password: {}", pass.as_str());
+					passwords.lock().clear();
+					return;
+				},
+				_ if counter % 100 == 0 => print!("."),
+				_ => {},
+			}
+		}
+	}
+}

accounts/ethstore/cli/src/main.rs

@@ -0,0 +1,317 @@
+// 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/>.
+
+extern crate dir;
+extern crate docopt;
+extern crate ethstore;
+extern crate num_cpus;
+extern crate panic_hook;
+extern crate parking_lot;
+extern crate rustc_hex;
+extern crate serde;
+
+extern crate env_logger;
+
+#[macro_use]
+extern crate serde_derive;
+
+use std::collections::VecDeque;
+use std::io::Read;
+use std::{env, process, fs, fmt};
+
+use docopt::Docopt;
+use ethstore::accounts_dir::{KeyDirectory, RootDiskDirectory};
+use ethstore::ethkey::{Address, Password};
+use ethstore::{EthStore, SimpleSecretStore, SecretStore, import_accounts, PresaleWallet, SecretVaultRef, StoreAccountRef};
+
+mod crack;
+
+pub const USAGE: &'static str = r#"
+Parity Ethereum key management tool.
+  Copyright 2015-2019 Parity Technologies (UK) Ltd.
+
+Usage:
+    ethstore insert <secret> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore change-pwd <address> <old-pwd> <new-pwd> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore list [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore import [<password>] [--src DIR] [--dir DIR]
+    ethstore import-wallet <path> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore find-wallet-pass <path> <password>
+    ethstore remove <address> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore sign <address> <password> <message> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore public <address> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore list-vaults [--dir DIR]
+    ethstore create-vault <vault> <password> [--dir DIR]
+    ethstore change-vault-pwd <vault> <old-pwd> <new-pwd> [--dir DIR]
+    ethstore move-to-vault <address> <vault> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
+    ethstore move-from-vault <address> <vault> <password> [--dir DIR]
+    ethstore [-h | --help]
+
+Options:
+    -h, --help               Display this message and exit.
+    --dir DIR                Specify the secret store directory. It may be either
+                             parity, parity-(chain), geth, geth-test
+                             or a path [default: parity].
+    --vault VAULT            Specify vault to use in this operation.
+    --vault-pwd VAULTPWD     Specify vault password to use in this operation. Please note
+                             that this option is required when vault option is set.
+                             Otherwise it is ignored.
+    --src DIR                Specify import source. It may be either
+                             parity, parity-(chain), geth, geth-test
+                             or a path [default: geth].
+
+Commands:
+    insert             Save account with password.
+    change-pwd         Change password.
+    list               List accounts.
+    import             Import accounts from src.
+    import-wallet      Import presale wallet.
+    find-wallet-pass   Tries to open a wallet with list of passwords given.
+    remove             Remove account.
+    sign               Sign message.
+    public             Displays public key for an address.
+    list-vaults        List vaults.
+    create-vault       Create new vault.
+    change-vault-pwd   Change vault password.
+    move-to-vault      Move account to vault from another vault/root directory.
+    move-from-vault    Move account to root directory from given vault.
+"#;
+
+#[derive(Debug, Deserialize)]
+struct Args {
+	cmd_insert: bool,
+	cmd_change_pwd: bool,
+	cmd_list: bool,
+	cmd_import: bool,
+	cmd_import_wallet: bool,
+	cmd_find_wallet_pass: bool,
+	cmd_remove: bool,
+	cmd_sign: bool,
+	cmd_public: bool,
+	cmd_list_vaults: bool,
+	cmd_create_vault: bool,
+	cmd_change_vault_pwd: bool,
+	cmd_move_to_vault: bool,
+	cmd_move_from_vault: bool,
+	arg_secret: String,
+	arg_password: String,
+	arg_old_pwd: String,
+	arg_new_pwd: String,
+	arg_address: String,
+	arg_message: String,
+	arg_path: String,
+	arg_vault: String,
+	flag_src: String,
+	flag_dir: String,
+	flag_vault: String,
+	flag_vault_pwd: String,
+}
+
+enum Error {
+	Ethstore(ethstore::Error),
+	Docopt(docopt::Error),
+}
+
+impl From<ethstore::Error> for Error {
+	fn from(err: ethstore::Error) -> Self {
+		Error::Ethstore(err)
+	}
+}
+
+impl From<docopt::Error> for Error {
+	fn from(err: docopt::Error) -> Self {
+		Error::Docopt(err)
+	}
+}
+
+impl fmt::Display for Error {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		match *self {
+			Error::Ethstore(ref err) => fmt::Display::fmt(err, f),
+			Error::Docopt(ref err) => fmt::Display::fmt(err, f),
+		}
+	}
+}
+
+fn main() {
+	panic_hook::set_abort();
+	if env::var("RUST_LOG").is_err() {
+		env::set_var("RUST_LOG", "warn")
+	}
+	env_logger::try_init().expect("Logger initialized only once.");
+
+	match execute(env::args()) {
+		Ok(result) => println!("{}", result),
+		Err(Error::Docopt(ref e)) => e.exit(),
+		Err(err) => {
+			eprintln!("{}", err);
+			process::exit(1);
+		}
+	}
+}
+
+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 path = dir::parity(chain);
+			RootDiskDirectory::create(path)?
+		},
+		path => RootDiskDirectory::create(path)?,
+	};
+
+	Ok(Box::new(dir.with_password(password)))
+}
+
+fn open_args_vault(store: &EthStore, args: &Args) -> Result<SecretVaultRef, Error> {
+	if args.flag_vault.is_empty() {
+		return Ok(SecretVaultRef::Root);
+	}
+
+	let vault_pwd = load_password(&args.flag_vault_pwd)?;
+	store.open_vault(&args.flag_vault, &vault_pwd)?;
+	Ok(SecretVaultRef::Vault(args.flag_vault.clone()))
+}
+
+fn open_args_vault_account(store: &EthStore, address: Address, args: &Args) -> Result<StoreAccountRef, Error> {
+	match open_args_vault(store, args)? {
+		SecretVaultRef::Root => Ok(StoreAccountRef::root(address)),
+		SecretVaultRef::Vault(name) => Ok(StoreAccountRef::vault(&name, address)),
+	}
+}
+
+fn format_accounts(accounts: &[Address]) -> String {
+	accounts.iter()
+		.enumerate()
+		.map(|(i, a)| format!("{:2}: 0x{:x}", i, a))
+		.collect::<Vec<String>>()
+		.join("\n")
+}
+
+fn format_vaults(vaults: &[String]) -> String {
+	vaults.join("\n")
+}
+
+fn load_password(path: &str) -> Result<Password, Error> {
+	let mut file = fs::File::open(path).map_err(|e| ethstore::Error::Custom(format!("Error opening password file '{}': {}", path, e)))?;
+	let mut password = String::new();
+	file.read_to_string(&mut password).map_err(|e| ethstore::Error::Custom(format!("Error reading password file '{}': {}", path, e)))?;
+	// drop EOF
+	let _ = password.pop();
+	Ok(password.into())
+}
+
+fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item=S>, S: AsRef<str> {
+	let args: Args = Docopt::new(USAGE)
+		.and_then(|d| d.argv(command).deserialize())?;
+
+	let store = EthStore::open(key_dir(&args.flag_dir, None)?)?;
+
+	return if args.cmd_insert {
+		let secret = args.arg_secret.parse().map_err(|_| ethstore::Error::InvalidSecret)?;
+		let password = load_password(&args.arg_password)?;
+		let vault_ref = open_args_vault(&store, &args)?;
+		let account_ref = store.insert_account(vault_ref, secret, &password)?;
+		Ok(format!("0x{:x}", account_ref.address))
+	} else if args.cmd_change_pwd {
+		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
+		let old_pwd = load_password(&args.arg_old_pwd)?;
+		let new_pwd = load_password(&args.arg_new_pwd)?;
+		let account_ref = open_args_vault_account(&store, address, &args)?;
+		let ok = store.change_password(&account_ref, &old_pwd, &new_pwd).is_ok();
+		Ok(format!("{}", ok))
+	} else if args.cmd_list {
+		let vault_ref = open_args_vault(&store, &args)?;
+		let accounts = store.accounts()?;
+		let accounts: Vec<_> = accounts
+			.into_iter()
+			.filter(|a| &a.vault == &vault_ref)
+			.map(|a| a.address)
+			.collect();
+		Ok(format_accounts(&accounts))
+	} else if args.cmd_import {
+		let password = match args.arg_password.as_ref() {
+			"" => None,
+			_ => Some(load_password(&args.arg_password)?)
+		};
+		let src = key_dir(&args.flag_src, password)?;
+		let dst = key_dir(&args.flag_dir, None)?;
+
+		let accounts = import_accounts(&*src, &*dst)?;
+		Ok(format_accounts(&accounts))
+	} else if args.cmd_import_wallet {
+		let wallet = PresaleWallet::open(&args.arg_path)?;
+		let password = load_password(&args.arg_password)?;
+		let kp = wallet.decrypt(&password)?;
+		let vault_ref = open_args_vault(&store, &args)?;
+		let account_ref = store.insert_account(vault_ref, kp.secret().clone(), &password)?;
+		Ok(format!("0x{:x}", account_ref.address))
+	} else if args.cmd_find_wallet_pass {
+		let passwords = load_password(&args.arg_password)?;
+		let passwords = passwords.as_str().lines().map(|line| str::to_owned(line).into()).collect::<VecDeque<_>>();
+		crack::run(passwords, &args.arg_path)?;
+		Ok(format!("Password not found."))
+	} else if args.cmd_remove {
+		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
+		let password = load_password(&args.arg_password)?;
+		let account_ref = open_args_vault_account(&store, address, &args)?;
+		let ok = store.remove_account(&account_ref, &password).is_ok();
+		Ok(format!("{}", ok))
+	} else if args.cmd_sign {
+		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
+		let message = args.arg_message.parse().map_err(|_| ethstore::Error::InvalidMessage)?;
+		let password = load_password(&args.arg_password)?;
+		let account_ref = open_args_vault_account(&store, address, &args)?;
+		let signature = store.sign(&account_ref, &password, &message)?;
+		Ok(format!("0x{}", signature))
+	} else if args.cmd_public {
+		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
+		let password = load_password(&args.arg_password)?;
+		let account_ref = open_args_vault_account(&store, address, &args)?;
+		let public = store.public(&account_ref, &password)?;
+		Ok(format!("0x{:x}", public))
+	} else if args.cmd_list_vaults {
+		let vaults = store.list_vaults()?;
+		Ok(format_vaults(&vaults))
+	} else if args.cmd_create_vault {
+		let password = load_password(&args.arg_password)?;
+		store.create_vault(&args.arg_vault, &password)?;
+		Ok("OK".to_owned())
+	} else if args.cmd_change_vault_pwd {
+		let old_pwd = load_password(&args.arg_old_pwd)?;
+		let new_pwd = load_password(&args.arg_new_pwd)?;
+		store.open_vault(&args.arg_vault, &old_pwd)?;
+		store.change_vault_password(&args.arg_vault, &new_pwd)?;
+		Ok("OK".to_owned())
+	} else if args.cmd_move_to_vault {
+		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
+		let password = load_password(&args.arg_password)?;
+		let account_ref = open_args_vault_account(&store, address, &args)?;
+		store.open_vault(&args.arg_vault, &password)?;
+		store.change_account_vault(SecretVaultRef::Vault(args.arg_vault), account_ref)?;
+		Ok("OK".to_owned())
+	} else if args.cmd_move_from_vault {
+		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
+		let password = load_password(&args.arg_password)?;
+		store.open_vault(&args.arg_vault, &password)?;
+		store.change_account_vault(SecretVaultRef::Root, StoreAccountRef::vault(&args.arg_vault, address))?;
+		Ok("OK".to_owned())
+	} else {
+		Ok(format!("{}", USAGE))
+	}
+}

accounts/ethstore/cli/tests/cli.rs

@@ -0,0 +1,82 @@
+// 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/>.
+
+extern crate tempdir;
+use std::process::Command;
+use tempdir::TempDir;
+use std::fs::File;
+use std::io::Write;
+
+fn run(args: &[&str]) -> String {
+	let output = Command::new("cargo")
+		.args(&["run", "--"])
+		.args(args)
+		.output()
+		.unwrap();
+	assert!(output.status.success());
+	String::from_utf8(output.stdout).unwrap()
+}
+
+#[test]
+fn cli_cmd() {
+	Command::new("cargo")
+		.arg("build")
+		.output()
+		.unwrap();
+
+	let dir = TempDir::new("test-vault").unwrap();
+
+	let mut passwd = File::create(dir.path().join("test-password")).unwrap();
+	writeln!(passwd, "password").unwrap();
+
+	let mut passwd2 = File::create(dir.path().join("test-vault-addr")).unwrap();
+	writeln!(passwd2, "password2").unwrap();
+
+	let test_password_buf = dir.path().join("test-password");
+	let test_password: &str = test_password_buf.to_str().unwrap();
+	let dir_str: &str = dir.path().to_str().unwrap();
+	let test_vault_addr_buf = dir.path().join("test-vault-addr");
+	let test_vault_addr = test_vault_addr_buf.to_str().unwrap();
+
+	run(&["create-vault", "test-vault", test_password, "--dir", dir_str]);
+
+	let output = run(&["insert", "7d29fab185a33e2cd955812397354c472d2b84615b645aa135ff539f6b0d70d5",
+			    test_vault_addr,
+			    "--dir", dir_str,
+			    "--vault", "test-vault",
+			   "--vault-pwd", test_password]);
+	let address = output.trim();
+
+	let output = run(&["list",
+			   "--dir", dir_str,
+			   "--vault", "test-vault",
+			   "--vault-pwd", test_password]);
+	assert_eq!(output, " 0: 0xa8fa5dd30a87bb9e3288d604eb74949c515ab66e\n");
+
+	let output = run(&["sign", &address[2..],
+			   test_vault_addr,
+			   "7d29fab185a33e2cd955812397354c472d2b84615b645aa135ff539f6b0d70d5",
+			   "--dir", dir_str,
+			   "--vault", "test-vault",
+			   "--vault-pwd", test_password]);
+	assert_eq!(output, "0x54ab6e5cf0c5cb40043fdca5d15d611a3a94285414a076dafecc8dc9c04183f413296a3defff61092c0bb478dc9887ec01070e1275234211208fb8f4be4a9b0101\n");
+
+	let output = run(&["public", &address[2..], test_vault_addr,
+			   "--dir", dir_str,
+			   "--vault", "test-vault",
+			   "--vault-pwd", test_password]);
+	assert_eq!(output, "0x35f222d88b80151857a2877826d940104887376a94c1cbd2c8c7c192eb701df88a18a4ecb8b05b1466c5b3706042027b5e079fe3a3683e66d822b0e047aa3418\n");
+}

accounts/ethstore/src/account/cipher.rs

@@ -0,0 +1,59 @@
+// 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 json;
+
+#[derive(Debug, PartialEq, Clone)]
+pub struct Aes128Ctr {
+	pub iv: [u8; 16],
+}
+
+#[derive(Debug, PartialEq, Clone)]
+pub enum Cipher {
+	Aes128Ctr(Aes128Ctr),
+}
+
+impl From<json::Aes128Ctr> for Aes128Ctr {
+	fn from(json: json::Aes128Ctr) -> Self {
+		Aes128Ctr {
+			iv: json.iv.into()
+		}
+	}
+}
+
+impl Into<json::Aes128Ctr> for Aes128Ctr {
+	fn into(self) -> json::Aes128Ctr {
+		json::Aes128Ctr {
+			iv: From::from(self.iv)
+		}
+	}
+}
+
+impl From<json::Cipher> for Cipher {
+	fn from(json: json::Cipher) -> Self {
+		match json {
+			json::Cipher::Aes128Ctr(params) => Cipher::Aes128Ctr(From::from(params)),
+		}
+	}
+}
+
+impl Into<json::Cipher> for Cipher {
+	fn into(self) -> json::Cipher {
+		match self {
+			Cipher::Aes128Ctr(params) => json::Cipher::Aes128Ctr(params.into()),
+		}
+	}
+}

accounts/ethstore/src/account/crypto.rs

@@ -0,0 +1,206 @@
+// 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::str;
+use ethkey::{Password, Secret};
+use {json, Error, crypto};
+use crypto::Keccak256;
+use random::Random;
+use smallvec::SmallVec;
+use account::{Cipher, Kdf, Aes128Ctr, Pbkdf2, Prf};
+
+/// Encrypted data
+#[derive(Debug, PartialEq, Clone)]
+pub struct Crypto {
+	/// Encryption parameters
+	pub cipher: Cipher,
+	/// Encrypted data buffer
+	pub ciphertext: Vec<u8>,
+	/// Key derivation function parameters
+	pub kdf: Kdf,
+	/// Message authentication code
+	pub mac: [u8; 32],
+}
+
+impl From<json::Crypto> for Crypto {
+	fn from(json: json::Crypto) -> Self {
+		Crypto {
+			cipher: json.cipher.into(),
+			ciphertext: json.ciphertext.into(),
+			kdf: json.kdf.into(),
+			mac: json.mac.into(),
+		}
+	}
+}
+
+impl From<Crypto> for json::Crypto {
+	fn from(c: Crypto) -> Self {
+		json::Crypto {
+			cipher: c.cipher.into(),
+			ciphertext: c.ciphertext.into(),
+			kdf: c.kdf.into(),
+			mac: c.mac.into(),
+		}
+	}
+}
+
+impl str::FromStr for Crypto {
+	type Err = <json::Crypto as str::FromStr>::Err;
+
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		s.parse::<json::Crypto>().map(Into::into)
+	}
+}
+
+impl From<Crypto> for String {
+	fn from(c: Crypto) -> Self {
+		json::Crypto::from(c).into()
+	}
+}
+
+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)
+	}
+
+	/// Encrypt custom plain data
+	pub fn with_plain(plain: &[u8], password: &Password, iterations: u32) -> Result<Self, crypto::Error> {
+		let salt: [u8; 32] = Random::random();
+		let iv: [u8; 16] = Random::random();
+
+		// two parts of derived key
+		// DK = [ DK[0..15] DK[16..31] ] = [derived_left_bits, derived_right_bits]
+		let (derived_left_bits, derived_right_bits) =
+			crypto::derive_key_iterations(password.as_bytes(), &salt, iterations);
+
+		// preallocated (on-stack in case of `Secret`) buffer to hold cipher
+		// length = length(plain) as we are using CTR-approach
+		let plain_len = plain.len();
+		let mut ciphertext: SmallVec<[u8; 32]> = SmallVec::from_vec(vec![0; plain_len]);
+
+		// aes-128-ctr with initial vector of iv
+		crypto::aes::encrypt_128_ctr(&derived_left_bits, &iv, plain, &mut *ciphertext)?;
+
+		// KECCAK(DK[16..31] ++ <ciphertext>), where DK[16..31] - derived_right_bits
+		let mac = crypto::derive_mac(&derived_right_bits, &*ciphertext).keccak256();
+
+		Ok(Crypto {
+			cipher: Cipher::Aes128Ctr(Aes128Ctr {
+				iv: iv,
+			}),
+			ciphertext: ciphertext.into_vec(),
+			kdf: Kdf::Pbkdf2(Pbkdf2 {
+				dklen: crypto::KEY_LENGTH as u32,
+				salt: salt.to_vec(),
+				c: iterations,
+				prf: Prf::HmacSha256,
+			}),
+			mac: mac,
+		})
+	}
+
+	/// Try to decrypt and convert result to account secret
+	pub fn secret(&self, password: &Password) -> Result<Secret, Error> {
+		if self.ciphertext.len() > 32 {
+			return Err(Error::InvalidSecret);
+		}
+
+		let secret = self.do_decrypt(password, 32)?;
+		Ok(Secret::from_unsafe_slice(&secret)?)
+	}
+
+	/// Try to decrypt and return result as is
+	pub fn decrypt(&self, password: &Password) -> Result<Vec<u8>, Error> {
+		let expected_len = self.ciphertext.len();
+		self.do_decrypt(password, expected_len)
+	}
+
+	fn do_decrypt(&self, password: &Password, expected_len: usize) -> Result<Vec<u8>, Error> {
+		let (derived_left_bits, derived_right_bits) = match self.kdf {
+			Kdf::Pbkdf2(ref params) => crypto::derive_key_iterations(password.as_bytes(), &params.salt, params.c),
+			Kdf::Scrypt(ref params) => crypto::scrypt::derive_key(password.as_bytes(), &params.salt, params.n, params.p, params.r)?,
+		};
+
+		let mac = crypto::derive_mac(&derived_right_bits, &self.ciphertext).keccak256();
+
+		if !crypto::is_equal(&mac, &self.mac) {
+			return Err(Error::InvalidPassword)
+		}
+
+		let mut plain: SmallVec<[u8; 32]> = SmallVec::from_vec(vec![0; expected_len]);
+
+		match self.cipher {
+			Cipher::Aes128Ctr(ref params) => {
+				// checker by callers
+				debug_assert!(expected_len >= self.ciphertext.len());
+
+				let from = expected_len - self.ciphertext.len();
+				crypto::aes::decrypt_128_ctr(&derived_left_bits, &params.iv, &self.ciphertext, &mut plain[from..])?;
+				Ok(plain.into_iter().collect())
+			},
+		}
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use ethkey::{Generator, Random};
+	use super::{Crypto, Error};
+
+	#[test]
+	fn crypto_with_secret_create() {
+		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();
+		assert_eq!(keypair.secret(), &secret);
+	}
+
+	#[test]
+	fn crypto_with_secret_invalid_password() {
+		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))
+	}
+
+	#[test]
+	fn crypto_with_null_plain_data() {
+		let original_data = b"";
+		let passwd = "this is sparta".into();
+		let crypto = Crypto::with_plain(&original_data[..], &passwd, 10240).unwrap();
+		let decrypted_data = crypto.decrypt(&passwd).unwrap();
+		assert_eq!(original_data[..], *decrypted_data);
+	}
+
+	#[test]
+	fn crypto_with_tiny_plain_data() {
+		let original_data = b"{}";
+		let passwd = "this is sparta".into();
+		let crypto = Crypto::with_plain(&original_data[..], &passwd, 10240).unwrap();
+		let decrypted_data = crypto.decrypt(&passwd).unwrap();
+		assert_eq!(original_data[..], *decrypted_data);
+	}
+
+	#[test]
+	fn crypto_with_huge_plain_data() {
+		let original_data: Vec<_> = (1..65536).map(|i| (i % 256) as u8).collect();
+		let passwd = "this is sparta".into();
+		let crypto = Crypto::with_plain(&original_data, &passwd, 10240).unwrap();
+		let decrypted_data = crypto.decrypt(&passwd).unwrap();
+		assert_eq!(&original_data, &decrypted_data);
+	}
+}

accounts/ethstore/src/account/kdf.rs

@@ -0,0 +1,125 @@
+// 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 json;
+
+#[derive(Debug, PartialEq, Clone)]
+pub enum Prf {
+	HmacSha256,
+}
+
+#[derive(Debug, PartialEq, Clone)]
+pub struct Pbkdf2 {
+	pub c: u32,
+	pub dklen: u32,
+	pub prf: Prf,
+	pub salt: Vec<u8>,
+}
+
+#[derive(Debug, PartialEq, Clone)]
+pub struct Scrypt {
+	pub dklen: u32,
+	pub p: u32,
+	pub n: u32,
+	pub r: u32,
+	pub salt: Vec<u8>,
+}
+
+#[derive(Debug, PartialEq, Clone)]
+pub enum Kdf {
+	Pbkdf2(Pbkdf2),
+	Scrypt(Scrypt),
+}
+
+impl From<json::Prf> for Prf {
+	fn from(json: json::Prf) -> Self {
+		match json {
+			json::Prf::HmacSha256 => Prf::HmacSha256,
+		}
+	}
+}
+
+impl Into<json::Prf> for Prf {
+	fn into(self) -> json::Prf {
+		match self {
+			Prf::HmacSha256 => json::Prf::HmacSha256,
+		}
+	}
+}
+
+impl From<json::Pbkdf2> for Pbkdf2 {
+	fn from(json: json::Pbkdf2) -> Self {
+		Pbkdf2 {
+			c: json.c,
+			dklen: json.dklen,
+			prf: From::from(json.prf),
+			salt: json.salt.into(),
+		}
+	}
+}
+
+impl Into<json::Pbkdf2> for Pbkdf2 {
+	fn into(self) -> json::Pbkdf2 {
+		json::Pbkdf2 {
+			c: self.c,
+			dklen: self.dklen,
+			prf: self.prf.into(),
+			salt: From::from(self.salt),
+		}
+	}
+}
+
+impl From<json::Scrypt> for Scrypt {
+	fn from(json: json::Scrypt) -> Self {
+		Scrypt {
+			dklen: json.dklen,
+			p: json.p,
+			n: json.n,
+			r: json.r,
+			salt: json.salt.into(),
+		}
+	}
+}
+
+impl Into<json::Scrypt> for Scrypt {
+	fn into(self) -> json::Scrypt {
+		json::Scrypt {
+			dklen: self.dklen,
+			p: self.p,
+			n: self.n,
+			r: self.r,
+			salt: From::from(self.salt),
+		}
+	}
+}
+
+impl From<json::Kdf> for Kdf {
+	fn from(json: json::Kdf) -> Self {
+		match json {
+			json::Kdf::Pbkdf2(params) => Kdf::Pbkdf2(From::from(params)),
+			json::Kdf::Scrypt(params) => Kdf::Scrypt(From::from(params)),
+		}
+	}
+}
+
+impl Into<json::Kdf> for Kdf {
+	fn into(self) -> json::Kdf {
+		match self {
+			Kdf::Pbkdf2(params) => json::Kdf::Pbkdf2(params.into()),
+			Kdf::Scrypt(params) => json::Kdf::Scrypt(params.into()),
+		}
+	}
+}

accounts/ethstore/src/account/mod.rs

@@ -0,0 +1,27 @@
+// 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/>.
+
+mod cipher;
+mod crypto;
+mod kdf;
+mod safe_account;
+mod version;
+
+pub use self::cipher::{Cipher, Aes128Ctr};
+pub use self::crypto::Crypto;
+pub use self::kdf::{Kdf, Pbkdf2, Scrypt, Prf};
+pub use self::safe_account::SafeAccount;
+pub use self::version::Version;

accounts/ethstore/src/account/safe_account.rs

@@ -0,0 +1,229 @@
+// 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 ethkey::{self, KeyPair, sign, Address, Password, Signature, Message, Public, Secret};
+use ethkey::crypto::ecdh::agree;
+use {json, Error};
+use account::Version;
+use crypto;
+use super::crypto::Crypto;
+
+/// Account representation.
+#[derive(Debug, PartialEq, Clone)]
+pub struct SafeAccount {
+	/// Account ID
+	pub id: [u8; 16],
+	/// Account version
+	pub version: Version,
+	/// Account address
+	pub address: Address,
+	/// Account private key derivation definition.
+	pub crypto: Crypto,
+	/// Account filename
+	pub filename: Option<String>,
+	/// Account name
+	pub name: String,
+	/// Account metadata
+	pub meta: String,
+}
+
+impl Into<json::KeyFile> for SafeAccount {
+	fn into(self) -> json::KeyFile {
+		json::KeyFile {
+			id: From::from(self.id),
+			version: self.version.into(),
+			address: Some(self.address.into()),
+			crypto: self.crypto.into(),
+			name: Some(self.name.into()),
+			meta: Some(self.meta.into()),
+		}
+	}
+}
+
+impl SafeAccount {
+	/// Create a new account
+	pub fn create(
+		keypair: &KeyPair,
+		id: [u8; 16],
+		password: &Password,
+		iterations: u32,
+		name: String,
+		meta: String
+	) -> Result<Self, crypto::Error> {
+		Ok(SafeAccount {
+			id: id,
+			version: Version::V3,
+			crypto: Crypto::with_secret(keypair.secret(), password, iterations)?,
+			address: keypair.address(),
+			filename: None,
+			name: name,
+			meta: meta,
+		})
+	}
+
+	/// Create a new `SafeAccount` from the given `json`; if it was read from a
+	/// file, the `filename` should be `Some` name. If it is as yet anonymous, then it
+	/// can be left `None`.
+	/// In case `password` is provided, we will attempt to read the secret from the keyfile
+	/// and derive the address from it instead of reading it directly.
+	/// Providing password is required for `json::KeyFile`s with no address.
+	pub fn from_file(json: json::KeyFile, filename: Option<String>, password: &Option<Password>) -> Result<Self, Error> {
+		let crypto = Crypto::from(json.crypto);
+		let address = match (password, &json.address) {
+			(None, Some(json_address)) => json_address.into(),
+			(None, None) => Err(Error::Custom(
+				"This keystore does not contain address. You need to provide password to import it".into()))?,
+			(Some(password), json_address) => {
+				let derived_address = KeyPair::from_secret(
+					crypto.secret(&password).map_err(|_| Error::InvalidPassword)?
+				)?.address();
+
+				match json_address {
+					Some(json_address) => {
+						let json_address = json_address.into();
+						if derived_address != json_address {
+							warn!("Detected address mismatch when opening an account. Derived: {:?}, in json got: {:?}",
+								derived_address, json_address);
+						}
+					},
+					_ => {},
+				}
+				derived_address
+			}
+		};
+
+		Ok(SafeAccount {
+			id: json.id.into(),
+			version: json.version.into(),
+			address,
+			crypto,
+			filename,
+			name: json.name.unwrap_or(String::new()),
+			meta: json.meta.unwrap_or("{}".to_owned()),
+		})
+	}
+
+	/// Create a new `SafeAccount` from the given vault `json`; if it was read from a
+	/// file, the `filename` should be `Some` name. If it is as yet anonymous, then it
+	/// can be left `None`.
+	pub fn from_vault_file(password: &Password, json: json::VaultKeyFile, filename: Option<String>) -> Result<Self, Error> {
+		let meta_crypto: Crypto = json.metacrypto.into();
+		let meta_plain = meta_crypto.decrypt(password)?;
+		let meta_plain = json::VaultKeyMeta::load(&meta_plain).map_err(|e| Error::Custom(format!("{:?}", e)))?;
+
+		SafeAccount::from_file(json::KeyFile {
+			id: json.id,
+			version: json.version,
+			crypto: json.crypto,
+			address: Some(meta_plain.address),
+			name: meta_plain.name,
+			meta: meta_plain.meta,
+		}, filename, &None)
+	}
+
+	/// Create a new `VaultKeyFile` from the given `self`
+	pub fn into_vault_file(self, iterations: u32, password: &Password) -> Result<json::VaultKeyFile, Error> {
+		let meta_plain = json::VaultKeyMeta {
+			address: self.address.into(),
+			name: Some(self.name),
+			meta: Some(self.meta),
+		};
+		let meta_plain = meta_plain.write().map_err(|e| Error::Custom(format!("{:?}", e)))?;
+		let meta_crypto = Crypto::with_plain(&meta_plain, password, iterations)?;
+
+		Ok(json::VaultKeyFile {
+			id: self.id.into(),
+			version: self.version.into(),
+			crypto: self.crypto.into(),
+			metacrypto: meta_crypto.into(),
+		})
+	}
+
+	/// Sign a message.
+	pub fn sign(&self, password: &Password, message: &Message) -> Result<Signature, Error> {
+		let secret = self.crypto.secret(password)?;
+		sign(&secret, message).map_err(From::from)
+	}
+
+	/// Decrypt a message.
+	pub fn decrypt(&self, password: &Password, shared_mac: &[u8], message: &[u8]) -> Result<Vec<u8>, Error> {
+		let secret = self.crypto.secret(password)?;
+		ethkey::crypto::ecies::decrypt(&secret, shared_mac, message).map_err(From::from)
+	}
+
+	/// Agree on shared key.
+	pub fn agree(&self, password: &Password, other: &Public) -> Result<Secret, Error> {
+		let secret = self.crypto.secret(password)?;
+		agree(&secret, other).map_err(From::from)
+	}
+
+	/// Derive public key.
+	pub fn public(&self, password: &Password) -> Result<Public, Error> {
+		let secret = self.crypto.secret(password)?;
+		Ok(KeyPair::from_secret(secret)?.public().clone())
+	}
+
+	/// Change account's password.
+	pub fn change_password(&self, old_password: &Password, new_password: &Password, iterations: u32) -> Result<Self, Error> {
+		let secret = self.crypto.secret(old_password)?;
+		let result = SafeAccount {
+			id: self.id.clone(),
+			version: self.version.clone(),
+			crypto: Crypto::with_secret(&secret, new_password, iterations)?,
+			address: self.address.clone(),
+			filename: self.filename.clone(),
+			name: self.name.clone(),
+			meta: self.meta.clone(),
+		};
+		Ok(result)
+	}
+
+	/// Check if password matches the account.
+	pub fn check_password(&self, password: &Password) -> bool {
+		self.crypto.secret(password).is_ok()
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use ethkey::{Generator, Random, verify_public, Message};
+	use super::SafeAccount;
+
+	#[test]
+	fn sign_and_verify_public() {
+		let keypair = Random.generate().unwrap();
+		let password = "hello world".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());
+	}
+
+	#[test]
+	fn change_password() {
+		let keypair = Random.generate().unwrap();
+		let first_password = "hello world".into();
+		let sec_password = "this is sparta".into();
+		let i = 10240;
+		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());
+		assert!(account.sign(&sec_password, &message).is_err());
+		assert!(new_account.sign(&first_password, &message).is_err());
+		assert!(new_account.sign(&sec_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 OpenEthereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// OpenEthereum 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.
 
-// OpenEthereum 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 OpenEthereum.  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

@@ -0,0 +1,484 @@
+// 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::{fs, io};
+use std::io::Write;
+use std::path::{PathBuf, Path};
+use std::collections::HashMap;
+use time;
+use {json, SafeAccount, Error};
+use json::Uuid;
+use super::{KeyDirectory, VaultKeyDirectory, VaultKeyDirectoryProvider, VaultKey};
+use super::vault::{VAULT_FILE_NAME, VaultDiskDirectory};
+use ethkey::Password;
+
+const IGNORED_FILES: &'static [&'static str] = &[
+	"thumbs.db",
+	"address_book.json",
+	"dapps_policy.json",
+	"dapps_accounts.json",
+	"dapps_history.json",
+	"vault.json",
+];
+
+/// Find a unique filename that does not exist using four-letter random suffix.
+pub fn find_unique_filename_using_random_suffix(parent_path: &Path, original_filename: &str) -> io::Result<String> {
+	let mut path = parent_path.join(original_filename);
+	let mut deduped_filename = original_filename.to_string();
+
+	if path.exists() {
+		const MAX_RETRIES: usize = 500;
+		let mut retries = 0;
+
+		while path.exists() {
+			if retries >= MAX_RETRIES {
+				return Err(io::Error::new(io::ErrorKind::Other, "Exceeded maximum retries when deduplicating filename."));
+			}
+
+			let suffix = ::random::random_string(4);
+			deduped_filename = format!("{}-{}", original_filename, suffix);
+			path.set_file_name(&deduped_filename);
+			retries += 1;
+		}
+	}
+
+	Ok(deduped_filename)
+}
+
+/// 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 std::os::unix::fs::OpenOptionsExt;
+
+	fs::OpenOptions::new()
+		.write(true)
+		.create_new(true)
+		.mode((libc::S_IWUSR | libc::S_IRUSR) as u32)
+		.open(file_path)
+}
+
+/// Create a new file and restrict permissions to owner only. It errors if the file already exists.
+#[cfg(not(unix))]
+pub fn create_new_file_with_permissions_to_owner(file_path: &Path) -> io::Result<fs::File> {
+	fs::OpenOptions::new()
+		.write(true)
+		.create_new(true)
+		.open(file_path)
+}
+
+/// 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 std::os::unix::fs::PermissionsExt;
+
+	let file = fs::File::create(file_path)?;
+	let mut permissions = file.metadata()?.permissions();
+	permissions.set_mode((libc::S_IWUSR | libc::S_IRUSR) as u32);
+	file.set_permissions(permissions)?;
+
+	Ok(file)
+}
+
+/// Create a new file and restrict permissions to owner only. It replaces the existing file if it already exists.
+#[cfg(not(unix))]
+pub fn replace_file_with_permissions_to_owner(file_path: &Path) -> io::Result<fs::File> {
+	fs::File::create(file_path)
+}
+
+/// Root keys directory implementation
+pub type RootDiskDirectory = DiskDirectory<DiskKeyFileManager>;
+
+/// Disk directory key file manager
+pub trait KeyFileManager: Send + Sync {
+	/// Read `SafeAccount` from given key file stream
+	fn read<T>(&self, filename: Option<String>, reader: T) -> Result<SafeAccount, Error> where T: io::Read;
+
+	/// Write `SafeAccount` to given key file stream
+	fn write<T>(&self, account: SafeAccount, writer: &mut T) -> Result<(), Error> where T: io::Write;
+}
+
+/// Disk-based keys directory implementation
+pub struct DiskDirectory<T> where T: KeyFileManager {
+	path: PathBuf,
+	key_manager: T,
+}
+
+/// Keys file manager for root keys directory
+#[derive(Default)]
+pub struct DiskKeyFileManager {
+	password: Option<Password>,
+}
+
+impl RootDiskDirectory {
+	pub fn create<P>(path: P) -> Result<Self, Error> where P: AsRef<Path> {
+		fs::create_dir_all(&path)?;
+		Ok(Self::at(path))
+	}
+
+	/// allows to read keyfiles with given password (needed for keyfiles w/o address)
+	pub fn with_password(&self, password: Option<Password>) -> Self {
+		DiskDirectory::new(&self.path, DiskKeyFileManager { password })
+	}
+
+	pub fn at<P>(path: P) -> Self where P: AsRef<Path> {
+		DiskDirectory::new(path, DiskKeyFileManager::default())
+	}
+}
+
+impl<T> DiskDirectory<T> where T: KeyFileManager {
+	/// Create new disk directory instance
+	pub fn new<P>(path: P, key_manager: T) -> Self where P: AsRef<Path> {
+		DiskDirectory {
+			path: path.as_ref().to_path_buf(),
+			key_manager: key_manager,
+		}
+	}
+
+	fn files(&self) -> Result<Vec<PathBuf>, Error>  {
+		Ok(fs::read_dir(&self.path)?
+			.flat_map(Result::ok)
+			.filter(|entry| {
+				let metadata = entry.metadata().ok();
+				let file_name = entry.file_name();
+				let name = file_name.to_string_lossy();
+				// filter directories
+				metadata.map_or(false, |m| !m.is_dir()) &&
+					// hidden files
+					!name.starts_with(".") &&
+					// other ignored files
+					!IGNORED_FILES.contains(&&*name)
+			})
+			.map(|entry| entry.path())
+			.collect::<Vec<PathBuf>>()
+		)
+	}
+
+	pub fn files_hash(&self) -> Result<u64, Error> {
+		use std::collections::hash_map::DefaultHasher;
+		use std::hash::Hasher;
+
+    	let mut hasher = DefaultHasher::new();
+		let files = self.files()?;
+		for file in files {
+			hasher.write(file.to_str().unwrap_or("").as_bytes())
+		}
+
+		Ok(hasher.finish())
+	}
+
+	fn last_modification_date(&self) -> Result<u64, Error> {
+		use std::time::{Duration, UNIX_EPOCH};
+		let duration = fs::metadata(&self.path)?.modified()?.duration_since(UNIX_EPOCH).unwrap_or(Duration::default());
+		let timestamp = duration.as_secs() ^ (duration.subsec_nanos() as u64);
+		Ok(timestamp)
+	}
+
+	/// all accounts found in keys directory
+	fn files_content(&self) -> Result<HashMap<PathBuf, SafeAccount>, Error> {
+		// it's not done using one iterator cause
+		// there is an issue with rustc and it takes tooo much time to compile
+		let paths = self.files()?;
+		Ok(paths
+			.into_iter()
+			.filter_map(|path| {
+				let filename = Some(path.file_name().and_then(|n| n.to_str()).expect("Keys have valid UTF8 names only.").to_owned());
+				fs::File::open(path.clone())
+					.map_err(Into::into)
+					.and_then(|file| self.key_manager.read(filename, file))
+					.map_err(|err| {
+						warn!("Invalid key file: {:?} ({})", path, err);
+						err
+					})
+					.map(|account| (path, account))
+					.ok()
+			})
+			.collect()
+		)
+	}
+
+	/// insert account with given filename. if the filename is a duplicate of any stored account and dedup is set to
+	/// true, a random suffix is appended to the filename.
+	pub fn insert_with_filename(&self, account: SafeAccount, mut filename: String, dedup: bool) -> Result<SafeAccount, Error> {
+		if dedup {
+			filename = find_unique_filename_using_random_suffix(&self.path, &filename)?;
+		}
+
+		// path to keyfile
+		let keyfile_path = self.path.join(filename.as_str());
+
+		// update account filename
+		let original_account = account.clone();
+		let mut account = account;
+		account.filename = Some(filename);
+
+		{
+			// save the file
+			let mut file = if dedup {
+				create_new_file_with_permissions_to_owner(&keyfile_path)?
+			} else {
+				replace_file_with_permissions_to_owner(&keyfile_path)?
+			};
+
+			// write key content
+			self.key_manager.write(original_account, &mut file).map_err(|e| Error::Custom(format!("{:?}", e)))?;
+
+			file.flush()?;
+			file.sync_all()?;
+		}
+
+		Ok(account)
+	}
+
+	/// Get key file manager referece
+	pub fn key_manager(&self) -> &T {
+		&self.key_manager
+	}
+}
+
+impl<T> KeyDirectory for DiskDirectory<T> where T: KeyFileManager {
+	fn load(&self) -> Result<Vec<SafeAccount>, Error> {
+		let accounts = self.files_content()?
+			.into_iter()
+			.map(|(_, account)| account)
+			.collect();
+		Ok(accounts)
+	}
+
+	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
+		// Disk store handles updates correctly iff filename is the same
+		let filename = account_filename(&account);
+		self.insert_with_filename(account, filename, false)
+	}
+
+	fn insert(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
+		let filename = account_filename(&account);
+		self.insert_with_filename(account, filename, true)
+	}
+
+	fn remove(&self, account: &SafeAccount) -> Result<(), Error> {
+		// enumerate all entries in keystore
+		// and find entry with given address
+		let to_remove = self.files_content()?
+			.into_iter()
+			.find(|&(_, ref acc)| acc.id == account.id && acc.address == account.address);
+
+		// remove it
+		match to_remove {
+			None => Err(Error::InvalidAccount),
+			Some((path, _)) => fs::remove_file(path).map_err(From::from)
+		}
+	}
+
+	fn path(&self) -> Option<&PathBuf> { Some(&self.path) }
+
+	fn as_vault_provider(&self) -> Option<&VaultKeyDirectoryProvider> {
+		Some(self)
+	}
+
+	fn unique_repr(&self) -> Result<u64, Error> {
+		self.last_modification_date()
+	}
+}
+
+impl<T> VaultKeyDirectoryProvider for DiskDirectory<T> where T: KeyFileManager {
+	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<VaultKeyDirectory>, Error> {
+		let vault_dir = VaultDiskDirectory::at(&self.path, name, key)?;
+		Ok(Box::new(vault_dir))
+	}
+
+	fn list_vaults(&self) -> Result<Vec<String>, Error> {
+		Ok(fs::read_dir(&self.path)?
+			.filter_map(|e| e.ok().map(|e| e.path()))
+			.filter_map(|path| {
+				let mut vault_file_path = path.clone();
+				vault_file_path.push(VAULT_FILE_NAME);
+				if vault_file_path.is_file() {
+					path.file_name().and_then(|f| f.to_str()).map(|f| f.to_owned())
+				} else {
+					None
+				}
+			})
+			.collect())
+	}
+
+	fn vault_meta(&self, name: &str) -> Result<String, Error> {
+		VaultDiskDirectory::meta_at(&self.path, name)
+	}
+}
+
+impl KeyFileManager for DiskKeyFileManager {
+	fn read<T>(&self, filename: Option<String>, reader: T) -> Result<SafeAccount, Error> where T: io::Read {
+		let key_file = json::KeyFile::load(reader).map_err(|e| Error::Custom(format!("{:?}", e)))?;
+		SafeAccount::from_file(key_file, filename, &self.password)
+	}
+
+	fn write<T>(&self, mut account: SafeAccount, writer: &mut T) -> Result<(), Error> where T: io::Write {
+		// when account is moved back to root directory from vault
+		// => remove vault field from meta
+		account.meta = json::remove_vault_name_from_json_meta(&account.meta)
+			.map_err(|err| Error::Custom(format!("{:?}", err)))?;
+
+		let key_file: json::KeyFile = account.into();
+		key_file.write(writer).map_err(|e| Error::Custom(format!("{:?}", e)))
+	}
+}
+
+fn account_filename(account: &SafeAccount) -> String {
+	// build file path
+	account.filename.clone().unwrap_or_else(|| {
+		let timestamp = time::strftime("%Y-%m-%dT%H-%M-%S", &time::now_utc()).expect("Time-format string is valid.");
+		format!("UTC--{}Z--{}", timestamp, Uuid::from(account.id))
+	})
+}
+
+#[cfg(test)]
+mod test {
+	extern crate tempdir;
+
+	use std::{env, fs};
+	use super::{KeyDirectory, RootDiskDirectory, VaultKey};
+	use account::SafeAccount;
+	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().unwrap();
+		let password = "hello world".into();
+		let directory = RootDiskDirectory::create(dir.clone()).unwrap();
+
+		// when
+		let account = SafeAccount::create(&keypair, [0u8; 16], &password, 1024, "Test".to_owned(), "{}".to_owned());
+		let res = directory.insert(account.unwrap());
+
+		// then
+		assert!(res.is_ok(), "Should save account succesfuly.");
+		assert!(res.unwrap().filename.is_some(), "Filename has been assigned.");
+
+		// cleanup
+		let _ = fs::remove_dir_all(dir);
+	}
+
+	#[test]
+	fn should_handle_duplicate_filenames() {
+		// given
+		let mut dir = env::temp_dir();
+		dir.push("ethstore_should_handle_duplicate_filenames");
+		let keypair = Random.generate().unwrap();
+		let password = "hello world".into();
+		let directory = RootDiskDirectory::create(dir.clone()).unwrap();
+
+		// when
+		let account = SafeAccount::create(&keypair, [0u8; 16], &password, 1024, "Test".to_owned(), "{}".to_owned()).unwrap();
+		let filename = "test".to_string();
+		let dedup = true;
+
+		directory.insert_with_filename(account.clone(), "foo".to_string(), dedup).unwrap();
+		let file1 = directory.insert_with_filename(account.clone(), filename.clone(), dedup).unwrap().filename.unwrap();
+		let file2 = directory.insert_with_filename(account.clone(), filename.clone(), dedup).unwrap().filename.unwrap();
+		let file3 = directory.insert_with_filename(account.clone(), filename.clone(), dedup).unwrap().filename.unwrap();
+
+		// then
+		// the first file should have the original names
+		assert_eq!(file1, filename);
+
+		// the following duplicate files should have a suffix appended
+		assert!(file2 != file3);
+		assert_eq!(file2.len(), filename.len() + 5);
+		assert_eq!(file3.len(), filename.len() + 5);
+
+		// cleanup
+		let _ = fs::remove_dir_all(dir);
+	}
+
+	#[test]
+	fn should_manage_vaults() {
+		// given
+		let mut dir = env::temp_dir();
+		dir.push("should_create_new_vault");
+		let directory = RootDiskDirectory::create(dir.clone()).unwrap();
+		let vault_name = "vault";
+		let password = "password".into();
+
+		// then
+		assert!(directory.as_vault_provider().is_some());
+
+		// and when
+		let before_root_items_count = fs::read_dir(&dir).unwrap().count();
+		let vault = directory.as_vault_provider().unwrap().create(vault_name, VaultKey::new(&password, 1024));
+
+		// then
+		assert!(vault.is_ok());
+		let after_root_items_count = fs::read_dir(&dir).unwrap().count();
+		assert!(after_root_items_count > before_root_items_count);
+
+		// and when
+		let vault = directory.as_vault_provider().unwrap().open(vault_name, VaultKey::new(&password, 1024));
+
+		// then
+		assert!(vault.is_ok());
+		let after_root_items_count2 = fs::read_dir(&dir).unwrap().count();
+		assert!(after_root_items_count == after_root_items_count2);
+
+		// cleanup
+		let _ = fs::remove_dir_all(dir);
+	}
+
+	#[test]
+	fn should_list_vaults() {
+		// given
+		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();
+		vault_provider.create("vault2", VaultKey::new(&"password2".into(), 1)).unwrap();
+
+		// then
+		let vaults = vault_provider.list_vaults().unwrap();
+		assert_eq!(vaults.len(), 2);
+		assert!(vaults.iter().any(|v| &*v == "vault1"));
+		assert!(vaults.iter().any(|v| &*v == "vault2"));
+	}
+
+	#[test]
+	fn hash_of_files() {
+		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");
+		assert_eq!(
+			hash,
+			15130871412783076140
+		);
+
+		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");
+
+		let new_hash = directory.files_hash().expect("New files hash should be calculated ok");
+
+		assert!(new_hash != hash, "hash of the file list should change once directory content changed");
+	}
+}

accounts/ethstore/src/accounts_dir/memory.rs

@@ -0,0 +1,74 @@
+// 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::collections::HashMap;
+use parking_lot::RwLock;
+use itertools;
+use ethkey::Address;
+
+use {SafeAccount, Error};
+use super::KeyDirectory;
+
+/// Accounts in-memory storage.
+#[derive(Default)]
+pub struct MemoryDirectory {
+	accounts: RwLock<HashMap<Address, Vec<SafeAccount>>>,
+}
+
+impl KeyDirectory for MemoryDirectory {
+	fn load(&self) -> Result<Vec<SafeAccount>, Error> {
+		Ok(itertools::Itertools::flatten(self.accounts.read().values().cloned()).collect())
+	}
+
+	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
+		let mut lock = self.accounts.write();
+		let accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new);
+		// If the filename is the same we just need to replace the entry
+		accounts.retain(|acc| acc.filename != account.filename);
+		accounts.push(account.clone());
+		Ok(account)
+	}
+
+	fn insert(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
+		let mut lock = self.accounts.write();
+		let accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new);
+		accounts.push(account.clone());
+		Ok(account)
+	}
+
+	fn remove(&self, account: &SafeAccount) -> Result<(), Error> {
+		let mut accounts = self.accounts.write();
+		let is_empty = if let Some(accounts) = accounts.get_mut(&account.address) {
+			if let Some(position) = accounts.iter().position(|acc| acc == account) {
+				accounts.remove(position);
+			}
+			accounts.is_empty()
+		} else {
+			false
+		};
+		if is_empty {
+			accounts.remove(&account.address);
+		}
+		Ok(())
+	}
+
+	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() }
+		Ok(val)
+	}
+}

accounts/ethstore/src/accounts_dir/mod.rs

@@ -0,0 +1,105 @@
+// 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/>.
+
+//! Accounts Directory
+
+use ethkey::Password;
+use std::path::{PathBuf};
+use {SafeAccount, Error};
+
+mod disk;
+mod memory;
+mod vault;
+
+/// `VaultKeyDirectory::set_key` error
+#[derive(Debug)]
+pub enum SetKeyError {
+	/// Error is fatal and directory is probably in inconsistent state
+	Fatal(Error),
+	/// Error is non fatal, directory is reverted to pre-operation state
+	NonFatalOld(Error),
+	/// Error is non fatal, directory is consistent with new key
+	NonFatalNew(Error),
+}
+
+/// Vault key
+#[derive(Clone, PartialEq, Eq)]
+pub struct VaultKey {
+	/// Vault password
+	pub password: Password,
+	/// Number of iterations to produce a derived key from password
+	pub iterations: u32,
+}
+
+/// Keys directory
+pub trait KeyDirectory: Send + Sync {
+	/// Read keys from directory
+	fn load(&self) -> Result<Vec<SafeAccount>, Error>;
+	/// Insert new key to directory
+	fn insert(&self, account: SafeAccount) -> Result<SafeAccount, Error>;
+	/// Update key in the directory
+	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error>;
+	/// Remove key from directory
+	fn remove(&self, account: &SafeAccount) -> Result<(), Error>;
+	/// Get directory filesystem path, if available
+	fn path(&self) -> Option<&PathBuf> { None }
+	/// Return vault provider, if available
+	fn as_vault_provider(&self) -> Option<&VaultKeyDirectoryProvider> { None }
+	/// Unique representation of directory account collection
+	fn unique_repr(&self) -> Result<u64, Error>;
+}
+
+/// Vaults provider
+pub trait VaultKeyDirectoryProvider {
+	/// Create new vault with given key
+	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<VaultKeyDirectory>, Error>;
+	/// List all vaults
+	fn list_vaults(&self) -> Result<Vec<String>, Error>;
+	/// Get vault meta
+	fn vault_meta(&self, name: &str) -> Result<String, Error>;
+}
+
+/// Vault directory
+pub trait VaultKeyDirectory: KeyDirectory {
+	/// Cast to `KeyDirectory`
+	fn as_key_directory(&self) -> &KeyDirectory;
+	/// Vault name
+	fn name(&self) -> &str;
+	/// Get vault key
+	fn key(&self) -> VaultKey;
+	/// Set new key for vault
+	fn set_key(&self, key: VaultKey) -> Result<(), SetKeyError>;
+	/// Get vault meta
+	fn meta(&self) -> String;
+	/// Set vault meta
+	fn set_meta(&self, meta: &str) -> Result<(), Error>;
+}
+
+pub use self::disk::{RootDiskDirectory, DiskKeyFileManager, KeyFileManager};
+pub use self::memory::MemoryDirectory;
+pub use self::vault::VaultDiskDirectory;
+
+impl VaultKey {
+	/// Create new vault key
+	pub fn new(password: &Password, iterations: u32) -> Self {
+		VaultKey {
+			password: password.clone(),
+			iterations: iterations,
+		}
+	}
+}

accounts/ethstore/src/accounts_dir/vault.rs

@@ -0,0 +1,443 @@
+// 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::{fs, io};
+use std::path::{PathBuf, Path};
+use parking_lot::Mutex;
+use {json, SafeAccount, Error};
+use crypto::Keccak256;
+use super::super::account::Crypto;
+use super::{KeyDirectory, VaultKeyDirectory, VaultKey, SetKeyError};
+use super::disk::{self, DiskDirectory, KeyFileManager};
+
+/// Name of vault metadata file
+pub const VAULT_FILE_NAME: &'static str = "vault.json";
+/// Name of temporary vault metadata file
+pub const VAULT_TEMP_FILE_NAME: &'static str = "vault_temp.json";
+
+/// Vault directory implementation
+pub type VaultDiskDirectory = DiskDirectory<VaultKeyFileManager>;
+
+/// Vault key file manager
+pub struct VaultKeyFileManager {
+	name: String,
+	key: VaultKey,
+	meta: Mutex<String>,
+}
+
+impl VaultDiskDirectory {
+	/// Create new vault directory with given key
+	pub fn create<P>(root: P, name: &str, key: VaultKey) -> Result<Self, Error> where P: AsRef<Path> {
+		// check that vault directory does not exists
+		let vault_dir_path = make_vault_dir_path(root, name, true)?;
+		if vault_dir_path.exists() {
+			return Err(Error::CreationFailed);
+		}
+
+		// create vault && vault file
+		let vault_meta = "{}";
+		fs::create_dir_all(&vault_dir_path)?;
+		if let Err(err) = create_vault_file(&vault_dir_path, &key, vault_meta) {
+			let _ = fs::remove_dir_all(&vault_dir_path); // can't do anything with this
+			return Err(err);
+		}
+
+		Ok(DiskDirectory::new(vault_dir_path, VaultKeyFileManager::new(name, key, vault_meta)))
+	}
+
+	/// Open existing vault directory with given key
+	pub fn at<P>(root: P, name: &str, key: VaultKey) -> Result<Self, Error> where P: AsRef<Path> {
+		// check that vault directory exists
+		let vault_dir_path = make_vault_dir_path(root, name, true)?;
+		if !vault_dir_path.is_dir() {
+			return Err(Error::CreationFailed);
+		}
+
+		// check that passed key matches vault file
+		let meta = read_vault_file(&vault_dir_path, Some(&key))?;
+
+		Ok(DiskDirectory::new(vault_dir_path, VaultKeyFileManager::new(name, key, &meta)))
+	}
+
+	/// Read vault meta without actually opening the vault
+	pub fn meta_at<P>(root: P, name: &str) -> Result<String, Error> where P: AsRef<Path> {
+		// check that vault directory exists
+		let vault_dir_path = make_vault_dir_path(root, name, true)?;
+		if !vault_dir_path.is_dir() {
+			return Err(Error::VaultNotFound);
+		}
+
+		// check that passed key matches vault file
+		read_vault_file(&vault_dir_path, None)
+	}
+
+	fn create_temp_vault(&self, key: VaultKey) -> Result<VaultDiskDirectory, Error> {
+		let original_path = self.path().expect("self is instance of DiskDirectory; DiskDirectory always returns path; qed");
+		let mut path: PathBuf = original_path.clone();
+		let name = self.name();
+
+		path.push(name); // to jump to the next level
+
+		let mut index = 0;
+		loop {
+			let name = format!("{}_temp_{}", name, index);
+			path.set_file_name(&name);
+			if !path.exists() {
+				return VaultDiskDirectory::create(original_path, &name, key);
+			}
+
+			index += 1;
+		}
+	}
+
+	fn copy_to_vault(&self, vault: &VaultDiskDirectory) -> Result<(), Error> {
+		for account in self.load()? {
+			let filename = account.filename.clone().expect("self is instance of DiskDirectory; DiskDirectory fills filename in load; qed");
+			vault.insert_with_filename(account, filename, true)?;
+		}
+
+		Ok(())
+	}
+
+	fn delete(&self) -> Result<(), Error> {
+		let path = self.path().expect("self is instance of DiskDirectory; DiskDirectory always returns path; qed");
+		fs::remove_dir_all(path).map_err(Into::into)
+	}
+}
+
+impl VaultKeyDirectory for VaultDiskDirectory {
+	fn as_key_directory(&self) -> &KeyDirectory {
+		self
+	}
+
+	fn name(&self) -> &str {
+		&self.key_manager().name
+	}
+
+	fn key(&self) -> VaultKey {
+		self.key_manager().key.clone()
+	}
+
+	fn set_key(&self, new_key: VaultKey) -> Result<(), SetKeyError> {
+		let temp_vault = VaultDiskDirectory::create_temp_vault(self, new_key.clone()).map_err(|err| SetKeyError::NonFatalOld(err))?;
+		let mut source_path = temp_vault.path().expect("temp_vault is instance of DiskDirectory; DiskDirectory always returns path; qed").clone();
+		let mut target_path = self.path().expect("self is instance of DiskDirectory; DiskDirectory always returns path; qed").clone();
+
+		// preserve meta
+		temp_vault.set_meta(&self.meta()).map_err(SetKeyError::NonFatalOld)?;
+
+		// jump to next fs level
+		source_path.push("next");
+		target_path.push("next");
+
+		let temp_accounts = self.copy_to_vault(&temp_vault)
+			.and_then(|_| temp_vault.load())
+			.map_err(|err| {
+				// ignore error, as we already processing error
+				let _ = temp_vault.delete();
+				SetKeyError::NonFatalOld(err)
+			})?;
+
+		// we can't just delete temp vault until all files moved, because
+		// original vault content has already been partially replaced
+		// => when error or crash happens here, we can't do anything
+		for temp_account in temp_accounts {
+			let filename = temp_account.filename.expect("self is instance of DiskDirectory; DiskDirectory fills filename in load; qed");
+			source_path.set_file_name(&filename);
+			target_path.set_file_name(&filename);
+			fs::rename(&source_path, &target_path).map_err(|err| SetKeyError::Fatal(err.into()))?;
+		}
+		source_path.set_file_name(VAULT_FILE_NAME);
+		target_path.set_file_name(VAULT_FILE_NAME);
+		fs::rename(source_path, target_path).map_err(|err| SetKeyError::Fatal(err.into()))?;
+
+		temp_vault.delete().map_err(|err| SetKeyError::NonFatalNew(err))
+	}
+
+	fn meta(&self) -> String {
+		self.key_manager().meta.lock().clone()
+	}
+
+	fn set_meta(&self, meta: &str) -> Result<(), Error> {
+		let key_manager = self.key_manager();
+		let vault_path = self.path().expect("self is instance of DiskDirectory; DiskDirectory always returns path; qed");
+		create_vault_file(vault_path, &key_manager.key, meta)?;
+		*key_manager.meta.lock() = meta.to_owned();
+		Ok(())
+	}
+}
+
+impl VaultKeyFileManager {
+	pub fn new(name: &str, key: VaultKey, meta: &str) -> Self {
+		VaultKeyFileManager {
+			name: name.into(),
+			key: key,
+			meta: Mutex::new(meta.to_owned()),
+		}
+	}
+}
+
+impl KeyFileManager for VaultKeyFileManager {
+	fn read<T>(&self, filename: Option<String>, reader: T) -> Result<SafeAccount, Error> where T: io::Read {
+		let vault_file = json::VaultKeyFile::load(reader).map_err(|e| Error::Custom(format!("{:?}", e)))?;
+		let mut safe_account = SafeAccount::from_vault_file(&self.key.password, vault_file, filename.clone())?;
+
+		safe_account.meta = json::insert_vault_name_to_json_meta(&safe_account.meta, &self.name)
+			.map_err(|err| Error::Custom(format!("{:?}", err)))?;
+		Ok(safe_account)
+	}
+
+	fn write<T>(&self, mut account: SafeAccount, writer: &mut T) -> Result<(), Error> where T: io::Write {
+		account.meta = json::remove_vault_name_from_json_meta(&account.meta)
+			.map_err(|err| Error::Custom(format!("{:?}", err)))?;
+
+		let vault_file: json::VaultKeyFile = account.into_vault_file(self.key.iterations, &self.key.password)?;
+		vault_file.write(writer).map_err(|e| Error::Custom(format!("{:?}", e)))
+	}
+}
+
+/// Makes path to vault directory, checking that vault name is appropriate
+fn make_vault_dir_path<P>(root: P, name: &str, check_name: bool) -> Result<PathBuf, Error> where P: AsRef<Path> {
+	// check vault name
+	if check_name && !check_vault_name(name) {
+		return Err(Error::InvalidVaultName);
+	}
+
+	let mut vault_dir_path: PathBuf = root.as_ref().into();
+	vault_dir_path.push(name);
+	Ok(vault_dir_path)
+}
+
+/// Every vault must have unique name => we rely on filesystem to check this
+/// => vault name must not contain any fs-special characters to avoid directory traversal
+/// => we only allow alphanumeric + separator characters in vault name.
+fn check_vault_name(name: &str) -> bool {
+	!name.is_empty()
+	&& name.chars()
+		.all(|c| c.is_alphanumeric()
+			|| c.is_whitespace()
+			|| c == '-' || c == '_')
+}
+
+/// Vault can be empty, but still must be pluggable => we store vault password in separate file
+fn create_vault_file<P>(vault_dir_path: P, key: &VaultKey, meta: &str) -> Result<(), Error> where P: AsRef<Path> {
+	let password_hash = key.password.as_bytes().keccak256();
+	let crypto = Crypto::with_plain(&password_hash, &key.password, key.iterations)?;
+
+	let vault_file_path = vault_dir_path.as_ref().join(VAULT_FILE_NAME);
+	let temp_vault_file_name = disk::find_unique_filename_using_random_suffix(vault_dir_path.as_ref(), &VAULT_TEMP_FILE_NAME)?;
+	let temp_vault_file_path = vault_dir_path.as_ref().join(&temp_vault_file_name);
+
+	// this method is used to rewrite existing vault file
+	// => write to temporary file first, then rename temporary file to vault file
+	let mut vault_file = disk::create_new_file_with_permissions_to_owner(&temp_vault_file_path)?;
+	let vault_file_contents = json::VaultFile {
+		crypto: crypto.into(),
+		meta: Some(meta.to_owned()),
+	};
+	vault_file_contents.write(&mut vault_file).map_err(|e| Error::Custom(format!("{:?}", e)))?;
+	drop(vault_file);
+	fs::rename(&temp_vault_file_path, &vault_file_path)?;
+
+	Ok(())
+}
+
+/// When vault is opened => we must check that password matches && read metadata
+fn read_vault_file<P>(vault_dir_path: P, key: Option<&VaultKey>) -> Result<String, Error> where P: AsRef<Path> {
+	let mut vault_file_path: PathBuf = vault_dir_path.as_ref().into();
+	vault_file_path.push(VAULT_FILE_NAME);
+
+	let vault_file = fs::File::open(vault_file_path)?;
+	let vault_file_contents = json::VaultFile::load(vault_file).map_err(|e| Error::Custom(format!("{:?}", e)))?;
+	let vault_file_meta = vault_file_contents.meta.unwrap_or("{}".to_owned());
+	let vault_file_crypto: Crypto = vault_file_contents.crypto.into();
+
+	if let Some(key) = key {
+		let password_bytes = vault_file_crypto.decrypt(&key.password)?;
+		let password_hash = key.password.as_bytes().keccak256();
+		if password_hash != password_bytes.as_slice() {
+			return Err(Error::InvalidPassword);
+		}
+	}
+
+	Ok(vault_file_meta)
+}
+
+#[cfg(test)]
+mod test {
+	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::tempdir::TempDir;
+
+	#[test]
+	fn check_vault_name_succeeds() {
+		assert!(check_vault_name("vault"));
+		assert!(check_vault_name("vault with spaces"));
+		assert!(check_vault_name("vault	with	tabs"));
+		assert!(check_vault_name("vault_with_underscores"));
+		assert!(check_vault_name("vault-with-dashes"));
+		assert!(check_vault_name("vault-with-digits-123"));
+		assert!(check_vault_name("vault中文名字"));
+	}
+
+	#[test]
+	fn check_vault_name_fails() {
+		assert!(!check_vault_name(""));
+		assert!(!check_vault_name("."));
+		assert!(!check_vault_name("*"));
+		assert!(!check_vault_name("../.bash_history"));
+		assert!(!check_vault_name("/etc/passwd"));
+		assert!(!check_vault_name("c:\\windows"));
+	}
+
+	#[test]
+	fn make_vault_dir_path_succeeds() {
+		use std::path::Path;
+
+		assert_eq!(&make_vault_dir_path("/home/user/parity", "vault", true).unwrap(), &Path::new("/home/user/parity/vault"));
+		assert_eq!(&make_vault_dir_path("/home/user/parity", "*bad-name*", false).unwrap(), &Path::new("/home/user/parity/*bad-name*"));
+	}
+
+	#[test]
+	fn make_vault_dir_path_fails() {
+		assert!(make_vault_dir_path("/home/user/parity", "*bad-name*", true).is_err());
+	}
+
+	#[test]
+	fn create_vault_file_succeeds() {
+		// given
+		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");
+		fs::create_dir_all(&vault_dir).unwrap();
+
+		// when
+		let result = create_vault_file(&vault_dir, &key, "{}");
+
+		// then
+		assert!(result.is_ok());
+		let mut vault_file_path = vault_dir.clone();
+		vault_file_path.push(VAULT_FILE_NAME);
+		assert!(vault_file_path.exists() && vault_file_path.is_file());
+	}
+
+	#[test]
+	fn read_vault_file_succeeds() {
+		// given
+		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();
+		let mut vault_file_path: PathBuf = dir.clone();
+		vault_file_path.push(VAULT_FILE_NAME);
+		{
+			let mut vault_file = fs::File::create(vault_file_path).unwrap();
+			vault_file.write_all(vault_file_contents.as_bytes()).unwrap();
+		}
+
+		// when
+		let result = read_vault_file(&dir, Some(&key));
+
+		// then
+		assert!(result.is_ok());
+	}
+
+	#[test]
+	fn read_vault_file_fails() {
+		// given
+		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();
+		vault_file_path.push(VAULT_FILE_NAME);
+
+		// when
+		let result = read_vault_file(&dir, Some(&key));
+
+		// then
+		assert!(result.is_err());
+
+		// and when given
+		let vault_file_contents = r#"{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"0155e3690be19fbfbecabcd440aa284b"},"ciphertext":"4d6938a1f49b7782","kdf":"pbkdf2","kdfparams":{"c":1024,"dklen":32,"prf":"hmac-sha256","salt":"b6a9338a7ccd39288a86dba73bfecd9101b4f3db9c9830e7c76afdbd4f6872e5"},"mac":"16381463ea11c6eb2239a9f339c2e780516d29d234ce30ac5f166f9080b5a262"}}"#;
+		{
+			let mut vault_file = fs::File::create(vault_file_path).unwrap();
+			vault_file.write_all(vault_file_contents.as_bytes()).unwrap();
+		}
+
+		// when
+		let result = read_vault_file(&dir, Some(&key));
+
+		// then
+		assert!(result.is_err());
+	}
+
+	#[test]
+	fn vault_directory_can_be_created() {
+		// given
+		let temp_path = TempDir::new("").unwrap();
+		let key = VaultKey::new(&"password".into(), 1024);
+		let dir: PathBuf = temp_path.path().into();
+
+		// when
+		let vault = VaultDiskDirectory::create(&dir, "vault", key.clone());
+
+		// then
+		assert!(vault.is_ok());
+
+		// and when
+		let vault = VaultDiskDirectory::at(&dir, "vault", key);
+
+		// then
+		assert!(vault.is_ok());
+	}
+
+	#[test]
+	fn vault_directory_cannot_be_created_if_already_exists() {
+		// given
+		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();
+		vault_dir.push("vault");
+		fs::create_dir_all(&vault_dir).unwrap();
+
+		// when
+		let vault = VaultDiskDirectory::create(&dir, "vault", key);
+
+		// then
+		assert!(vault.is_err());
+	}
+
+	#[test]
+	fn vault_directory_cannot_be_opened_if_not_exists() {
+		// given
+		let temp_path = TempDir::new("").unwrap();
+		let key = VaultKey::new(&"password".into(), 1024);
+		let dir: PathBuf = temp_path.path().into();
+
+		// when
+		let vault = VaultDiskDirectory::at(&dir, "vault", key);
+
+		// then
+		assert!(vault.is_err());
+	}
+}

accounts/ethstore/src/error.rs

@@ -0,0 +1,128 @@
+// 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::io::Error as IoError;
+use ethkey::{self, Error as EthKeyError};
+use crypto::{self, Error as EthCryptoError};
+use ethkey::DerivationError;
+
+/// Account-related errors.
+#[derive(Debug)]
+pub enum Error {
+	/// IO error
+	Io(IoError),
+	/// Invalid Password
+	InvalidPassword,
+	/// Account's secret is invalid.
+	InvalidSecret,
+	/// Invalid Vault Crypto meta.
+	InvalidCryptoMeta,
+	/// Invalid Account.
+	InvalidAccount,
+	/// Invalid Message.
+	InvalidMessage,
+	/// Invalid Key File
+	InvalidKeyFile(String),
+	/// Vaults are not supported.
+	VaultsAreNotSupported,
+	/// Unsupported vault
+	UnsupportedVault,
+	/// Invalid vault name
+	InvalidVaultName,
+	/// Vault not found
+	VaultNotFound,
+	/// Account creation failed.
+	CreationFailed,
+	/// `EthKey` error
+	EthKey(EthKeyError),
+	/// `ethkey::crypto::Error`
+	EthKeyCrypto(ethkey::crypto::Error),
+	/// `EthCrypto` error
+	EthCrypto(EthCryptoError),
+	/// Derivation error
+	Derivation(DerivationError),
+	/// Custom error
+	Custom(String),
+}
+
+impl fmt::Display for Error {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		let s = match *self {
+			Error::Io(ref err) => err.to_string(),
+			Error::InvalidPassword => "Invalid password".into(),
+			Error::InvalidSecret => "Invalid secret".into(),
+			Error::InvalidCryptoMeta => "Invalid crypted metadata".into(),
+			Error::InvalidAccount => "Invalid account".into(),
+			Error::InvalidMessage => "Invalid message".into(),
+			Error::InvalidKeyFile(ref reason) => format!("Invalid key file: {}", reason),
+			Error::VaultsAreNotSupported => "Vaults are not supported".into(),
+			Error::UnsupportedVault => "Vault is not supported for this operation".into(),
+			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::Derivation(ref err) => format!("Derivation error: {:?}", err),
+			Error::Custom(ref s) => s.clone(),
+		};
+
+		write!(f, "{}", s)
+	}
+}
+
+impl From<IoError> for Error {
+	fn from(err: IoError) -> Self {
+		Error::Io(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)
+	}
+}
+
+impl From<EthCryptoError> for Error {
+	fn from(err: EthCryptoError) -> Self {
+		Error::EthCrypto(err)
+	}
+}
+
+impl From<crypto::error::ScryptError> for Error {
+	fn from(err: crypto::error::ScryptError) -> Self {
+		Error::EthCrypto(err.into())
+	}
+}
+
+impl From<crypto::error::SymmError> for Error {
+	fn from(err: crypto::error::SymmError) -> Self {
+		Error::EthCrypto(err.into())
+	}
+}
+
+impl From<DerivationError> for Error {
+	fn from(err: DerivationError) -> Self {
+		Error::Derivation(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/import.rs

@@ -0,0 +1,80 @@
+// 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::collections::HashSet;
+use std::path::Path;
+use std::fs;
+
+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: &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());
+	let account = fs::File::open(&path)
+		.map_err(Into::into)
+		.and_then(|file| key_manager.read(filename, file))?;
+
+	let address = account.address.clone();
+	if !existing_accounts.contains(&address) {
+		dst.insert(account)?;
+	}
+	Ok(address)
+}
+
+/// Import all accounts from one directory to the other.
+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)
+		.collect::<HashSet<_>>();
+
+	accounts.into_iter()
+		.filter(|a| !existing_accounts.contains(&a.address))
+		.map(|a| {
+			let address = a.address.clone();
+			dst.insert(a)?;
+			Ok(address)
+		}).collect()
+}
+
+/// Provide a `HashSet` of all accounts available for import from the Geth keystore.
+pub fn read_geth_accounts(testnet: bool) -> Vec<Address> {
+	RootDiskDirectory::at(dir::geth(testnet))
+		.load()
+		.map(|d| d.into_iter().map(|a| a.address).collect())
+		.unwrap_or_else(|_| Vec::new())
+}
+
+/// Import specific `desired` accounts from the Geth keystore into `dst`.
+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.into_iter()
+		.filter(|a| !existing_accounts.contains(&a.address))
+		.filter(|a| desired.contains(&a.address))
+		.map(|a| {
+			let address = a.address.clone();
+			dst.insert(a)?;
+			Ok(address)
+		}).collect()
+}

accounts/ethstore/src/json/bytes.rs

@@ -0,0 +1,74 @@
+// 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, str};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use serde::de::Error;
+use rustc_hex::{ToHex, FromHex, FromHexError};
+
+#[derive(Debug, PartialEq)]
+pub struct Bytes(Vec<u8>);
+
+impl ops::Deref for Bytes {
+	type Target = [u8];
+
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
+impl<'a> Deserialize<'a> for Bytes {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+		where D: Deserializer<'a>
+	{
+		let s = String::deserialize(deserializer)?;
+		let data = s.from_hex().map_err(|e| Error::custom(format!("Invalid hex value {}", e)))?;
+		Ok(Bytes(data))
+	}
+}
+
+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())
+	}
+}
+
+impl str::FromStr for Bytes {
+	type Err = FromHexError;
+
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		s.from_hex().map(Bytes)
+	}
+}
+
+impl From<&'static str> for Bytes {
+	fn from(s: &'static str) -> Self {
+		s.parse().expect(&format!("invalid string literal for {}: '{}'", stringify!(Self), s))
+	}
+}
+
+impl From<Vec<u8>> for Bytes {
+	fn from(v: Vec<u8>) -> Self {
+		Bytes(v)
+	}
+}
+
+impl From<Bytes> for Vec<u8> {
+	fn from(b: Bytes) -> Self {
+		b.0
+	}
+}

accounts/ethstore/src/json/cipher.rs

@@ -0,0 +1,96 @@
+// 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 serde::{Serialize, Serializer, Deserialize, Deserializer};
+use serde::de::{Visitor, Error as SerdeError};
+use super::{Error, H128};
+
+#[derive(Debug, PartialEq)]
+pub enum CipherSer {
+	Aes128Ctr,
+}
+
+impl Serialize for CipherSer {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where S: Serializer {
+		match *self {
+			CipherSer::Aes128Ctr => serializer.serialize_str("aes-128-ctr"),
+		}
+	}
+}
+
+impl<'a> Deserialize<'a> for CipherSer {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where D: Deserializer<'a> {
+		deserializer.deserialize_any(CipherSerVisitor)
+	}
+}
+
+struct CipherSerVisitor;
+
+impl<'a> Visitor<'a> for CipherSerVisitor {
+	type Value = CipherSer;
+
+	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+		write!(formatter, "a valid cipher identifier")
+	}
+
+	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
+		match value {
+			"aes-128-ctr" => Ok(CipherSer::Aes128Ctr),
+			_ => Err(SerdeError::custom(Error::UnsupportedCipher))
+		}
+	}
+
+	fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
+		self.visit_str(value.as_ref())
+	}
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct Aes128Ctr {
+	pub iv: H128,
+}
+
+#[derive(Debug, PartialEq)]
+pub enum CipherSerParams {
+	Aes128Ctr(Aes128Ctr),
+}
+
+impl Serialize for CipherSerParams {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where S: Serializer {
+		match *self {
+			CipherSerParams::Aes128Ctr(ref params) => params.serialize(serializer),
+		}
+	}
+}
+
+impl<'a> Deserialize<'a> for CipherSerParams {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where D: Deserializer<'a> {
+		Aes128Ctr::deserialize(deserializer)
+			.map(CipherSerParams::Aes128Ctr)
+			.map_err(|_| Error::InvalidCipherParams)
+			.map_err(SerdeError::custom)
+	}
+}
+
+#[derive(Debug, PartialEq)]
+pub enum Cipher {
+	Aes128Ctr(Aes128Ctr),
+}

accounts/ethstore/src/json/crypto.rs

@@ -0,0 +1,194 @@
+// 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, str};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use serde::ser::SerializeStruct;
+use serde::de::{Visitor, MapAccess, Error};
+use serde_json;
+use super::{Cipher, CipherSer, CipherSerParams, Kdf, KdfSer, KdfSerParams, H256, Bytes};
+
+pub type CipherText = Bytes;
+
+#[derive(Debug, PartialEq)]
+pub struct Crypto {
+	pub cipher: Cipher,
+	pub ciphertext: CipherText,
+	pub kdf: Kdf,
+	pub mac: H256,
+}
+
+impl str::FromStr for Crypto {
+	type Err = serde_json::error::Error;
+
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		serde_json::from_str(s)
+	}
+}
+
+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")
+	}
+}
+
+enum CryptoField {
+	Cipher,
+	CipherParams,
+	CipherText,
+	Kdf,
+	KdfParams,
+	Mac,
+	Version,
+}
+
+impl<'a> Deserialize<'a> for CryptoField {
+	fn deserialize<D>(deserializer: D) -> Result<CryptoField, D::Error>
+		where D: Deserializer<'a>
+	{
+		deserializer.deserialize_any(CryptoFieldVisitor)
+	}
+}
+
+struct CryptoFieldVisitor;
+
+impl<'a> Visitor<'a> for CryptoFieldVisitor {
+	type Value = CryptoField;
+
+	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+		write!(formatter, "a valid crypto struct description")
+	}
+
+	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
+		where E: Error
+	{
+		match value {
+			"cipher" => Ok(CryptoField::Cipher),
+			"cipherparams" => Ok(CryptoField::CipherParams),
+			"ciphertext" => Ok(CryptoField::CipherText),
+			"kdf" => Ok(CryptoField::Kdf),
+			"kdfparams" => Ok(CryptoField::KdfParams),
+			"mac" => Ok(CryptoField::Mac),
+			"version" => Ok(CryptoField::Version),
+			_ => Err(Error::custom(format!("Unknown field: '{}'", value))),
+		}
+	}
+}
+
+impl<'a> Deserialize<'a> for Crypto {
+	fn deserialize<D>(deserializer: D) -> Result<Crypto, D::Error>
+		where D: Deserializer<'a>
+	{
+		static FIELDS: &'static [&'static str] = &["id", "version", "crypto", "Crypto", "address"];
+		deserializer.deserialize_struct("Crypto", FIELDS, CryptoVisitor)
+	}
+}
+
+struct CryptoVisitor;
+
+impl<'a> Visitor<'a> for CryptoVisitor {
+	type Value = Crypto;
+
+	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+		write!(formatter, "a valid vault crypto object")
+	}
+
+	fn visit_map<V>(self, mut visitor: V) -> Result<Self::Value, V::Error>
+		where V: MapAccess<'a>
+	{
+		let mut cipher = None;
+		let mut cipherparams = None;
+		let mut ciphertext = None;
+		let mut kdf = None;
+		let mut kdfparams = None;
+		let mut mac = None;
+
+		loop {
+			match visitor.next_key()? {
+				Some(CryptoField::Cipher) => { cipher = Some(visitor.next_value()?); }
+				Some(CryptoField::CipherParams) => { cipherparams = Some(visitor.next_value()?); }
+				Some(CryptoField::CipherText) => { ciphertext = Some(visitor.next_value()?); }
+				Some(CryptoField::Kdf) => { kdf = Some(visitor.next_value()?); }
+				Some(CryptoField::KdfParams) => { kdfparams = Some(visitor.next_value()?); }
+				Some(CryptoField::Mac) => { mac = Some(visitor.next_value()?); }
+				// skip not required version field (it appears in pyethereum generated keystores)
+				Some(CryptoField::Version) => { visitor.next_value().unwrap_or(()) }
+				None => { break; }
+			}
+		}
+
+		let cipher = match (cipher, cipherparams) {
+			(Some(CipherSer::Aes128Ctr), Some(CipherSerParams::Aes128Ctr(params))) => Cipher::Aes128Ctr(params),
+			(None, _) => return Err(V::Error::missing_field("cipher")),
+			(Some(_), None) => return Err(V::Error::missing_field("cipherparams")),
+		};
+
+		let ciphertext = match ciphertext {
+			Some(ciphertext) => ciphertext,
+			None => return Err(V::Error::missing_field("ciphertext")),
+		};
+
+		let kdf = match (kdf, kdfparams) {
+			(Some(KdfSer::Pbkdf2), Some(KdfSerParams::Pbkdf2(params))) => Kdf::Pbkdf2(params),
+			(Some(KdfSer::Scrypt), Some(KdfSerParams::Scrypt(params))) => Kdf::Scrypt(params),
+			(Some(_), Some(_)) => return Err(V::Error::custom("Invalid cipherparams")),
+			(None, _) => return Err(V::Error::missing_field("kdf")),
+			(Some(_), None) => return Err(V::Error::missing_field("kdfparams")),
+		};
+
+		let mac = match mac {
+			Some(mac) => mac,
+			None => return Err(V::Error::missing_field("mac")),
+		};
+
+		let result = Crypto {
+			cipher: cipher,
+			ciphertext: ciphertext,
+			kdf: kdf,
+			mac: mac,
+		};
+
+		Ok(result)
+	}
+}
+
+impl Serialize for Crypto {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+		where S: Serializer
+	{
+		let mut crypto = serializer.serialize_struct("Crypto", 6)?;
+		match self.cipher {
+			Cipher::Aes128Ctr(ref params) => {
+				crypto.serialize_field("cipher", &CipherSer::Aes128Ctr)?;
+				crypto.serialize_field("cipherparams", params)?;
+			},
+		}
+		crypto.serialize_field("ciphertext", &self.ciphertext)?;
+		match self.kdf {
+			Kdf::Pbkdf2(ref params) => {
+				crypto.serialize_field("kdf", &KdfSer::Pbkdf2)?;
+				crypto.serialize_field("kdfparams", params)?;
+			},
+			Kdf::Scrypt(ref params) => {
+				crypto.serialize_field("kdf", &KdfSer::Scrypt)?;
+				crypto.serialize_field("kdfparams", params)?;
+			},
+		}
+
+		crypto.serialize_field("mac", &self.mac)?;
+		crypto.end()
+	}
+}

accounts/ethstore/src/json/error.rs

@@ -0,0 +1,50 @@
+// 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;
+
+#[derive(Debug, PartialEq)]
+pub enum Error {
+	UnsupportedCipher,
+	InvalidCipherParams,
+	UnsupportedKdf,
+	InvalidUuid,
+	UnsupportedVersion,
+	InvalidCiphertext,
+	InvalidH256,
+	InvalidPrf,
+}
+
+impl fmt::Display for Error {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		match *self {
+			Error::InvalidUuid => write!(f, "Invalid Uuid"),
+			Error::UnsupportedVersion => write!(f, "Unsupported version"),
+			Error::UnsupportedKdf => write!(f, "Unsupported kdf"),
+			Error::InvalidCiphertext => write!(f, "Invalid ciphertext"),
+			Error::UnsupportedCipher => write!(f, "Unsupported cipher"),
+			Error::InvalidCipherParams => write!(f, "Invalid cipher params"),
+			Error::InvalidH256 => write!(f, "Invalid hash"),
+			Error::InvalidPrf => write!(f, "Invalid prf"),
+		}
+	}
+}
+
+impl Into<String> for Error {
+	fn into(self) -> String {
+		format!("{}", self)
+	}
+}

accounts/ethstore/src/json/hash.rs

@@ -0,0 +1,119 @@
+// 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, fmt, str};
+use rustc_hex::{FromHex, ToHex};
+use serde::{Serialize, Serializer, Deserialize, Deserializer};
+use serde::de::{Visitor, Error as SerdeError};
+use super::Error;
+
+macro_rules! impl_hash {
+	($name: ident, $size: expr) => {
+		pub struct $name([u8; $size]);
+
+		impl fmt::Debug for $name {
+			fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+				let self_ref: &[u8] = &self.0;
+				write!(f, "{:?}", self_ref)
+			}
+		}
+
+		impl PartialEq for $name {
+			fn eq(&self, other: &Self) -> bool {
+				let self_ref: &[u8] = &self.0;
+				let other_ref: &[u8] = &other.0;
+				self_ref == other_ref
+			}
+		}
+
+		impl ops::Deref for $name {
+			type Target = [u8];
+
+			fn deref(&self) -> &Self::Target {
+				&self.0
+			}
+		}
+
+		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())
+			}
+		}
+
+		impl<'a> Deserialize<'a> for $name {
+			fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+			where D: Deserializer<'a> {
+				struct HashVisitor;
+
+				impl<'b> Visitor<'b> for HashVisitor {
+					type Value = $name;
+
+					fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+						write!(formatter, "a hex-encoded {}", stringify!($name))
+					}
+
+					fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
+						value.parse().map_err(SerdeError::custom)
+					}
+
+					fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
+						self.visit_str(value.as_ref())
+					}
+				}
+
+				deserializer.deserialize_any(HashVisitor)
+			}
+		}
+
+		impl str::FromStr for $name {
+			type Err = Error;
+
+			fn from_str(value: &str) -> Result<Self, Self::Err> {
+				match value.from_hex() {
+					Ok(ref hex) if hex.len() == $size => {
+						let mut hash = [0u8; $size];
+						hash.clone_from_slice(hex);
+						Ok($name(hash))
+					}
+					_ => Err(Error::InvalidH256),
+				}
+			}
+		}
+
+		impl From<&'static str> for $name {
+			fn from(s: &'static str) -> Self {
+				s.parse().expect(&format!("invalid string literal for {}: '{}'", stringify!($name), s))
+			}
+		}
+
+		impl From<[u8; $size]> for $name {
+			fn from(bytes: [u8; $size]) -> Self {
+				$name(bytes)
+			}
+		}
+
+		impl Into<[u8; $size]> for $name {
+			fn into(self) -> [u8; $size] {
+				self.0
+			}
+		}
+	}
+}
+
+impl_hash!(H128, 16);
+impl_hash!(H160, 20);
+impl_hash!(H256, 32);

accounts/ethstore/src/json/id.rs

@@ -0,0 +1,153 @@
+// 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/>.
+
+//! Universaly unique identifier.
+use std::{fmt, str};
+use rustc_hex::{ToHex, FromHex};
+use serde::{Deserialize, Serialize, Deserializer, Serializer};
+use serde::de::{Visitor, Error as SerdeError};
+use super::Error;
+
+/// Universaly unique identifier.
+#[derive(Debug, PartialEq)]
+pub struct Uuid([u8; 16]);
+
+impl From<[u8; 16]> for Uuid {
+	fn from(uuid: [u8; 16]) -> Self {
+		Uuid(uuid)
+	}
+}
+
+impl<'a> Into<String> for &'a Uuid {
+	fn into(self) -> String {
+		let d1 = &self.0[0..4];
+		let d2 = &self.0[4..6];
+		let d3 = &self.0[6..8];
+		let d4 = &self.0[8..10];
+		let d5 = &self.0[10..16];
+		[d1, d2, d3, d4, d5].into_iter().map(|d| d.to_hex()).collect::<Vec<String>>().join("-")
+	}
+}
+
+impl Into<String> for Uuid {
+	fn into(self) -> String {
+		Into::into(&self)
+	}
+}
+
+impl Into<[u8; 16]> for Uuid {
+	fn into(self) -> [u8; 16] {
+		self.0
+	}
+}
+
+impl fmt::Display for Uuid {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		let s: String = (self as &Uuid).into();
+		write!(f, "{}", s)
+	}
+}
+
+fn copy_into(from: &str, into: &mut [u8]) -> Result<(), Error> {
+	let from = from.from_hex().map_err(|_| Error::InvalidUuid)?;
+
+	if from.len() != into.len() {
+		return Err(Error::InvalidUuid);
+	}
+
+	into.copy_from_slice(&from);
+	Ok(())
+}
+
+impl str::FromStr for Uuid {
+	type Err = Error;
+
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		let parts: Vec<&str> = s.split("-").collect();
+
+		if parts.len() != 5 {
+			return Err(Error::InvalidUuid);
+		}
+
+		let mut uuid = [0u8; 16];
+
+		copy_into(parts[0], &mut uuid[0..4])?;
+		copy_into(parts[1], &mut uuid[4..6])?;
+		copy_into(parts[2], &mut uuid[6..8])?;
+		copy_into(parts[3], &mut uuid[8..10])?;
+		copy_into(parts[4], &mut uuid[10..16])?;
+
+		Ok(Uuid(uuid))
+	}
+}
+
+impl From<&'static str> for Uuid {
+	fn from(s: &'static str) -> Self {
+		s.parse().expect(&format!("invalid string literal for {}: '{}'", stringify!(Self), s))
+	}
+}
+
+impl Serialize for Uuid {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where S: Serializer {
+		let s: String = self.into();
+		serializer.serialize_str(&s)
+	}
+}
+
+impl<'a> Deserialize<'a> for Uuid {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where D: Deserializer<'a> {
+		deserializer.deserialize_any(UuidVisitor)
+	}
+}
+
+struct UuidVisitor;
+
+impl<'a> Visitor<'a> for UuidVisitor {
+	type Value = Uuid;
+
+	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+		write!(formatter, "a valid hex-encoded UUID")
+	}
+
+	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
+		value.parse().map_err(SerdeError::custom)
+	}
+
+	fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
+		self.visit_str(value.as_ref())
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::Uuid;
+
+	#[test]
+	fn uuid_from_str() {
+		let uuid: Uuid = "3198bc9c-6672-5ab3-d995-4942343ae5b6".into();
+		assert_eq!(uuid, Uuid::from([0x31, 0x98, 0xbc, 0x9c, 0x66, 0x72, 0x5a, 0xb3, 0xd9, 0x95, 0x49, 0x42, 0x34, 0x3a, 0xe5, 0xb6]));
+	}
+
+	#[test]
+	fn uuid_from_and_to_str() {
+		let from = "3198bc9c-6672-5ab3-d995-4942343ae5b6";
+		let uuid: Uuid = from.into();
+		let to: String = uuid.into();
+		assert_eq!(from, &to);
+	}
+}

accounts/ethstore/src/json/kdf.rs

@@ -0,0 +1,159 @@
+// 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 serde::{Serialize, Serializer, Deserialize, Deserializer};
+use serde::de::{Visitor, Error as SerdeError};
+use super::{Error, Bytes};
+
+#[derive(Debug, PartialEq)]
+pub enum KdfSer {
+	Pbkdf2,
+	Scrypt,
+}
+
+impl Serialize for KdfSer {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where S: Serializer {
+		match *self {
+			KdfSer::Pbkdf2 => serializer.serialize_str("pbkdf2"),
+			KdfSer::Scrypt => serializer.serialize_str("scrypt"),
+		}
+	}
+}
+
+impl<'a> Deserialize<'a> for KdfSer {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where D: Deserializer<'a> {
+		deserializer.deserialize_any(KdfSerVisitor)
+	}
+}
+
+struct KdfSerVisitor;
+
+impl<'a> Visitor<'a> for KdfSerVisitor {
+	type Value = KdfSer;
+
+	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+		write!(formatter, "a kdf algorithm identifier")
+	}
+
+	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
+		match value {
+			"pbkdf2" => Ok(KdfSer::Pbkdf2),
+			"scrypt" => Ok(KdfSer::Scrypt),
+			_ => Err(SerdeError::custom(Error::UnsupportedKdf))
+		}
+	}
+
+	fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
+		self.visit_str(value.as_ref())
+	}
+}
+
+#[derive(Debug, PartialEq)]
+pub enum Prf {
+	HmacSha256,
+}
+
+impl Serialize for Prf {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where S: Serializer {
+		match *self {
+			Prf::HmacSha256 => serializer.serialize_str("hmac-sha256"),
+		}
+	}
+}
+
+impl<'a> Deserialize<'a> for Prf {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where D: Deserializer<'a> {
+		deserializer.deserialize_any(PrfVisitor)
+	}
+}
+
+struct PrfVisitor;
+
+impl<'a> Visitor<'a> for PrfVisitor {
+	type Value = Prf;
+
+	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+		write!(formatter, "a prf algorithm identifier")
+	}
+
+	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
+		match value {
+			"hmac-sha256" => Ok(Prf::HmacSha256),
+			_ => Err(SerdeError::custom(Error::InvalidPrf)),
+		}
+	}
+
+	fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
+		self.visit_str(value.as_ref())
+	}
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct Pbkdf2 {
+	pub c: u32,
+	pub dklen: u32,
+	pub prf: Prf,
+	pub salt: Bytes,
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct Scrypt {
+	pub dklen: u32,
+	pub p: u32,
+	pub n: u32,
+	pub r: u32,
+	pub salt: Bytes,
+}
+
+#[derive(Debug, PartialEq)]
+pub enum KdfSerParams {
+	Pbkdf2(Pbkdf2),
+	Scrypt(Scrypt),
+}
+
+impl Serialize for KdfSerParams {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where S: Serializer {
+		match *self {
+			KdfSerParams::Pbkdf2(ref params) => params.serialize(serializer),
+			KdfSerParams::Scrypt(ref params) => params.serialize(serializer),
+		}
+	}
+}
+
+impl<'a> Deserialize<'a> for KdfSerParams {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where D: Deserializer<'a> {
+		use serde_json::{Value, from_value};
+
+		let v: Value = Deserialize::deserialize(deserializer)?;
+
+		from_value(v.clone()).map(KdfSerParams::Pbkdf2)
+			.or_else(|_| from_value(v).map(KdfSerParams::Scrypt))
+			.map_err(|_| D::Error::custom("Invalid KDF algorithm"))
+	}
+}
+
+#[derive(Debug, PartialEq)]
+pub enum Kdf {
+	Pbkdf2(Pbkdf2),
+	Scrypt(Scrypt),
+}

accounts/ethstore/src/json/key_file.rs

@@ -0,0 +1,324 @@
+// 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::io::{Read, Write};
+use serde::{Serialize, Serializer, Deserialize, Deserializer};
+use serde::de::{Error, Visitor, MapAccess, DeserializeOwned};
+use serde_json;
+use super::{Uuid, Version, Crypto, H160};
+
+/// Public opaque type representing serializable `KeyFile`.
+#[derive(Debug, PartialEq)]
+pub struct OpaqueKeyFile {
+	key_file: KeyFile
+}
+
+impl Serialize for OpaqueKeyFile {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where
+		S: Serializer,
+	{
+		self.key_file.serialize(serializer)
+	}
+}
+
+impl<T> From<T> for OpaqueKeyFile where T: Into<KeyFile> {
+	fn from(val: T) -> Self {
+		OpaqueKeyFile { key_file: val.into() }
+	}
+}
+
+#[derive(Debug, PartialEq, Serialize)]
+pub struct KeyFile {
+	pub id: Uuid,
+	pub version: Version,
+	pub crypto: Crypto,
+	pub address: Option<H160>,
+	pub name: Option<String>,
+	pub meta: Option<String>,
+}
+
+enum KeyFileField {
+	Id,
+	Version,
+	Crypto,
+	Address,
+	Name,
+	Meta,
+}
+
+impl<'a> Deserialize<'a> for KeyFileField {
+	fn deserialize<D>(deserializer: D) -> Result<KeyFileField, D::Error>
+		where D: Deserializer<'a>
+	{
+		deserializer.deserialize_any(KeyFileFieldVisitor)
+	}
+}
+
+struct KeyFileFieldVisitor;
+
+impl<'a> Visitor<'a> for KeyFileFieldVisitor {
+	type Value = KeyFileField;
+
+	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+		write!(formatter, "a valid key file field")
+	}
+
+	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
+		where E: Error
+	{
+		match value {
+			"id" => Ok(KeyFileField::Id),
+			"version" => Ok(KeyFileField::Version),
+			"crypto" => Ok(KeyFileField::Crypto),
+			"Crypto" => Ok(KeyFileField::Crypto),
+			"address" => Ok(KeyFileField::Address),
+			"name" => Ok(KeyFileField::Name),
+			"meta" => Ok(KeyFileField::Meta),
+			_ => Err(Error::custom(format!("Unknown field: '{}'", value))),
+		}
+	}
+}
+
+impl<'a> Deserialize<'a> for KeyFile {
+	fn deserialize<D>(deserializer: D) -> Result<KeyFile, D::Error>
+		where D: Deserializer<'a>
+	{
+		static FIELDS: &'static [&'static str] = &["id", "version", "crypto", "Crypto", "address"];
+		deserializer.deserialize_struct("KeyFile", FIELDS, KeyFileVisitor)
+	}
+}
+
+fn none_if_empty<'a, T>(v: Option<serde_json::Value>) -> Option<T> where
+	T: DeserializeOwned
+{
+	v.and_then(|v| if v.is_null() {
+		None
+	} else {
+		serde_json::from_value(v).ok()
+	})
+
+}
+
+struct KeyFileVisitor;
+impl<'a> Visitor<'a> for KeyFileVisitor {
+	type Value = KeyFile;
+
+	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+		write!(formatter, "a valid key object")
+	}
+
+	fn visit_map<V>(self, mut visitor: V) -> Result<Self::Value, V::Error>
+		where V: MapAccess<'a>
+	{
+		let mut id = None;
+		let mut version = None;
+		let mut crypto = None;
+		let mut address = None;
+		let mut name = None;
+		let mut meta = None;
+
+		loop {
+			match visitor.next_key()? {
+				Some(KeyFileField::Id) => { id = Some(visitor.next_value()?); }
+				Some(KeyFileField::Version) => { version = Some(visitor.next_value()?); }
+				Some(KeyFileField::Crypto) => { crypto = Some(visitor.next_value()?); }
+				Some(KeyFileField::Address) => { address = Some(visitor.next_value()?); }
+				Some(KeyFileField::Name) => { name = none_if_empty(visitor.next_value().ok()) }
+				Some(KeyFileField::Meta) => { meta = none_if_empty(visitor.next_value().ok()) }
+				None => { break; }
+			}
+		}
+
+		let id = match id {
+			Some(id) => id,
+			None => return Err(V::Error::missing_field("id")),
+		};
+
+		let version = match version {
+			Some(version) => version,
+			None => return Err(V::Error::missing_field("version")),
+		};
+
+		let crypto = match crypto {
+			Some(crypto) => crypto,
+			None => return Err(V::Error::missing_field("crypto")),
+		};
+
+		let result = KeyFile {
+			id: id,
+			version: version,
+			crypto: crypto,
+			address: address,
+			name: name,
+			meta: meta,
+		};
+
+		Ok(result)
+	}
+}
+
+impl KeyFile {
+	pub fn load<R>(reader: R) -> Result<Self, serde_json::Error> where R: Read {
+		serde_json::from_reader(reader)
+	}
+
+	pub fn write<W>(&self, writer: &mut W) -> Result<(), serde_json::Error> where W: Write {
+		serde_json::to_writer(writer, self)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use std::str::FromStr;
+	use serde_json;
+	use json::{KeyFile, Uuid, Version, Crypto, Cipher, Aes128Ctr, Kdf, Scrypt};
+
+	#[test]
+	fn basic_keyfile() {
+		let json = r#"
+		{
+			"address": "6edddfc6349aff20bc6467ccf276c5b52487f7a8",
+			"crypto": {
+				"cipher": "aes-128-ctr",
+				"ciphertext": "7203da0676d141b138cd7f8e1a4365f59cc1aa6978dc5443f364ca943d7cb4bc",
+				"cipherparams": {
+					"iv": "b5a7ec855ec9e2c405371356855fec83"
+				},
+				"kdf": "scrypt",
+				"kdfparams": {
+					"dklen": 32,
+					"n": 262144,
+					"p": 1,
+					"r": 8,
+					"salt": "1e8642fdf1f87172492c1412fc62f8db75d796cdfa9c53c3f2b11e44a2a1b209"
+				},
+				"mac": "46325c5d4e8c991ad2683d525c7854da387138b6ca45068985aa4959fa2b8c8f"
+			},
+			"id": "8777d9f6-7860-4b9b-88b7-0b57ee6b3a73",
+			"version": 3,
+			"name": "Test",
+			"meta": "{}"
+		}"#;
+
+		let expected = KeyFile {
+			id: Uuid::from_str("8777d9f6-7860-4b9b-88b7-0b57ee6b3a73").unwrap(),
+			version: Version::V3,
+			address: Some("6edddfc6349aff20bc6467ccf276c5b52487f7a8".into()),
+			crypto: Crypto {
+				cipher: Cipher::Aes128Ctr(Aes128Ctr {
+					iv: "b5a7ec855ec9e2c405371356855fec83".into(),
+				}),
+				ciphertext: "7203da0676d141b138cd7f8e1a4365f59cc1aa6978dc5443f364ca943d7cb4bc".into(),
+				kdf: Kdf::Scrypt(Scrypt {
+					n: 262144,
+					dklen: 32,
+					p: 1,
+					r: 8,
+					salt: "1e8642fdf1f87172492c1412fc62f8db75d796cdfa9c53c3f2b11e44a2a1b209".into(),
+				}),
+				mac: "46325c5d4e8c991ad2683d525c7854da387138b6ca45068985aa4959fa2b8c8f".into(),
+			},
+			name: Some("Test".to_owned()),
+			meta: Some("{}".to_owned()),
+		};
+
+		let keyfile: KeyFile = serde_json::from_str(json).unwrap();
+		assert_eq!(keyfile, expected);
+	}
+
+	#[test]
+	fn capital_crypto_keyfile() {
+		let json = r#"
+		{
+			"address": "6edddfc6349aff20bc6467ccf276c5b52487f7a8",
+			"Crypto": {
+				"cipher": "aes-128-ctr",
+				"ciphertext": "7203da0676d141b138cd7f8e1a4365f59cc1aa6978dc5443f364ca943d7cb4bc",
+				"cipherparams": {
+					"iv": "b5a7ec855ec9e2c405371356855fec83"
+				},
+				"kdf": "scrypt",
+				"kdfparams": {
+					"dklen": 32,
+					"n": 262144,
+					"p": 1,
+					"r": 8,
+					"salt": "1e8642fdf1f87172492c1412fc62f8db75d796cdfa9c53c3f2b11e44a2a1b209"
+				},
+				"mac": "46325c5d4e8c991ad2683d525c7854da387138b6ca45068985aa4959fa2b8c8f"
+			},
+			"id": "8777d9f6-7860-4b9b-88b7-0b57ee6b3a73",
+			"version": 3
+		}"#;
+
+		let expected = KeyFile {
+			id: "8777d9f6-7860-4b9b-88b7-0b57ee6b3a73".into(),
+			version: Version::V3,
+			address: Some("6edddfc6349aff20bc6467ccf276c5b52487f7a8".into()),
+			crypto: Crypto {
+				cipher: Cipher::Aes128Ctr(Aes128Ctr {
+					iv: "b5a7ec855ec9e2c405371356855fec83".into(),
+				}),
+				ciphertext: "7203da0676d141b138cd7f8e1a4365f59cc1aa6978dc5443f364ca943d7cb4bc".into(),
+				kdf: Kdf::Scrypt(Scrypt {
+					n: 262144,
+					dklen: 32,
+					p: 1,
+					r: 8,
+					salt: "1e8642fdf1f87172492c1412fc62f8db75d796cdfa9c53c3f2b11e44a2a1b209".into(),
+				}),
+				mac: "46325c5d4e8c991ad2683d525c7854da387138b6ca45068985aa4959fa2b8c8f".into(),
+			},
+			name: None,
+			meta: None,
+		};
+
+		let keyfile: KeyFile = serde_json::from_str(json).unwrap();
+		assert_eq!(keyfile, expected);
+	}
+
+	#[test]
+	fn to_and_from_json() {
+		let file = KeyFile {
+			id: "8777d9f6-7860-4b9b-88b7-0b57ee6b3a73".into(),
+			version: Version::V3,
+			address: Some("6edddfc6349aff20bc6467ccf276c5b52487f7a8".into()),
+			crypto: Crypto {
+				cipher: Cipher::Aes128Ctr(Aes128Ctr {
+					iv: "b5a7ec855ec9e2c405371356855fec83".into(),
+				}),
+				ciphertext: "7203da0676d141b138cd7f8e1a4365f59cc1aa6978dc5443f364ca943d7cb4bc".into(),
+				kdf: Kdf::Scrypt(Scrypt {
+					n: 262144,
+					dklen: 32,
+					p: 1,
+					r: 8,
+					salt: "1e8642fdf1f87172492c1412fc62f8db75d796cdfa9c53c3f2b11e44a2a1b209".into(),
+				}),
+				mac: "46325c5d4e8c991ad2683d525c7854da387138b6ca45068985aa4959fa2b8c8f".into(),
+			},
+			name: Some("Test".to_owned()),
+			meta: None,
+		};
+
+		let serialized = serde_json::to_string(&file).unwrap();
+		println!("{}", serialized);
+		let deserialized = serde_json::from_str(&serialized).unwrap();
+
+		assert_eq!(file, deserialized);
+	}
+}

accounts/ethstore/src/json/mod.rs

@@ -0,0 +1,43 @@
+// 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/>.
+
+//! Contract interface specification.
+
+mod bytes;
+mod cipher;
+mod crypto;
+mod error;
+mod hash;
+mod id;
+mod kdf;
+mod key_file;
+mod presale;
+mod vault_file;
+mod vault_key_file;
+mod version;
+
+pub use self::bytes::Bytes;
+pub use self::cipher::{Cipher, CipherSer, CipherSerParams, Aes128Ctr};
+pub use self::crypto::{Crypto, CipherText};
+pub use self::error::Error;
+pub use self::hash::{H128, H160, H256};
+pub use self::id::Uuid;
+pub use self::kdf::{Kdf, KdfSer, Prf, Pbkdf2, Scrypt, KdfSerParams};
+pub use self::key_file::{KeyFile, OpaqueKeyFile};
+pub use self::presale::{PresaleWallet, Encseed};
+pub use self::vault_file::VaultFile;
+pub use self::vault_key_file::{VaultKeyFile, VaultKeyMeta, insert_vault_name_to_json_meta, remove_vault_name_from_json_meta};
+pub use self::version::Version;

accounts/ethstore/src/json/presale.rs

@@ -1,22 +1,22 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of OpenEthereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// OpenEthereum 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.
 
-// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-use super::{Bytes, H160};
-use serde_json;
 use std::io::Read;
+use serde_json;
+use super::{H160, Bytes};
 
 pub type Encseed = Bytes;
 
@@ -28,19 +28,16 @@ pub struct PresaleWallet {
 }
 
 impl PresaleWallet {
-    pub fn load<R>(reader: R) -> Result<Self, serde_json::Error>
-    where
-        R: Read,
-    {
+	pub fn load<R>(reader: R) -> Result<Self, serde_json::Error> where R: Read {
 		serde_json::from_reader(reader)
 	}
 }
 
 #[cfg(test)]
 mod tests {
-    use json::{PresaleWallet, H160};
-    use serde_json;
 	use std::str::FromStr;
+	use serde_json;
+	use json::{PresaleWallet, H160};
 
 	#[test]
 	fn presale_wallet() {

accounts/ethstore/src/json/vault_file.rs

@@ -0,0 +1,94 @@
+// 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::io::{Read, Write};
+use serde_json;
+use super::Crypto;
+
+/// Vault meta file
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct VaultFile {
+	/// Vault password, encrypted with vault password
+	pub crypto: Crypto,
+	/// Vault metadata string
+	pub meta: Option<String>,
+}
+
+impl VaultFile {
+	pub fn load<R>(reader: R) -> Result<Self, serde_json::Error> where R: Read {
+		serde_json::from_reader(reader)
+	}
+
+	pub fn write<W>(&self, writer: &mut W) -> Result<(), serde_json::Error> where W: Write {
+		serde_json::to_writer(writer, self)
+	}
+}
+
+#[cfg(test)]
+mod test {
+	use serde_json;
+	use json::{VaultFile, Crypto, Cipher, Aes128Ctr, Kdf, Pbkdf2, Prf};
+
+	#[test]
+	fn to_and_from_json() {
+		let file = VaultFile {
+			crypto: Crypto {
+				cipher: Cipher::Aes128Ctr(Aes128Ctr {
+					iv: "0155e3690be19fbfbecabcd440aa284b".into(),
+				}),
+				ciphertext: "4d6938a1f49b7782".into(),
+				kdf: Kdf::Pbkdf2(Pbkdf2 {
+					c: 1024,
+					dklen: 32,
+					prf: Prf::HmacSha256,
+					salt: "b6a9338a7ccd39288a86dba73bfecd9101b4f3db9c9830e7c76afdbd4f6872e5".into(),
+				}),
+				mac: "16381463ea11c6eb2239a9f339c2e780516d29d234ce30ac5f166f9080b5a262".into(),
+			},
+			meta: Some("{}".into()),
+		};
+
+		let serialized = serde_json::to_string(&file).unwrap();
+		let deserialized = serde_json::from_str(&serialized).unwrap();
+
+		assert_eq!(file, deserialized);
+	}
+
+	#[test]
+	fn to_and_from_json_no_meta() {
+		let file = VaultFile {
+			crypto: Crypto {
+				cipher: Cipher::Aes128Ctr(Aes128Ctr {
+					iv: "0155e3690be19fbfbecabcd440aa284b".into(),
+				}),
+				ciphertext: "4d6938a1f49b7782".into(),
+				kdf: Kdf::Pbkdf2(Pbkdf2 {
+					c: 1024,
+					dklen: 32,
+					prf: Prf::HmacSha256,
+					salt: "b6a9338a7ccd39288a86dba73bfecd9101b4f3db9c9830e7c76afdbd4f6872e5".into(),
+				}),
+				mac: "16381463ea11c6eb2239a9f339c2e780516d29d234ce30ac5f166f9080b5a262".into(),
+			},
+			meta: None,
+		};
+
+		let serialized = serde_json::to_string(&file).unwrap();
+		let deserialized = serde_json::from_str(&serialized).unwrap();
+
+		assert_eq!(file, deserialized);
+	}
+}

accounts/ethstore/src/json/vault_key_file.rs

@@ -0,0 +1,172 @@
+// 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::io::{Read, Write};
+use serde::de::Error;
+use serde_json;
+use serde_json::value::Value;
+use serde_json::error;
+use super::{Uuid, Version, Crypto, H160};
+
+/// Meta key name for vault field
+const VAULT_NAME_META_KEY: &'static str = "vault";
+
+/// Key file as stored in vaults
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct VaultKeyFile {
+	/// Key id
+	pub id: Uuid,
+	/// Key version
+	pub version: Version,
+	/// Secret, encrypted with account password
+	pub crypto: Crypto,
+	/// Serialized `VaultKeyMeta`, encrypted with vault password
+	pub metacrypto: Crypto,
+}
+
+/// Data, stored in `VaultKeyFile::metacrypto`
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct VaultKeyMeta {
+	/// Key address
+	pub address: H160,
+	/// Key name
+	pub name: Option<String>,
+	/// Key metadata
+	pub meta: Option<String>,
+}
+
+/// Insert vault name to the JSON meta field
+pub fn insert_vault_name_to_json_meta(meta: &str, vault_name: &str) -> Result<String, error::Error> {
+	let mut meta = if meta.is_empty() {
+		Value::Object(serde_json::Map::new())
+	} else {
+		serde_json::from_str(meta)?
+	};
+
+	if let Some(meta_obj) = meta.as_object_mut() {
+		meta_obj.insert(VAULT_NAME_META_KEY.to_owned(), Value::String(vault_name.to_owned()));
+		serde_json::to_string(meta_obj)
+	} else {
+		Err(error::Error::custom("Meta is expected to be a serialized JSON object"))
+	}
+}
+
+/// Remove vault name from the JSON meta field
+pub fn remove_vault_name_from_json_meta(meta: &str) -> Result<String, error::Error> {
+	let mut meta = if meta.is_empty() {
+		Value::Object(serde_json::Map::new())
+	} else {
+		serde_json::from_str(meta)?
+	};
+
+	if let Some(meta_obj) = meta.as_object_mut() {
+		meta_obj.remove(VAULT_NAME_META_KEY);
+		serde_json::to_string(meta_obj)
+	} else {
+		Err(error::Error::custom("Meta is expected to be a serialized JSON object"))
+	}
+}
+
+impl VaultKeyFile {
+	pub fn load<R>(reader: R) -> Result<Self, serde_json::Error> where R: Read {
+		serde_json::from_reader(reader)
+	}
+
+	pub fn write<W>(&self, writer: &mut W) -> Result<(), serde_json::Error> where W: Write {
+		serde_json::to_writer(writer, self)
+	}
+}
+
+impl VaultKeyMeta {
+	pub fn load(bytes: &[u8]) -> Result<Self, serde_json::Error> {
+		serde_json::from_slice(&bytes)
+	}
+
+	pub fn write(&self) -> Result<Vec<u8>, serde_json::Error> {
+		let s = serde_json::to_string(self)?;
+		Ok(s.as_bytes().into())
+	}
+}
+
+#[cfg(test)]
+mod test {
+	use serde_json;
+	use json::{VaultKeyFile, Version, Crypto, Cipher, Aes128Ctr, Kdf, Pbkdf2, Prf,
+		insert_vault_name_to_json_meta, remove_vault_name_from_json_meta};
+
+	#[test]
+	fn to_and_from_json() {
+		let file = VaultKeyFile {
+			id: "08d82c39-88e3-7a71-6abb-89c8f36c3ceb".into(),
+			version: Version::V3,
+			crypto: Crypto {
+				cipher: Cipher::Aes128Ctr(Aes128Ctr {
+					iv: "fecb968bbc8c7e608a89ebcfe53a41d0".into(),
+				}),
+				ciphertext: "4befe0a66d9a4b6fec8e39eb5c90ac5dafdeaab005fff1af665fd1f9af925c91".into(),
+				kdf: Kdf::Pbkdf2(Pbkdf2 {
+					c: 10240,
+					dklen: 32,
+					prf: Prf::HmacSha256,
+					salt: "f17731e84ecac390546692dbd4ccf6a3a2720dc9652984978381e61c28a471b2".into(),
+				}),
+				mac: "7c7c3daafb24cf11eb3079dfb9064a11e92f309a0ee1dd676486bab119e686b7".into(),
+			},
+			metacrypto: Crypto {
+				cipher: Cipher::Aes128Ctr(Aes128Ctr {
+					iv: "9c353fb3f894fc05946843616c26bb3f".into(),
+				}),
+				ciphertext: "fef0d113d7576c1702daf380ad6f4c5408389e57991cae2a174facd74bd549338e1014850bddbab7eb486ff5f5c9c5532800c6a6d4db2be2212cd5cd3769244ab230e1f369e8382a9e6d7c0a".into(),
+				kdf: Kdf::Pbkdf2(Pbkdf2 {
+					c: 10240,
+					dklen: 32,
+					prf: Prf::HmacSha256,
+					salt: "aca82865174a82249a198814b263f43a631f272cbf7ed329d0f0839d259c652a".into(),
+				}),
+				mac: "b7413946bfe459d2801268dc331c04b3a84d92be11ef4dd9a507f895e8d9b5bd".into(),
+			}
+		};
+
+		let serialized = serde_json::to_string(&file).unwrap();
+		let deserialized = serde_json::from_str(&serialized).unwrap();
+
+		assert_eq!(file, deserialized);
+	}
+
+	#[test]
+	fn vault_name_inserted_to_json_meta() {
+		assert_eq!(insert_vault_name_to_json_meta(r#""#, "MyVault").unwrap(), r#"{"vault":"MyVault"}"#);
+		assert_eq!(insert_vault_name_to_json_meta(r#"{"tags":["kalabala"]}"#, "MyVault").unwrap(), r#"{"tags":["kalabala"],"vault":"MyVault"}"#);
+	}
+
+	#[test]
+	fn vault_name_not_inserted_to_json_meta() {
+		assert!(insert_vault_name_to_json_meta(r#"///3533"#, "MyVault").is_err());
+		assert!(insert_vault_name_to_json_meta(r#""string""#, "MyVault").is_err());
+	}
+
+	#[test]
+	fn vault_name_removed_from_json_meta() {
+		assert_eq!(remove_vault_name_from_json_meta(r#"{"vault":"MyVault"}"#).unwrap(), r#"{}"#);
+		assert_eq!(remove_vault_name_from_json_meta(r#"{"tags":["kalabala"],"vault":"MyVault"}"#).unwrap(), r#"{"tags":["kalabala"]}"#);
+	}
+
+	#[test]
+	fn vault_name_not_removed_from_json_meta() {
+		assert!(remove_vault_name_from_json_meta(r#"///3533"#).is_err());
+		assert!(remove_vault_name_from_json_meta(r#""string""#).is_err());
+	}
+}

accounts/ethstore/src/json/version.rs

@@ -0,0 +1,58 @@
+// 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 serde::{Serialize, Serializer, Deserialize, Deserializer};
+use serde::de::{Error as SerdeError, Visitor};
+use super::Error;
+
+#[derive(Debug, PartialEq)]
+pub enum Version {
+	V3,
+}
+
+impl Serialize for Version {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where S: Serializer {
+		match *self {
+			Version::V3 => serializer.serialize_u64(3)
+		}
+	}
+}
+
+impl<'a> Deserialize<'a> for Version {
+	fn deserialize<D>(deserializer: D) -> Result<Version, D::Error>
+	where D: Deserializer<'a> {
+		deserializer.deserialize_any(VersionVisitor)
+	}
+}
+
+struct VersionVisitor;
+
+impl<'a> Visitor<'a> for VersionVisitor {
+	type Value = Version;
+
+	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+		write!(formatter, "a valid key version identifier")
+	}
+
+	fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E> where E: SerdeError {
+		match value {
+			3 => Ok(Version::V3),
+			_ => Err(SerdeError::custom(Error::UnsupportedVersion))
+		}
+	}
+}

accounts/ethstore/src/lib.rs

@@ -1,23 +1,24 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of OpenEthereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// OpenEthereum 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.
 
-// OpenEthereum 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 OpenEthereum.  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;
@@ -26,16 +27,15 @@ extern crate rustc_hex;
 extern crate serde;
 extern crate serde_json;
 extern crate smallvec;
-extern crate tempdir;
 extern crate time;
+extern crate tiny_keccak;
+extern crate tempdir;
 
+extern crate parity_crypto as crypto;
 extern crate ethereum_types;
 extern crate ethkey as _ethkey;
-extern crate parity_crypto as crypto;
 extern crate parity_wordlist;
 
-#[macro_use]
-extern crate lazy_static;
 #[macro_use]
 extern crate log;
 #[macro_use]
@@ -58,20 +58,18 @@ mod presale;
 mod random;
 mod secret_store;
 
-pub use self::{
-    account::{Crypto, SafeAccount},
-    error::Error,
-    ethstore::{EthMultiStore, EthStore},
-    import::{import_account, import_accounts},
-    json::OpaqueKeyFile as KeyFile,
-    parity_wordlist::random_phrase,
-    presale::PresaleWallet,
-    random::random_string,
-    secret_store::{
-        Derivation, IndexDerivation, SecretStore, SecretVaultRef, SimpleSecretStore,
-        StoreAccountRef,
-    },
+pub use self::account::{SafeAccount, Crypto};
+pub use self::error::Error;
+pub use self::ethstore::{EthStore, EthMultiStore};
+pub use self::import::{import_account, import_accounts, read_geth_accounts};
+pub use self::json::OpaqueKeyFile as KeyFile;
+pub use self::presale::PresaleWallet;
+pub use self::secret_store::{
+	SecretVaultRef, StoreAccountRef, SimpleSecretStore, SecretStore,
+	Derivation, IndexDerivation,
 };
+pub use self::random::random_string;
+pub use self::parity_wordlist::random_phrase;
 
 /// An opaque wrapper for secret.
-pub struct OpaqueSecret(crypto::publickey::Secret);
+pub struct OpaqueSecret(::ethkey::Secret);

accounts/ethstore/src/presale.rs

@@ -0,0 +1,99 @@
+// 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::fs;
+use std::path::Path;
+use json;
+use ethkey::{Address, Secret, KeyPair, Password};
+use crypto::{Keccak256, pbkdf2};
+use {crypto, Error};
+
+/// Pre-sale wallet.
+pub struct PresaleWallet {
+	iv: [u8; 16],
+	ciphertext: Vec<u8>,
+	address: Address,
+}
+
+impl From<json::PresaleWallet> for PresaleWallet {
+	fn from(wallet: json::PresaleWallet) -> Self {
+		let mut iv = [0u8; 16];
+		iv.copy_from_slice(&wallet.encseed[..16]);
+
+		let mut ciphertext = vec![];
+		ciphertext.extend_from_slice(&wallet.encseed[16..]);
+
+		PresaleWallet {
+			iv: iv,
+			ciphertext: ciphertext,
+			address: Address::from(wallet.address),
+		}
+	}
+}
+
+impl PresaleWallet {
+	/// Open a pre-sale wallet.
+	pub fn open<P>(path: P) -> Result<Self, Error> where P: AsRef<Path> {
+		let file = fs::File::open(path)?;
+		let presale = json::PresaleWallet::load(file)
+			.map_err(|e| Error::InvalidKeyFile(format!("{}", e)))?;
+		Ok(PresaleWallet::from(presale))
+	}
+
+	/// Decrypt the wallet.
+	pub fn decrypt(&self, password: &Password) -> Result<KeyPair, Error> {
+		let mut derived_key = [0u8; 32];
+		let salt = pbkdf2::Salt(password.as_bytes());
+		let sec = pbkdf2::Secret(password.as_bytes());
+		pbkdf2::sha256(2000, salt, sec, &mut derived_key);
+
+		let mut key = vec![0; self.ciphertext.len()];
+		let len = crypto::aes::decrypt_128_cbc(&derived_key[0..16], &self.iv, &self.ciphertext, &mut key)
+			.map_err(|_| Error::InvalidPassword)?;
+		let unpadded = &key[..len];
+
+		let secret = Secret::from_unsafe_slice(&unpadded.keccak256())?;
+		if let Ok(kp) = KeyPair::from_secret(secret) {
+			if kp.address() == self.address {
+				return Ok(kp)
+			}
+		}
+
+		Err(Error::InvalidPassword)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::PresaleWallet;
+	use json;
+
+	#[test]
+	fn test() {
+		let json = r#"
+		{
+			"encseed": "137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dedb3bc0a9ac6c79b9c426c5878ca2c9d06ff42a23cb648312fc32ba83649de0928e066",
+			"ethaddr": "ede84640d1a1d3e06902048e67aa7db8d52c2ce1",
+			"email": "123@gmail.com",
+			"btcaddr": "1JvqEc6WLhg6GnyrLBe2ztPAU28KRfuseH"
+		} "#;
+
+		let wallet = json::PresaleWallet::load(json.as_bytes()).unwrap();
+		let wallet = PresaleWallet::from(wallet);
+		assert!(wallet.decrypt(&"123".into()).is_ok());
+		assert!(wallet.decrypt(&"124".into()).is_err());
+	}
+}

accounts/ethstore/src/random.rs

@@ -0,0 +1,45 @@
+// 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::{Rng, RngCore, rngs::OsRng, distributions::Alphanumeric};
+
+pub trait Random {
+	fn random() -> Self where Self: Sized;
+}
+
+impl Random for [u8; 16] {
+	fn random() -> Self {
+		let mut result = [0u8; 16];
+		let mut rng = OsRng::new().unwrap();
+		rng.fill_bytes(&mut result);
+		result
+	}
+}
+
+impl Random for [u8; 32] {
+	fn random() -> Self {
+		let mut result = [0u8; 32];
+		let mut rng = OsRng::new().unwrap();
+		rng.fill_bytes(&mut result);
+		result
+	}
+}
+
+/// Generate a random string of given length.
+pub fn random_string(length: usize) -> String {
+	let mut rng = OsRng::new().expect("Not able to operate without random source.");
+	rng.sample_iter(&Alphanumeric).take(length).collect()
+}

accounts/ethstore/src/secret_store.rs

@@ -0,0 +1,190 @@
+// 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::hash::{Hash, Hasher};
+use std::path::PathBuf;
+use std::cmp::Ordering;
+use ethkey::{Address, Message, Signature, Secret, Password, Public};
+use Error;
+use json::{Uuid, OpaqueKeyFile};
+use ethereum_types::H256;
+use OpaqueSecret;
+
+/// Key directory reference
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum SecretVaultRef {
+	/// Reference to key in root directory
+	Root,
+	/// Referenc to key in specific vault
+	Vault(String),
+}
+
+/// Stored account reference
+#[derive(Debug, Clone, PartialEq, Eq, Ord)]
+pub struct StoreAccountRef {
+	/// Account address
+	pub address: Address,
+	/// Vault reference
+	pub vault: SecretVaultRef,
+}
+
+impl PartialOrd for StoreAccountRef {
+	fn partial_cmp(&self, other: &StoreAccountRef) -> Option<Ordering> {
+		Some(self.address.cmp(&other.address).then_with(|| self.vault.cmp(&other.vault)))
+	}
+}
+
+impl ::std::borrow::Borrow<Address> for StoreAccountRef {
+	fn borrow(&self) -> &Address {
+		&self.address
+	}
+}
+
+/// Simple Secret Store API
+pub trait SimpleSecretStore: Send + Sync {
+	/// Inserts new accounts to the store (or vault) with given password.
+	fn insert_account(&self, vault: SecretVaultRef, secret: Secret, password: &Password) -> Result<StoreAccountRef, Error>;
+	/// Inserts new derived account to the store (or vault) with given password.
+	fn insert_derived(&self, vault: SecretVaultRef, account_ref: &StoreAccountRef, password: &Password, derivation: Derivation) -> Result<StoreAccountRef, Error>;
+	/// Changes accounts password.
+	fn change_password(&self, account: &StoreAccountRef, old_password: &Password, new_password: &Password) -> Result<(), Error>;
+	/// Exports key details for account.
+	fn export_account(&self, account: &StoreAccountRef, password: &Password) -> Result<OpaqueKeyFile, Error>;
+	/// Entirely removes account from the store and underlying storage.
+	fn remove_account(&self, account: &StoreAccountRef, password: &Password) -> Result<(), Error>;
+	/// Generates new derived account.
+	fn generate_derived(&self, account_ref: &StoreAccountRef, password: &Password, derivation: Derivation) -> Result<Address, Error>;
+	/// Sign a message with given account.
+	fn sign(&self, account: &StoreAccountRef, password: &Password, message: &Message) -> Result<Signature, Error>;
+	/// Sign a message with derived account.
+	fn sign_derived(&self, account_ref: &StoreAccountRef, password: &Password, derivation: Derivation, message: &Message) -> Result<Signature, Error>;
+	/// Decrypt a messages with given account.
+	fn decrypt(&self, account: &StoreAccountRef, password: &Password, shared_mac: &[u8], message: &[u8]) -> Result<Vec<u8>, Error>;
+	/// Agree on shared key.
+	fn agree(&self, account: &StoreAccountRef, password: &Password, other: &Public) -> Result<Secret, Error>;
+
+	/// Returns all accounts in this secret store.
+	fn accounts(&self) -> Result<Vec<StoreAccountRef>, Error>;
+	/// Get reference to some account with given address.
+	/// This method could be removed if we will guarantee that there is max(1) account for given address.
+	fn account_ref(&self, address: &Address) -> Result<StoreAccountRef, Error>;
+
+	/// Create new vault with given password
+	fn create_vault(&self, name: &str, password: &Password) -> Result<(), Error>;
+	/// Open vault with given password
+	fn open_vault(&self, name: &str, password: &Password) -> Result<(), Error>;
+	/// Close vault
+	fn close_vault(&self, name: &str) -> Result<(), Error>;
+	/// List all vaults
+	fn list_vaults(&self) -> Result<Vec<String>, Error>;
+	/// List all currently opened vaults
+	fn list_opened_vaults(&self) -> Result<Vec<String>, Error>;
+	/// Change vault password
+	fn change_vault_password(&self, name: &str, new_password: &Password) -> Result<(), Error>;
+	/// Cnage account' vault
+	fn change_account_vault(&self, vault: SecretVaultRef, account: StoreAccountRef) -> Result<StoreAccountRef, Error>;
+	/// Get vault metadata string.
+	fn get_vault_meta(&self, name: &str) -> Result<String, Error>;
+	/// Set vault metadata string.
+	fn set_vault_meta(&self, name: &str, meta: &str) -> Result<(), Error>;
+}
+
+/// Secret Store API
+pub trait SecretStore: SimpleSecretStore {
+
+	/// Returns a raw opaque Secret that can be later used to sign a message.
+	fn raw_secret(&self, account: &StoreAccountRef, password: &Password) -> Result<OpaqueSecret, Error>;
+
+	/// Signs a message with raw secret.
+	fn sign_with_secret(&self, secret: &OpaqueSecret, message: &Message) -> Result<Signature, Error> {
+		Ok(::ethkey::sign(&secret.0, message)?)
+	}
+
+	/// Imports presale wallet
+	fn import_presale(&self, vault: SecretVaultRef, json: &[u8], password: &Password) -> Result<StoreAccountRef, Error>;
+	/// 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: &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>;
+
+	/// Returns a public key for given account.
+	fn public(&self, account: &StoreAccountRef, password: &Password) -> Result<Public, Error>;
+
+	/// Returns uuid of an account.
+	fn uuid(&self, account: &StoreAccountRef) -> Result<Uuid, Error>;
+	/// Returns account's name.
+	fn name(&self, account: &StoreAccountRef) -> Result<String, Error>;
+	/// Returns account's metadata.
+	fn meta(&self, account: &StoreAccountRef) -> Result<String, Error>;
+
+	/// Modifies account metadata.
+	fn set_name(&self, account: &StoreAccountRef, name: String) -> Result<(), Error>;
+	/// Modifies account name.
+	fn set_meta(&self, account: &StoreAccountRef, meta: String) -> Result<(), Error>;
+
+	/// Returns local path of the store.
+	fn local_path(&self) -> PathBuf;
+	/// Lists all found geth accounts.
+	fn list_geth_accounts(&self, testnet: bool) -> Vec<Address>;
+	/// Imports geth accounts to the store/vault.
+	fn import_geth_accounts(&self, vault: SecretVaultRef, desired: Vec<Address>, testnet: bool) -> Result<Vec<StoreAccountRef>, Error>;
+}
+
+impl StoreAccountRef {
+	/// Create reference to root account with given address
+	pub fn root(address: Address) -> Self {
+		StoreAccountRef::new(SecretVaultRef::Root, address)
+	}
+
+	/// Create reference to vault account with given address
+	pub fn vault(vault_name: &str, address: Address) -> Self {
+		StoreAccountRef::new(SecretVaultRef::Vault(vault_name.to_owned()), address)
+	}
+
+	/// Create new account reference
+	pub fn new(vault_ref: SecretVaultRef, address: Address) -> Self {
+		StoreAccountRef {
+			vault: vault_ref,
+			address: address,
+		}
+	}
+}
+
+impl Hash for StoreAccountRef {
+	fn hash<H: Hasher>(&self, state: &mut H) {
+		self.address.hash(state);
+	}
+}
+
+/// Node in hierarchical derivation.
+pub struct IndexDerivation {
+	/// Node is soft (allows proof of parent from parent node).
+	pub soft: bool,
+	/// Index sequence of the node.
+	pub index: u32,
+}
+
+/// Derivation scheme for keys
+pub enum Derivation {
+	/// Hierarchical derivation
+	Hierarchical(Vec<IndexDerivation>),
+	/// Hash derivation, soft.
+	SoftHash(H256),
+	/// Hash derivation, hard.
+	HardHash(H256),
+}

accounts/ethstore/tests/api.rs

@@ -0,0 +1,157 @@
+// 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/>.
+
+extern crate rand;
+extern crate ethstore;
+extern crate ethereum_types;
+
+mod util;
+
+use ethstore::{EthStore, SimpleSecretStore, SecretVaultRef, StoreAccountRef};
+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() {
+	let dir = TransientDir::create().unwrap();
+	let _ = EthStore::open(Box::new(dir)).unwrap();
+}
+
+#[test]
+#[should_panic]
+fn secret_store_open_not_existing() {
+	let dir = TransientDir::open();
+	let _ = EthStore::open(Box::new(dir)).unwrap();
+}
+
+fn random_secret() -> Secret {
+	Random.generate().unwrap().secret().clone()
+}
+
+#[test]
+fn secret_store_create_account() {
+	let dir = TransientDir::create().unwrap();
+	let store = EthStore::open(Box::new(dir)).unwrap();
+	assert_eq!(store.accounts().unwrap().len(), 0);
+	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
+	assert_eq!(store.accounts().unwrap().len(), 1);
+	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
+	assert_eq!(store.accounts().unwrap().len(), 2);
+}
+
+#[test]
+fn secret_store_sign() {
+	let dir = TransientDir::create().unwrap();
+	let store = EthStore::open(Box::new(dir)).unwrap();
+	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
+	let accounts = store.accounts().unwrap();
+	assert_eq!(accounts.len(), 1);
+	assert!(store.sign(&accounts[0], &"".into(), &Default::default()).is_ok());
+	assert!(store.sign(&accounts[0], &"1".into(), &Default::default()).is_err());
+}
+
+#[test]
+fn secret_store_change_password() {
+	let dir = TransientDir::create().unwrap();
+	let store = EthStore::open(Box::new(dir)).unwrap();
+	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
+	let accounts = store.accounts().unwrap();
+	assert_eq!(accounts.len(), 1);
+	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(), &Default::default()).is_err());
+	assert!(store.sign(&accounts[0], &"1".into(), &Default::default()).is_ok());
+}
+
+#[test]
+fn secret_store_remove_account() {
+	let dir = TransientDir::create().unwrap();
+	let store = EthStore::open(Box::new(dir)).unwrap();
+	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
+	let accounts = store.accounts().unwrap();
+	assert_eq!(accounts.len(), 1);
+	assert!(store.remove_account(&accounts[0], &"".into()).is_ok());
+	assert_eq!(store.accounts().unwrap().len(), 0);
+	assert!(store.remove_account(&accounts[0], &"".into()).is_err());
+}
+
+fn test_path() -> &'static str {
+	match ::std::fs::metadata("ethstore") {
+		Ok(_) => "ethstore/tests/res/geth_keystore",
+ 		Err(_) => "tests/res/geth_keystore",
+	}
+}
+
+fn pat_path() -> &'static str {
+	match ::std::fs::metadata("ethstore") {
+		Ok(_) => "ethstore/tests/res/pat",
+		Err(_) => "tests/res/pat",
+	}
+}
+
+fn ciphertext_path() -> &'static str {
+	match ::std::fs::metadata("ethstore") {
+		Ok(_) => "ethstore/tests/res/ciphertext",
+		Err(_) => "tests/res/ciphertext",
+	}
+}
+
+#[test]
+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()),
+	]);
+}
+
+#[test]
+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()),
+	]);
+}
+
+#[test]
+fn test_decrypting_files_with_short_ciphertext() {
+	// 31e9d1e6d844bd3a536800ef8d8be6a9975db509, 30
+	let kp1 = KeyPair::from_secret("000081c29e8142bb6a81bef5a92bda7a8328a5c85bb2f9542e76f9b0f94fc018".parse().unwrap()).unwrap();
+	// d1e64e5480bfaf733ba7d48712decb8227797a4e , 31
+	let kp2 = KeyPair::from_secret("00fa7b3db73dc7dfdf8c5fbdb796d741e4488628c41fc4febd9160a866ba0f35".parse().unwrap()).unwrap();
+	let dir = RootDiskDirectory::at(ciphertext_path());
+	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()),
+	]);
+
+	let message = Default::default();
+
+	let s1 = store.sign(&accounts[0], &"foo".into(), &message).unwrap();
+	let s2 = store.sign(&accounts[1], &"foo".into(), &message).unwrap();
+	assert!(verify_address(&accounts[0].address, &s1, &message).unwrap());
+	assert!(verify_address(&kp1.address(), &s1, &message).unwrap());
+	assert!(verify_address(&kp2.address(), &s2, &message).unwrap());
+}

accounts/ethstore/tests/util/mod.rs

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

@@ -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::path::PathBuf;
+use std::{env, fs};
+use rand::{RngCore, rngs::OsRng};
+use ethstore::accounts_dir::{KeyDirectory, RootDiskDirectory};
+use ethstore::{Error, SafeAccount};
+
+pub fn random_dir() -> PathBuf {
+	let mut rng = OsRng::new().unwrap();
+	let mut dir = env::temp_dir();
+	dir.push(format!("{:x}-{:x}", rng.next_u64(), rng.next_u64()));
+	dir
+}
+
+pub struct TransientDir {
+	dir: RootDiskDirectory,
+	path: PathBuf,
+}
+
+impl TransientDir {
+	pub fn create() -> Result<Self, Error> {
+		let path = random_dir();
+		let result = TransientDir {
+			dir: RootDiskDirectory::create(&path)?,
+			path: path,
+		};
+
+		Ok(result)
+	}
+
+	pub fn open() -> Self {
+		let path = random_dir();
+		TransientDir {
+			dir: RootDiskDirectory::at(&path),
+			path: path,
+		}
+	}
+}
+
+impl Drop for TransientDir {
+	fn drop(&mut self) {
+		fs::remove_dir_all(&self.path).expect("Expected to remove temp dir");
+	}
+}
+
+impl KeyDirectory for TransientDir {
+	fn load(&self) -> Result<Vec<SafeAccount>, Error> {
+		self.dir.load()
+	}
+
+	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
+		self.dir.update(account)
+	}
+
+	fn insert(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
+		self.dir.insert(account)
+	}
+
+	fn remove(&self, account: &SafeAccount) -> Result<(), Error> {
+		self.dir.remove(account)
+	}
+
+	fn unique_repr(&self) -> Result<u64, Error> {
+		self.dir.unique_repr()
+	}
+}

accounts/src/account_data.rs

@@ -0,0 +1,73 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Account Metadata
+
+use std::{
+	collections::HashMap,
+	time::Instant,
+};
+
+use ethkey::{Address, Password};
+use serde_derive::{Serialize, Deserialize};
+use serde_json;
+
+/// Type of unlock.
+#[derive(Clone, PartialEq)]
+pub enum Unlock {
+	/// If account is unlocked temporarily, it should be locked after first usage.
+	OneTime,
+	/// Account unlocked permanently can always sign message.
+	/// Use with caution.
+	Perm,
+	/// Account unlocked with a timeout
+	Timed(Instant),
+}
+
+/// Data associated with account.
+#[derive(Clone)]
+pub struct AccountData {
+	pub unlock: Unlock,
+	pub password: Password,
+}
+
+/// Collected account metadata
+#[derive(Default, Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct AccountMeta {
+	/// The name of the account.
+	pub name: String,
+	/// The rest of the metadata of the account.
+	pub meta: String,
+	/// The 128-bit Uuid of the account, if it has one (brain-wallets don't).
+	pub uuid: Option<String>,
+}
+
+impl AccountMeta {
+	/// Read a hash map of Address -> AccountMeta
+	pub fn read<R>(reader: R) -> Result<HashMap<Address, Self>, serde_json::Error> where
+		R: ::std::io::Read,
+	{
+		serde_json::from_reader(reader)
+	}
+
+	/// Write a hash map of Address -> AccountMeta
+	pub fn write<W>(m: &HashMap<Address, Self>, writer: &mut W) -> Result<(), serde_json::Error> where
+		W: ::std::io::Write,
+	{
+		serde_json::to_writer(writer, m)
+	}
+}
+

accounts/src/error.rs

@@ -14,23 +14,33 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-/// Transaction Pool options.
-#[derive(Clone, Debug, PartialEq)]
-pub struct Options {
-    /// Maximal number of transactions in the pool.
-    pub max_count: usize,
-    /// Maximal number of transactions from single sender.
-    pub max_per_sender: usize,
-    /// Maximal memory usage.
-    pub max_mem_usage: usize,
+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 Default for Options {
-    fn default() -> Self {
-        Options {
-            max_count: 1024,
-            max_per_sender: 16,
-            max_mem_usage: 8 * 1024 * 1024,
+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)
+	}
+}

accounts/src/lib.rs

@@ -0,0 +1,643 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+#![warn(missing_docs)]
+
+//! Account management.
+
+mod account_data;
+mod error;
+mod stores;
+
+use self::account_data::{Unlock, AccountData};
+use self::stores::AddressBook;
+
+use std::collections::HashMap;
+use std::time::{Instant, Duration};
+
+use ethkey::{Address, Message, Public, Secret, Password, Random, Generator};
+use ethstore::accounts_dir::MemoryDirectory;
+use ethstore::{
+	SimpleSecretStore, SecretStore, EthStore, EthMultiStore,
+	random_string, SecretVaultRef, StoreAccountRef, OpaqueSecret,
+};
+use log::warn;
+use parking_lot::RwLock;
+
+pub use ethkey::Signature;
+pub use ethstore::{Derivation, IndexDerivation, KeyFile, Error};
+
+pub use self::account_data::AccountMeta;
+pub use self::error::SignError;
+
+type AccountToken = Password;
+
+/// Account management settings.
+#[derive(Debug, Default)]
+pub struct AccountProviderSettings {
+	/// Store raw account secret when unlocking the account permanently.
+	pub unlock_keep_secret: bool,
+	/// Disallowed accounts.
+	pub blacklisted_accounts: Vec<Address>,
+}
+
+/// Account management.
+/// Responsible for unlocking accounts.
+pub struct AccountProvider {
+	/// For performance reasons some methods can re-use unlocked secrets.
+	unlocked_secrets: RwLock<HashMap<StoreAccountRef, OpaqueSecret>>,
+	/// Unlocked account data.
+	unlocked: RwLock<HashMap<StoreAccountRef, AccountData>>,
+	/// Address book.
+	address_book: RwLock<AddressBook>,
+	/// Accounts on disk
+	sstore: Box<SecretStore>,
+	/// Accounts unlocked with rolling tokens
+	transient_sstore: EthMultiStore,
+	/// When unlocking account permanently we additionally keep a raw secret in memory
+	/// to increase the performance of transaction signing.
+	unlock_keep_secret: bool,
+	/// Disallowed accounts.
+	blacklisted_accounts: Vec<Address>,
+}
+
+fn transient_sstore() -> EthMultiStore {
+	EthMultiStore::open(Box::new(MemoryDirectory::default())).expect("MemoryDirectory load always succeeds; qed")
+}
+
+impl AccountProvider {
+	/// Creates new account provider.
+	pub fn new(sstore: Box<SecretStore>, settings: AccountProviderSettings) -> Self {
+		if let Ok(accounts) = sstore.accounts() {
+			for account in accounts.into_iter().filter(|a| settings.blacklisted_accounts.contains(&a.address)) {
+				warn!("Local Account {} has a blacklisted (known to be weak) address and will be ignored",
+					account.address);
+			}
+		}
+
+		// Remove blacklisted accounts from address book.
+		let mut address_book = AddressBook::new(&sstore.local_path());
+		for addr in &settings.blacklisted_accounts {
+			address_book.remove(*addr);
+		}
+
+		AccountProvider {
+			unlocked_secrets: RwLock::new(HashMap::new()),
+			unlocked: RwLock::new(HashMap::new()),
+			address_book: RwLock::new(address_book),
+			sstore,
+			transient_sstore: transient_sstore(),
+			unlock_keep_secret: settings.unlock_keep_secret,
+			blacklisted_accounts: settings.blacklisted_accounts,
+		}
+	}
+
+	/// Creates not disk backed provider.
+	pub fn transient_provider() -> Self {
+		AccountProvider {
+			unlocked_secrets: RwLock::new(HashMap::new()),
+			unlocked: RwLock::new(HashMap::new()),
+			address_book: RwLock::new(AddressBook::transient()),
+			sstore: Box::new(EthStore::open(Box::new(MemoryDirectory::default())).expect("MemoryDirectory load always succeeds; qed")),
+			transient_sstore: transient_sstore(),
+			unlock_keep_secret: false,
+			blacklisted_accounts: vec![],
+		}
+	}
+
+	/// Creates new random account.
+	pub fn new_account(&self, password: &Password) -> Result<Address, Error> {
+		self.new_account_and_public(password).map(|d| d.0)
+	}
+
+	/// Creates new random account and returns address and public key
+	pub fn new_account_and_public(&self, password: &Password) -> Result<(Address, Public), Error> {
+		let acc = Random.generate().expect("secp context has generation capabilities; qed");
+		let public = acc.public().clone();
+		let secret = acc.secret().clone();
+		let account = self.sstore.insert_account(SecretVaultRef::Root, secret, password)?;
+		Ok((account.address, public))
+	}
+
+	/// Inserts new account into underlying store.
+	/// Does not unlock account!
+	pub fn insert_account(&self, secret: Secret, password: &Password) -> Result<Address, Error> {
+		let account = self.sstore.insert_account(SecretVaultRef::Root, secret, password)?;
+		if self.blacklisted_accounts.contains(&account.address) {
+			self.sstore.remove_account(&account, password)?;
+			return Err(Error::InvalidAccount.into());
+		}
+		Ok(account.address)
+	}
+
+	/// Generates new derived account based on the existing one
+	/// If password is not provided, account must be unlocked
+	/// New account will be created with the same password (if save: true)
+	pub fn derive_account(&self, address: &Address, password: Option<Password>, derivation: Derivation, save: bool)
+		-> Result<Address, SignError>
+	{
+		let account = self.sstore.account_ref(&address)?;
+		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
+		Ok(
+			if save { self.sstore.insert_derived(SecretVaultRef::Root, &account, &password, derivation)?.address }
+			else { self.sstore.generate_derived(&account, &password, derivation)? }
+		)
+	}
+
+	/// Import a new presale wallet.
+	pub fn import_presale(&self, presale_json: &[u8], password: &Password) -> Result<Address, Error> {
+		let account = self.sstore.import_presale(SecretVaultRef::Root, presale_json, password)?;
+		Ok(Address::from(account.address).into())
+	}
+
+	/// Import a new wallet.
+	pub fn import_wallet(&self, json: &[u8], password: &Password, gen_id: bool) -> Result<Address, Error> {
+		let account = self.sstore.import_wallet(SecretVaultRef::Root, json, password, gen_id)?;
+		if self.blacklisted_accounts.contains(&account.address) {
+			self.sstore.remove_account(&account, password)?;
+			return Err(Error::InvalidAccount.into());
+		}
+		Ok(Address::from(account.address).into())
+	}
+
+	/// Checks whether an account with a given address is present.
+	pub fn has_account(&self, address: Address) -> bool {
+		self.sstore.account_ref(&address).is_ok() && !self.blacklisted_accounts.contains(&address)
+	}
+
+	/// Returns addresses of all accounts.
+	pub fn accounts(&self) -> Result<Vec<Address>, Error> {
+		let accounts = self.sstore.accounts()?;
+		Ok(accounts
+			.into_iter()
+			.map(|a| a.address)
+			.filter(|address| !self.blacklisted_accounts.contains(address))
+			.collect()
+		)
+	}
+
+	/// Returns the address of default account.
+	pub fn default_account(&self) -> Result<Address, Error> {
+		Ok(self.accounts()?.first().cloned().unwrap_or_default())
+	}
+
+	/// Returns each address along with metadata.
+	pub fn addresses_info(&self) -> HashMap<Address, AccountMeta> {
+		self.address_book.read().get()
+	}
+
+	/// Returns each address along with metadata.
+	pub fn set_address_name(&self, account: Address, name: String) {
+		self.address_book.write().set_name(account, name)
+	}
+
+	/// Returns each address along with metadata.
+	pub fn set_address_meta(&self, account: Address, meta: String) {
+		self.address_book.write().set_meta(account, meta)
+	}
+
+	/// Removes and address from the address book
+	pub fn remove_address(&self, addr: Address) {
+		self.address_book.write().remove(addr)
+	}
+
+	/// Returns each account along with name and meta.
+	pub fn accounts_info(&self) -> Result<HashMap<Address, AccountMeta>, Error> {
+		let r = self.sstore.accounts()?
+			.into_iter()
+			.filter(|a| !self.blacklisted_accounts.contains(&a.address))
+			.map(|a| (a.address.clone(), self.account_meta(a.address).ok().unwrap_or_default()))
+			.collect();
+		Ok(r)
+	}
+
+	/// Returns each account along with name and meta.
+	pub fn account_meta(&self, address: Address) -> Result<AccountMeta, Error> {
+		let account = self.sstore.account_ref(&address)?;
+		Ok(AccountMeta {
+			name: self.sstore.name(&account)?,
+			meta: self.sstore.meta(&account)?,
+			uuid: self.sstore.uuid(&account).ok().map(Into::into),	// allowed to not have a Uuid
+		})
+	}
+
+	/// Returns account public key.
+	pub fn account_public(&self, address: Address, password: &Password) -> Result<Public, Error> {
+		self.sstore.public(&self.sstore.account_ref(&address)?, password)
+	}
+
+	/// Returns each account along with name and meta.
+	pub fn set_account_name(&self, address: Address, name: String) -> Result<(), Error> {
+		self.sstore.set_name(&self.sstore.account_ref(&address)?, name)?;
+		Ok(())
+	}
+
+	/// Returns each account along with name and meta.
+	pub fn set_account_meta(&self, address: Address, meta: String) -> Result<(), Error> {
+		self.sstore.set_meta(&self.sstore.account_ref(&address)?, meta)?;
+		Ok(())
+	}
+
+	/// Returns `true` if the password for `account` is `password`. `false` if not.
+	pub fn test_password(&self, address: &Address, password: &Password) -> Result<bool, Error> {
+		self.sstore.test_password(&self.sstore.account_ref(&address)?, password)
+			.map_err(Into::into)
+	}
+
+	/// Permanently removes an account.
+	pub fn kill_account(&self, address: &Address, password: &Password) -> Result<(), Error> {
+		self.sstore.remove_account(&self.sstore.account_ref(&address)?, &password)?;
+		Ok(())
+	}
+
+	/// Changes the password of `account` from `password` to `new_password`. Fails if incorrect `password` given.
+	pub fn change_password(&self, address: &Address, password: Password, new_password: Password) -> Result<(), Error> {
+		self.sstore.change_password(&self.sstore.account_ref(address)?, &password, &new_password)
+	}
+
+	/// Exports an account for given address.
+	pub fn export_account(&self, address: &Address, password: Password) -> Result<KeyFile, Error> {
+		self.sstore.export_account(&self.sstore.account_ref(address)?, &password)
+	}
+
+	/// Helper method used for unlocking accounts.
+	fn unlock_account(&self, address: Address, password: Password, unlock: Unlock) -> Result<(), Error> {
+		let account = self.sstore.account_ref(&address)?;
+
+		// check if account is already unlocked permanently, if it is, do nothing
+		let mut unlocked = self.unlocked.write();
+		if let Some(data) = unlocked.get(&account) {
+			if let Unlock::Perm = data.unlock {
+				return Ok(())
+			}
+		}
+
+		if self.unlock_keep_secret && unlock == Unlock::Perm {
+			// verify password and get the secret
+			let secret = self.sstore.raw_secret(&account, &password)?;
+			self.unlocked_secrets.write().insert(account.clone(), secret);
+		} else {
+			// verify password by signing dump message
+			// result may be discarded
+			let _ = self.sstore.sign(&account, &password, &Default::default())?;
+		}
+
+		let data = AccountData { unlock, password };
+
+		unlocked.insert(account, data);
+		Ok(())
+	}
+
+	fn password(&self, account: &StoreAccountRef) -> Result<Password, SignError> {
+		let mut unlocked = self.unlocked.write();
+		let data = unlocked.get(account).ok_or(SignError::NotUnlocked)?.clone();
+		if let Unlock::OneTime = data.unlock {
+			unlocked.remove(account).expect("data exists: so key must exist: qed");
+		}
+		if let Unlock::Timed(ref end) = data.unlock {
+			if Instant::now() > *end {
+				unlocked.remove(account).expect("data exists: so key must exist: qed");
+				return Err(SignError::NotUnlocked);
+			}
+		}
+		Ok(data.password)
+	}
+
+	/// Unlocks account permanently.
+	pub fn unlock_account_permanently(&self, account: Address, password: Password) -> Result<(), Error> {
+		self.unlock_account(account, password, Unlock::Perm)
+	}
+
+	/// Unlocks account temporarily (for one signing).
+	pub fn unlock_account_temporarily(&self, account: Address, password: Password) -> Result<(), Error> {
+		self.unlock_account(account, password, Unlock::OneTime)
+	}
+
+	/// Unlocks account temporarily with a timeout.
+	pub fn unlock_account_timed(&self, account: Address, password: Password, duration: Duration) -> Result<(), Error> {
+		self.unlock_account(account, password, Unlock::Timed(Instant::now() + duration))
+	}
+
+	/// Checks if given account is unlocked
+	pub fn is_unlocked(&self, address: &Address) -> bool {
+		let unlocked = self.unlocked.read();
+		let unlocked_secrets = self.unlocked_secrets.read();
+		self.sstore.account_ref(address)
+			.map(|r| unlocked.get(&r).is_some() || unlocked_secrets.get(&r).is_some())
+			.unwrap_or(false)
+	}
+
+	/// Checks if given account is unlocked permanently
+	pub fn is_unlocked_permanently(&self, address: &Address) -> bool {
+		let unlocked = self.unlocked.read();
+		self.sstore.account_ref(address)
+			.map(|r| unlocked.get(&r).map_or(false, |account| account.unlock == Unlock::Perm))
+			.unwrap_or(false)
+	}
+
+	/// Signs the message. If password is not provided the account must be unlocked.
+	pub fn sign(&self, address: Address, password: Option<Password>, message: Message) -> Result<Signature, SignError> {
+		let account = self.sstore.account_ref(&address)?;
+		match self.unlocked_secrets.read().get(&account) {
+			Some(secret) => {
+				Ok(self.sstore.sign_with_secret(&secret, &message)?)
+			},
+			None => {
+				let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
+				Ok(self.sstore.sign(&account, &password, &message)?)
+			}
+		}
+	}
+
+	/// Signs message using the derived secret. If password is not provided the account must be unlocked.
+	pub fn sign_derived(&self, address: &Address, password: Option<Password>, derivation: Derivation, message: Message)
+		-> Result<Signature, SignError>
+	{
+		let account = self.sstore.account_ref(address)?;
+		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
+		Ok(self.sstore.sign_derived(&account, &password, derivation, &message)?)
+	}
+
+	/// Signs given message with supplied token. Returns a token to use in next signing within this session.
+	pub fn sign_with_token(&self, address: Address, token: AccountToken, message: Message) -> Result<(Signature, AccountToken), SignError> {
+		let account = self.sstore.account_ref(&address)?;
+		let is_std_password = self.sstore.test_password(&account, &token)?;
+
+		let new_token = Password::from(random_string(16));
+		let signature = if is_std_password {
+			// Insert to transient store
+			self.sstore.copy_account(&self.transient_sstore, SecretVaultRef::Root, &account, &token, &new_token)?;
+			// sign
+			self.sstore.sign(&account, &token, &message)?
+		} else {
+			// check transient store
+			self.transient_sstore.change_password(&account, &token, &new_token)?;
+			// and sign
+			self.transient_sstore.sign(&account, &new_token, &message)?
+		};
+
+		Ok((signature, new_token))
+	}
+
+	/// Decrypts a message with given token. Returns a token to use in next operation for this account.
+	pub fn decrypt_with_token(&self, address: Address, token: AccountToken, shared_mac: &[u8], message: &[u8])
+		-> Result<(Vec<u8>, AccountToken), SignError>
+	{
+		let account = self.sstore.account_ref(&address)?;
+		let is_std_password = self.sstore.test_password(&account, &token)?;
+
+		let new_token = Password::from(random_string(16));
+		let message = if is_std_password {
+			// Insert to transient store
+			self.sstore.copy_account(&self.transient_sstore, SecretVaultRef::Root, &account, &token, &new_token)?;
+			// decrypt
+			self.sstore.decrypt(&account, &token, shared_mac, message)?
+		} else {
+			// check transient store
+			self.transient_sstore.change_password(&account, &token, &new_token)?;
+			// and decrypt
+			self.transient_sstore.decrypt(&account, &token, shared_mac, message)?
+		};
+
+		Ok((message, new_token))
+	}
+
+	/// Decrypts a message. If password is not provided the account must be unlocked.
+	pub fn decrypt(&self, address: Address, password: Option<Password>, shared_mac: &[u8], message: &[u8]) -> Result<Vec<u8>, SignError> {
+		let account = self.sstore.account_ref(&address)?;
+		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
+		Ok(self.sstore.decrypt(&account, &password, shared_mac, message)?)
+	}
+
+	/// Agree on shared key.
+	pub fn agree(&self, address: Address, password: Option<Password>, other_public: &Public) -> Result<Secret, SignError> {
+		let account = self.sstore.account_ref(&address)?;
+		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
+		Ok(self.sstore.agree(&account, &password, other_public)?)
+	}
+
+	/// Returns the underlying `SecretStore` reference if one exists.
+	pub fn list_geth_accounts(&self, testnet: bool) -> Vec<Address> {
+		self.sstore.list_geth_accounts(testnet).into_iter().map(|a| Address::from(a).into()).collect()
+	}
+
+	/// Returns the underlying `SecretStore` reference if one exists.
+	pub fn import_geth_accounts(&self, desired: Vec<Address>, testnet: bool) -> Result<Vec<Address>, Error> {
+		self.sstore.import_geth_accounts(SecretVaultRef::Root, desired, testnet)
+			.map(|a| a.into_iter().map(|a| a.address).collect())
+			.map_err(Into::into)
+	}
+
+	/// Create new vault.
+	pub fn create_vault(&self, name: &str, password: &Password) -> Result<(), Error> {
+		self.sstore.create_vault(name, password)
+			.map_err(Into::into)
+	}
+
+	/// Open existing vault.
+	pub fn open_vault(&self, name: &str, password: &Password) -> Result<(), Error> {
+		self.sstore.open_vault(name, password)
+			.map_err(Into::into)
+	}
+
+	/// Close previously opened vault.
+	pub fn close_vault(&self, name: &str) -> Result<(), Error> {
+		self.sstore.close_vault(name)
+			.map_err(Into::into)
+	}
+
+	/// List all vaults
+	pub fn list_vaults(&self) -> Result<Vec<String>, Error> {
+		self.sstore.list_vaults()
+			.map_err(Into::into)
+	}
+
+	/// List all currently opened vaults
+	pub fn list_opened_vaults(&self) -> Result<Vec<String>, Error> {
+		self.sstore.list_opened_vaults()
+			.map_err(Into::into)
+	}
+
+	/// Change vault password.
+	pub fn change_vault_password(&self, name: &str, new_password: &Password) -> Result<(), Error> {
+		self.sstore.change_vault_password(name, new_password)
+			.map_err(Into::into)
+	}
+
+	/// Change vault of the given address.
+	pub fn change_vault(&self, address: Address, new_vault: &str) -> Result<(), Error> {
+		let new_vault_ref = if new_vault.is_empty() { SecretVaultRef::Root } else { SecretVaultRef::Vault(new_vault.to_owned()) };
+		let old_account_ref = self.sstore.account_ref(&address)?;
+		self.sstore.change_account_vault(new_vault_ref, old_account_ref)
+			.map_err(Into::into)
+			.map(|_| ())
+	}
+
+	/// Get vault metadata string.
+	pub fn get_vault_meta(&self, name: &str) -> Result<String, Error> {
+		self.sstore.get_vault_meta(name)
+			.map_err(Into::into)
+	}
+
+	/// Set vault metadata string.
+	pub fn set_vault_meta(&self, name: &str, meta: &str) -> Result<(), Error> {
+		self.sstore.set_vault_meta(name, meta)
+			.map_err(Into::into)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::{AccountProvider, Unlock};
+	use std::time::{Duration, Instant};
+	use ethkey::{Generator, Random, Address};
+	use ethstore::{StoreAccountRef, Derivation};
+	use ethereum_types::H256;
+
+	#[test]
+	fn unlock_account_temp() {
+		let kp = Random.generate().unwrap();
+		let ap = AccountProvider::transient_provider();
+		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).is_ok());
+		assert!(ap.unlock_account_temporarily(kp.address(), "test1".into()).is_err());
+		assert!(ap.unlock_account_temporarily(kp.address(), "test".into()).is_ok());
+		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
+		assert!(ap.sign(kp.address(), None, Default::default()).is_err());
+	}
+
+	#[test]
+	fn derived_account_nosave() {
+		let kp = Random.generate().unwrap();
+		let ap = AccountProvider::transient_provider();
+		assert!(ap.insert_account(kp.secret().clone(), &"base".into()).is_ok());
+		assert!(ap.unlock_account_permanently(kp.address(), "base".into()).is_ok());
+
+		let derived_addr = ap.derive_account(
+			&kp.address(),
+			None,
+			Derivation::SoftHash(H256::from_low_u64_be(999)),
+			false,
+		).expect("Derivation should not fail");
+
+		assert!(ap.unlock_account_permanently(derived_addr, "base".into()).is_err(),
+			"There should be an error because account is not supposed to be saved");
+	}
+
+	#[test]
+	fn derived_account_save() {
+		let kp = Random.generate().unwrap();
+		let ap = AccountProvider::transient_provider();
+		assert!(ap.insert_account(kp.secret().clone(), &"base".into()).is_ok());
+		assert!(ap.unlock_account_permanently(kp.address(), "base".into()).is_ok());
+
+		let derived_addr = ap.derive_account(
+			&kp.address(),
+			None,
+			Derivation::SoftHash(H256::from_low_u64_be(999)),
+			true,
+		).expect("Derivation should not fail");
+
+		assert!(ap.unlock_account_permanently(derived_addr, "base_wrong".into()).is_err(),
+			"There should be an error because password is invalid");
+
+		assert!(ap.unlock_account_permanently(derived_addr, "base".into()).is_ok(),
+			"Should be ok because account is saved and password is valid");
+	}
+
+	#[test]
+	fn derived_account_sign() {
+		let kp = Random.generate().unwrap();
+		let ap = AccountProvider::transient_provider();
+		assert!(ap.insert_account(kp.secret().clone(), &"base".into()).is_ok());
+		assert!(ap.unlock_account_permanently(kp.address(), "base".into()).is_ok());
+
+		let derived_addr = ap.derive_account(
+			&kp.address(),
+			None,
+			Derivation::SoftHash(H256::from_low_u64_be(1999)),
+			true,
+		).expect("Derivation should not fail");
+		ap.unlock_account_permanently(derived_addr, "base".into())
+			.expect("Should be ok because account is saved and password is valid");
+
+		let msg = Default::default();
+		let signed_msg1 = ap.sign(derived_addr, None, msg)
+			.expect("Signing with existing unlocked account should not fail");
+		let signed_msg2 = ap.sign_derived(
+			&kp.address(),
+			None,
+			Derivation::SoftHash(H256::from_low_u64_be(1999)),
+			msg,
+		).expect("Derived signing with existing unlocked account should not fail");
+
+		assert_eq!(signed_msg1, signed_msg2,
+			"Signed messages should match");
+	}
+
+	#[test]
+	fn unlock_account_perm() {
+		let kp = Random.generate().unwrap();
+		let ap = AccountProvider::transient_provider();
+		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).is_ok());
+		assert!(ap.unlock_account_permanently(kp.address(), "test1".into()).is_err());
+		assert!(ap.unlock_account_permanently(kp.address(), "test".into()).is_ok());
+		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
+		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
+		assert!(ap.unlock_account_temporarily(kp.address(), "test".into()).is_ok());
+		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
+		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
+	}
+
+	#[test]
+	fn unlock_account_timer() {
+		let kp = Random.generate().unwrap();
+		let ap = AccountProvider::transient_provider();
+		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).is_ok());
+		assert!(ap.unlock_account_timed(kp.address(), "test1".into(), Duration::from_secs(60)).is_err());
+		assert!(ap.unlock_account_timed(kp.address(), "test".into(), Duration::from_secs(60)).is_ok());
+		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
+		ap.unlocked.write().get_mut(&StoreAccountRef::root(kp.address())).unwrap().unlock = Unlock::Timed(Instant::now());
+		assert!(ap.sign(kp.address(), None, Default::default()).is_err());
+	}
+
+	#[test]
+	fn should_sign_and_return_token() {
+		// given
+		let kp = Random.generate().unwrap();
+		let ap = AccountProvider::transient_provider();
+		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).is_ok());
+
+		// when
+		let (_signature, token) = ap.sign_with_token(kp.address(), "test".into(), Default::default()).unwrap();
+
+		// then
+		ap.sign_with_token(kp.address(), token.clone(), Default::default())
+			.expect("First usage of token should be correct.");
+		assert!(ap.sign_with_token(kp.address(), token, Default::default()).is_err(), "Second usage of the same token should fail.");
+	}
+
+	#[test]
+	fn should_not_return_blacklisted_account() {
+		// given
+		let mut ap = AccountProvider::transient_provider();
+		let acc = ap.new_account(&"test".into()).unwrap();
+		ap.blacklisted_accounts = vec![acc];
+
+		// then
+		assert_eq!(ap.accounts_info().unwrap().keys().cloned().collect::<Vec<Address>>(), vec![]);
+		assert_eq!(ap.accounts().unwrap(), vec![]);
+	}
+}

accounts/src/stores.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/>.
+
+//! Address Book Store
+
+use std::{fs, fmt, hash, ops};
+use std::collections::HashMap;
+use std::path::{Path, PathBuf};
+
+use ethkey::Address;
+use log::{trace, warn};
+
+use crate::AccountMeta;
+
+/// Disk-backed map from Address to String. Uses JSON.
+pub struct AddressBook {
+	cache: DiskMap<Address, AccountMeta>,
+}
+
+impl AddressBook {
+	/// Creates new address book at given directory.
+	pub fn new(path: &Path) -> Self {
+		let mut r = AddressBook {
+			cache: DiskMap::new(path, "address_book.json")
+		};
+		r.cache.revert(AccountMeta::read);
+		r
+	}
+
+	/// Creates transient address book (no changes are saved to disk).
+	pub fn transient() -> Self {
+		AddressBook {
+			cache: DiskMap::transient()
+		}
+	}
+
+	/// Get the address book.
+	pub fn get(&self) -> HashMap<Address, AccountMeta> {
+		self.cache.clone()
+	}
+
+	fn save(&self) {
+		self.cache.save(AccountMeta::write)
+	}
+
+	/// Sets new name for given address.
+	pub fn set_name(&mut self, a: Address, name: String) {
+		{
+			let x = self.cache.entry(a)
+				.or_insert_with(|| AccountMeta {name: Default::default(), meta: "{}".to_owned(), uuid: None});
+			x.name = name;
+		}
+		self.save();
+	}
+
+	/// Sets new meta for given address.
+	pub fn set_meta(&mut self, a: Address, meta: String) {
+		{
+			let x = self.cache.entry(a)
+				.or_insert_with(|| AccountMeta {name: "Anonymous".to_owned(), meta: Default::default(), uuid: None});
+			x.meta = meta;
+		}
+		self.save();
+	}
+
+	/// Removes an entry
+	pub fn remove(&mut self, a: Address) {
+		self.cache.remove(&a);
+		self.save();
+	}
+}
+
+/// Disk-serializable HashMap
+#[derive(Debug)]
+struct DiskMap<K: hash::Hash + Eq, V> {
+	path: PathBuf,
+	cache: HashMap<K, V>,
+	transient: bool,
+}
+
+impl<K: hash::Hash + Eq, V> ops::Deref for DiskMap<K, V> {
+	type Target = HashMap<K, V>;
+	fn deref(&self) -> &Self::Target {
+		&self.cache
+	}
+}
+
+impl<K: hash::Hash + Eq, V> ops::DerefMut for DiskMap<K, V> {
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		&mut self.cache
+	}
+}
+
+impl<K: hash::Hash + Eq, V> DiskMap<K, V> {
+	pub fn new(path: &Path, file_name: &str) -> Self {
+		let mut path = path.to_owned();
+		path.push(file_name);
+		trace!(target: "diskmap", "path={:?}", path);
+		DiskMap {
+			path: path,
+			cache: HashMap::new(),
+			transient: false,
+		}
+	}
+
+	pub fn transient() -> Self {
+		let mut map = DiskMap::new(&PathBuf::new(), "diskmap.json".into());
+		map.transient = true;
+		map
+	}
+
+	fn revert<F, E>(&mut self, read: F) where
+		F: Fn(fs::File) -> Result<HashMap<K, V>, E>,
+		E: fmt::Display,
+	{
+		if self.transient { return; }
+		trace!(target: "diskmap", "revert {:?}", self.path);
+		let _ = fs::File::open(self.path.clone())
+			.map_err(|e| trace!(target: "diskmap", "Couldn't open disk map: {}", e))
+			.and_then(|f| read(f).map_err(|e| warn!(target: "diskmap", "Couldn't read disk map: {}", e)))
+			.and_then(|m| {
+				self.cache = m;
+				Ok(())
+			});
+	}
+
+	fn save<F, E>(&self, write: F) where
+		F: Fn(&HashMap<K, V>, &mut fs::File) -> Result<(), E>,
+		E: fmt::Display,
+	{
+		if self.transient { return; }
+		trace!(target: "diskmap", "save {:?}", self.path);
+		let _ = fs::File::create(self.path.clone())
+			.map_err(|e| warn!(target: "diskmap", "Couldn't open disk map for writing: {}", e))
+			.and_then(|mut f| {
+				write(&self.cache, &mut f).map_err(|e| warn!(target: "diskmap", "Couldn't write to disk map: {}", e))
+			});
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::{AddressBook, Address};
+	use std::collections::HashMap;
+	use tempdir::TempDir;
+	use crate::account_data::AccountMeta;
+
+	#[test]
+	fn should_save_and_reload_address_book() {
+		let tempdir = TempDir::new("").unwrap();
+		let mut b = AddressBook::new(tempdir.path());
+		b.set_name(Address::from_low_u64_be(1), "One".to_owned());
+		b.set_meta(Address::from_low_u64_be(1), "{1:1}".to_owned());
+		let b = AddressBook::new(tempdir.path());
+		assert_eq!(b.get(), vec![
+		   (Address::from_low_u64_be(1), AccountMeta {name: "One".to_owned(), meta: "{1:1}".to_owned(), uuid: None})
+		].into_iter().collect::<HashMap<_, _>>());
+	}
+
+	#[test]
+	fn should_remove_address() {
+		let tempdir = TempDir::new("").unwrap();
+		let mut b = AddressBook::new(tempdir.path());
+
+		b.set_name(Address::from_low_u64_be(1), "One".to_owned());
+		b.set_name(Address::from_low_u64_be(2), "Two".to_owned());
+		b.set_name(Address::from_low_u64_be(3), "Three".to_owned());
+		b.remove(Address::from_low_u64_be(2).into());
+
+		let b = AddressBook::new(tempdir.path());
+		assert_eq!(b.get(), vec![
+			(Address::from_low_u64_be(1), AccountMeta{name: "One".to_owned(), meta: "{}".to_owned(), uuid: None}),
+			(Address::from_low_u64_be(3), AccountMeta{name: "Three".to_owned(), meta: "{}".to_owned(), uuid: None}),
+		].into_iter().collect::<HashMap<_, _>>());
+	}
+}

bin/chainspec/src/main.rs

@@ -1,51 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of OpenEthereum.
-
-// OpenEthereum 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.
-
-// OpenEthereum 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 OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate ethjson;
-extern crate serde_json;
-
-use ethjson::spec::Spec;
-use std::{env, fs, process};
-
-fn quit(s: &str) -> ! {
-    println!("{}", s);
-    process::exit(1);
-}
-
-fn main() {
-    let mut args = env::args();
-    if args.len() != 2 {
-        quit(
-            "You need to specify chainspec.json\n\
-		\n\
-		./chainspec <chainspec.json>",
-        );
-    }
-
-    let path = args.nth(1).expect("args.len() == 2; qed");
-    let file = match fs::File::open(&path) {
-        Ok(file) => file,
-        Err(_) => quit(&format!("{} could not be opened", path)),
-    };
-
-    let spec: Result<Spec, _> = serde_json::from_reader(file);
-
-    if let Err(err) = spec {
-        quit(&format!("{} {}", path, err.to_string()));
-    }
-
-    println!("{} is valid", path);
-}

bin/ethkey/src/main.rs

@@ -1,493 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of OpenEthereum.
-
-// OpenEthereum 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.
-
-// OpenEthereum 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 OpenEthereum.  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_crypto as crypto;
-extern crate parity_wordlist;
-extern crate rustc_hex;
-extern crate serde;
-extern crate threadpool;
-
-#[macro_use]
-extern crate serde_derive;
-
-use std::{env, fmt, io, num::ParseIntError, process, sync};
-
-use crypto::publickey::{
-    sign, verify_address, verify_public, Error as EthkeyError, Generator, KeyPair, Random,
-};
-use docopt::Docopt;
-use ethkey::{brain_recover, Brain, BrainPrefix, Prefix};
-use rustc_hex::{FromHex, FromHexError};
-
-const USAGE: &'static str = r#"
-Parity Ethereum keys generator.
-  Copyright 2015-2019 Parity Technologies (UK) Ltd.
-
-Usage:
-    ethkey info <secret-or-phrase> [options]
-    ethkey generate random [options]
-    ethkey generate prefix <prefix> [options]
-    ethkey sign <secret> <message>
-    ethkey verify public <public> <signature> <message>
-    ethkey verify address <address> <signature> <message>
-    ethkey recover <address> <known-phrase>
-    ethkey [-h | --help]
-
-Options:
-    -h, --help         Display this message and exit.
-    -s, --secret       Display only the secret key.
-    -p, --public       Display only the public key.
-    -a, --address      Display only the address.
-    -b, --brain        Use parity brain wallet algorithm. Not recommended.
-
-Commands:
-    info               Display public key and address of the secret.
-    generate random    Generates new random Ethereum key.
-    generate prefix    Random generation, but address must start with a prefix ("vanity address").
-    sign               Sign message using a secret key.
-    verify             Verify signer of the signature by public key or address.
-    recover            Try to find brain phrase matching given address from partial phrase.
-"#;
-
-#[derive(Debug, Deserialize)]
-struct Args {
-    cmd_info: bool,
-    cmd_generate: bool,
-    cmd_random: bool,
-    cmd_prefix: bool,
-    cmd_sign: bool,
-    cmd_verify: bool,
-    cmd_public: bool,
-    cmd_address: bool,
-    cmd_recover: bool,
-    arg_prefix: String,
-    arg_secret: String,
-    arg_secret_or_phrase: String,
-    arg_known_phrase: String,
-    arg_message: String,
-    arg_public: String,
-    arg_address: String,
-    arg_signature: String,
-    flag_secret: bool,
-    flag_public: bool,
-    flag_address: bool,
-    flag_brain: bool,
-}
-
-#[derive(Debug)]
-enum Error {
-    Ethkey(EthkeyError),
-    FromHex(FromHexError),
-    ParseInt(ParseIntError),
-    Docopt(docopt::Error),
-    Io(io::Error),
-}
-
-impl From<EthkeyError> for Error {
-    fn from(err: EthkeyError) -> Self {
-        Error::Ethkey(err)
-    }
-}
-
-impl From<FromHexError> for Error {
-    fn from(err: FromHexError) -> Self {
-        Error::FromHex(err)
-    }
-}
-
-impl From<ParseIntError> for Error {
-    fn from(err: ParseIntError) -> Self {
-        Error::ParseInt(err)
-    }
-}
-
-impl From<docopt::Error> for Error {
-    fn from(err: docopt::Error) -> Self {
-        Error::Docopt(err)
-    }
-}
-
-impl From<io::Error> for Error {
-    fn from(err: io::Error) -> Self {
-        Error::Io(err)
-    }
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-        match *self {
-            Error::Ethkey(ref e) => write!(f, "{}", e),
-            Error::FromHex(ref e) => write!(f, "{}", e),
-            Error::ParseInt(ref e) => write!(f, "{}", e),
-            Error::Docopt(ref e) => write!(f, "{}", e),
-            Error::Io(ref e) => write!(f, "{}", e),
-        }
-    }
-}
-
-enum DisplayMode {
-    KeyPair,
-    Secret,
-    Public,
-    Address,
-}
-
-impl DisplayMode {
-    fn new(args: &Args) -> Self {
-        if args.flag_secret {
-            DisplayMode::Secret
-        } else if args.flag_public {
-            DisplayMode::Public
-        } else if args.flag_address {
-            DisplayMode::Address
-        } else {
-            DisplayMode::KeyPair
-        }
-    }
-}
-
-fn main() {
-    panic_hook::set_abort();
-    env_logger::try_init().expect("Logger initialized only once.");
-
-    match execute(env::args()) {
-        Ok(ok) => println!("{}", ok),
-        Err(Error::Docopt(ref e)) => e.exit(),
-        Err(err) => {
-            eprintln!("{}", err);
-            process::exit(1);
-        }
-    }
-}
-
-fn display(result: (KeyPair, Option<String>), mode: DisplayMode) -> String {
-    let keypair = result.0;
-    match mode {
-        DisplayMode::KeyPair => match result.1 {
-            Some(extra_data) => format!("{}\n{}", extra_data, keypair),
-            None => format!("{}", keypair),
-        },
-        DisplayMode::Secret => format!("{:x}", keypair.secret()),
-        DisplayMode::Public => format!("{:x}", keypair.public()),
-        DisplayMode::Address => format!("{:x}", keypair.address()),
-    }
-}
-
-fn execute<S, I>(command: I) -> Result<String, Error>
-where
-    I: IntoIterator<Item = S>,
-    S: AsRef<str>,
-{
-    let args: Args = Docopt::new(USAGE).and_then(|d| d.argv(command).deserialize())?;
-
-    return if args.cmd_info {
-        let display_mode = DisplayMode::new(&args);
-
-        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();
-            (keypair, Some(phrase_info))
-        } else {
-            let secret = args
-                .arg_secret_or_phrase
-                .parse()
-                .map_err(|_| EthkeyError::InvalidSecretKey)?;
-            (KeyPair::from_secret(secret)?, None)
-        };
-        Ok(display(result, display_mode))
-    } else if args.cmd_generate {
-        let display_mode = DisplayMode::new(&args);
-        let result = if args.cmd_random {
-            if args.flag_brain {
-                let mut brain = BrainPrefix::new(vec![0], usize::max_value(), BRAIN_WORDS);
-                let keypair = brain.generate()?;
-                let phrase = format!("recovery phrase: {}", brain.phrase());
-                (keypair, Some(phrase))
-            } else {
-                (Random.generate(), None)
-            }
-        } else if args.cmd_prefix {
-            let prefix = args.arg_prefix.from_hex()?;
-            let brain = args.flag_brain;
-            in_threads(move || {
-                let iterations = 1024;
-                let prefix = prefix.clone();
-                move || {
-                    let prefix = prefix.clone();
-                    let res = if brain {
-                        let mut brain = BrainPrefix::new(prefix, iterations, BRAIN_WORDS);
-                        let result = brain.generate();
-                        let phrase = format!("recovery phrase: {}", brain.phrase());
-                        result.map(|keypair| (keypair, Some(phrase)))
-                    } else {
-                        let result = Prefix::new(prefix, iterations).generate();
-                        result.map(|res| (res, None))
-                    };
-
-                    Ok(res.map(Some).unwrap_or(None))
-                }
-            })?
-        } else {
-            return Ok(format!("{}", USAGE));
-        };
-        Ok(display(result, display_mode))
-    } else if args.cmd_sign {
-        let secret = args
-            .arg_secret
-            .parse()
-            .map_err(|_| EthkeyError::InvalidSecretKey)?;
-        let message = args
-            .arg_message
-            .parse()
-            .map_err(|_| EthkeyError::InvalidMessage)?;
-        let signature = sign(&secret, &message)?;
-        Ok(format!("{}", signature))
-    } else if args.cmd_verify {
-        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)?;
-            verify_public(&public, &signature, &message)?
-        } else if args.cmd_address {
-            let address = args
-                .arg_address
-                .parse()
-                .map_err(|_| EthkeyError::InvalidAddress)?;
-            verify_address(&address, &signature, &message)?
-        } else {
-            return Ok(format!("{}", USAGE));
-        };
-        Ok(format!("{}", ok))
-    } else if args.cmd_recover {
-        let display_mode = DisplayMode::new(&args);
-        let known_phrase = args.arg_known_phrase;
-        let address = args
-            .arg_address
-            .parse()
-            .map_err(|_| EthkeyError::InvalidAddress)?;
-        let (phrase, keypair) = in_threads(move || {
-            let mut it =
-                brain_recover::PhrasesIterator::from_known_phrase(&known_phrase, BRAIN_WORDS);
-            move || {
-                let mut i = 0;
-                while let Some(phrase) = it.next() {
-                    i += 1;
-
-                    let keypair = Brain::new(phrase.clone()).generate();
-                    if keypair.address() == address {
-                        return Ok(Some((phrase, keypair)));
-                    }
-
-                    if i >= 1024 {
-                        return Ok(None);
-                    }
-                }
-
-                Err(EthkeyError::Custom("Couldn't find any results.".into()))
-            }
-        })?;
-        Ok(display((keypair, Some(phrase)), display_mode))
-    } else {
-        Ok(format!("{}", USAGE))
-    };
-}
-
-const BRAIN_WORDS: usize = 12;
-
-fn validate_phrase(phrase: &str) -> String {
-    match Brain::validate_phrase(phrase, BRAIN_WORDS) {
-        Ok(()) => format!("The recovery phrase looks correct.\n"),
-        Err(err) => format!("The recover phrase was not generated by Parity: {}", err),
-    }
-}
-
-fn in_threads<F, X, O>(prepare: F) -> Result<O, EthkeyError>
-where
-    O: Send + 'static,
-    X: Send + 'static,
-    F: Fn() -> X,
-    X: FnMut() -> Result<Option<O>, EthkeyError>,
-{
-    let pool = threadpool::Builder::new().build();
-
-    let (tx, rx) = sync::mpsc::sync_channel(1);
-    let is_done = sync::Arc::new(sync::atomic::AtomicBool::default());
-
-    for _ in 0..pool.max_count() {
-        let is_done = is_done.clone();
-        let tx = tx.clone();
-        let mut task = prepare();
-        pool.execute(move || {
-            loop {
-                if is_done.load(sync::atomic::Ordering::SeqCst) {
-                    return;
-                }
-
-                let res = match task() {
-                    Ok(None) => continue,
-                    Ok(Some(v)) => Ok(v),
-                    Err(err) => Err(err),
-                };
-
-                // We are interested only in the first response.
-                let _ = tx.send(res);
-            }
-        });
-    }
-
-    if let Ok(solution) = rx.recv() {
-        is_done.store(true, sync::atomic::Ordering::SeqCst);
-        return solution;
-    }
-
-    Err(EthkeyError::Custom("No results found.".into()))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::execute;
-
-    #[test]
-    fn info() {
-        let command = vec![
-            "ethkey",
-            "info",
-            "17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55",
-        ]
-        .into_iter()
-        .map(Into::into)
-        .collect::<Vec<String>>();
-
-        let expected =
-"secret:  17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55
-public:  689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124
-address: 26d1ec50b4e62c1d1a40d16e7cacc6a6580757d5".to_owned();
-        assert_eq!(execute(command).unwrap(), expected);
-    }
-
-    #[test]
-    fn brain() {
-        let command = vec!["ethkey", "info", "--brain", "this is sparta"]
-            .into_iter()
-            .map(Into::into)
-            .collect::<Vec<String>>();
-
-        let expected =
-"The recover phrase was not generated by Parity: The word 'this' does not come from the dictionary.
-
-secret:  aa22b54c0cb43ee30a014afe5ef3664b1cde299feabca46cd3167a85a57c39f2
-public:  c4c5398da6843632c123f543d714d2d2277716c11ff612b2a2f23c6bda4d6f0327c31cd58c55a9572c3cc141dade0c32747a13b7ef34c241b26c84adbb28fcf4
-address: 006e27b6a72e1f34c626762f3c4761547aff1421".to_owned();
-        assert_eq!(execute(command).unwrap(), expected);
-    }
-
-    #[test]
-    fn secret() {
-        let command = vec!["ethkey", "info", "--brain", "this is sparta", "--secret"]
-            .into_iter()
-            .map(Into::into)
-            .collect::<Vec<String>>();
-
-        let expected =
-            "aa22b54c0cb43ee30a014afe5ef3664b1cde299feabca46cd3167a85a57c39f2".to_owned();
-        assert_eq!(execute(command).unwrap(), expected);
-    }
-
-    #[test]
-    fn public() {
-        let command = vec!["ethkey", "info", "--brain", "this is sparta", "--public"]
-            .into_iter()
-            .map(Into::into)
-            .collect::<Vec<String>>();
-
-        let expected = "c4c5398da6843632c123f543d714d2d2277716c11ff612b2a2f23c6bda4d6f0327c31cd58c55a9572c3cc141dade0c32747a13b7ef34c241b26c84adbb28fcf4".to_owned();
-        assert_eq!(execute(command).unwrap(), expected);
-    }
-
-    #[test]
-    fn address() {
-        let command = vec!["ethkey", "info", "-b", "this is sparta", "--address"]
-            .into_iter()
-            .map(Into::into)
-            .collect::<Vec<String>>();
-
-        let expected = "006e27b6a72e1f34c626762f3c4761547aff1421".to_owned();
-        assert_eq!(execute(command).unwrap(), expected);
-    }
-
-    #[test]
-    fn sign() {
-        let command = vec![
-            "ethkey",
-            "sign",
-            "17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55",
-            "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987",
-        ]
-        .into_iter()
-        .map(Into::into)
-        .collect::<Vec<String>>();
-
-        let expected = "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200".to_owned();
-        assert_eq!(execute(command).unwrap(), expected);
-    }
-
-    #[test]
-    fn verify_valid_public() {
-        let command = vec!["ethkey", "verify", "public", "689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124", "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-        let expected = "true".to_owned();
-        assert_eq!(execute(command).unwrap(), expected);
-    }
-
-    #[test]
-    fn verify_valid_address() {
-        let command = vec!["ethkey", "verify", "address", "26d1ec50b4e62c1d1a40d16e7cacc6a6580757d5", "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-        let expected = "true".to_owned();
-        assert_eq!(execute(command).unwrap(), expected);
-    }
-
-    #[test]
-    fn verify_invalid() {
-        let command = vec!["ethkey", "verify", "public", "689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124", "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec986"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-        let expected = "false".to_owned();
-        assert_eq!(execute(command).unwrap(), expected);
-    }
-}