Backports beta (#7780)

* Bump beta to 1.9.2

* Update ropsten.json (#7776)

.cargo/config

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

.dockerignore

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

.editorconfig

@@ -9,7 +9,7 @@ trim_trailing_whitespace=true
 max_line_length=120
 insert_final_newline=true
 
-[*.{yml,sh}]
+[.travis.yml]
 indent_style=space
 indent_size=2
 tab_width=8

.github/CODE_OF_CONDUCT.md

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

.github/CONTRIBUTING.md

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

.github/ISSUE_TEMPLATE.md

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

.github/PULL_REQUEST_TEMPLATE.md

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

.github/workflows/audit.yml

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

.github/workflows/build-test.yml

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

.github/workflows/build.yml

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

.github/workflows/check.yml

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

.github/workflows/deploy-docker.yml

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

.gitignore

@@ -38,8 +38,7 @@ node_modules
 
 # Build artifacts
 out/
-parity-clib-examples/cpp/build/
 
 .vscode
-rls/
-/openethereum.*
+
+/parity.*

.gitlab-ci.yml

@@ -0,0 +1,269 @@
+stages:
+  - test
+  - js-build
+  - push-release
+  - build
+variables:
+  RUST_BACKTRACE: "1"
+  RUSTFLAGS: ""
+  CARGOFLAGS: ""
+  CI_SERVER_NAME: "GitLab CI"
+  LIBSSL: "libssl1.0.0 (>=1.0.0)"
+cache:
+  key: "$CI_BUILD_STAGE-$CI_BUILD_REF_NAME"
+  paths:
+    - target
+  untracked: true
+linux-stable:
+  stage: build
+  image: parity/rust:gitlab-ci
+  only:
+    - stable
+    - beta
+    - tags
+    - triggers
+  script:
+    - rustup default stable
+    # ARGUMENTS: 1. BUILD_PLATFORM (target for binaries) 2. PLATFORM (target for cargo) 3. ARC (architecture) 4. & 5. CC & CXX flags
+    - scripts/gitlab-build.sh x86_64-unknown-linux-gnu x86_64-unknown-linux-gnu amd64 gcc g++
+  tags:
+    - rust-stable
+  artifacts:
+    paths:
+    - parity.zip
+    name: "stable-x86_64-unknown-linux-gnu_parity"
+linux-stable-debian:
+  stage: build
+  image: parity/rust-debian:gitlab-ci
+  only:
+    - stable
+    - beta
+    - tags
+    - triggers
+  script:
+    - export LIBSSL="libssl1.1 (>=1.1.0)"
+    - scripts/gitlab-build.sh x86_64-unknown-debian-gnu x86_64-unknown-linux-gnu amd64 gcc g++
+  tags:
+    - rust-debian
+  artifacts:
+    paths:
+    - parity.zip
+    name: "stable-x86_64-unknown-debian-gnu_parity"
+linux-centos:
+  stage: build
+  image: parity/rust-centos:gitlab-ci
+  only:
+    - stable
+    - beta
+    - tags
+    - triggers
+  script:
+    - scripts/gitlab-build.sh x86_64-unknown-centos-gnu x86_64-unknown-linux-gnu x86_64 gcc g++
+  tags:
+    - rust-centos
+  artifacts:
+    paths:
+    - parity.zip
+    name: "x86_64-unknown-centos-gnu_parity"
+linux-i686:
+  stage: build
+  image: parity/rust-i686:gitlab-ci
+  only:
+    - stable
+    - beta
+    - tags
+    - triggers
+  script:
+    - scripts/gitlab-build.sh i686-unknown-linux-gnu i686-unknown-linux-gnu i386 gcc g++
+  tags:
+    - rust-i686
+  artifacts:
+    paths:
+      - parity.zip
+    name: "i686-unknown-linux-gnu"
+linux-armv7:
+  stage: build
+  image: parity/rust-armv7:gitlab-ci
+  only:
+    - stable
+    - beta
+    - tags
+    - triggers
+  script:
+    - scripts/gitlab-build.sh armv7-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++
+  tags:
+    - rust-arm
+  artifacts:
+    paths:
+    - parity.zip
+    name: "armv7_unknown_linux_gnueabihf_parity"
+linux-arm:
+  stage: build
+  image: parity/rust-arm:gitlab-ci
+  only:
+    - stable
+    - beta
+    - tags
+    - triggers
+  script:
+    - scripts/gitlab-build.sh arm-unknown-linux-gnueabihf arm-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++
+  tags:
+    - rust-arm
+  artifacts:
+    paths:
+    - parity.zip
+    name: "arm-unknown-linux-gnueabihf_parity"
+linux-aarch64:
+  stage: build
+  image: parity/rust-arm64:gitlab-ci
+  only:
+    - stable
+    - beta
+    - tags
+    - triggers
+  script:
+    - scripts/gitlab-build.sh aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu arm64 aarch64-linux-gnu-gcc aarch64-linux-gnu-g++
+  tags:
+    - rust-arm
+  artifacts:
+    paths:
+    - parity.zip
+    name: "aarch64-unknown-linux-gnu_parity"
+linux-snap:
+  stage: build
+  image: parity/snapcraft:gitlab-ci
+  only:
+    - stable
+    - beta
+    - tags
+    - triggers
+  script:
+    - scripts/gitlab-build.sh x86_64-unknown-snap-gnu x86_64-unknown-linux-gnu amd64 gcc g++
+  tags:
+    - rust-stable
+  artifacts:
+    paths:
+    - snap/parity.zip
+    name: "stable-x86_64-unknown-snap-gnu_parity"
+  allow_failure: true
+darwin:
+  stage: build
+  only:
+    - stable
+    - beta
+    - tags
+    - triggers
+  script:
+    - scripts/gitlab-build.sh x86_64-apple-darwin x86_64-apple-darwin macos gcc g++
+  tags:
+    - osx
+  artifacts:
+    paths:
+    - parity.zip
+    name: "x86_64-apple-darwin_parity"
+windows:
+  cache:
+    key: "%CI_BUILD_STAGE%-%CI_BUILD_REF_NAME%"
+    untracked: true
+  stage: build
+  only:
+    - stable
+    - beta
+    - tags
+    - triggers
+  script:
+    - sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc installer "" "" ""
+  tags:
+   - rust-windows
+  artifacts:
+    paths:
+    - parity.zip
+    name: "x86_64-pc-windows-msvc_parity"
+docker-build:
+  stage: build
+  only:
+    - stable
+    - beta
+    - tags
+    - triggers
+  before_script:
+    - docker info
+  script:
+    - DOCKER_TAG=$CI_BUILD_REF_NAME
+    - echo "Tag:" $DOCKER_TAG
+    - docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
+    - scripts/docker-build.sh $DOCKER_TAG
+    - docker logout
+  tags:
+    - docker
+test-coverage:
+  stage: test
+  only:
+    - master
+  script:
+    - scripts/gitlab-test.sh test-coverage
+  tags:
+    - kcov
+  allow_failure: true
+test-rust-stable:
+  stage: test
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-test.sh stable
+  tags:
+    - rust-stable
+test-rust-beta:
+  stage: test
+  only:
+    - triggers
+    - master
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-test.sh beta
+  tags:
+    - rust-beta
+  allow_failure: true
+test-rust-nightly:
+  stage: test
+  only:
+    - triggers
+    - master
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-test.sh nightly
+  tags:
+    - rust
+    - rust-nightly
+  allow_failure: true
+js-test:
+  stage: test
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-test.sh js-test
+  tags:
+    - rust-stable
+js-release:
+  stage: js-build
+  only:
+    - master
+    - stable
+    - beta
+    - tags
+    - triggers
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-test.sh js-release
+  tags:
+    - javascript
+push-release:
+  stage: push-release
+  only:
+    - tags
+    - triggers
+  image: parity/rust:gitlab-ci
+  script:
+    - rustup default stable
+    - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1337/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
+    - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1338/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
+  tags:
+    - curl

.gitmodules

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

CHANGELOG.md

@@ -1,119 +1,371 @@
-## OpenEthereum [v3.0.0](https://github.com/openethereum/openethereum/releases/tag/v3.0.0)
+## Parity [v1.8.5](https://github.com/paritytech/parity/releases/tag/v1.8.5) (2017-12-29)
 
-OpenEthereum v3.0.0 is the first release of OpenEthereum client as part of OpenEthereum project, divested from Parity Technologies.
+Parity 1.8.5 changes the default behavior of JSON-RPC CORS setting, detects same-key engine signers in Aura networks, and updates bootnodes for the Kovan and Foundation networks.
 
-This release marks the transition from Parity Technologies infrastructure and bootnodes to the one managed by OpenEthereum project.
-
-Parity-Ethereum v2.7 users can continue using their existing data folders. Command-line interface has also stayed identical.
-Unless specified otherwise, OpenEthereum v3.0.0 will detect if the user's database in the old Parity-Ethereum default path,
-and only if it's not found will write to the new default location.
-
-This release includes several major improvements to network and database stack:
-- Support for `eth/64` protocol and Node Discovery v4 `Ethereum Node Records` extension.
-- Accounts bloom is removed which should decrease the database size.
-
-**Due to database changes this is a one-way upgrade. Please back up your database if you plan to continue using Parity-Ethereum v2.7.2.**
-
-Note that this release drops support for IPFS and `eth/62` protocol. Additionally, it marks light client, private transactions and updater as deprecated features which may be removed in a future release.
+Note: The default value of `--jsonrpc-cors` option has been altered to disallow (potentially malicious) websites from accessing the low-sensitivity RPCs (viewing exposed accounts, proposing transactions for signing). Currently domains need to be whitelisted manually. To bring back previous behaviour run with `--jsonrpc-cors all` or `--jsonrpc-cors http://example.com`.
 
 The full list of included changes:
-- Add deprecation warnings (#11682)
-- Add Curl to Docker image (#11687)
-- v3 release version strings and track stable (#11680)
-- Fix sccache server errors (#11675)
-- Don't delete old db after migration (#11662)
-- rename inject to drain_transaction_overlay (#11657)
-- Drain the transaction overlay (#11654)
-- vergen library seems to depend not only on the .git folder content but also on the git binary (#11651)
-- New default paths (#11641)
-- Update EWF's chains with Istanbul transition block numbers (#11482)
-- add openethereum supplementary bootnodes, those are not active right now, but will be in case the network needs more power (#11650)
-- Remove Parity bootnodes (#11644)
-- Remove accounts bloom (#11589)
-- Deploy docker images on master (#11640)
-- Fix some compiler warnings (#11632)
-- Add support for non-fork side of Phoenix (#11627)
-- validate mainnet specs against all forks (#11625)
-- Fix ecrecover builtin (#11623)
-- Update .gitmodules (#11628)
-- ethcore/res: activate ecip-1088 phoenix on classic (#11598)
-- Upgrade parity-common deps to latest (#11620)
-- Fix Goerli syncing (#11604)
-- deps: switch to upstream ctrlc (#11617)
-- Deduplicating crate dependencies (part 3 of n) (#11614)
-- Deduplicating crate dependencies (part 2 of n, `slab`) (#11613)
-- Actually save ENR on creation and modification (#11602)
-- Activate POSDAO on xDai chain and update bootnodes (#11610)
-- Activate on-chain randomness in POA Core (#11609)
-- Deduplicating crate dependencies (part 1 of n) (#11606)
-- Update enodes for POA Sokol (#11611)
-- Remove .git folder from dogerignore file so vergen library can get build date and commit hash in the binary generatio vergen library can get build date and commit hash in the binary generation (#11608)
-- Reduced gas cost for static calls made to precompiles EIP2046/1352 (#11583)
-- `ethcore-bloom-journal` was renamed to `accounts-bloom` (#11605)
-- Use serde_json to export hardcoded sync (#11601)
-- Node Discovery v4 ENR Extension (EIP-868) (#11540)
-- Fix compile warnings (#11595)
-- Update version to 3.0.0-alpha.1 (#11592)
-- ethcore/res: bump canon fork hash for mordor and kotti testnets (#11584)
-- Update on push tags (#11590)
-- Replace deprecated tempdir dependency with tempfile (#11588)
-- Fix project name, links, rename the binaries (#11580)
-- Update Cargo.lock (#11573)
-- ci: workaround for the cache bug on Linux (#11568)
-- Increase the default pruning parameters (#11558)
-- Add Docker build and push to github actions (#11555)
-- Update README (#11578)
-- informant: display I/O stats (#11523)
-- [devp2p discovery]: remove `deprecated_echo_hash` (#11564)
-- [secretstore] create db_version file when database doesn't exist (#11570)
-- Remove Parity's Security Policy (#11565)
-- ethcore/res: enable ecip-1088 phoenix upgrade for kotti and mordor testnets (#11529)
-- Misc docs and renames …and one less clone (#11556)
-- [secretstore]: don't sign message with only zeroes (#11561)
-- [devp2p discovery]: cleanup (#11547)
-- Code cleanup in the sync module (#11552)
-- initial cleanup (#11542)
-- Warn if genesis constructor revert (#11550)
-- ethcore: cleanup after #11531 (#11546)
-- license update (#11543)
-- Less cloning when importing blocks (#11531)
-- Github Actions (#11528)
-- Fix Alpine Dockerfile (#11538)
-- Remove AuxiliaryData/AuxiliaryRequest (#11533)
-- [journaldb]: cleanup (#11534)
-- Remove references to parity-ethereum (#11525)
-- Drop IPFS support (#11532)
-- chain-supplier: fix warning reporting for GetNodeData request (#11530)
-- Faster kill_garbage (#11514)
-- [EngineSigner]: don't sign message with only zeroes (#11524)
-- fix compilation warnings (#11522)
-- [ethcore cleanup]: various unrelated fixes from `#11493` (#11507)
-- Add benchmark for transaction execution (#11509)
-- Add Smart Contract License v1.0
-- Misc fixes (#11510)
-- [dependencies]: unify `rustc-hex` (#11506)
-- Activate on-chain randomness in POA Sokol (#11505)
-- Grab bag of cleanup (#11504)
-- Implement eth/64 (EIP-2364) and drop support for eth/62 (#11472)
-- [dependencies]: remove `util/macros` (#11501)
-- OpenEthereum bootnodes are added (#11499)
-- [ci benches]: use `all-features` (#11496)
-- [verification]: make test-build compile standalone (#11495)
-- complete null-signatures removal (#11491)
-- Include the seal when populating the header for a new block (#11475)
-- fix compilation warnings (#11492)
-- cargo update -p cmake (#11490)
-- update to published rlp-derive (#11489)
-- Switch usage of Secret Store to the external lib (#11487)
-- Switch from the internal runtime lib to external one from crates.io (#11480)
-- Update params.rs (#11474)
-- weak_counts has been stabilized (#11476)
-- sync: remove broken eth_protocol_version method (#11473)
-- Use parity-crypto updated to use upstream rust-secp256k1 (#11406)
-- Cleanup some code in Aura (#11466)
-- upgrade some of the dependencies (#11467)
-- Some more release track changes to README.md (#11465)
-- Update simple one-line installer due to switching to a single stable release track (#11463)
-- update Dockerfile (#11461)
-- Implement EIP-2124 (#11456)
-- [eth classic chainspec]: remove `balance = 1` (#11459)
+
+- Beta Backports ([#7297](https://github.com/paritytech/parity/pull/7297))
+  - New warp enodes ([#7287](https://github.com/paritytech/parity/pull/7287))
+    - New warp enodes
+    - Added one more warp enode; replaced spaces with tabs
+    - Bump beta to 1.8.5
+    - Update kovan boot nodes
+  - Detect different node, same-key signing in aura ([#7245](https://github.com/paritytech/parity/pull/7245))
+    - Detect different node, same-key signing in aura
+    - Reduce scope of warning
+    - Fix Cargo.lock
+    - Updating mainnet bootnodes.
+  - Update bootnodes ([#7363](https://github.com/paritytech/parity/pull/7363))
+    - Updating mainnet bootnodes.
+    - Add additional parity-beta bootnodes.
+    - Restore old parity bootnodes and update foudation bootnodes
+- Fix default CORS. ([#7388](https://github.com/paritytech/parity/pull/7388))
+
+## Parity [v1.8.4](https://github.com/paritytech/parity/releases/tag/v1.8.4) (2017-12-12)
+
+Parity 1.8.4 applies fixes for Proof-of-Authority networks and schedules the Kovan-Byzantium hard-fork.
+
+- The Kovan testnet will fork on block `5067000` at `Thu Dec 14 2017 05:40:03 UTC`.
+  - This enables Byzantium features on Kovan.
+  - This disables uncles on Kovan for stability reasons.
+- Proof-of-Authority networks are advised to set `maximumUncleCount` to 0 in a future `maximumUncleCountTransition` for stability reasons.
+  - See the [Kovan chain spec](https://github.com/paritytech/parity/blob/master/ethcore/res/ethereum/kovan.json) for an example.
+  - New PoA networks created with Parity will have this feature enabled by default.
+
+Furthermore, this release includes the ECIP-1039 Monetary policy rounding specification for Ethereum Classic, reduces the maximum Ethash-block timestamp drift to 15 seconds, and fixes various bugs for WASM and the RPC APIs.
+
+The full list of included changes:
+
+- Beta Backports and HF block update ([#7244](https://github.com/paritytech/parity/pull/7244))
+  - Reduce max block timestamp drift to 15 seconds ([#7240](https://github.com/paritytech/parity/pull/7240))
+    - Add test for block timestamp validation within allowed drift
+  - Update kovan HF block number.
+- Beta Kovan HF ([#7234](https://github.com/paritytech/parity/pull/7234))
+  - Kovan HF.
+  - Bump version.
+  - Fix aura difficulty race ([#7198](https://github.com/paritytech/parity/pull/7198))
+    - Fix test key
+    - Extract out score calculation
+    - Fix build
+  - Update kovan HF block number.
+  - Add missing byzantium builtins.
+  - Bump installers versions.
+  - Increase allowed time drift to 10s. ([#7238](https://github.com/paritytech/parity/pull/7238))
+- Beta Backports ([#7197](https://github.com/paritytech/parity/pull/7197))
+  - Maximum uncle count transition ([#7196](https://github.com/paritytech/parity/pull/7196))
+    - Enable delayed maximum_uncle_count activation.
+    - Fix tests.
+    - Defer kovan HF.
+  - Disable uncles by default ([#7006](https://github.com/paritytech/parity/pull/7006))
+  - Escape inifinite loop in estimte_gas ([#7075](https://github.com/paritytech/parity/pull/7075))
+  - ECIP-1039: Monetary policy rounding specification ([#7067](https://github.com/paritytech/parity/pull/7067))
+  - WASM Remove blockhash error ([#7121](https://github.com/paritytech/parity/pull/7121))
+    - Remove blockhash error
+    - Update tests.
+  - WASM storage_read and storage_write don't return anything ([#7110](https://github.com/paritytech/parity/pull/7110))
+  - WASM parse payload from panics ([#7097](https://github.com/paritytech/parity/pull/7097))
+  - Fix no-default-features. ([#7096](https://github.com/paritytech/parity/pull/7096))
+
+## Parity [v1.8.3](https://github.com/paritytech/parity/releases/tag/v1.8.3) (2017-11-15)
+
+Parity 1.8.3 contains several bug-fixes and removes the ability to deploy built-in multi-signature wallets.
+
+The full list of included changes:
+
+- Backports to beta ([#7043](https://github.com/paritytech/parity/pull/7043))
+  - pwasm-std update ([#7018](https://github.com/paritytech/parity/pull/7018))
+  - Version 1.8.3
+  - Make CLI arguments parsing more backwards compatible ([#7004](https://github.com/paritytech/parity/pull/7004))
+  - Skip nonce check for gas estimation ([#6997](https://github.com/paritytech/parity/pull/6997))
+  - Events in WASM runtime ([#6967](https://github.com/paritytech/parity/pull/6967))
+  - Return decoded seal fields. ([#6932](https://github.com/paritytech/parity/pull/6932))
+  - Fix serialization of status in transaction receipts. ([#6926](https://github.com/paritytech/parity/pull/6926))
+  - Windows fixes ([#6921](https://github.com/paritytech/parity/pull/6921))
+- Disallow built-in multi-sig deploy (only watch) ([#7014](https://github.com/paritytech/parity/pull/7014))
+- Add hint in ActionParams for splitting code/data ([#6968](https://github.com/paritytech/parity/pull/6968))
+  - Action params and embedded params handling
+  - Fix name-spaces
+
+## Parity [v1.8.2](https://github.com/paritytech/parity/releases/tag/v1.8.2) (2017-10-26)
+
+Parity 1.8.2 fixes an important potential consensus issue and a few additional minor issues:
+
+- `blockNumber` transaction field is now returned correctly in RPC calls.
+- Possible crash when `--force-sealing` option is used.
+
+The full list of included changes:
+
+- Beta Backports ([#6891](https://github.com/paritytech/parity/pull/6891))
+  - Bump to v1.8.2
+  - Refactor static context check in CREATE. ([#6886](https://github.com/paritytech/parity/pull/6886))
+    - Refactor static context check in CREATE.
+    - Fix wasm.
+  - Fix serialization of non-localized transactions ([#6868](https://github.com/paritytech/parity/pull/6868))
+    - Fix serialization of non-localized transactions.
+    - Return proper SignedTransactions representation.
+  - Allow force sealing and reseal=0 for non-dev chains. ([#6878](https://github.com/paritytech/parity/pull/6878))
+
+## Parity [v1.8.1](https://github.com/paritytech/parity/releases/tag/v1.8.1) (2017-10-20)
+
+Parity 1.8.1 fixes several bugs with token balances, tweaks snapshot-sync, improves the performance of nodes with huge amounts of accounts and changes the Trezor account derivation path.
+
+**Important Note**: The **Trezor** account derivation path was changed in this release ([#6815](https://github.com/paritytech/parity/pull/6815)) to always use the first account (`m/44'/60'/0'/0/0` instead of `m/44'/60'/0'/0`). This way we enable compatibility with other Ethereum wallets supporting Trezor hardware-wallets. However, **action is required** before upgrading, if you have funds on your Parity Trezor wallet. If you already upgraded to 1.8.1, please downgrade to 1.8.0 first to recover the funds with the following steps:
+
+1. Make sure you have 1.8.0-beta and your Trezor plugged in.
+2. Create a new standard Parity account. Make sure you have backups of the recovery phrase and don't forget the password.
+3. Move your funds from the Trezor hardware-wallet account to the freshly generated Parity account.
+4. Upgrade to 1.8.1-beta and plug in your Trezor.
+5. Move your funds from your Parity account to the new Trezor account.
+6. Keep using Parity as normal.
+
+If you don't want to downgrade or move your funds off your Trezor-device, you can also use the official Trezor application or other wallets allowing to select the derivation path to access the funds.
+
+The full list of included changes:
+
+- Add ECIP1017 to Morden config ([#6845](https://github.com/paritytech/parity/pull/6845))
+- Ethstore optimizations ([#6844](https://github.com/paritytech/parity/pull/6844))
+- Bumb to v1.8.1 ([#6843](https://github.com/paritytech/parity/pull/6843))
+- Backport ([#6837](https://github.com/paritytech/parity/pull/6837))
+  - Tweaked snapshot sync threshold ([#6829](https://github.com/paritytech/parity/pull/6829))
+  - Change keypath derivation logic ([#6815](https://github.com/paritytech/parity/pull/6815))
+- Refresh cached tokens based on registry info & random balances ([#6824](https://github.com/paritytech/parity/pull/6824))
+  - Refresh cached tokens based on registry info & random balances ([#6818](https://github.com/paritytech/parity/pull/6818))
+  - Don't display errored token images
+
+## Parity [v1.8.0](https://github.com/paritytech/parity/releases/tag/v1.8.0) (2017-10-15)
+
+We are happy to announce our newest Parity 1.8 release. Among others, it enables the following features:
+
+- Full Whisper v6 integration
+- Trezor hardware-wallet support
+- WASM contract support
+- PICOPS KYC-certified accounts and vouching for community-dapps
+- Light client compatibility for Proof-of-Authority networks
+- Transaction permissioning and permissioned p2p-connections
+- Full Byzantium-fork compatibility
+- Full Musicoin MCIP-3 UBI-fork compatibility
+
+Further, users upgrading from 1.7 should acknowledge the following changes:
+
+- The chain-engine was further abstracted and chain-specs need to be upgraded. [#6134](https://github.com/paritytech/parity/pull/6134) [#6591](https://github.com/paritytech/parity/pull/6591)
+- `network_id` was renamed to `chain_id` where applicable. [#6345](https://github.com/paritytech/parity/pull/6345)
+- `trace_filter` RPC method now comes with pagination. [#6312](https://github.com/paritytech/parity/pull/6312)
+- Added tracing of rewards on closing blocks. [#6194](https://github.com/paritytech/parity/pull/6194)
+
+The full list of included changes:
+
+- Updated ethabi to fix auto-update ([#6771](https://github.com/paritytech/parity/pull/6771))
+- Fixed kovan chain validation ([#6760](https://github.com/paritytech/parity/pull/6760))
+  - Fixed kovan chain validation
+  - Fork detection
+  - Fixed typo
+- Bumped fork block number for auto-update ([#6755](https://github.com/paritytech/parity/pull/6755))
+- CLI: Reject invalid argument values rather than ignore them ([#6747](https://github.com/paritytech/parity/pull/6747))
+- Fixed modexp gas calculation overflow ([#6745](https://github.com/paritytech/parity/pull/6745))
+- Backport beta - Fixes Badges ([#6732](https://github.com/paritytech/parity/pull/6732))
+  - Fix badges not showing up ([#6730](https://github.com/paritytech/parity/pull/6730))
+  - Always fetch meta data first [badges]
+- Bump to v1.8.0 in beta
+- Fix tokens and badges ([#6725](https://github.com/paritytech/parity/pull/6725))
+  - Update new token fetching
+  - Working Certifications Monitoring
+  - Update on Certification / Revoke
+  - Fix none-fetched tokens value display
+  - Fix tests
+- Check vouch status on appId in addition to contentHash ([#6719](https://github.com/paritytech/parity/pull/6719))
+  - Check vouch status on appId in addition to contentHash
+  - Simplify var expansion
+- Prevent going offline when restoring or taking a snapshot [#6694](https://github.com/paritytech/parity/pull/6694)
+- Graceful exit when invalid CLI flags are passed (#6485) [#6711](https://github.com/paritytech/parity/pull/6711)
+- Fixed RETURNDATA out of bounds check [#6718](https://github.com/paritytech/parity/pull/6718)
+- Display vouched overlay on dapps [#6710](https://github.com/paritytech/parity/pull/6710)
+- Fix gas estimation if `from` is not provided. [#6714](https://github.com/paritytech/parity/pull/6714)
+- Emulate signer pubsub on public node [#6708](https://github.com/paritytech/parity/pull/6708)
+- Removes  dependency on rustc_serialize (#5988) [#6705](https://github.com/paritytech/parity/pull/6705)
+- Fixed potential modexp exp len overflow [#6686](https://github.com/paritytech/parity/pull/6686)
+- Fix asciiToHex for characters < 0x10 [#6702](https://github.com/paritytech/parity/pull/6702)
+- Fix address input [#6701](https://github.com/paritytech/parity/pull/6701)
+- Allow signer signing display of markdown [#6707](https://github.com/paritytech/parity/pull/6707)
+- Fixed build warnings [#6664](https://github.com/paritytech/parity/pull/6664)
+- Fix warp sync blockers detection [#6691](https://github.com/paritytech/parity/pull/6691)
+- Difficulty tests [#6687](https://github.com/paritytech/parity/pull/6687)
+- Separate migrations from util [#6690](https://github.com/paritytech/parity/pull/6690)
+- Changelog for 1.7.3 [#6678](https://github.com/paritytech/parity/pull/6678)
+- WASM gas schedule [#6638](https://github.com/paritytech/parity/pull/6638)
+- Fix wallet view [#6597](https://github.com/paritytech/parity/pull/6597)
+- Byzantium fork block number [#6660](https://github.com/paritytech/parity/pull/6660)
+- Fixed RETURNDATA size for built-ins [#6652](https://github.com/paritytech/parity/pull/6652)
+- Light Client: fetch transactions/receipts by transaction hash [#6641](https://github.com/paritytech/parity/pull/6641)
+- Add Musicoin and MCIP-3 UBI hardfork.  [#6621](https://github.com/paritytech/parity/pull/6621)
+- fix 1.8 backcompat: revert to manual encoding/decoding of transition proofs [#6665](https://github.com/paritytech/parity/pull/6665)
+- Tweaked block download timeouts (#6595) [#6655](https://github.com/paritytech/parity/pull/6655)
+- Renamed RPC receipt statusCode field to status [#6650](https://github.com/paritytech/parity/pull/6650)
+- SecretStore: session level timeout [#6631](https://github.com/paritytech/parity/pull/6631)
+- SecretStore: ShareRemove of 'isolated' nodes [#6630](https://github.com/paritytech/parity/pull/6630)
+- SecretStore: exclusive sessions [#6624](https://github.com/paritytech/parity/pull/6624)
+- Fixed network protocol version negotiation [#6649](https://github.com/paritytech/parity/pull/6649)
+- Updated systemd files for linux (Resolves #6592) [#6598](https://github.com/paritytech/parity/pull/6598)
+- move additional_params to machine, fixes registry on non-ethash chains [#6646](https://github.com/paritytech/parity/pull/6646)
+- Fix Token Transfer in transaction list [#6589](https://github.com/paritytech/parity/pull/6589)
+- Update jsonrpc dependencies and rewrite dapps to futures. [#6522](https://github.com/paritytech/parity/pull/6522)
+- Balance queries implemented in WASM runtime [#6639](https://github.com/paritytech/parity/pull/6639)
+- Don't expose port 80 for parity anymore [#6633](https://github.com/paritytech/parity/pull/6633)
+- WASM Runtime refactoring [#6596](https://github.com/paritytech/parity/pull/6596)
+- Fix compilation [#6625](https://github.com/paritytech/parity/pull/6625)
+- Downgrade futures to suppress warnings. [#6620](https://github.com/paritytech/parity/pull/6620)
+- Add pagination for trace_filter rpc method [#6312](https://github.com/paritytech/parity/pull/6312)
+- Disallow pasting recovery phrases on first run [#6602](https://github.com/paritytech/parity/pull/6602)
+- fix typo: Unkown => Unknown [#6559](https://github.com/paritytech/parity/pull/6559)
+- SecretStore: administrative sessions prototypes [#6605](https://github.com/paritytech/parity/pull/6605)
+- fix parity.io link 404 [#6617](https://github.com/paritytech/parity/pull/6617)
+- SecretStore: add node to existing session poc + discussion [#6480](https://github.com/paritytech/parity/pull/6480)
+- Generalize engine trait [#6591](https://github.com/paritytech/parity/pull/6591)
+- Add RPC eth_chainId for querying the current blockchain chain ID [#6329](https://github.com/paritytech/parity/pull/6329)
+- Debounce sync status. [#6572](https://github.com/paritytech/parity/pull/6572)
+- [Public Node] Disable tx scheduling and hardware wallets [#6588](https://github.com/paritytech/parity/pull/6588)
+- Use memmap for dag cache [#6193](https://github.com/paritytech/parity/pull/6193)
+- Rename Requests to Batch [#6582](https://github.com/paritytech/parity/pull/6582)
+- Use host as ws/dapps url if present. [#6566](https://github.com/paritytech/parity/pull/6566)
+- Sync progress and error handling fixes [#6560](https://github.com/paritytech/parity/pull/6560)
+- Fixed receipt serialization and RPC [#6555](https://github.com/paritytech/parity/pull/6555)
+- Fix number of confirmations for transaction [#6552](https://github.com/paritytech/parity/pull/6552)
+- Fix #6540 [#6556](https://github.com/paritytech/parity/pull/6556)
+- Fix failing hardware tests [#6553](https://github.com/paritytech/parity/pull/6553)
+- Required validators >= num owners in Wallet Creation [#6551](https://github.com/paritytech/parity/pull/6551)
+- Random cleanups / improvements to a state [#6472](https://github.com/paritytech/parity/pull/6472)
+- Changelog for 1.7.2 [#6363](https://github.com/paritytech/parity/pull/6363)
+- Ropsten fork [#6533](https://github.com/paritytech/parity/pull/6533)
+- Byzantium updates [#5855](https://github.com/paritytech/parity/pull/5855)
+- Fix extension detection [#6452](https://github.com/paritytech/parity/pull/6452)
+- Downgrade futures to supress warnings [#6521](https://github.com/paritytech/parity/pull/6521)
+- separate trie from util and make its dependencies into libs [#6478](https://github.com/paritytech/parity/pull/6478)
+- WASM sha3 test [#6512](https://github.com/paritytech/parity/pull/6512)
+- Fix broken JavaScript tests [#6498](https://github.com/paritytech/parity/pull/6498)
+- SecretStore: use random key to encrypt channel + session-level nonce [#6470](https://github.com/paritytech/parity/pull/6470)
+- Trezor Support [#6403](https://github.com/paritytech/parity/pull/6403)
+- Fix compiler warning [#6491](https://github.com/paritytech/parity/pull/6491)
+- Fix typo [#6505](https://github.com/paritytech/parity/pull/6505)
+- WASM: added math overflow test [#6474](https://github.com/paritytech/parity/pull/6474)
+- Fix slow balances [#6471](https://github.com/paritytech/parity/pull/6471)
+- WASM runtime update [#6467](https://github.com/paritytech/parity/pull/6467)
+- Compatibility with whisper v6 [#6179](https://github.com/paritytech/parity/pull/6179)
+- light-poa round 2: allow optional casting of engine client to full client [#6468](https://github.com/paritytech/parity/pull/6468)
+- Moved attributes under docs [#6475](https://github.com/paritytech/parity/pull/6475)
+- cleanup util dependencies [#6464](https://github.com/paritytech/parity/pull/6464)
+- removed redundant earlymergedb trace guards [#6463](https://github.com/paritytech/parity/pull/6463)
+- UtilError utilizes error_chain! [#6461](https://github.com/paritytech/parity/pull/6461)
+- fixed master [#6465](https://github.com/paritytech/parity/pull/6465)
+- Refactor and port CLI from Docopt to Clap (#2066) [#6356](https://github.com/paritytech/parity/pull/6356)
+- Add language selector in production [#6317](https://github.com/paritytech/parity/pull/6317)
+- eth_call returns output of contract creations [#6420](https://github.com/paritytech/parity/pull/6420)
+- Refactor: Don't reexport bigint from util [#6459](https://github.com/paritytech/parity/pull/6459)
+- Transaction permissioning [#6441](https://github.com/paritytech/parity/pull/6441)
+- Added missing SecretStore tests - signing session [#6411](https://github.com/paritytech/parity/pull/6411)
+- Light-client sync for contract-based PoA [#6370](https://github.com/paritytech/parity/pull/6370)
+- triehash is separated from util [#6428](https://github.com/paritytech/parity/pull/6428)
+- remove re-export of parking_lot in util [#6435](https://github.com/paritytech/parity/pull/6435)
+- fix modexp bug: return 0 if base is zero [#6424](https://github.com/paritytech/parity/pull/6424)
+- separate semantic_version from util [#6438](https://github.com/paritytech/parity/pull/6438)
+- move timer.rs to ethcore [#6437](https://github.com/paritytech/parity/pull/6437)
+- remove re-export of ansi_term in util [#6433](https://github.com/paritytech/parity/pull/6433)
+- Pub sub blocks [#6139](https://github.com/paritytech/parity/pull/6139)
+- replace trait Hashable with fn keccak [#6423](https://github.com/paritytech/parity/pull/6423)
+- add more hash backward compatibility test for bloom [#6425](https://github.com/paritytech/parity/pull/6425)
+- remove the redundant hasher in Bloom [#6404](https://github.com/paritytech/parity/pull/6404)
+- Remove re-export of HeapSizeOf in util (part of #6418) [#6419](https://github.com/paritytech/parity/pull/6419)
+- Rewards on closing blocks [#6194](https://github.com/paritytech/parity/pull/6194)
+- ensure balances of constructor accounts are kept [#6413](https://github.com/paritytech/parity/pull/6413)
+- removed recursion from triedbmut::lookup [#6394](https://github.com/paritytech/parity/pull/6394)
+- do not activate genesis epoch in immediate transition validator contract [#6349](https://github.com/paritytech/parity/pull/6349)
+- Use git for the snap version [#6271](https://github.com/paritytech/parity/pull/6271)
+- Permissioned p2p connections [#6359](https://github.com/paritytech/parity/pull/6359)
+- Don't accept transactions above block gas limit. [#6408](https://github.com/paritytech/parity/pull/6408)
+- Fix memory tracing. [#6399](https://github.com/paritytech/parity/pull/6399)
+- earlydb optimizations [#6393](https://github.com/paritytech/parity/pull/6393)
+- Optimized PlainHasher hashing. Trie insertions are >15 faster [#6321](https://github.com/paritytech/parity/pull/6321)
+- Trie optimizations [#6389](https://github.com/paritytech/parity/pull/6389)
+- small optimizations for triehash [#6392](https://github.com/paritytech/parity/pull/6392)
+- Bring back IPFS tests. [#6398](https://github.com/paritytech/parity/pull/6398)
+- Running state test using parity-evm [#6355](https://github.com/paritytech/parity/pull/6355)
+- Wasm math tests extended [#6354](https://github.com/paritytech/parity/pull/6354)
+- Expose health status over RPC [#6274](https://github.com/paritytech/parity/pull/6274)
+- fix bloom bitvecjournal storage allocation [#6390](https://github.com/paritytech/parity/pull/6390)
+- fixed pending block panic [#6391](https://github.com/paritytech/parity/pull/6391)
+- Infoline less opaque for UI/visibility [#6364](https://github.com/paritytech/parity/pull/6364)
+- Fix eth_call. [#6365](https://github.com/paritytech/parity/pull/6365)
+- updated bigint [#6341](https://github.com/paritytech/parity/pull/6341)
+- Optimize trie iter by avoiding redundant copying [#6347](https://github.com/paritytech/parity/pull/6347)
+- Only keep a single rocksdb debug log file [#6346](https://github.com/paritytech/parity/pull/6346)
+- Tweaked snapshot params [#6344](https://github.com/paritytech/parity/pull/6344)
+- Rename network_id to chain_id where applicable. [#6345](https://github.com/paritytech/parity/pull/6345)
+- Itertools are no longer reexported from util, optimized triedb iter [#6322](https://github.com/paritytech/parity/pull/6322)
+- Better check the created accounts before showing Startup Wizard [#6331](https://github.com/paritytech/parity/pull/6331)
+- Better error messages for invalid types in RPC [#6311](https://github.com/paritytech/parity/pull/6311)
+- fix panic in parity-evm json tracer [#6338](https://github.com/paritytech/parity/pull/6338)
+- WASM math test [#6305](https://github.com/paritytech/parity/pull/6305)
+- rlp_derive [#6125](https://github.com/paritytech/parity/pull/6125)
+- Fix --chain parsing in parity-evm. [#6314](https://github.com/paritytech/parity/pull/6314)
+- Unexpose RPC methods on :8180 [#6295](https://github.com/paritytech/parity/pull/6295)
+- Ignore errors from dappsUrl when starting UI. [#6296](https://github.com/paritytech/parity/pull/6296)
+- updated bigint with optimized mul and from_big_indian [#6323](https://github.com/paritytech/parity/pull/6323)
+- SecretStore: bunch of fixes and improvements [#6168](https://github.com/paritytech/parity/pull/6168)
+- Master requires rust 1.19 [#6308](https://github.com/paritytech/parity/pull/6308)
+- Add more descriptive error when signing/decrypting using hw wallet. [#6302](https://github.com/paritytech/parity/pull/6302)
+- Increase default gas limit for eth_call. [#6299](https://github.com/paritytech/parity/pull/6299)
+- rust-toolchain file on master [#6266](https://github.com/paritytech/parity/pull/6266)
+- Migrate wasm-tests to updated runtime [#6278](https://github.com/paritytech/parity/pull/6278)
+- Extension fixes [#6284](https://github.com/paritytech/parity/pull/6284)
+- Fix a hash displayed in tooltip when signing arbitrary data [#6283](https://github.com/paritytech/parity/pull/6283)
+- Time should not contribue to overall status. [#6276](https://github.com/paritytech/parity/pull/6276)
+- Add --to and --gas-price to evmbin [#6277](https://github.com/paritytech/parity/pull/6277)
+- Fix dapps CSP when UI is exposed externally [#6178](https://github.com/paritytech/parity/pull/6178)
+- Add warning to web browser and fix links. [#6232](https://github.com/paritytech/parity/pull/6232)
+- Update Settings/Proxy view to match entries in proxy.pac [#4771](https://github.com/paritytech/parity/pull/4771)
+- Dapp refresh [#5752](https://github.com/paritytech/parity/pull/5752)
+- Add support for ConsenSys multisig wallet [#6153](https://github.com/paritytech/parity/pull/6153)
+- updated jsonrpc [#6264](https://github.com/paritytech/parity/pull/6264)
+- SecretStore: encrypt messages using private key from key store [#6146](https://github.com/paritytech/parity/pull/6146)
+- Wasm storage read test [#6255](https://github.com/paritytech/parity/pull/6255)
+- propagate stratum submit share error upstream [#6260](https://github.com/paritytech/parity/pull/6260)
+- Using multiple NTP servers [#6173](https://github.com/paritytech/parity/pull/6173)
+- Add GitHub issue templates. [#6259](https://github.com/paritytech/parity/pull/6259)
+- format instant change proofs correctly [#6241](https://github.com/paritytech/parity/pull/6241)
+- price-info does not depend on util [#6231](https://github.com/paritytech/parity/pull/6231)
+- native-contracts crate does not depend on util any more [#6233](https://github.com/paritytech/parity/pull/6233)
+- Bump master to 1.8.0 [#6256](https://github.com/paritytech/parity/pull/6256)
+- SecretStore: do not cache ACL contract + on-chain key servers configuration [#6107](https://github.com/paritytech/parity/pull/6107)
+- Fix the README badges [#6229](https://github.com/paritytech/parity/pull/6229)
+- updated tiny-keccak to 1.3 [#6248](https://github.com/paritytech/parity/pull/6248)
+- Small grammatical error [#6244](https://github.com/paritytech/parity/pull/6244)
+- Multi-call RPC [#6195](https://github.com/paritytech/parity/pull/6195)
+- InstantSeal fix [#6223](https://github.com/paritytech/parity/pull/6223)
+- Untrusted RLP length overflow check  [#6227](https://github.com/paritytech/parity/pull/6227)
+- Chainspec validation [#6197](https://github.com/paritytech/parity/pull/6197)
+- Fix cache path when using --base-path [#6212](https://github.com/paritytech/parity/pull/6212)
+- removed std reexports from util && fixed broken tests [#6187](https://github.com/paritytech/parity/pull/6187)
+- WASM MVP continued [#6132](https://github.com/paritytech/parity/pull/6132)
+- Decouple virtual machines [#6184](https://github.com/paritytech/parity/pull/6184)
+- Realloc test added [#6177](https://github.com/paritytech/parity/pull/6177)
+- Re-enable wallets, fixed forgetting accounts [#6196](https://github.com/paritytech/parity/pull/6196)
+- Move more params to the common section. [#6134](https://github.com/paritytech/parity/pull/6134)
+- Whisper js [#6161](https://github.com/paritytech/parity/pull/6161)
+- typo in uninstaller [#6185](https://github.com/paritytech/parity/pull/6185)
+- fix #6052. honor --no-color for signer command [#6100](https://github.com/paritytech/parity/pull/6100)
+- Refactor --allow-ips to handle custom ip-ranges [#6144](https://github.com/paritytech/parity/pull/6144)
+- Update Changelog for 1.6.10 and 1.7.0 [#6183](https://github.com/paritytech/parity/pull/6183)
+- Fix unsoundness in ethash's unsafe code [#6140](https://github.com/paritytech/parity/pull/6140)
+
+
+### Previous releases
+
+- [CHANGELOG-1.7](docs/CHANGELOG-1.7.md)
+- [CHANGELOG-1.6](docs/CHANGELOG-1.6.md)
+- [CHANGELOG-1.5](docs/CHANGELOG-1.5.md)
+- [CHANGELOG-1.4](docs/CHANGELOG-1.4.md)
+- [CHANGELOG-1.3](docs/CHANGELOG-1.3.md)
+- [CHANGELOG-1.2](docs/CHANGELOG-1.2.md)
+- [CHANGELOG-1.1](docs/CHANGELOG-1.1.md)
+- [CHANGELOG-1.0](docs/CHANGELOG-1.0.md)
+- [CHANGELOG-0.9](docs/CHANGELOG-0.9.md)

Cargo.toml

@@ -1,84 +1,75 @@
 [package]
-description = "OpenEthereum"
-name = "openethereum"
-# NOTE Make sure to update util/version/Cargo.toml as well
-version = "3.0.0"
+description = "Parity Ethereum client"
+name = "parity"
+version = "1.9.2"
 license = "GPL-3.0"
-authors = [
-	"OpenEthereum developers",
-	"Parity Technologies <admin@parity.io>"
-]
+authors = ["Parity Technologies <admin@parity.io>"]
+build = "build.rs"
 
 [dependencies]
-ansi_term = "0.11"
-atty = "0.2.8"
-blooms-db = { path = "util/blooms-db" }
+log = "0.3"
+env_logger = "0.4"
+rustc-hex = "1.0"
+docopt = "0.8"
 clap = "2"
-cli-signer= { path = "cli-signer" }
-client-traits = { path = "ethcore/client-traits" }
-common-types = { path = "ethcore/types" }
-ctrlc = { version = "3.1.4", features = ["termination"] }
-dir = { path = "util/dir" }
-docopt = "1.0"
-engine = { path = "ethcore/engine" }
-ethabi = { version = "12.0", optional = true }
-ethcore = { path = "ethcore", features = ["parity"] }
-ethcore-accounts = { path = "accounts", optional = true }
-ethcore-blockchain = { path = "ethcore/blockchain" }
-ethcore-call-contract = { path = "ethcore/call-contract", optional = true }
-ethcore-db = { path = "ethcore/db" }
-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.9.0"
-ethkey = { path = "accounts/ethkey" }
-ethstore = { path = "accounts/ethstore" }
-fdlimit = "0.1"
-futures = "0.1"
-journaldb = { path = "util/journaldb" }
-jsonrpc-core = "14.0.3"
-keccak-hash = "0.5.0"
-kvdb = "0.5.0"
-kvdb-rocksdb = "0.7.0"
-log = "0.4"
-migration-rocksdb = { path = "util/migration-rocksdb" }
-node-filter = { path = "ethcore/node-filter" }
+term_size = "0.3"
+textwrap = "0.9"
+time = "0.1"
 num_cpus = "1.2"
 number_prefix = "0.2"
-panic_hook = { path = "util/panic-hook" }
-parity-bytes = "0.1"
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-parity-daemonize = "0.3"
-parity-hash-fetch = { path = "updater/hash-fetch" }
-parity-local-store = { path = "miner/local-store" }
-parity-path = "0.1"
-parity-rpc = { path = "rpc" }
-parity-runtime = "0.1.1"
-parity-secretstore = { git = "https://github.com/paritytech/secret-store", branch = "v1.x", optional = true }
-parity-updater = { path = "updater" }
-parity-util-mem = { version = "0.6.0", features = ["jemalloc-global"] }
-parity-version = { path = "util/version" }
-parking_lot = "0.10.0"
-regex = "1.0"
-registrar = { path = "util/registrar" }
-rlp = "0.4.5"
 rpassword = "1.0"
-rustc-hex = "2.1.0"
-semver = "0.9"
+semver = "0.6"
+ansi_term = "0.9"
+parking_lot = "0.4"
+regex = "0.2"
+isatty = "0.1"
+toml = "0.4"
 serde = "1.0"
-serde_derive = "1.0"
 serde_json = "1.0"
-snapshot = { path = "ethcore/snapshot" }
-spec = { path = "ethcore/spec" }
-term_size = "0.3"
-textwrap = "0.11.0"
-toml = "0.5.6"
-verification = { path = "ethcore/verification" }
+serde_derive = "1.0"
+app_dirs = "1.1.1"
+futures = "0.1"
+futures-cpupool = "0.1"
+fdlimit = "0.1"
+ws2_32-sys = "0.2"
+ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
+ethsync = { path = "sync" }
+ethcore = { path = "ethcore" }
+ethcore-util = { path = "util" }
+ethcore-bytes = { path = "util/bytes" }
+ethcore-bigint = { path = "util/bigint" }
+ethcore-io = { path = "util/io" }
+ethcore-devtools = { path = "devtools" }
+ethcore-light = { path = "ethcore/light" }
+ethcore-logger = { path = "logger" }
+ethcore-stratum = { path = "stratum" }
+ethcore-network = { path = "util/network" }
+node-filter = { path = "ethcore/node_filter" }
+ethkey = { path = "ethkey" }
+node-health = { path = "dapps/node-health" }
+rlp = { path = "util/rlp" }
+rpc-cli = { path = "rpc_cli" }
+parity-hash-fetch = { path = "hash-fetch" }
+parity-ipfs-api = { path = "ipfs" }
+parity-local-store = { path = "local-store" }
+parity-reactor = { path = "util/reactor" }
+parity-rpc = { path = "rpc" }
+parity-rpc-client = { path = "rpc_client" }
+parity-updater = { path = "updater" }
+parity-version = { path = "util/version" }
+parity-whisper = { path = "whisper" }
+path = { path = "util/path" }
+dir = { path = "util/dir" }
+panic_hook = { path = "panic_hook" }
+keccak-hash = { path = "util/hash" }
+migration = { path = "util/migration" }
+kvdb = { path = "util/kvdb" }
+kvdb-rocksdb = { path = "util/kvdb-rocksdb" }
+journaldb = { path = "util/journaldb" }
+
+parity-dapps = { path = "dapps", optional = true }
+ethcore-secretstore = { path = "secret_store", optional = true }
 
 [build-dependencies]
 rustc_version = "0.2"
@@ -86,48 +77,54 @@ rustc_version = "0.2"
 [dev-dependencies]
 pretty_assertions = "0.1"
 ipnetwork = "0.12.6"
-tempfile = "3.1"
-fake-fetch = { path = "util/fake-fetch" }
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.8", features = ["winsock2", "winuser", "shellapi"] }
+winapi = "0.2"
+
+[target.'cfg(not(windows))'.dependencies]
+daemonize = "0.2"
 
 [features]
-default = ["accounts"]
-accounts = ["ethcore-accounts", "parity-rpc/accounts"]
-miner-debug = ["ethcore/miner-debug"]
+default = ["ui-precompiled"]
+ui = [
+	"ui-enabled",
+	"parity-dapps/ui",
+]
+ui-precompiled = [
+	"ui-enabled",
+	"parity-dapps/ui-precompiled",
+]
+ui-enabled = ["dapps"]
+dapps = ["parity-dapps"]
+jit = ["ethcore/jit"]
 json-tests = ["ethcore/json-tests"]
 test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
-secretstore = ["parity-secretstore", "accounts", "ethabi", "ethcore-call-contract"]
+secretstore = ["ethcore-secretstore"]
 final = ["parity-version/final"]
-deadlock_detection = ["parking_lot/deadlock_detection"]
-# 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 = "parity/lib.rs"
 
 [[bin]]
 path = "parity/main.rs"
-name = "openethereum"
+name = "parity"
+
+[profile.dev]
+panic = "abort"
 
 [profile.release]
 debug = false
-lto = true
+lto = false
+panic = "abort"
 
 [workspace]
-# This should only list projects that are not
-# in the dependency tree in any other way
-# (i.e. pretty much only standalone CLI tools)
 members = [
-	"accounts/ethkey/cli",
-	"accounts/ethstore/cli",
 	"chainspec",
+	"dapps/js-glue",
 	"ethcore/wasm/run",
+	"ethkey/cli",
+	"ethstore/cli",
 	"evmbin",
+	"transaction-pool",
+	"whisper",
 ]

README.md

@@ -1,102 +1,102 @@
-# OpenEthereum
+# [Parity](https://parity.io/) - fast, light, and robust Ethereum client
 
-Fast and feature-rich multi-network Ethereum client.
+[![build status](https://gitlab.parity.io/parity/parity/badges/master/build.svg)](https://gitlab.parity.io/parity/parity/commits/master)
+[![Snap Status](https://build.snapcraft.io/badge/paritytech/parity.svg)](https://build.snapcraft.io/user/paritytech/parity)
+[![GPLv3](https://img.shields.io/badge/license-GPL%20v3-green.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)
 
-[» Download the latest release «](https://github.com/openethereum/openethereum/releases/latest)
+- [Download the latest release here.](https://github.com/paritytech/parity/releases/latest)
 
-[![GPL licensed][license-badge]][license-url]
-[![Build Status][ci-badge]][ci-url]
-[![Discord chat][chat-badge]][chat-url]
+### Join the chat!
 
-[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
+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)
 
-## Table of Contents
+Or 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)
 
-1. [Description](#chapter-001)
-2. [Technical Overview](#chapter-002)
-3. [Building](#chapter-003)<br>
-  3.1 [Building Dependencies](#chapter-0031)<br>
-  3.2 [Building from Source Code](#chapter-0032)<br>
-  3.3 [Starting OpenEthereum](#chapter-0034)
-4. [Testing](#chapter-004)
-5. [Documentation](#chapter-005)
-6. [Toolchain](#chapter-006)
-7. [Contributing](#chapter-008)
-8. [License](#chapter-009)
+Be sure to check out [our wiki](https://paritytech.github.io/wiki/) and the [internal documentation](https://paritytech.github.io/parity/ethcore/index.html) for more information.
 
+----
 
-## 1. Description <a id="chapter-001"></a>
+## About Parity
 
-**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.
+Parity's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing Parity using the sophisticated and cutting-edge Rust programming language. Parity is licensed under the GPLv3, and can be used for all your Ethereum needs.
 
-- Clean, modular codebase for easy customisation
-- Advanced CLI-based client
-- Minimal memory and storage footprint
-- Synchronise in hours, not days with Warp Sync
-- Modular for light integration into your service or product
+Parity comes with a built-in wallet. To access [Parity Wallet](http://web3.site/) simply go to http://web3.site/ (if you don't have access to the internet, but still want to use the service, you can also use http://127.0.0.1:8180/). It includes various functionality allowing you to:
 
-## 2. Technical Overview <a id="chapter-002"></a>
+- create and manage your Ethereum accounts;
+- manage your Ether and any Ethereum tokens;
+- create and register your own tokens;
+- and much more.
 
-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.
+By default, Parity will also run a JSONRPC server on `127.0.0.1:8545` and a websockets server on `127.0.0.1:8546`. This is fully configurable and supports a number of APIs.
 
-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.
+If you run into an issue while using Parity, feel free to file one in this repository 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!
 
-If you run into problems while using OpenEthereum, check out the [old wiki for documentation](https://wiki.parity.io/), feel free to [file an issue in this repository](https://github.com/openethereum/openethereum/issues/new), or hop on our [Discord](https://discord.io/openethereum) chat room to ask a question. We are glad to help!
+**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's current release is 1.8. You can download it at https://github.com/paritytech/parity/releases or follow the instructions below to build from source.
 
-## 3. Building <a id="chapter-003"></a>
+----
 
-### 3.1 Build Dependencies <a id="chapter-0031"></a>
+## Build dependencies
 
-OpenEthereum requires **latest stable Rust version** to build.
+**Parity requires Rust version 1.21.0 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:
+We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have rustup, you can install it like this:
 
 - Linux:
-  ```bash
-  $ curl https://sh.rustup.rs -sSf | sh
-  ```
+	```bash
+	$ 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 also requires `gcc`, `g++`, `libssl-dev`/`openssl`, `libudev-dev` and `pkg-config` packages to be installed.
 
 - OSX:
+	```bash
+	$ curl https://sh.rustup.rs -sSf | sh
+	```
+
+	`clang` is required. It comes with Xcode command line tools or can be installed with homebrew.
+
+- Windows
+  Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the rustup installer from
+	https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe, start "VS2015 x64 Native Tools Command Prompt", and use the following command to install and set up the msvc toolchain:
   ```bash
-  $ curl https://sh.rustup.rs -sSf | sh
+	$ rustup default stable-x86_64-pc-windows-msvc
   ```
 
-  `clang` is required. It comes with Xcode command line tools or can be installed with homebrew.
+Once you have rustup, install Parity or download and build from source
 
-- Windows:
-  Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the `rustup` installer from
-  https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe, start "VS2015 x64 Native Tools Command Prompt", and use the following command to install and set up the `msvc` toolchain:
-  ```bash
-  $ rustup default stable-x86_64-pc-windows-msvc
-  ```
+----
 
-Once you have `rustup` installed, then you need to install:
-* [Perl](https://www.perl.org)
-* [Yasm](https://yasm.tortall.net)
+## Install from the snap store
 
-Make sure that these binaries are in your `PATH`. After that, you should be able to build OpenEthereum from source.
-
-### 3.2 Build from Source Code <a id="chapter-0032"></a>
+In any of the [supported Linux distros](https://snapcraft.io/docs/core/install):
 
 ```bash
-# download OpenEthereum code
-$ git clone https://github.com/openethereum/openethereum
-$ cd openethereum
-
-# build in release mode
-$ cargo build --release --features final
+sudo snap install parity --edge
 ```
 
-This produces an executable in the `./target/release` subdirectory.
+(Note that this is an experimental and unstable release, at the moment)
+
+----
+
+## Build from source
+
+```bash
+# download Parity code
+$ git clone https://github.com/paritytech/parity
+$ cd parity
+
+# build in release mode
+$ cargo build --release
+```
+
+This will produce an executable in the `./target/release` subdirectory.
 
 Note: if cargo fails to parse manifest try:
 
@@ -104,219 +104,46 @@ Note: if cargo fails to parse manifest try:
 $ ~/.cargo/bin/cargo build --release
 ```
 
-Note, when compiling a crate and you receive errors, it's in most cases your outdated version of Rust, or some of your crates have to be recompiled. Cleaning the repository will most likely solve the issue if you are on the latest stable version of Rust, try:
+Note: When compiling a crate and you receive the following error:
+
+```
+error: the crate is compiled with the panic strategy `abort` which is incompatible with this crate's strategy of `unwind`
+```
+
+Cleaning the repository will most likely solve the issue, try:
 
 ```bash
 $ cargo clean
 ```
 
-This always compiles the latest nightly builds. If you want to build stable, do a
+This will always compile the latest nightly builds. If you want to build stable or beta, do a `git checkout stable` or `git checkout beta` first.
+
+----
+
+## Simple one-line installer for Mac and Ubuntu
 
 ```bash
-$ git checkout stable
+bash <(curl https://get.parity.io -Lk)
 ```
 
-### 3.3 Starting OpenEthereum <a id="chapter-0034"></a>
+The one-line installer always defaults to the latest beta release.
 
-#### Manually
+## Start Parity
 
-To start OpenEthereum manually, just run
+### Manually
+
+To start Parity manually, just run
 
 ```bash
-$ ./target/release/openethereum
+$ ./target/release/parity
 ```
 
-so OpenEthereum begins syncing the Ethereum blockchain.
+and Parity will begin syncing the Ethereum blockchain.
 
-#### Using `systemd` service file
+### Using systemd service file
 
-To start OpenEthereum as a regular user using `systemd` init:
+To start Parity as a regular user using systemd init:
 
-1. Copy `./scripts/openethereum.service` to your
-`systemd` user directory (usually `~/.config/systemd/user`).
-2. Copy release to bin folder, write `sudo install ./target/release/openethereum /usr/bin/openethereum`
-3. To configure OpenEthereum, see [our old wiki](https://paritytech.github.io/wiki/Configuring-Parity) for details.
-
-## 4. Testing <a id="chapter-004"></a>
-
-Download the required test files: `git submodule update --init --recursive`. You can run tests with the following commands:
-
-* **All** packages
-  ```
-  cargo test --all
-  ```
-
-* Specific package
-  ```
-  cargo test --package <spec>
-  ```
-
-Replace `<spec>` with one of the packages from the [package list](#package-list) (e.g. `cargo test --package evmbin`).
-
-You can show your logs in the test output by passing `--nocapture` (i.e. `cargo test --package evmbin -- --nocapture`)
-
-## 5. Documentation <a id="chapter-005"></a>
-
-Be sure to [check out our old wiki](https://wiki.parity.io) for more information.
-
-### Viewing documentation for OpenEthereum packages
-
-You can generate documentation for OpenEthereum Rust packages that automatically opens in your web browser using [rustdoc with Cargo](https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html#using-rustdoc-with-cargo) (of the The Rustdoc Book), by running the the following commands:
-
-* **All** packages
-  ```
-  cargo doc --document-private-items --open
-  ```
-
-* Specific package
-  ```
-  cargo doc --package <spec> -- --document-private-items --open
-  ```
-
-Use`--document-private-items` to also view private documentation and `--no-deps` to exclude building documentation for dependencies.
-
-Replacing `<spec>` with one of the following from the details section below (i.e. `cargo doc --package openethereum --open`):
-
-<a id="package-list"></a>
-**Package List**
-<details><p>
-
-* OpenEthereum Client Application
-  ```bash
-  openethereum
-  ```
-* OpenEthereum Account Management, Key Management Tool, and Keys Generator
-  ```bash
-  ethcore-accounts, ethkey-cli, ethstore, ethstore-cli
-  ```
-* OpenEthereum Chain Specification
-  ```bash
-  chainspec
-  ```
-* OpenEthereum CLI Signer Tool & RPC Client
-  ```bash
-  cli-signer parity-rpc-client
-  ```
-* OpenEthereum Ethash & ProgPoW Implementations
-  ```bash
-  ethash
-  ```
-* EthCore Library
-  ```bash
-  ethcore
-  ```
-  * OpenEthereum Blockchain Database, Test Generator, Configuration,
-Caching, Importing Blocks, and Block Information
-    ```bash
-    ethcore-blockchain
-    ```
-  * OpenEthereum Contract Calls and Blockchain Service & Registry Information
-    ```bash
-    ethcore-call-contract
-    ```
-  * OpenEthereum Database Access & Utilities, Database Cache Manager
-    ```bash
-    ethcore-db
-    ```
-  * OpenEthereum Virtual Machine (EVM) Rust Implementation
-    ```bash
-    evm
-    ```
-  * OpenEthereum Light Client Implementation
-    ```bash
-    ethcore-light
-    ```
-  * Smart Contract based Node Filter, Manage Permissions of Network Connections
-    ```bash
-    node-filter
-    ```
-  * Private Transactions
-    ```bash
-    ethcore-private-tx
-    ```
-  * OpenEthereum Client & Network Service Creation & Registration with the I/O Subsystem
-    ```bash
-    ethcore-service
-    ```
-  * OpenEthereum Blockchain Synchronization
-    ```bash
-    ethcore-sync
-    ```
-  * OpenEthereum Common Types
-    ```bash
-    common-types
-    ```
-  * OpenEthereum Virtual Machines (VM) Support Library
-    ```bash
-    vm
-    ```
-  * OpenEthereum WASM Interpreter
-    ```bash
-    wasm
-    ```
-  * OpenEthereum WASM Test Runner
-    ```bash
-    pwasm-run-test
-    ```
-  * OpenEthereum EVM Implementation
-    ```bash
-    evmbin
-    ```
-  * OpenEthereum JSON Deserialization
-    ```bash
-    ethjson
-    ```
-  * OpenEthereum State Machine Generalization for Consensus Engines
-    ```bash
-    parity-machine
-    ```
-* OpenEthereum Miner Interface
-  ```bash
-  ethcore-miner parity-local-store price-info ethcore-stratum using_queue
-  ```
-* OpenEthereum Logger Implementation
-  ```bash
-  ethcore-logger
-  ```
-* OpenEthereum JSON-RPC Servers
-  ```bash
-  parity-rpc
-  ```
-* OpenEthereum Updater Service
-  ```bash
-  parity-updater parity-hash-fetch
-  ```
-* OpenEthereum Core Libraries (`util`)
-  ```bash
-  accounts-bloom blooms-db dir eip-712 fake-fetch fastmap fetch ethcore-io
-  journaldb keccak-hasher len-caching-lock memory-cache memzero
-  migration-rocksdb ethcore-network ethcore-network-devp2p panic_hook
-  patricia-trie-ethereum registrar rlp_compress stats
-  time-utils triehash-ethereum unexpected parity-version
-  ```
-
-</p></details>
-
-## 6. Toolchain <a id="chapter-006"></a>
-
-In addition to the OpenEthereum client, there are additional tools in this repository available:
-
-- [evmbin](./evmbin) - OpenEthereum EVM Implementation.
-- [ethstore](./accounts/ethstore) - OpenEthereum Key Management.
-- [ethkey](./accounts/ethkey) - OpenEthereum Keys Generator.
-
-The following tools are available in a separate repository:
-- [ethabi](https://github.com/openethereum/ethabi) - OpenEthereum Encoding of Function Calls. [Docs here](https://crates.io/crates/ethabi)
-- [whisper](https://github.com/openethereum/whisper) - OpenEthereum Whisper-v2 PoC Implementation.
-
-## 7. Contributing <a id="chapter-007"></a>
-
-An introduction has been provided in the ["So You Want to be a Core Developer" presentation slides by Hernando Castano](http://tiny.cc/contrib-to-parity-eth). Additional guidelines are provided in [CONTRIBUTING](./.github/CONTRIBUTING.md).
-
-### Contributor Code of Conduct
-
-[CODE_OF_CONDUCT](./.github/CODE_OF_CONDUCT.md)
-
-## 8. License <a id="chapter-008"></a>
-
-[LICENSE](./LICENSE)
+1. Copy `./scripts/parity.service` to your
+systemd user directory (usually `~/.config/systemd/user`).
+2. To configure Parity, write a `/etc/parity/config.toml` config file, see [Configuring Parity](https://github.com/paritytech/parity/wiki/Configuring-Parity) for details.

SECURITY.md

@@ -0,0 +1,54 @@
+# Security Policy
+
+For security inquiries or vulnerability reports, please send a message to security@parity.io.
+
+Please use a descriptive subject line so we can identify the report as such.
+
+If you send a report, we will respond to the e-mail within 48 hours, and provide regular updates from that time onwards.
+
+If you would like to encrypt your report, please use the PGP key provided below.
+It is also reproduced [on MIT's key server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73)
+
+```
+-----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-----
+```
+
+Important Legal Information:
+
+Your submission might be eligible for a bug bounty. The bug bounty program is an experimental and discretionary rewards program for the Parity community to reward those who are helping to improve the Parity software. Rewards are at the sole discretion of Parity Technologies Ltd.. 
+
+We are not able to issue rewards to individuals who are on sanctions lists or who are in countries on sanctions lists (e.g. North Korea, Iran, etc). 
+
+You are responsible for all taxes. All rewards are subject to applicable law. 
+
+Finally, your testing must not violate any law or compromise any data that is not yours.

SMART_CONTRACT_LICENSE

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

accounts/Cargo.toml

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

accounts/ethkey/Cargo.toml

@@ -1,13 +0,0 @@
-[package]
-description = "OpenEthereum Keys Generator"
-name = "ethkey"
-version = "0.4.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-edit-distance = "2.0"
-log = "0.4"
-serde = "1.0"
-serde_derive = "1.0"
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-parity-wordlist = "1.3.1"

accounts/ethkey/README.md

@@ -1,221 +0,0 @@
-## ethkey-cli
-
-OpenEthereum keys generator.
-
-### Usage
-
-```
-OpenEthereum Keys Generator.
-  Copyright 2015-2020 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.
-```
-
-### Examples
-
-#### `info <secret>`
-*Display info about private key.*
-
-- `<secret>` - ethereum secret, 32 bytes long
-
-```
-ethkey info 17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55
-```
-
-```
-secret:  17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55
-public:  689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124
-address: 26d1ec50b4e62c1d1a40d16e7cacc6a6580757d5
-```
-
---
-
-
-#### `info --brain <phrase>`
-*Display info about private key generate from brain wallet recovery phrase.*
-
-- `<phrase>` - Parity recovery phrase, 12 words
-
-```
-ethkey info --brain "this is sparta"
-```
-
-```
-The recover phrase was not generated by Parity: The word 'this' does not come from the dictionary.
-
-secret:  aa22b54c0cb43ee30a014afe5ef3664b1cde299feabca46cd3167a85a57c39f2
-public:  c4c5398da6843632c123f543d714d2d2277716c11ff612b2a2f23c6bda4d6f0327c31cd58c55a9572c3cc141dade0c32747a13b7ef34c241b26c84adbb28fcf4
-address: 006e27b6a72e1f34c626762f3c4761547aff1421
-```
-
---
-
-#### `generate random`
-*Generate new keypair randomly.*
-
-```
-ethkey generate random
-```
-
-```
-secret:  7d29fab185a33e2cd955812397354c472d2b84615b645aa135ff539f6b0d70d5
-public:  35f222d88b80151857a2877826d940104887376a94c1cbd2c8c7c192eb701df88a18a4ecb8b05b1466c5b3706042027b5e079fe3a3683e66d822b0e047aa3418
-address: a8fa5dd30a87bb9e3288d604eb74949c515ab66e
-```
-
---
-
-#### `generate random --brain`
-*Generate new keypair with recovery phrase randomly.*
-
-```
-ethkey generate random --brain
-```
-
-```
-recovery phrase: thwarting scandal creamer nuzzle asparagus blast crouch trusting anytime elixir frenzied octagon
-secret:  001ce488d50d2f7579dc190c4655f32918d505cee3de63bddc7101bc91c0c2f0
-public:  4e19a5fdae82596e1485c69b687c9cc52b5078e5b0668ef3ce8543cd90e712cb00df822489bc1f1dcb3623538a54476c7b3def44e1a51dc174e86448b63f42d0
-address: 00cf3711cbd3a1512570639280758118ba0b2bcb
-```
-
-
---
-
-#### `generate prefix <prefix>`
-*Generate new keypair randomly with address starting with prefix.*
-
-- `<prefix>` - desired address prefix, 0 - 32 bytes long.
-
-```
-ethkey generate prefix ff
-```
-
-```
-secret:  2075b1d9c124ea673de7273758ed6de14802a9da8a73ceb74533d7c312ff6acd
-public:  48dbce4508566a05509980a5dd1335599fcdac6f9858ba67018cecb9f09b8c4066dc4c18ae2722112fd4d9ac36d626793fffffb26071dfeb0c2300df994bd173
-address: fff7e25dff2aa60f61f9d98130c8646a01f31649
-```
-
---
-
-#### `generate prefix --brain <prefix>`
-*Generate new keypair with recovery phrase randomly with address starting with prefix.*
-
-- `<prefix>` - desired address prefix, 0 - 32 bytes long.
-
-```
-ethkey generate prefix --brain 00cf
-```
-
-```
-recovery phrase: thwarting scandal creamer nuzzle asparagus blast crouch trusting anytime elixir frenzied octagon
-secret:  001ce488d50d2f7579dc190c4655f32918d505cee3de63bddc7101bc91c0c2f0
-public:  4e19a5fdae82596e1485c69b687c9cc52b5078e5b0668ef3ce8543cd90e712cb00df822489bc1f1dcb3623538a54476c7b3def44e1a51dc174e86448b63f42d0
-address: 00cf3711cbd3a1512570639280758118ba0b2bcb
-```
-
---
-
-#### `sign <secret> <message>`
-*Sign a message with a secret.*
-
-- `<secret>` - ethereum secret, 32 bytes long
-- `<message>` - message to sign, 32 bytes long
-
-```
-ethkey sign 17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55 bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987
-```
-
-```
-c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200
-```
-
---
-
-#### `verify public <public> <signature> <message>`
-*Verify the signature.*
-
-- `<public>` - ethereum public, 64 bytes long
-- `<signature>` - message signature, 65 bytes long
-- `<message>` - message, 32 bytes long
-
-```
-ethkey verify public 689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124 c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200 bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987
-```
-
-```
-true
-```
-
---
-
-#### `verify address <address> <signature> <message>`
-*Verify the signature.*
-
-- `<address>` - ethereum address, 20 bytes long
-- `<signature>` - message signature, 65 bytes long
-- `<message>` - message, 32 bytes long
-
-```
-ethkey verify address 689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124 c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200 bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987
-```
-
-```
-true
-```
-
---
-
-#### `recover <address> <known-phrase>`
-*Try to recover an account given expected address and partial (too short or with invalid words) recovery phrase.*
-
-- `<address>` - ethereum address, 20 bytes long
-- `<known-phrase>` - known phrase, can be in a form of `thwarting * creamer`
-
-```
-RUST_LOG="info" ethkey recover "00cf3711cbd3a1512570639280758118ba0b2bcb" "thwarting scandal creamer nuzzle asparagus blast crouch trusting anytime elixir frenzied octag"
-```
-
-```
-INFO:ethkey::brain_recover: Invalid word 'octag', looking for potential substitutions.
-INFO:ethkey::brain_recover: Closest words: ["ocean", "octagon", "octane", "outage", "tag", "acting", "acts", "aorta", "cage", "chug"]
-INFO:ethkey::brain_recover: Starting to test 7776 possible combinations.
-
-thwarting scandal creamer nuzzle asparagus blast crouch trusting anytime elixir frenzied octagon
-secret:  001ce488d50d2f7579dc190c4655f32918d505cee3de63bddc7101bc91c0c2f0
-public:  4e19a5fdae82596e1485c69b687c9cc52b5078e5b0668ef3ce8543cd90e712cb00df822489bc1f1dcb3623538a54476c7b3def44e1a51dc174e86448b63f42d0
-address: 00cf3711cbd3a1512570639280758118ba0b2bcb
-```
-
-## OpenEthereum toolchain
-_This project is a part of the OpenEthereum toolchain._
-
-- [evmbin](https://github.com/openethereum/openethereum/blob/master/evmbin/) - EVM implementation for OpenEthereum.
-- [ethabi](https://github.com/OpenEthereum/ethabi) - OpenEthereum function calls encoding.
-- [ethstore](https://github.com/openethereum/openethereum/blob/master/accounts/ethstore) - OpenEthereum key management.
-- [ethkey](https://github.com/openethereum/openethereum/blob/master/accounts/ethkey) - OpenEthereum keys generator.
-- [whisper](https://github.com/OpenEthereum/whisper) - Implementation of Whisper-v2 PoC.

accounts/ethkey/cli/Cargo.toml

@@ -1,22 +0,0 @@
-[package]
-description = "OpenEthereum Keys Generator CLI"
-name = "ethkey-cli"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-docopt = "1.0"
-env_logger = "0.5"
-ethkey = { path = "../" }
-panic_hook = { path = "../../../util/panic-hook" }
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-parity-wordlist= "1.3.1"
-rustc-hex = "2.1.0"
-serde = "1.0"
-serde_derive = "1.0"
-threadpool = "1.7"
-
-[[bin]]
-name = "ethkey"
-path = "src/main.rs"
-doc = false

accounts/ethkey/cli/src/main.rs

@@ -1,453 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate docopt;
-extern crate env_logger;
-extern crate ethkey;
-extern crate panic_hook;
-extern crate parity_wordlist;
-extern crate parity_crypto;
-extern crate rustc_hex;
-extern crate serde;
-extern crate threadpool;
-
-#[macro_use]
-extern crate serde_derive;
-
-use std::num::ParseIntError;
-use std::{env, fmt, process, io, sync};
-
-use docopt::Docopt;
-use ethkey::{Brain, BrainPrefix, Prefix, brain_recover};
-use parity_crypto::publickey::{KeyPair, Random, Error as EthkeyError, Generator, sign, verify_public, verify_address};
-use rustc_hex::{FromHex, FromHexError};
-
-const USAGE: &'static str = r#"
-OpenEthereum keys generator.
-  Copyright 2015-2020 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: Vec<_> = 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);
-	}
-}

accounts/ethkey/src/brain.rs

@@ -1,72 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use parity_crypto::publickey::{KeyPair, Generator, Secret};
-use parity_crypto::Keccak256;
-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 {
-	fn generate(&mut self) -> KeyPair {
-		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::import_key(&secret)
-						.and_then(KeyPair::from_secret)
-					{
-						if pair.address()[0] == 0 {
-							trace!("Testing: {}, got: {:?}", self.0, pair.address());
-							return pair
-						}
-					}
-				},
-			}
-		}
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use Brain;
-	use parity_crypto::publickey::Generator;
-
-	#[test]
-	fn test_brain() {
-		let words = "this is sparta!".to_owned();
-		let first_keypair = Brain::new(words.clone()).generate();
-		let second_keypair = Brain::new(words.clone()).generate();
-		assert_eq!(first_keypair.secret(), second_keypair.secret());
-	}
-}

accounts/ethkey/src/brain_prefix.rs

@@ -1,67 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use super::Brain;
-use parity_crypto::publickey::{Generator, KeyPair, Error};
-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
-	}
-
-	pub fn generate(&mut self) -> Result<KeyPair, Error> {
-		for _ in 0..self.iterations {
-			let phrase = wordlist::random_phrase(self.no_of_words);
-			let keypair = Brain::new(phrase.clone()).generate();
-			if keypair.address().as_ref().starts_with(&self.prefix) {
-				self.last_phrase = phrase;
-				return Ok(keypair)
-			}
-		}
-
-		Err(Error::Custom("Could not find keypair".into()))
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use 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/lib.rs

@@ -1,40 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-// #![warn(missing_docs)]
-
-extern crate edit_distance;
-extern crate parity_crypto;
-extern crate parity_wordlist;
-extern crate serde;
-
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate serde_derive;
-
-mod brain;
-mod brain_prefix;
-mod password;
-mod prefix;
-
-pub mod brain_recover;
-
-pub use self::parity_wordlist::Error as WordlistError;
-pub use self::brain::Brain;
-pub use self::brain_prefix::BrainPrefix;
-pub use self::password::Password;
-pub use self::prefix::Prefix;

accounts/ethkey/src/password.rs

@@ -1,59 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{fmt, 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

@@ -1,52 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use parity_crypto::publickey::{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, iterations }
-	}
-
-	pub 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 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/ethstore/Cargo.toml

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

accounts/ethstore/README.md

@@ -1,340 +0,0 @@
-## ethstore-cli
-
-OpenEthereum key management.
-
-### Usage
-
-```
-OpenEthereum key management tool.
-  Copyright 2015-2020 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 [--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.
-```
-
-### Examples
-
-#### `insert <secret> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]`
-*Encrypt secret with a password and save it in secret store.*
-
-- `<secret>` - ethereum secret, 32 bytes long
-- `<password>` - account password, file path
-- `[--dir DIR]` - secret store directory, It may be either parity, parity-test, geth, geth-test or a path. default: parity
-- `[--vault VAULT]` - vault to use in this operation
-- `[--vault-pwd VAULTPWD]` - vault password to use in this operation, file path
-
-```
-ethstore insert 7d29fab185a33e2cd955812397354c472d2b84615b645aa135ff539f6b0d70d5 password.txt
-```
-
-```
-a8fa5dd30a87bb9e3288d604eb74949c515ab66e
-```
-
---
-
-```
-ethstore insert `ethkey generate random -s` "this is sparta"
-```
-
-```
-24edfff680d536a5f6fe862d36df6f8f6f40f115
-```
-
---
-
-#### `change-pwd <address> <old-pwd> <new-pwd> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]`
-*Change account password.*
-
-- `<address>` - ethereum address, 20 bytes long
-- `<old-pwd>` - old account password, file path
-- `<new-pwd>` - new account password, file path
-- `[--dir DIR]` - secret store directory, It may be either parity, parity-test, geth, geth-test or a path. default: parity
-- `[--vault VAULT]` - vault to use in this operation
-- `[--vault-pwd VAULTPWD]` - vault password to use in this operation, file path
-
-```
-ethstore change-pwd a8fa5dd30a87bb9e3288d604eb74949c515ab66e old_pwd.txt new_pwd.txt
-```
-
-```
-true
-```
-
---
-
-#### `list [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]`
-*List secret store accounts.*
-
-- `[--dir DIR]` - secret store directory, It may be either parity, parity-test, geth, geth-test or a path. default: parity
-- `[--vault VAULT]` - vault to use in this operation
-- `[--vault-pwd VAULTPWD]` - vault password to use in this operation, file path
-
-```
-ethstore list
-```
-
-```
- 0: 24edfff680d536a5f6fe862d36df6f8f6f40f115
- 1: 6edddfc6349aff20bc6467ccf276c5b52487f7a8
- 2: e6a3d25a7cb7cd21cb720df5b5e8afd154af1bbb
-```
-
---
-
-#### `import [--src DIR] [--dir DIR]`
-*Import accounts from src.*
-
-- `[--src DIR]` - secret store directory, It may be either parity, parity-test, geth, geth-test or a path. default: geth
-- `[--dir DIR]` - secret store directory, It may be either parity, parity-test, geth, geth-test or a path. default: parity
-
-```
-ethstore import
-```
-
-```
- 0: e6a3d25a7cb7cd21cb720df5b5e8afd154af1bbb
- 1: 6edddfc6349aff20bc6467ccf276c5b52487f7a8
-```
-
---
-
-#### `import-wallet <path> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]`
-*Import account from presale wallet.*
-
-- `<path>` - presale wallet path
-- `<password>` - account password, file path
-- `[--dir DIR]` - secret store directory, It may be either parity, parity-test, geth, geth-test or a path. default: parity
-- `[--vault VAULT]` - vault to use in this operation
-- `[--vault-pwd VAULTPWD]` - vault password to use in this operation, file path
-
-```
-ethstore import-wallet ethwallet.json password.txt
-```
-
-```
-e6a3d25a7cb7cd21cb720df5b5e8afd154af1bbb
-```
-
-
---
-
-#### `find-wallet-pass <path> <password>`
-Try to open presale wallet given a list of passwords from a file.
-The list of passwords can be generated using e.g. [Phildo/brutedist](https://github.com/Phildo/brutedist).
-
-- `<path>` - presale wallet path
-- `<password>` - possible passwords, file path
-
-```
-ethstore find-wallet-pass ethwallet.json passwords.txt
-```
-
-```
-Found password: test
-```
-
-
---
-
-#### `remove <address> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]`
-*Remove account from secret store.*
-
-- `<address>` - ethereum address, 20 bytes long
-- `<password>` - account password, file path
-- `[--dir DIR]` - secret store directory, It may be either parity, parity-test, geth, geth-test or a path. default: parity
-- `[--vault VAULT]` - vault to use in this operation
-- `[--vault-pwd VAULTPWD]` - vault password to use in this operation, file path
-
-```
-ethstore remove a8fa5dd30a87bb9e3288d604eb74949c515ab66e password.txt
-```
-
-```
-true
-```
-
---
-
-#### `sign <address> <password> <message> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]`
-*Sign message with account's secret.*
-
-- `<address>` - ethereum address, 20 bytes long
-- `<password>` - account password, file path
-- `<message>` - message to sign, 32 bytes long
-- `[--dir DIR]` - secret store directory, It may be either parity, parity-test, geth, geth-test or a path. default: parity
-- `[--vault VAULT]` - vault to use in this operation
-- `[--vault-pwd VAULTPWD]` - vault password to use in this operation, file path
-
-```
-ethstore sign 24edfff680d536a5f6fe862d36df6f8f6f40f115 password.txt 7d29fab185a33e2cd955812397354c472d2b84615b645aa135ff539f6b0d70d5
-```
-
-```
-c6649f9555232d90ff716d7e552a744c5af771574425a74860e12f763479eb1b708c1f3a7dc0a0a7f7a81e0a0ca88c6deacf469222bb3d9c5bf0847f98bae54901
-```
-
---
-
-#### `public <address> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]`
-*Displays public key for an address.*
-
-- `<address>` - ethereum address, 20 bytes long
-- `<password>` - account password, file path
-- `[--dir DIR]` - secret store directory, It may be either parity, parity-test, geth, geth-test or a path. default: parity
-- `[--vault VAULT]` - vault to use in this operation
-- `[--vault-pwd VAULTPWD]` - vault password to use in this operation, file path
-
-```
-ethstore public 00e63fdb87ceb815ec96ae185b8f7381a0b4a5ea account_password.txt --vault vault_name --vault-pwd vault_password.txt
-```
-
-```
-0x84161d8c05a996a534efbec50f24485cfcc07458efaef749a1b22156d7836c903eeb39bf2df74676e702eacc4cfdde069e5fd86692b5ef6ef81ba906e9e77d82
-```
-
---
-
-#### `list-vaults [--dir DIR]`
-*List vaults.*
-
-- `[--dir DIR]` - secret store directory, It may be either parity, parity-test, geth, geth-test or a path. default: parity
-
-```
-ethstore list-vaults
-```
-
-```
-vault1
-vault2
-vault3
-```
-
---
-
-#### `create-vault <vault> <password> [--dir DIR]`
-*Create new vault.*
-
-- `<vault>` - name of new vault. This can only contain letters, digits, whitespaces, dashes and underscores
-- `<password>` - vault password, file path
-- `[--dir DIR]` - secret store directory, It may be either parity, parity-test, geth, geth-test or a path. default: parity
-
-```
-ethstore create-vault vault3 vault3_password.txt
-```
-
-```
-OK
-```
-
---
-
-#### `change-vault-pwd <vault> <old-pwd> <new-pwd> [--dir DIR]`
-*Change vault password.*
-
-- `<vault>` - name of existing vault
-- `<old-pwd>` - old vault password, file path
-- `<new-pwd>` - new vault password, file path
-- `[--dir DIR]` - secret store directory, It may be either parity, parity-test, geth, geth-test or a path. default: parity
-
-```
-ethstore change-vault-pwd vault3 vault3_password.txt new_vault3_password.txt
-```
-
-```
-OK
-```
-
---
-
-#### `move-to-vault <address> <vault> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]`
-*Move account to vault from another vault/root directory.*
-
-- `<address>` - ethereum address, 20 bytes long
-- `<vault>` - name of existing vault to move account to
-- `<password>` - password of existing `<vault>` to move account to, file path
-- `[--dir DIR]` - secret store directory, It may be either parity, parity-test, geth, geth-test or a path. default: parity
-- `[--vault VAULT]` - current vault of the `<address>` argument, if set
-- `[--vault-pwd VAULTPWD]` - password for the current vault of the `<address>` argument, if any. file path
-
-
-```
-ethstore move-to-vault 00e63fdb87ceb815ec96ae185b8f7381a0b4a5ea vault3 vault3_password.txt
-ethstore move-to-vault 00e63fdb87ceb815ec96ae185b8f7381a0b4a5ea vault1 vault1_password.txt --vault vault3 --vault-pwd vault3_password.txt
-```
-
-```
-OK
-OK
-```
-
---
-
-#### `move-from-vault <address> <vault> <password> [--dir DIR]`
-*Move account to root directory from given vault.*
-
-- `<address>` - ethereum address, 20 bytes long
-- `<vault>` - name of existing vault to move account to
-- `<password>` - password of existing `<vault>` to move account to, file path
-- `[--dir DIR]` - secret store directory, It may be either parity, parity-test, geth, geth-test or a path. default: parity
-
-
-```
-ethstore move-from-vault 00e63fdb87ceb815ec96ae185b8f7381a0b4a5ea vault1 vault1_password.txt
-```
-
-```
-OK
-```
-
-## OpenEthereum toolchain
-_This project is a part of the OpenEthereum toolchain._
-
-- [evmbin](https://github.com/openethereum/openethereum/blob/master/evmbin/) - EVM implementation for OpenEthereum.
-- [ethabi](https://github.com/OpenEthereum/ethabi) - OpenEthereum function calls encoding.
-- [ethstore](https://github.com/openethereum/openethereum/blob/master/accounts/ethstore) - OpenEthereum key management.
-- [ethkey](https://github.com/openethereum/openethereum/blob/master/accounts/ethkey) - OpenEthereum keys generator.
-- [whisper](https://github.com/OpenEthereum/whisper) - Implementation of Whisper-v2 PoC.

accounts/ethstore/cli/Cargo.toml

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

accounts/ethstore/cli/src/crack.rs

@@ -1,67 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{cmp, thread};
-use std::sync::Arc;
-use std::collections::VecDeque;
-use parking_lot::Mutex;
-
-use ethstore::{PresaleWallet, Error};
-use ethkey::Password;
-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

@@ -1,322 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate dir;
-extern crate docopt;
-extern crate ethstore;
-extern crate ethkey;
-extern crate num_cpus;
-extern crate panic_hook;
-extern crate parking_lot;
-extern crate parity_crypto;
-extern crate rustc_hex;
-extern crate serde;
-
-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 ethkey::Password;
-use parity_crypto::publickey::Address;
-use ethstore::{EthStore, SimpleSecretStore, SecretStore, import_accounts, PresaleWallet, SecretVaultRef, StoreAccountRef};
-
-mod crack;
-
-pub const USAGE: &'static str = r#"
-OpenEthereum key management tool.
-  Copyright 2015-2020 Parity Technologies (UK) Ltd.
-
-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<dyn KeyDirectory>, Error> {
-	let dir: RootDiskDirectory = match location {
-		"geth" => RootDiskDirectory::create(dir::geth(false))?,
-		"geth-test" => RootDiskDirectory::create(dir::geth(true))?,
-		path if path.starts_with("parity") => {
-			let chain = path.split('-').nth(1).unwrap_or("ethereum");
-			let mut path = dir::default_data_pathbuf();
-			path.push("keys");
-			path.push(chain);
-			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

@@ -1,82 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate tempfile;
-use std::process::Command;
-use tempfile::Builder;
-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 = Builder::new().prefix("test-vault").tempdir().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

@@ -1,59 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use 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

@@ -1,207 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::str;
-use crypto::publickey::Secret;
-use ethkey::Password;
-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::import_key(&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 crypto::publickey::{Generator, Random};
-	use super::{Crypto, Error};
-
-	#[test]
-	fn crypto_with_secret_create() {
-		let keypair = Random.generate();
-		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();
-		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

@@ -1,125 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use 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

@@ -1,27 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-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

@@ -1,230 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use crypto::publickey::{KeyPair, sign, Address, Signature, Message, Public, Secret};
-use ethkey::Password;
-use crypto::publickey::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)?;
-		crypto::publickey::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 crypto::publickey::{Generator, Random, verify_public};
-	use super::SafeAccount;
-
-	#[test]
-	fn sign_and_verify_public() {
-		let keypair = Random.generate();
-		let password = "hello world".into();
-		let message = [1u8; 32].into();
-		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();
-		let first_password = "hello world".into();
-		let sec_password = "this is sparta".into();
-		let i = 10240;
-		let message = [1u8; 32].into();
-		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,38 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use json;
-
-#[derive(Debug, PartialEq, Clone)]
-pub enum Version {
-	V3,
-}
-
-impl From<json::Version> for Version {
-	fn from(json: json::Version) -> Self {
-		match json {
-			json::Version::V3 => Version::V3,
-		}
-	}
-}
-
-impl Into<json::Version> for Version {
-	fn into(self) -> json::Version {
-		match self {
-			Version::V3 => json::Version::V3,
-		}
-	}
-}

accounts/ethstore/src/accounts_dir/disk.rs

@@ -1,484 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{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<&dyn 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<dyn VaultKeyDirectory>, Error> {
-		let vault_dir = VaultDiskDirectory::create(&self.path, name, key)?;
-		Ok(Box::new(vault_dir))
-	}
-
-	fn open(&self, name: &str, key: VaultKey) -> Result<Box<dyn VaultKeyDirectory>, Error> {
-		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 tempfile;
-
-	use std::{env, fs};
-	use super::{KeyDirectory, RootDiskDirectory, VaultKey};
-	use account::SafeAccount;
-	use crypto::publickey::{Random, Generator};
-	use self::tempfile::TempDir;
-
-	#[test]
-	fn should_create_new_account() {
-		// given
-		let mut dir = env::temp_dir();
-		dir.push("ethstore_should_create_new_account");
-		let keypair = Random.generate();
-		let 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();
-		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();
-		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/mod.rs

@@ -1,105 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! 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<&dyn 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<dyn VaultKeyDirectory>, Error>;
-	/// Open existing vault with given key
-	fn open(&self, name: &str, key: VaultKey) -> Result<Box<dyn 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) -> &dyn 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/error.rs

@@ -1,118 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-use std::io::Error as IoError;
-use crypto::{self, Error as EthCryptoError};
-use crypto::publickey::{Error as EthPublicKeyCryptoError, 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,
-	/// `EthCrypto` error
-	EthCrypto(EthCryptoError),
-	/// `EthPublicKeyCryptoError` error
-	EthPublicKeyCrypto(EthPublicKeyCryptoError),
-	/// 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::EthCrypto(ref err) => err.to_string(),
-			Error::EthPublicKeyCrypto(ref err) => err.to_string(),
-			Error::Derivation(ref err) => format!("Derivation error: {:?}", err),
-			Error::Custom(ref s) => s.clone(),
-		};
-
-		write!(f, "{}", s)
-	}
-}
-
-impl From<IoError> for Error {
-	fn from(err: IoError) -> Self {
-		Error::Io(err)
-	}
-}
-
-impl From<EthPublicKeyCryptoError> for Error {
-	fn from(err: EthPublicKeyCryptoError) -> Self {
-		Error::EthPublicKeyCrypto(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/import.rs

@@ -1,80 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::collections::HashSet;
-use std::path::Path;
-use std::fs;
-
-use crypto::publickey::Address;
-use accounts_dir::{KeyDirectory, RootDiskDirectory, DiskKeyFileManager, KeyFileManager};
-use dir;
-use Error;
-
-/// Import an account from a file.
-pub fn import_account(path: &Path, dst: &dyn KeyDirectory) -> Result<Address, Error> {
-	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: &dyn KeyDirectory, dst: &dyn 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: &dyn 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/cipher.rs

@@ -1,96 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-use 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

@@ -1,194 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{fmt, 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

@@ -1,50 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-
-#[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

@@ -1,120 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{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::<String>())
-			}
-		}
-
-		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::<Vec<u8>>() {
-					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/kdf.rs

@@ -1,159 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-use 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/mod.rs

@@ -1,43 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! 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,80 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::io::Read;
-use serde_json;
-use super::{H160, Bytes};
-
-pub type Encseed = Bytes;
-
-#[derive(Debug, PartialEq, Deserialize)]
-pub struct PresaleWallet {
-	pub encseed: Encseed,
-	#[serde(rename = "ethaddr")]
-	pub address: H160,
-}
-
-impl PresaleWallet {
-	pub fn load<R>(reader: R) -> Result<Self, serde_json::Error> where R: Read {
-		serde_json::from_reader(reader)
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use std::str::FromStr;
-	use serde_json;
-	use json::{PresaleWallet, H160};
-
-	#[test]
-	fn presale_wallet() {
-		let json = r#"
-		{
-			"encseed": "137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dedb3bc0a9ac6c79b9c426c5878ca2c9d06ff42a23cb648312fc32ba83649de0928e066",
-			"ethaddr": "ede84640d1a1d3e06902048e67aa7db8d52c2ce1",
-			"email": "123@gmail.com",
-			"btcaddr": "1JvqEc6WLhg6GnyrLBe2ztPAU28KRfuseH"
-		} "#;
-
-		let expected = PresaleWallet {
-			encseed: "137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dedb3bc0a9ac6c79b9c426c5878ca2c9d06ff42a23cb648312fc32ba83649de0928e066".into(),
-			address: H160::from_str("ede84640d1a1d3e06902048e67aa7db8d52c2ce1").unwrap(),
-		};
-
-		let wallet: PresaleWallet = serde_json::from_str(json).unwrap();
-		assert_eq!(expected, wallet);
-	}
-
-	#[test]
-	fn long_presale_wallet() {
-		let json = r#"
-		{
-			"encseed":
-			"137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dedb3bc0a9ac6c79b9c426c5878ca2c9d06ff42a23cb648312fc32ba83649de0928e066137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dedb3bc0a9ac6c79b9c426c5878ca2c9d06ff42a23cb648312fc32ba83649de0928e066137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dedb3bc0a9ac6c79b9c426c5878ca2c9d06ff42a23cb648312fc32ba83649de0928e066137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dedb3bc0a9ac6c79b9c426c5878ca2c9d06ff42a23cb648312fc32ba83649de0928e066137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dedb3bc0a9ac6c79b9c426c5878ca2c9d06ff42a23cb648312fc32ba83649de0928e066137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0d",
-			"ethaddr": "ede84640d1a1d3e06902048e67aa7db8d52c2ce1",
-			"email": "123@gmail.com",
-			"btcaddr": "1JvqEc6WLhg6GnyrLBe2ztPAU28KRfuseH"
-		} "#;
-
-		let expected = PresaleWallet {
-			encseed: "137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dedb3bc0a9ac6c79b9c426c5878ca2c9d06ff42a23cb648312fc32ba83649de0928e066137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dedb3bc0a9ac6c79b9c426c5878ca2c9d06ff42a23cb648312fc32ba83649de0928e066137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dedb3bc0a9ac6c79b9c426c5878ca2c9d06ff42a23cb648312fc32ba83649de0928e066137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dedb3bc0a9ac6c79b9c426c5878ca2c9d06ff42a23cb648312fc32ba83649de0928e066137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dedb3bc0a9ac6c79b9c426c5878ca2c9d06ff42a23cb648312fc32ba83649de0928e066137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0dcf0d".into(),
-			address: H160::from_str("ede84640d1a1d3e06902048e67aa7db8d52c2ce1").unwrap(),
-		};
-
-		let wallet: PresaleWallet = serde_json::from_str(json).unwrap();
-		assert_eq!(expected, wallet);
-	}
-}

accounts/ethstore/src/json/version.rs

@@ -1,58 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-use 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,98 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Ethereum key-management.
-
-#![warn(missing_docs)]
-
-extern crate dir;
-extern crate libc;
-extern crate parking_lot;
-extern crate rand;
-extern crate rustc_hex;
-extern crate serde;
-extern crate serde_json;
-extern crate smallvec;
-extern crate time;
-extern crate tiny_keccak;
-extern crate tempfile;
-
-extern crate parity_crypto as crypto;
-extern crate ethereum_types;
-extern crate ethkey as ethkey;
-extern crate parity_wordlist;
-
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate serde_derive;
-
-#[cfg(test)]
-#[macro_use]
-extern crate matches;
-
-pub mod accounts_dir;
-
-mod account;
-mod json;
-
-mod error;
-mod ethstore;
-mod import;
-mod presale;
-mod random;
-mod secret_store;
-
-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);
-
-// Additional converters for Address
-use crypto::publickey::Address;
-
-impl Into<json::H160> for Address {
-	fn into(self) -> json::H160 {
-		let a: [u8; 20] = self.into();
-		From::from(a)
-	}
-}
-
-impl From<json::H160> for Address {
-	fn from(json: json::H160) -> Self {
-		let a: [u8; 20] = json.into();
-		From::from(a)
-	}
-}
-
-impl<'a> From<&'a json::H160> for Address {
-	fn from(json: &'a json::H160) -> Self {
-		let mut a = [0u8; 20];
-		a.copy_from_slice(json);
-		From::from(a)
-	}
-}

accounts/ethstore/src/presale.rs

@@ -1,100 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fs;
-use std::path::Path;
-use json;
-use crypto::publickey::{Address, Secret, KeyPair};
-use ethkey::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::import_key(&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

@@ -1,45 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use 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;
-		rng.fill_bytes(&mut result);
-		result
-	}
-}
-
-impl Random for [u8; 32] {
-	fn random() -> Self {
-		let mut result = [0u8; 32];
-		let mut rng = OsRng;
-		rng.fill_bytes(&mut result);
-		result
-	}
-}
-
-/// Generate a random string of given length.
-pub fn random_string(length: usize) -> String {
-	let rng = OsRng;
-	rng.sample_iter(&Alphanumeric).take(length).collect()
-}

accounts/ethstore/src/secret_store.rs

@@ -1,191 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::hash::{Hash, Hasher};
-use std::path::PathBuf;
-use std::cmp::Ordering;
-use crypto::publickey::{Address, Message, Signature, Secret, Public};
-use ethkey::Password;
-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(crypto::publickey::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: &dyn 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

@@ -1,160 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate rand;
-extern crate ethstore;
-extern crate ethereum_types;
-extern crate parity_crypto;
-
-mod util;
-
-use ethstore::{EthStore, SimpleSecretStore, SecretVaultRef, StoreAccountRef};
-use parity_crypto::publickey::{Random, Generator, Secret, KeyPair, verify_address};
-use ethstore::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().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();
-	let message = [1u8; 32].into();
-	assert_eq!(accounts.len(), 1);
-	assert!(store.sign(&accounts[0], &"".into(), &message).is_ok());
-	assert!(store.sign(&accounts[0], &"1".into(), &message).is_err());
-}
-
-#[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();
-	let message = [1u8; 32].into();
-	assert_eq!(accounts.len(), 1);
-	assert!(store.sign(&accounts[0], &"".into(), &message).is_ok());
-	assert!(store.change_password(&accounts[0], &"".into(), &"1".into()).is_ok());
-	assert!(store.sign(&accounts[0], &"".into(), &message).is_err());
-	assert!(store.sign(&accounts[0], &"1".into(), &message).is_ok());
-}
-
-#[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 = [1u8; 32].into();
-
-	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,19 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-mod transient_dir;
-
-pub use self::transient_dir::TransientDir;

accounts/src/account_data.rs

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

accounts/src/error.rs

@@ -1,46 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-
-use ethstore::{Error as SSError};
-
-/// Signing error
-#[derive(Debug)]
-pub enum SignError {
-	/// Account is not unlocked
-	NotUnlocked,
-	/// Account does not exist.
-	NotFound,
-	/// Low-level error from store
-	SStore(SSError),
-}
-
-impl fmt::Display for SignError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		match *self {
-			SignError::NotUnlocked => write!(f, "Account is locked"),
-			SignError::NotFound => write!(f, "Account does not exist"),
-			SignError::SStore(ref e) => write!(f, "{}", e),
-		}
-	}
-}
-
-impl From<SSError> for SignError {
-	fn from(e: SSError) -> Self {
-		SignError::SStore(e)
-	}
-}

accounts/src/lib.rs

@@ -1,649 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-#![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::Password;
-use parity_crypto::publickey::{Address, Message, Public, Secret, Random, Generator, Signature};
-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 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<dyn 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<dyn 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();
-		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 a dummy message
-			// result may be discarded
-			let dummy_msg = [1u8;32].into();
-			let _ = self.sstore.sign(&account, &password, &dummy_msg)?;
-		}
-
-		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 parity_crypto::publickey::{Generator, Random, Address};
-	use ethstore::{StoreAccountRef, Derivation};
-	use ethereum_types::H256;
-
-	#[test]
-	fn unlock_account_temp() {
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		let dummy_msg = [1u8; 32].into();
-		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, dummy_msg).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_err());
-	}
-
-	#[test]
-	fn derived_account_nosave() {
-		let kp = Random.generate();
-		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();
-		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();
-		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 = [2u8; 32].into();
-		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();
-		let ap = AccountProvider::transient_provider();
-		let dummy_msg = [1u8; 32].into();
-		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, dummy_msg).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_ok());
-		assert!(ap.unlock_account_temporarily(kp.address(), "test".into()).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_ok());
-	}
-
-	#[test]
-	fn unlock_account_timer() {
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		let dummy_msg = [1u8; 32].into();
-
-		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, dummy_msg).is_ok());
-		ap.unlocked.write().get_mut(&StoreAccountRef::root(kp.address())).unwrap().unlock = Unlock::Timed(Instant::now());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_err());
-	}
-
-	#[test]
-	fn should_sign_and_return_token() {
-		// given
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		let dummy_msg = [1u8; 32].into();
-		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).is_ok());
-
-		// when
-		let (_signature, token) = ap.sign_with_token(kp.address(), "test".into(), dummy_msg).unwrap();
-
-		// then
-		ap.sign_with_token(kp.address(), token.clone(), dummy_msg)
-			.expect("First usage of token should be correct.");
-		assert!(ap.sign_with_token(kp.address(), token, dummy_msg).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

@@ -1,189 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Address Book Store
-
-use std::{fs, fmt, hash, ops};
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-
-use parity_crypto::publickey::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 at: {:?} {}", self.path, 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 at: {:?} {}", self.path, e))
-			.and_then(|mut f| {
-				write(&self.cache, &mut f).map_err(|e| warn!(target: "diskmap", "Couldn't write to disk map at: {:?} {}", self.path, e))
-			});
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::{AddressBook, Address};
-	use std::collections::HashMap;
-	use tempfile::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<_, _>>());
-	}
-}

build.rs

@@ -0,0 +1,35 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+extern crate rustc_version;
+
+const MIN_RUSTC_VERSION: &'static str = "1.15.1";
+
+fn main() {
+	let is = rustc_version::version().unwrap();
+	let required = MIN_RUSTC_VERSION.parse().unwrap();
+	assert!(is >= required, format!("
+
+It looks like you are compiling Parity with an old rustc compiler {}.
+Parity requires version {}. Please update your compiler.
+If you use rustup, try this:
+
+    rustup update stable
+
+and try building Parity again.
+
+", is, required));
+}

chainspec/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
-description = "OpenEthereum Chain Specification"
 name = "chainspec"
 version = "0.1.0"
-authors = ["Marek Kotewicz <marek@parity.io>"]
+authors = ["debris <marek.kotewicz@gmail.com>"]
 
 [dependencies]
 ethjson = { path = "../json" }
 serde_json = "1.0"
+serde_ignored = "0.0.4"

chainspec/src/main.rs

@@ -1,22 +1,8 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
 extern crate serde_json;
+extern crate serde_ignored;
 extern crate ethjson;
 
+use std::collections::BTreeSet;
 use std::{fs, env, process};
 use ethjson::spec::Spec;
 
@@ -39,11 +25,24 @@ fn main() {
 		Err(_) => quit(&format!("{} could not be opened", path)),
 	};
 
-	let spec: Result<Spec, _> = serde_json::from_reader(file);
+	let mut unused = BTreeSet::new();
+	let mut deserializer = serde_json::Deserializer::from_reader(file);
+
+	let spec: Result<Spec, _> = serde_ignored::deserialize(&mut deserializer, |field| {
+		unused.insert(field.to_string());
+	});
 
 	if let Err(err) = spec {
 		quit(&format!("{} {}", path, err.to_string()));
 	}
 
+	if !unused.is_empty() {
+		let err = unused.into_iter()
+			.map(|field| format!("{} unexpected field `{}`", path, field))
+			.collect::<Vec<_>>()
+			.join("\n");
+		quit(&err);
+	}
+
 	println!("{} is valid", path);
 }

cli-signer/Cargo.toml

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

cli-signer/rpc-client/Cargo.toml

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

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

@@ -1,347 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt::{Debug, Formatter, Error as FmtError};
-use std::io::{BufReader, BufRead};
-use std::sync::Arc;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::collections::BTreeMap;
-use std::thread;
-use std::time;
-
-use std::path::PathBuf;
-use hash::keccak;
-use parking_lot::Mutex;
-use url::Url;
-use std::fs::File;
-
-use ws::ws::{
-	self,
-	Request,
-	Handler,
-	Sender,
-	Handshake,
-	Error as WsError,
-	ErrorKind as WsErrorKind,
-	Message,
-	Result as WsResult,
-};
-
-use serde::de::DeserializeOwned;
-use serde_json::{
-	self as json,
-	Value as JsonValue,
-	Error as JsonError,
-};
-
-use futures::{Canceled, Complete, Future, oneshot, done};
-
-use jsonrpc_core::{Id, Version, Params, Error as JsonRpcError};
-use jsonrpc_core::request::MethodCall;
-use jsonrpc_core::response::{Output, Success, Failure};
-
-use BoxFuture;
-
-/// The actual websocket connection handler, passed into the
-/// event loop of ws-rs
-struct RpcHandler {
-	pending: Pending,
-	// Option is used here as temporary storage until connection
-	// is setup and the values are moved into the new `Rpc`
-	complete: Option<Complete<Result<Rpc, RpcError>>>,
-	auth_code: String,
-	out: Option<Sender>,
-}
-
-impl RpcHandler {
-	fn new(
-		out: Sender,
-		auth_code: String,
-		complete: Complete<Result<Rpc, RpcError>>
-	) -> Self {
-		RpcHandler {
-			out: Some(out),
-			auth_code: auth_code,
-			pending: Pending::new(),
-			complete: Some(complete),
-		}
-	}
-}
-
-impl Handler for RpcHandler {
-	fn build_request(&mut self, url: &Url) -> WsResult<Request> {
-		match Request::from_url(url) {
-			Ok(mut r) => {
-				let timestamp = time::UNIX_EPOCH.elapsed().map_err(|err| {
-					WsError::new(WsErrorKind::Internal, format!("{}", err))
-				})?;
-				let secs = timestamp.as_secs();
-				let hashed = keccak(format!("{}:{}", self.auth_code, secs));
-				let proto = format!("{:x}_{}", hashed, secs);
-				r.add_protocol(&proto);
-				Ok(r)
-			},
-			Err(e) =>
-				Err(WsError::new(WsErrorKind::Internal, format!("{}", e))),
-		}
-	}
-	fn on_error(&mut self, err: WsError) {
-		match self.complete.take() {
-			Some(c) => match c.send(Err(RpcError::WsError(err))) {
-				Ok(_) => {},
-				Err(_) => warn!(target: "rpc-client", "Unable to notify about error."),
-			},
-			None => warn!(target: "rpc-client", "unexpected error: {}", err),
-		}
-	}
-	fn on_open(&mut self, _: Handshake) -> WsResult<()> {
-		match (self.complete.take(), self.out.take()) {
-			(Some(c), Some(out)) => {
-				let res = c.send(Ok(Rpc {
-					out: out,
-					counter: AtomicUsize::new(0),
-					pending: self.pending.clone(),
-				}));
-				if let Err(_) = res {
-					warn!(target: "rpc-client", "Unable to open a connection.")
-				}
-				Ok(())
-			},
-			_ => {
-				let msg = format!("on_open called twice");
-				Err(WsError::new(WsErrorKind::Internal, msg))
-			}
-		}
-	}
-	fn on_message(&mut self, msg: Message) -> WsResult<()> {
-		let ret: Result<JsonValue, JsonRpcError>;
-		let response_id;
-		let string = &msg.to_string();
-		match json::from_str::<Output>(&string) {
-			Ok(Output::Success(Success { result, id: Id::Num(id), .. })) =>
-			{
-				ret = Ok(result);
-				response_id = id as usize;
-			}
-			Ok(Output::Failure(Failure { error, id: Id::Num(id), .. })) => {
-				ret = Err(error);
-				response_id = id as usize;
-			}
-			Err(e) => {
-				warn!(
-					target: "rpc-client",
-					"recieved invalid message: {}\n {:?}",
-					string,
-					e
-				);
-				return Ok(())
-			},
-			_ => {
-				warn!(
-					target: "rpc-client",
-					"recieved invalid message: {}",
-					string
-				);
-				return Ok(())
-			}
-		}
-
-		match self.pending.remove(response_id) {
-			Some(c) => if let Err(_) = c.send(ret.map_err(|err| RpcError::JsonRpc(err))) {
-				warn!(target: "rpc-client", "Unable to send response.")
-			},
-			None => warn!(
-				target: "rpc-client",
-				"warning: unexpected id: {}",
-				response_id
-			),
-		}
-		Ok(())
-	}
-}
-
-/// Keeping track of issued requests to be matched up with responses
-#[derive(Clone)]
-struct Pending(
-	Arc<Mutex<BTreeMap<usize, Complete<Result<JsonValue, RpcError>>>>>
-);
-
-impl Pending {
-	fn new() -> Self {
-		Pending(Arc::new(Mutex::new(BTreeMap::new())))
-	}
-	fn insert(&mut self, k: usize, v: Complete<Result<JsonValue, RpcError>>) {
-		self.0.lock().insert(k, v);
-	}
-	fn remove(
-		&mut self,
-		k: usize
-	) -> Option<Complete<Result<JsonValue, RpcError>>> {
-		self.0.lock().remove(&k)
-	}
-}
-
-fn get_authcode(path: &PathBuf) -> Result<String, RpcError> {
-	if let Ok(fd) = File::open(path) {
-		if let Some(Ok(line)) = BufReader::new(fd).lines().next() {
-			let mut parts = line.split(';');
-			let token = parts.next();
-
-			if let Some(code) = token {
-				return Ok(code.into());
-			}
-		}
-	}
-	Err(RpcError::NoAuthCode)
-}
-
-/// The handle to the connection
-pub struct Rpc {
-	out: Sender,
-	counter: AtomicUsize,
-	pending: Pending,
-}
-
-impl Rpc {
-	/// Blocking, returns a new initialized connection or RpcError
-	pub fn new(url: &str, authpath: &PathBuf) -> Result<Self, RpcError> {
-		let rpc = Self::connect(url, authpath).map(|rpc| rpc).wait()?;
-		rpc
-	}
-
-	/// Non-blocking, returns a future
-	pub fn connect(
-		url: &str, authpath: &PathBuf
-	) -> BoxFuture<Result<Self, RpcError>, Canceled> {
-		let (c, p) = oneshot::<Result<Self, RpcError>>();
-		match get_authcode(authpath) {
-			Err(e) => return Box::new(done(Ok(Err(e)))),
-			Ok(code) => {
-				let url = String::from(url);
-				// The ws::connect takes a FnMut closure, which means c cannot
-				// be moved into it, since it's consumed on complete.
-				// Therefore we wrap it in an option and pick it out once.
-				let mut once = Some(c);
-				thread::spawn(move || {
-					let conn = ws::connect(url, |out| {
-						// this will panic if the closure is called twice,
-						// which it should never be.
-						let c = once.take()
-							.expect("connection closure called only once");
-						RpcHandler::new(out, code.clone(), c)
-					});
-					match conn {
-						Err(err) => {
-							// since ws::connect is only called once, it cannot
-							// both fail and succeed.
-							let c = once.take()
-								.expect("connection closure called only once");
-							let _ = c.send(Err(RpcError::WsError(err)));
-						},
-						// c will complete on the `on_open` event in the Handler
-						_ => ()
-					}
-				});
-				Box::new(p)
-			}
-		}
-	}
-
-	/// Non-blocking, returns a future of the request response
-	pub fn request<T>(
-		&mut self, method: &'static str, params: Vec<JsonValue>
-	) -> BoxFuture<Result<T, RpcError>, Canceled>
-		where T: DeserializeOwned + Send + Sized {
-
-		let (c, p) = oneshot::<Result<JsonValue, RpcError>>();
-
-		let id = self.counter.fetch_add(1, Ordering::Relaxed);
-		self.pending.insert(id, c);
-
-		let request = MethodCall {
-			jsonrpc: Some(Version::V2),
-			method: method.to_owned(),
-			params: Params::Array(params),
-			id: Id::Num(id as u64),
-		};
-
-		let serialized = json::to_string(&request)
-			.expect("request is serializable");
-		let _ = self.out.send(serialized);
-
-		Box::new(p.map(|result| {
-			match result {
-				Ok(json) => {
-					let t: T = json::from_value(json)?;
-					Ok(t)
-				},
-				Err(err) => Err(err)
-			}
-		}))
-	}
-}
-
-pub enum RpcError {
-	WrongVersion(String),
-	ParseError(JsonError),
-	MalformedResponse(String),
-	JsonRpc(JsonRpcError),
-	WsError(WsError),
-	Canceled(Canceled),
-	UnexpectedId,
-	NoAuthCode,
-}
-
-impl Debug for RpcError {
-	fn fmt(&self, f: &mut Formatter) -> Result<(), FmtError> {
-		match *self {
-			RpcError::WrongVersion(ref s)
-				=> write!(f, "Expected version 2.0, got {}", s),
-			RpcError::ParseError(ref err)
-				=> write!(f, "ParseError: {}", err),
-			RpcError::MalformedResponse(ref s)
-				=> write!(f, "Malformed response: {}", s),
-			RpcError::JsonRpc(ref json)
-				=> write!(f, "JsonRpc error: {:?}", json),
-			RpcError::WsError(ref s)
-				=> write!(f, "Websocket error: {}", s),
-			RpcError::Canceled(ref s)
-				=> write!(f, "Futures error: {:?}", s),
-			RpcError::UnexpectedId
-				=> write!(f, "Unexpected response id"),
-			RpcError::NoAuthCode
-				=> write!(f, "No authcodes available"),
-		}
-	}
-}
-
-impl From<JsonError> for RpcError {
-	fn from(err: JsonError) -> RpcError {
-		RpcError::ParseError(err)
-	}
-}
-
-impl From<WsError> for RpcError {
-	fn from(err: WsError) -> RpcError {
-		RpcError::WsError(err)
-	}
-}
-
-impl From<Canceled> for RpcError {
-	fn from(err: Canceled) -> RpcError {
-		RpcError::Canceled(err)
-	}
-}

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

@@ -1,91 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-pub mod client;
-pub mod signer_client;
-
-extern crate ethereum_types;
-extern crate futures;
-extern crate jsonrpc_core;
-extern crate jsonrpc_ws_server as ws;
-extern crate parity_rpc as rpc;
-extern crate parking_lot;
-extern crate serde;
-extern crate serde_json;
-extern crate url;
-extern crate keccak_hash as hash;
-
-#[macro_use]
-extern crate log;
-
-#[cfg(test)]
-#[macro_use]
-extern crate matches;
-
-/// Boxed future response.
-pub type BoxFuture<T, E> = Box<dyn futures::Future<Item=T, Error=E> + Send>;
-
-#[cfg(test)]
-mod tests {
-
-	use futures::Future;
-	use std::path::PathBuf;
-	use client::{Rpc, RpcError};
-	use rpc;
-
-	#[test]
-	fn test_connection_refused() {
-		let (_srv, port, mut authcodes) = rpc::tests::ws::serve();
-
-		let _ = authcodes.generate_new();
-		authcodes.to_file(&authcodes.path).unwrap();
-
-		let connect = Rpc::connect(&format!("ws://127.0.0.1:{}", port - 1),
-								   &authcodes.path);
-
-		let _ = connect.map(|conn| {
-			assert!(matches!(&conn, &Err(RpcError::WsError(_))));
-		}).wait();
-	}
-
-	#[test]
-	fn test_authcode_fail() {
-		let (_srv, port, _) = rpc::tests::ws::serve();
-		let path = PathBuf::from("nonexist");
-
-		let connect = Rpc::connect(&format!("ws://127.0.0.1:{}", port), &path);
-
-		let _ = connect.map(|conn| {
-			assert!(matches!(&conn, &Err(RpcError::NoAuthCode)));
-		}).wait();
-	}
-
-	#[test]
-	fn test_authcode_correct() {
-		let (_srv, port, mut authcodes) = rpc::tests::ws::serve();
-
-		let _ = authcodes.generate_new();
-		authcodes.to_file(&authcodes.path).unwrap();
-
-		let connect = Rpc::connect(&format!("ws://127.0.0.1:{}", port),
-								   &authcodes.path);
-
-		let _ = connect.map(|conn| {
-			assert!(conn.is_ok())
-		}).wait();
-	}
-
-}

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

@@ -1,63 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use client::{Rpc, RpcError};
-use ethereum_types::U256;
-use rpc::signer::{ConfirmationRequest, TransactionModification, TransactionCondition};
-use serde;
-use serde_json::{Value as JsonValue, to_value};
-use std::path::PathBuf;
-use futures::{Canceled};
-use {BoxFuture};
-
-pub struct SignerRpc {
-	rpc: Rpc,
-}
-
-impl SignerRpc {
-	pub fn new(url: &str, authfile: &PathBuf) -> Result<Self, RpcError> {
-		Ok(SignerRpc { rpc: Rpc::new(&url, authfile)? })
-	}
-
-	pub fn requests_to_confirm(&mut self) -> BoxFuture<Result<Vec<ConfirmationRequest>, RpcError>, Canceled> {
-		self.rpc.request("signer_requestsToConfirm", vec![])
-	}
-
-	pub fn confirm_request(
-		&mut self,
-		id: U256,
-		new_gas: Option<U256>,
-		new_gas_price: Option<U256>,
-		new_condition: Option<Option<TransactionCondition>>,
-		pwd: &str
-	) -> BoxFuture<Result<U256, RpcError>, Canceled> {
-		self.rpc.request("signer_confirmRequest", vec![
-			Self::to_value(&format!("{:#x}", id)),
-			Self::to_value(&TransactionModification { sender: None, gas_price: new_gas_price, gas: new_gas, condition: new_condition }),
-			Self::to_value(&pwd),
-		])
-	}
-
-	pub fn reject_request(&mut self, id: U256) -> BoxFuture<Result<bool, RpcError>, Canceled> {
-		self.rpc.request("signer_rejectRequest", vec![
-			JsonValue::String(format!("{:#x}", id))
-		])
-	}
-
-	fn to_value<T: serde::Serialize>(v: &T) -> JsonValue {
-		to_value(v).expect("Our types are always serializable; qed")
-	}
-}

cli-signer/src/lib.rs

@@ -1,197 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate ethereum_types;
-extern crate futures;
-extern crate rpassword;
-
-extern crate parity_rpc as rpc;
-extern crate parity_rpc_client as client;
-
-use ethereum_types::U256;
-use rpc::signer::ConfirmationRequest;
-use client::signer_client::SignerRpc;
-use std::io::{Write, BufRead, BufReader, stdout, stdin};
-use std::path::PathBuf;
-use std::fs::File;
-
-use futures::Future;
-
-fn sign_interactive(
-	signer: &mut SignerRpc,
-	password: &str,
-	request: ConfirmationRequest
-) {
-	print!("\n{}\nSign this transaction? (y)es/(N)o/(r)eject: ", request);
-	let _ = stdout().flush();
-	match BufReader::new(stdin()).lines().next() {
-		Some(Ok(line)) => {
-			match line.to_lowercase().chars().nth(0) {
-				Some('y') => {
-					match sign_transaction(signer, request.id, password) {
-						Ok(s) | Err(s) => println!("{}", s),
-					}
-				}
-				Some('r') => {
-					match reject_transaction(signer, request.id) {
-						Ok(s) | Err(s) => println!("{}", s),
-					}
-				}
-				_ => ()
-			}
-		}
-		_ => println!("Could not read from stdin")
-	}
-}
-
-fn sign_transactions(
-	signer: &mut SignerRpc,
-	password: String
-) -> Result<String, String> {
-	signer.requests_to_confirm().map(|reqs| {
-		match reqs {
-			Ok(ref reqs) if reqs.is_empty() => {
-				Ok("No transactions in signing queue".to_owned())
-			}
-			Ok(reqs) => {
-				for r in reqs {
-					sign_interactive(signer, &password, r)
-				}
-				Ok("".to_owned())
-			}
-			Err(err) => {
-				Err(format!("error: {:?}", err))
-			}
-		}
-	}).map_err(|err| {
-		format!("{:?}", err)
-	}).wait()?
-}
-
-fn list_transactions(signer: &mut SignerRpc) -> Result<String, String> {
-	signer.requests_to_confirm().map(|reqs| {
-		match reqs {
-			Ok(ref reqs) if reqs.is_empty() => {
-				Ok("No transactions in signing queue".to_owned())
-			}
-			Ok(ref reqs) => {
-				Ok(format!("Transaction queue:\n{}", reqs
-						   .iter()
-						   .map(|r| format!("{}", r))
-						   .collect::<Vec<String>>()
-						   .join("\n")))
-			}
-			Err(err) => {
-				Err(format!("error: {:?}", err))
-			}
-		}
-	}).map_err(|err| {
-		format!("{:?}", err)
-	}).wait()?
-}
-
-fn sign_transaction(
-	signer: &mut SignerRpc, id: U256, password: &str
-) -> Result<String, String> {
-	signer.confirm_request(id, None, None, None, password).map(|res| {
-		match res {
-			Ok(u) => Ok(format!("Signed transaction id: {:#x}", u)),
-			Err(e) => Err(format!("{:?}", e)),
-		}
-	}).map_err(|err| {
-		format!("{:?}", err)
-	}).wait()?
-}
-
-fn reject_transaction(
-	signer: &mut SignerRpc, id: U256) -> Result<String, String>
-{
-	signer.reject_request(id).map(|res| {
-		match res {
-			Ok(true) => Ok(format!("Rejected transaction id {:#x}", id)),
-			Ok(false) => Err(format!("No such request")),
-			Err(e) => Err(format!("{:?}", e)),
-		}
-	}).map_err(|err| {
-		format!("{:?}", err)
-	}).wait()?
-}
-
-// cmds
-
-pub fn signer_list(
-	signerport: u16, authfile: PathBuf
-) -> Result<String, String> {
-	let addr = &format!("ws://127.0.0.1:{}", signerport);
-	let mut signer = SignerRpc::new(addr, &authfile).map_err(|err| {
-		format!("{:?}", err)
-	})?;
-	list_transactions(&mut signer)
-}
-
-pub fn signer_reject(
-	id: Option<usize>, signerport: u16, authfile: PathBuf
-) -> Result<String, String> {
-	let id = id.ok_or(format!("id required for signer reject"))?;
-	let addr = &format!("ws://127.0.0.1:{}", signerport);
-	let mut signer = SignerRpc::new(addr, &authfile).map_err(|err| {
-		format!("{:?}", err)
-	})?;
-	reject_transaction(&mut signer, U256::from(id))
-}
-
-pub fn signer_sign(
-	id: Option<usize>,
-	pwfile: Option<PathBuf>,
-	signerport: u16,
-	authfile: PathBuf
-) -> Result<String, String> {
-	let password;
-	match pwfile {
-		Some(pwfile) => {
-			match File::open(pwfile) {
-				Ok(fd) => {
-					match BufReader::new(fd).lines().next() {
-						Some(Ok(line)) => password = line,
-						_ => return Err(format!("No password in file"))
-					}
-				},
-				Err(e) =>
-					return Err(format!("Could not open password file: {}", e))
-			}
-		}
-		None => {
-			password = match rpassword::prompt_password_stdout("Password: ") {
-				Ok(p) => p,
-				Err(e) => return Err(format!("{}", e)),
-			}
-		}
-	}
-
-	let addr = &format!("ws://127.0.0.1:{}", signerport);
-	let mut signer = SignerRpc::new(addr, &authfile).map_err(|err| {
-		format!("{:?}", err)
-	})?;
-
-	match id {
-		Some(id) => {
-			sign_transaction(&mut signer, U256::from(id), &password)
-		},
-		None => {
-			sign_transactions(&mut signer, password)
-		}
-	}
-}

dapps/Cargo.toml

@@ -0,0 +1,48 @@
+[package]
+description = "Parity Dapps crate"
+name = "parity-dapps"
+version = "1.9.0"
+license = "GPL-3.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[lib]
+
+[dependencies]
+base32 = "0.3"
+futures = "0.1"
+futures-cpupool = "0.1"
+linked-hash-map = "0.5"
+log = "0.3"
+parity-dapps-glue = "1.9"
+parking_lot = "0.4"
+mime_guess = "2.0.0-alpha.2"
+rand = "0.3"
+rustc-hex = "1.0"
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = "1.0"
+unicase = "1.4"
+zip = { version = "0.1", default-features = false }
+itertools = "0.5"
+
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
+jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
+
+ethcore-util = { path = "../util" }
+ethcore-bigint = { path = "../util/bigint" }
+ethcore-bytes = { path = "../util/bytes" }
+fetch = { path = "../util/fetch" }
+node-health = { path = "./node-health" }
+parity-hash-fetch = { path = "../hash-fetch" }
+parity-reactor = { path = "../util/reactor" }
+parity-ui = { path = "./ui" }
+keccak-hash = { path = "../util/hash" }
+parity-version = { path = "../util/version" }
+
+[dev-dependencies]
+env_logger = "0.4"
+ethcore-devtools = { path = "../devtools" }
+
+[features]
+ui = ["parity-ui/no-precompiled-js"]
+ui-precompiled = ["parity-ui/use-precompiled-js"]

dapps/js-glue/Cargo.toml

@@ -0,0 +1,28 @@
+[package]
+description = "Base Package for all Parity built-in dapps"
+name = "parity-dapps-glue"
+version = "1.9.1"
+license = "GPL-3.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+build = "build.rs"
+
+[build-dependencies]
+quasi_codegen = { version = "0.32", optional = true }
+syntex = { version = "0.58", optional = true }
+
+[dependencies]
+glob = { version = "0.2.11" }
+mime_guess = { version = "2.0.0-alpha.2" }
+aster = { version = "0.41", default-features = false }
+quasi = { version = "0.32", default-features = false }
+quasi_macros = { version = "0.32", optional = true }
+syntex = { version = "0.58", optional = true }
+syntex_syntax = { version = "0.58", optional = true }
+
+[features]
+default = ["with-syntex"]
+nightly = ["quasi_macros"]
+with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
+use-precompiled-js = []
+
+

dapps/js-glue/README.md

@@ -0,0 +1,65 @@
+# Parity Dapps (JS-glue)
+
+Code generator to simplify creating a built-in Parity Dapp
+
+# How to create new builtin Dapp.
+1. Clone this repository.
+
+   ```bash
+   $ git clone https://github.com/paritytech/parity.git
+   ```
+
+1. Create a new directory for your Dapp. (`./myapp`)
+
+   ```bash
+   $ mkdir -p ./parity/dapps/myapp/src/web
+   ```
+
+1. Copy your frontend files to `./dapps/myapp/src/web` (bundled ones)
+
+   ```bash
+   $ cp -r ./myapp-src/* ./parity/dapps/myapp/src/web
+   ```
+
+1. Instead of creating `web3` in your app. Load (as the first script tag in `head`):
+
+   ```html
+   <script src="/parity-utils/inject.js"></script>
+   ```
+
+   The `inject.js` script will create global `web3` instance with proper provider that should be used by your dapp.
+
+1. Create `./parity/dapps/myapp/Cargo.toml` with you apps details. See example here: [parity-status Cargo.toml](https://github.com/paritytech/parity-ui/blob/master/status/Cargo.toml).
+
+   ```bash
+   $ git clone https://github.com/paritytech/parity-ui.git
+   $ cd ./parity-ui/
+   $ cp ./home/Cargo.toml ../parity/dapps/myapp/Cargo.toml
+   $ cp ./home/build.rs ../parity/dapps/myapp/build.rs
+   $ cp ./home/src/lib.rs ../parity/dapps/myapp/src/lib.rs
+   $ cp ./home/src/lib.rs.in ../parity/dapps/myapp/src/lib.rs.in
+   # And edit the details of your app
+   $ vim ../parity/dapps/myapp/Cargo.toml # Edit the details
+   $ vim ./parity/dapps/myapp/src/lib.rs.in # Edit the details
+   ```
+# How to include your Dapp into `Parity`?
+1. Edit `dapps/Cargo.toml` and add dependency to your application (it can be optional)
+
+   ```toml
+   # Use git repo and version
+   parity-dapps-myapp = { path="./myapp" }
+   ```
+
+1. Edit `dapps/src/apps.rs` and add your application to `all_pages` (if it's optional you need to specify two functions - see `parity-dapps-wallet` example)
+
+1. Compile parity.
+
+   ```bash
+   $ cargo build --release # While inside `parity`
+   ```
+
+1. Commit the results.
+
+   ```bash
+   $ git add myapp && git commit -am "My first Parity Dapp".
+   ```

dapps/js-glue/build.rs

@@ -0,0 +1,43 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+
+#[cfg(feature = "with-syntex")]
+mod inner {
+	extern crate syntex;
+	extern crate quasi_codegen;
+
+	use std::env;
+	use std::path::Path;
+
+	pub fn main() {
+		let out_dir = env::var_os("OUT_DIR").unwrap();
+
+		let src = Path::new("src/lib.rs.in");
+		let dst = Path::new(&out_dir).join("lib.rs");
+
+		quasi_codegen::expand(&src, &dst).unwrap();
+	}
+}
+
+#[cfg(not(feature = "with-syntex"))]
+mod inner {
+	pub fn main() {}
+}
+
+fn main() {
+	inner::main();
+}

dapps/js-glue/src/build.rs

@@ -0,0 +1,65 @@
+
+#[cfg(feature = "with-syntex")]
+pub mod inner {
+	use syntex;
+	use codegen;
+	use syntax::{ast, fold};
+	use std::env;
+	use std::path::Path;
+
+	fn strip_attributes(krate: ast::Crate) -> ast::Crate {
+		/// Helper folder that strips the serde attributes after the extensions have been expanded.
+		struct StripAttributeFolder;
+
+		impl fold::Folder for StripAttributeFolder {
+			fn fold_attribute(&mut self, attr: ast::Attribute) -> Option<ast::Attribute> {
+				if &*attr.value.name.as_str() == "webapp" {
+					return None;
+				}
+
+				Some(attr)
+			}
+
+			fn fold_mac(&mut self, mac: ast::Mac) -> ast::Mac {
+				fold::noop_fold_mac(mac, self)
+			}
+		}
+
+		fold::Folder::fold_crate(&mut StripAttributeFolder, krate)
+	}
+
+	pub fn register(reg: &mut syntex::Registry) {
+		reg.add_attr("feature(custom_derive)");
+		reg.add_attr("feature(custom_attribute)");
+
+		reg.add_decorator("derive_WebAppFiles", codegen::expand_webapp_implementation);
+		reg.add_post_expansion_pass(strip_attributes);
+	}
+
+	pub fn generate() {
+		let out_dir = env::var_os("OUT_DIR").unwrap();
+		let mut registry = syntex::Registry::new();
+		register(&mut registry);
+
+		let src = Path::new("src/lib.rs.in");
+		let dst = Path::new(&out_dir).join("lib.rs");
+
+		registry.expand("", &src, &dst).unwrap();
+	}
+}
+
+#[cfg(not(feature = "with-syntex"))]
+pub mod inner {
+	use codegen;
+
+	pub fn register(reg: &mut rustc_plugin::Registry) {
+		reg.register_syntax_extension(
+			syntax::parse::token::intern("derive_WebAppFiles"),
+			syntax::ext::base::MultiDecorator(
+				Box::new(codegen::expand_webapp_implementation)));
+
+		reg.register_attribute("webapp".to_owned(), AttributeType::Normal);
+	}
+
+	pub fn generate() {}
+}

dapps/js-glue/src/codegen.rs

@@ -0,0 +1,194 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+extern crate aster;
+extern crate glob;
+extern crate mime_guess;
+
+use self::mime_guess::guess_mime_type;
+use std::path::{self, Path, PathBuf};
+use std::ops::Deref;
+
+use syntax::attr;
+use syntax::ast::{self, MetaItem, Item};
+use syntax::codemap::Span;
+use syntax::ext::base::{Annotatable, ExtCtxt};
+use syntax::print::pprust::lit_to_string;
+use syntax::symbol::InternedString;
+
+pub fn expand_webapp_implementation(
+	cx: &mut ExtCtxt,
+	span: Span,
+	meta_item: &MetaItem,
+	annotatable: &Annotatable,
+	push: &mut FnMut(Annotatable)
+) {
+	let item = match *annotatable {
+		Annotatable::Item(ref item) => item,
+		_ => {
+			cx.span_err(meta_item.span, "`#[derive(WebAppFiles)]` may only be applied to struct implementations");
+			return;
+		},
+	};
+	let builder = aster::AstBuilder::new().span(span);
+	implement_webapp(cx, &builder, item, push);
+}
+
+fn implement_webapp(cx: &ExtCtxt, builder: &aster::AstBuilder, item: &Item, push: &mut FnMut(Annotatable)) {
+	let static_files_dir = extract_path(cx, item);
+
+	let src = Path::new("src");
+	let static_files = {
+		let mut buf = src.to_path_buf();
+		buf.push(static_files_dir.deref());
+		buf
+	};
+
+	let search_location = {
+		let mut buf = static_files.to_path_buf();
+		buf.push("**");
+		buf.push("*");
+		buf
+	};
+
+	let files = glob::glob(search_location.to_str().expect("Valid UTF8 path"))
+		.expect("The sources directory is missing.")
+		.collect::<Result<Vec<PathBuf>, glob::GlobError>>()
+		.expect("There should be no error when reading a list of files.");
+
+	let statements = files
+		.iter()
+		.filter(|path_buf| path_buf.is_file())
+		.map(|path_buf| {
+			let path = path_buf.as_path();
+			let filename = path.file_name().and_then(|s| s.to_str()).expect("Only UTF8 paths.");
+			let mime_type = guess_mime_type(filename).to_string();
+			let file_path = as_uri(path.strip_prefix(&static_files).ok().expect("Prefix is always there, cause it's absolute path;qed"));
+			let file_path_in_source = path.to_str().expect("Only UTF8 paths.");
+
+			let path_lit = builder.expr().str(file_path.as_str());
+			let mime_lit = builder.expr().str(mime_type.as_str());
+			let web_path_lit = builder.expr().str(file_path_in_source);
+			let separator_lit = builder.expr().str(path::MAIN_SEPARATOR.to_string().as_str());
+			let concat_id = builder.id("concat!");
+			let env_id = builder.id("env!");
+			let macro_id = builder.id("include_bytes!");
+
+			let content = quote_expr!(
+				cx,
+				$macro_id($concat_id($env_id("CARGO_MANIFEST_DIR"), $separator_lit, $web_path_lit))
+			);
+			quote_stmt!(
+				cx,
+				files.insert($path_lit, File { path: $path_lit, content_type: $mime_lit, content: $content });
+			).expect("The statement is always ok, because it just uses literals.")
+		}).collect::<Vec<ast::Stmt>>();
+
+	let type_name = item.ident;
+
+	let files_impl = quote_item!(cx,
+		impl $type_name {
+			#[allow(unused_mut)]
+			fn files() -> ::std::collections::HashMap<&'static str, File> {
+				let mut files = ::std::collections::HashMap::new();
+				$statements
+				files
+			}
+		}
+	).unwrap();
+
+	push(Annotatable::Item(files_impl));
+}
+
+fn extract_path(cx: &ExtCtxt, item: &Item) -> String {
+	for meta_items in item.attrs.iter().filter_map(webapp_meta_items) {
+		for meta_item in meta_items {
+			let is_path = &*meta_item.name.as_str() == "path";
+			match meta_item.node {
+				ast::MetaItemKind::NameValue(ref lit) if is_path => {
+					if let Some(s) = get_str_from_lit(cx, lit) {
+						return s.deref().to_owned();
+					}
+				},
+				_ => {},
+			}
+		}
+	}
+
+	// default
+	"web".to_owned()
+}
+
+fn webapp_meta_items(attr: &ast::Attribute) -> Option<Vec<ast::MetaItem>> {
+	let is_webapp = &*attr.value.name.as_str() == "webapp";
+	match attr.value.node {
+		ast::MetaItemKind::List(ref items) if is_webapp => {
+			attr::mark_used(&attr);
+			Some(
+				items.iter()
+				.map(|item| item.node.clone())
+				.filter_map(|item| match item {
+					ast::NestedMetaItemKind::MetaItem(item) => Some(item),
+					_ => None,
+				})
+				.collect()
+			)
+		}
+		_ => None
+	}
+}
+
+fn get_str_from_lit(cx: &ExtCtxt, lit: &ast::Lit) -> Option<InternedString> {
+	match lit.node {
+		ast::LitKind::Str(ref s, _) => Some(s.clone().as_str()),
+		_ => {
+			cx.span_err(
+				lit.span,
+				&format!("webapp annotation path must be a string, not `{}`",
+					lit_to_string(lit)
+				)
+			);
+			return None;
+		}
+	}
+}
+
+fn as_uri(path: &Path) -> String {
+	let mut s = String::new();
+	for component in path.iter() {
+		s.push_str(component.to_str().expect("Only UTF-8 filenames are supported."));
+		s.push('/');
+	}
+	s[0..s.len()-1].into()
+}
+
+#[test]
+fn should_convert_path_separators_on_all_platforms() {
+	// given
+	let p = {
+		let mut p = PathBuf::new();
+		p.push("web");
+		p.push("src");
+		p.push("index.html");
+		p
+	};
+
+	// when
+	let path = as_uri(&p);
+
+	// then
+	assert_eq!(path, "web/src/index.html".to_owned());
+}

dapps/js-glue/src/js.rs

@@ -0,0 +1,89 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+#![cfg_attr(feature="use-precompiled-js", allow(dead_code))]
+#![cfg_attr(feature="use-precompiled-js", allow(unused_imports))]
+
+use std::fmt;
+use std::process::Command;
+
+#[cfg(not(windows))]
+mod platform {
+	use std::process::Command;
+
+	pub static NPM_CMD: &'static str = "npm";
+	pub fn handle_cmd(cmd: &mut Command) -> &mut Command {
+		cmd
+	}
+}
+
+#[cfg(windows)]
+mod platform {
+	use std::process::{Command, Stdio};
+
+	pub static NPM_CMD: &'static str = "cmd.exe";
+	// NOTE [ToDr] For some reason on windows
+	// The command doesn't have %~dp0 set properly
+	// and it cannot load globally installed node.exe
+	pub fn handle_cmd(cmd: &mut Command) -> &mut Command {
+		cmd.stdin(Stdio::null())
+			.arg("/c")
+			.arg("npm.cmd")
+	}
+}
+
+fn die<T : fmt::Debug>(s: &'static str, e: T) -> ! {
+	panic!("Error: {}: {:?}", s, e);
+}
+
+#[cfg(feature = "use-precompiled-js")]
+pub fn test(_path: &str) {
+}
+#[cfg(feature = "use-precompiled-js")]
+pub fn build(_path: &str, _dest: &str) {
+}
+
+#[cfg(not(feature = "use-precompiled-js"))]
+pub fn build(path: &str, dest: &str) {
+	let child = platform::handle_cmd(&mut Command::new(platform::NPM_CMD))
+		.arg("install")
+		.arg("--no-progress")
+		.current_dir(path)
+		.status()
+		.unwrap_or_else(|e| die("Installing node.js dependencies with npm", e));
+	assert!(child.success(), "There was an error installing dependencies.");
+
+	let child = platform::handle_cmd(&mut Command::new(platform::NPM_CMD))
+		.arg("run")
+		.arg("build")
+		.env("NODE_ENV", "production")
+		.env("BUILD_DEST", dest)
+		.current_dir(path)
+		.status()
+		.unwrap_or_else(|e| die("Building JS code", e));
+	assert!(child.success(), "There was an error build JS code.");
+}
+
+#[cfg(not(feature = "use-precompiled-js"))]
+pub fn test(path: &str) {
+	let child = Command::new(platform::NPM_CMD)
+		.arg("run")
+		.arg("test")
+		.current_dir(path)
+		.status()
+		.unwrap_or_else(|e| die("Running test command", e));
+	assert!(child.success(), "There was an error while running JS tests.");
+}

dapps/js-glue/src/lib.rs

@@ -0,0 +1,38 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+
+#![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))]
+#![cfg_attr(not(feature = "with-syntex"), plugin(quasi_macros))]
+
+#[cfg(feature = "with-syntex")]
+extern crate syntex;
+
+#[cfg(feature = "with-syntex")]
+extern crate syntex_syntax as syntax;
+
+#[cfg(feature = "with-syntex")]
+include!(concat!(env!("OUT_DIR"), "/lib.rs"));
+
+#[cfg(not(feature = "with-syntex"))]
+#[macro_use]
+extern crate syntax;
+
+#[cfg(not(feature = "with-syntex"))]
+extern crate rustc_plugin;
+
+#[cfg(not(feature = "with-syntex"))]
+include!("lib.rs.in");

dapps/js-glue/src/lib.rs.in

@@ -0,0 +1,46 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+extern crate quasi;
+
+mod codegen;
+mod build;
+pub mod js;
+pub use build::inner::generate;
+
+use std::default::Default;
+
+#[derive(Clone)]
+pub struct File {
+	pub path: &'static str,
+	pub content: &'static [u8],
+	// TODO: use strongly-typed MIME.
+	pub content_type: &'static str,
+}
+
+#[derive(Clone, Debug)]
+pub struct Info {
+	pub name: &'static str,
+	pub version: &'static str,
+	pub author: &'static str,
+	pub description: &'static str,
+	pub icon_url: &'static str,
+}
+
+pub trait WebApp : Default + Send + Sync {
+	fn file(&self, path: &str) -> Option<&File>;
+	fn info(&self) -> Info;
+}

dapps/node-health/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "node-health"
+description = "Node's health status"
+version = "0.1.0"
+license = "GPL-3.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+futures = "0.1"
+futures-cpupool = "0.1"
+log = "0.3"
+ntp = "0.3.0"
+parking_lot = "0.4"
+serde = "1.0"
+serde_derive = "1.0"
+time = "0.1.35"
+
+parity-reactor = { path = "../../util/reactor" }

dapps/node-health/src/health.rs

@@ -0,0 +1,122 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Reporting node's health.
+
+use std::sync::Arc;
+use std::time;
+use futures::Future;
+use futures::sync::oneshot;
+use types::{HealthInfo, HealthStatus, Health};
+use time::{TimeChecker, MAX_DRIFT};
+use parity_reactor::Remote;
+use parking_lot::Mutex;
+use {SyncStatus};
+
+const TIMEOUT_SECS: u64 = 5;
+const PROOF: &str = "Only one closure is invoked.";
+
+/// A struct enabling you to query for node's health.
+#[derive(Debug, Clone)]
+pub struct NodeHealth {
+	sync_status: Arc<SyncStatus>,
+	time: TimeChecker,
+	remote: Remote,
+}
+
+impl NodeHealth {
+	/// Creates new `NodeHealth`.
+	pub fn new(sync_status: Arc<SyncStatus>, time: TimeChecker, remote: Remote) -> Self {
+		NodeHealth { sync_status, time, remote, }
+	}
+
+	/// Query latest health report.
+	pub fn health(&self) -> Box<Future<Item = Health, Error = ()> + Send> {
+		trace!(target: "dapps", "Checking node health.");
+		// Check timediff
+		let sync_status = self.sync_status.clone();
+		let time = self.time.time_drift();
+		let (tx, rx) = oneshot::channel();
+		let tx = Arc::new(Mutex::new(Some(tx)));
+		let tx2 = tx.clone();
+		self.remote.spawn_with_timeout(
+			move || time.then(move |result| {
+				let _ = tx.lock().take().expect(PROOF).send(Ok(result));
+				Ok(())
+			}),
+			time::Duration::from_secs(TIMEOUT_SECS),
+			move || {
+				let _ = tx2.lock().take().expect(PROOF).send(Err(()));
+			},
+		);
+
+		Box::new(rx.map_err(|err| {
+			warn!(target: "dapps", "Health request cancelled: {:?}", err);
+		}).and_then(move |time| {
+			// Check peers
+			let peers = {
+				let (connected, max) = sync_status.peers();
+				let (status, message) = match connected {
+					0 => {
+						(HealthStatus::Bad, "You are not connected to any peers. There is most likely some network issue. Fix connectivity.".into())
+					},
+					1 => (HealthStatus::NeedsAttention, "You are connected to only one peer. Your node might not be reliable. Check your network connection.".into()),
+					_ => (HealthStatus::Ok, "".into()),
+				};
+				HealthInfo { status, message, details: (connected, max) }
+			};
+
+			// Check sync
+			let sync = {
+				let is_syncing = sync_status.is_major_importing();
+				let (status, message) = if is_syncing {
+					(HealthStatus::NeedsAttention, "Your node is still syncing, the values you see might be outdated. Wait until it's fully synced.".into())
+				} else {
+					(HealthStatus::Ok, "".into())
+				};
+				HealthInfo { status, message, details: is_syncing }
+			};
+
+			// Check time
+			let time = {
+				let (status, message, details) = match time {
+					Ok(Ok(diff)) if diff < MAX_DRIFT && diff > -MAX_DRIFT => {
+						(HealthStatus::Ok, "".into(), diff)
+					},
+					Ok(Ok(diff)) => {
+						(HealthStatus::Bad, format!(
+							"Your clock is not in sync. Detected difference is too big for the protocol to work: {}ms. Synchronize your clock.",
+							diff,
+						), diff)
+					},
+					Ok(Err(err)) => {
+						(HealthStatus::NeedsAttention, format!(
+							"Unable to reach time API: {}. Make sure that your clock is synchronized.",
+							err,
+						), 0)
+					},
+					Err(_) => {
+						(HealthStatus::NeedsAttention, "Time API request timed out. Make sure that the clock is synchronized.".into(), 0)
+					},
+				};
+
+				HealthInfo { status, message, details, }
+			};
+
+			Ok(Health { peers, sync, time})
+		}))
+	}
+}

dapps/node-health/src/lib.rs

@@ -0,0 +1,49 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Node Health status reporting.
+
+#![warn(missing_docs)]
+
+extern crate futures;
+extern crate futures_cpupool;
+extern crate ntp;
+extern crate time as time_crate;
+extern crate parity_reactor;
+extern crate parking_lot;
+
+#[macro_use]
+extern crate log;
+#[macro_use]
+extern crate serde_derive;
+
+mod health;
+mod time;
+mod types;
+
+pub use futures_cpupool::CpuPool;
+pub use health::NodeHealth;
+pub use types::{Health, HealthInfo, HealthStatus};
+pub use time::{TimeChecker, Error};
+
+/// Indicates sync status
+pub trait SyncStatus: ::std::fmt::Debug + Send + Sync {
+	/// Returns true if there is a major sync happening.
+	fn is_major_importing(&self) -> bool;
+
+	/// Returns number of connected and ideal peers.
+	fn peers(&self) -> (usize, usize);
+}

dapps/node-health/src/time.rs

@@ -0,0 +1,357 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Periodically checks node's time drift using [SNTP](https://tools.ietf.org/html/rfc1769).
+//!
+//! An NTP packet is sent to the server with a local timestamp, the server then completes the packet, yielding the
+//! following timestamps:
+//!
+//!    Timestamp Name          ID   When Generated
+//!   ------------------------------------------------------------
+//!    Originate Timestamp     T1   time request sent by client
+//!    Receive Timestamp       T2   time request received at server
+//!    Transmit Timestamp      T3   time reply sent by server
+//!    Destination Timestamp   T4   time reply received at client
+//!
+//! The drift is defined as:
+//!
+//! drift = ((T2 - T1) + (T3 - T4)) / 2.
+//!
+
+use std::io;
+use std::{fmt, mem, time};
+use std::collections::VecDeque;
+use std::sync::atomic::{self, AtomicUsize};
+use std::sync::Arc;
+
+use futures::{self, Future};
+use futures::future::{self, IntoFuture};
+use futures_cpupool::{CpuPool, CpuFuture};
+use ntp;
+use parking_lot::RwLock;
+use time_crate::{Duration, Timespec};
+
+/// Time checker error.
+#[derive(Debug, Clone, PartialEq)]
+pub enum Error {
+	/// No servers are currently available for a query.
+	NoServersAvailable,
+	/// There was an error when trying to reach the NTP server.
+	Ntp(String),
+	/// IO error when reading NTP response.
+	Io(String),
+}
+
+impl fmt::Display for Error {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		use self::Error::*;
+
+		match *self {
+			NoServersAvailable => write!(fmt, "No NTP servers available"),
+			Ntp(ref err) => write!(fmt, "NTP error: {}", err),
+			Io(ref err) => write!(fmt, "Connection Error: {}", err),
+		}
+	}
+}
+
+impl From<io::Error> for Error {
+	fn from(err: io::Error) -> Self { Error::Io(format!("{}", err)) }
+}
+
+impl From<ntp::errors::Error> for Error {
+	fn from(err: ntp::errors::Error) -> Self { Error::Ntp(format!("{}", err)) }
+}
+
+/// NTP time drift checker.
+pub trait Ntp {
+	/// Returned Future.
+	type Future: IntoFuture<Item=Duration, Error=Error>;
+
+	/// Returns the current time drift.
+	fn drift(&self) -> Self::Future;
+}
+
+const SERVER_MAX_POLL_INTERVAL_SECS: u64 = 60;
+#[derive(Debug)]
+struct Server {
+	pub address: String,
+	next_call: RwLock<time::Instant>,
+	failures: AtomicUsize,
+}
+
+impl Server {
+	pub fn is_available(&self) -> bool {
+		*self.next_call.read() < time::Instant::now()
+	}
+
+	pub fn report_success(&self) {
+		self.failures.store(0, atomic::Ordering::SeqCst);
+		self.update_next_call(1)
+	}
+
+	pub fn report_failure(&self) {
+		let errors = self.failures.fetch_add(1, atomic::Ordering::SeqCst);
+		self.update_next_call(1 << errors)
+	}
+
+	fn update_next_call(&self, delay: usize) {
+		*self.next_call.write() = time::Instant::now() + time::Duration::from_secs(delay as u64 * SERVER_MAX_POLL_INTERVAL_SECS);
+	}
+}
+
+impl<T: AsRef<str>> From<T> for Server {
+	fn from(t: T) -> Self {
+		Server {
+			address: t.as_ref().to_owned(),
+			next_call: RwLock::new(time::Instant::now()),
+			failures: Default::default(),
+		}
+	}
+}
+
+/// NTP client using the SNTP algorithm for calculating drift.
+#[derive(Clone)]
+pub struct SimpleNtp {
+	addresses: Vec<Arc<Server>>,
+	pool: CpuPool,
+}
+
+impl fmt::Debug for SimpleNtp {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		f
+			.debug_struct("SimpleNtp")
+			.field("addresses", &self.addresses)
+			.finish()
+	}
+}
+
+impl SimpleNtp {
+	fn new<T: AsRef<str>>(addresses: &[T], pool: CpuPool) -> SimpleNtp {
+		SimpleNtp {
+			addresses: addresses.iter().map(Server::from).map(Arc::new).collect(),
+			pool: pool,
+		}
+	}
+}
+
+impl Ntp for SimpleNtp {
+	type Future = future::Either<
+		CpuFuture<Duration, Error>,
+		future::FutureResult<Duration, Error>,
+	>;
+
+	fn drift(&self) -> Self::Future {
+		use self::future::Either::{A, B};
+
+		let server = self.addresses.iter().find(|server| server.is_available());
+		server.map(|server| {
+			let server = server.clone();
+			A(self.pool.spawn_fn(move || {
+				debug!(target: "dapps", "Fetching time from {}.", server.address);
+
+				match ntp::request(&server.address) {
+					Ok(packet) => {
+						let dest_time = ::time_crate::now_utc().to_timespec();
+						let orig_time = Timespec::from(packet.orig_time);
+						let recv_time = Timespec::from(packet.recv_time);
+						let transmit_time = Timespec::from(packet.transmit_time);
+
+						let drift = ((recv_time - orig_time) + (transmit_time - dest_time)) / 2;
+
+						server.report_success();
+						Ok(drift)
+					},
+					Err(err) => {
+						server.report_failure();
+						Err(err.into())
+					},
+				}
+			}))
+		}).unwrap_or_else(|| B(future::err(Error::NoServersAvailable)))
+	}
+}
+
+// NOTE In a positive scenario first results will be seen after:
+// MAX_RESULTS * UPDATE_TIMEOUT_INCOMPLETE_SECS seconds.
+const MAX_RESULTS: usize = 4;
+const UPDATE_TIMEOUT_OK_SECS: u64 = 6 * 60 * 60;
+const UPDATE_TIMEOUT_WARN_SECS: u64 = 15 * 60;
+const UPDATE_TIMEOUT_ERR_SECS: u64 = 60;
+const UPDATE_TIMEOUT_INCOMPLETE_SECS: u64 = 10;
+
+/// Maximal valid time drift.
+pub const MAX_DRIFT: i64 = 10_000;
+
+type BoxFuture<A, B> = Box<Future<Item = A, Error = B> + Send>;
+
+#[derive(Debug, Clone)]
+/// A time checker.
+pub struct TimeChecker<N: Ntp = SimpleNtp> {
+	ntp: N,
+	last_result: Arc<RwLock<(time::Instant, VecDeque<Result<i64, Error>>)>>,
+}
+
+impl TimeChecker<SimpleNtp> {
+	/// Creates new time checker given the NTP server address.
+	pub fn new<T: AsRef<str>>(ntp_addresses: &[T], pool: CpuPool) -> Self {
+		let last_result = Arc::new(RwLock::new(
+			// Assume everything is ok at the very beginning.
+			(time::Instant::now(), vec![Ok(0)].into())
+		));
+
+		let ntp = SimpleNtp::new(ntp_addresses, pool);
+
+		TimeChecker {
+			ntp,
+			last_result,
+		}
+	}
+}
+
+impl<N: Ntp> TimeChecker<N> where <N::Future as IntoFuture>::Future: Send + 'static {
+	/// Updates the time
+	pub fn update(&self) -> BoxFuture<i64, Error> {
+		trace!(target: "dapps", "Updating time from NTP.");
+		let last_result = self.last_result.clone();
+		Box::new(self.ntp.drift().into_future().then(move |res| {
+			let res = res.map(|d| d.num_milliseconds());
+
+			if let Err(Error::NoServersAvailable) = res {
+				debug!(target: "dapps", "No NTP servers available. Selecting an older result.");
+				return select_result(last_result.read().1.iter());
+			}
+
+			// Update the results.
+			let mut results = mem::replace(&mut last_result.write().1, VecDeque::new());
+			let has_all_results = results.len() >= MAX_RESULTS;
+			let valid_till = time::Instant::now() + time::Duration::from_secs(
+				match res {
+					Ok(time) if has_all_results && time < MAX_DRIFT => UPDATE_TIMEOUT_OK_SECS,
+					Ok(_) if has_all_results => UPDATE_TIMEOUT_WARN_SECS,
+					Err(_) if has_all_results => UPDATE_TIMEOUT_ERR_SECS,
+					_ => UPDATE_TIMEOUT_INCOMPLETE_SECS,
+				}
+			);
+
+			trace!(target: "dapps", "New time drift received: {:?}", res);
+			// Push the result.
+			results.push_back(res);
+			while results.len() > MAX_RESULTS {
+				results.pop_front();
+			}
+
+			// Select a response and update last result.
+			let res = select_result(results.iter());
+			*last_result.write() = (valid_till, results);
+			res
+		}))
+	}
+
+	/// Returns a current time drift or error if last request to NTP server failed.
+	pub fn time_drift(&self) -> BoxFuture<i64, Error> {
+		// return cached result
+		{
+			let res = self.last_result.read();
+			if res.0 > time::Instant::now() {
+				return Box::new(futures::done(select_result(res.1.iter())));
+			}
+		}
+		// or update and return result
+		self.update()
+	}
+}
+
+fn select_result<'a, T: Iterator<Item=&'a Result<i64, Error>>>(results: T) -> Result<i64, Error> {
+	let mut min = None;
+	for res in results {
+		min = Some(match (min.take(), res) {
+			(Some(Ok(min)), &Ok(ref new)) => Ok(::std::cmp::min(min, *new)),
+			(Some(Ok(old)), &Err(_)) => Ok(old),
+			(_, ref new) => (*new).clone(),
+		})
+	}
+
+	min.unwrap_or_else(|| Err(Error::Ntp("NTP server unavailable.".into())))
+}
+
+#[cfg(test)]
+mod tests {
+	use std::sync::Arc;
+	use std::cell::{Cell, RefCell};
+	use std::time::Instant;
+	use time::Duration;
+	use futures::{future, Future};
+	use super::{Ntp, TimeChecker, Error};
+	use parking_lot::RwLock;
+
+	#[derive(Clone)]
+	struct FakeNtp(RefCell<Vec<Duration>>, Cell<u64>);
+	impl FakeNtp {
+		fn new() -> FakeNtp {
+			FakeNtp(
+				RefCell::new(vec![Duration::milliseconds(150)]),
+				Cell::new(0))
+		}
+	}
+
+	impl Ntp for FakeNtp {
+		type Future = future::FutureResult<Duration, Error>;
+
+		fn drift(&self) -> Self::Future {
+			self.1.set(self.1.get() + 1);
+			future::ok(self.0.borrow_mut().pop().expect("Unexpected call to drift()."))
+		}
+	}
+
+	fn time_checker() -> TimeChecker<FakeNtp> {
+		let last_result = Arc::new(RwLock::new(
+			(Instant::now(), vec![Err(Error::Ntp("NTP server unavailable".into()))].into())
+		));
+
+		TimeChecker {
+			ntp: FakeNtp::new(),
+			last_result: last_result,
+		}
+	}
+
+	#[test]
+	fn should_fetch_time_on_start() {
+		// given
+		let time = time_checker();
+
+		// when
+		let diff = time.time_drift().wait().unwrap();
+
+		// then
+		assert_eq!(diff, 150);
+		assert_eq!(time.ntp.1.get(), 1);
+	}
+
+	#[test]
+	fn should_not_fetch_twice_if_timeout_has_not_passed() {
+		// given
+		let time = time_checker();
+
+		// when
+		let diff1 = time.time_drift().wait().unwrap();
+		let diff2 = time.time_drift().wait().unwrap();
+
+		// then
+		assert_eq!(diff1, 150);
+		assert_eq!(diff2, 150);
+		assert_eq!(time.ntp.1.get(), 1);
+	}
+}

dapps/node-health/src/types.rs

@@ -0,0 +1,57 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Base health types.
+
+/// Health API endpoint status.
+#[derive(Debug, PartialEq, Serialize)]
+pub enum HealthStatus {
+	/// Everything's OK.
+	#[serde(rename = "ok")]
+	Ok,
+	/// Node health need attention
+	/// (the issue is not critical, but may need investigation)
+	#[serde(rename = "needsAttention")]
+	NeedsAttention,
+	/// There is something bad detected with the node.
+	#[serde(rename = "bad")]
+	Bad,
+}
+
+/// Represents a single check in node health.
+/// Cointains the status of that check and apropriate message and details.
+#[derive(Debug, PartialEq, Serialize)]
+#[serde(deny_unknown_fields)]
+pub struct HealthInfo<T> {
+	/// Check status.
+	pub status: HealthStatus,
+	/// Human-readable message.
+	pub message: String,
+	/// Technical details of the check.
+	pub details: T,
+}
+
+/// Node Health status.
+#[derive(Debug, PartialEq, Serialize)]
+#[serde(deny_unknown_fields)]
+pub struct Health {
+	/// Status of peers.
+	pub peers: HealthInfo<(usize, usize)>,
+	/// Sync status.
+	pub sync: HealthInfo<bool>,
+	/// Time diff info.
+	pub time: HealthInfo<i64>,
+}

dapps/src/api/api.rs

@@ -0,0 +1,97 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+
+use hyper::{Method, StatusCode};
+
+use api::response;
+use apps::fetcher::Fetcher;
+use endpoint::{Endpoint, Request, Response, EndpointPath};
+use futures::{future, Future};
+use node_health::{NodeHealth, HealthStatus};
+
+#[derive(Clone)]
+pub struct RestApi {
+	fetcher: Arc<Fetcher>,
+	health: NodeHealth,
+}
+
+impl Endpoint for RestApi {
+	fn respond(&self, mut path: EndpointPath, req: Request) -> Response {
+		if let Method::Options = *req.method() {
+			return Box::new(future::ok(response::empty()));
+		}
+
+		let endpoint = path.app_params.get(0).map(String::to_owned);
+		let hash = path.app_params.get(1).map(String::to_owned);
+
+		// at this point path.app_id contains 'api', adjust it to the hash properly, otherwise
+		// we will try and retrieve 'api' as the hash when doing the /api/content route
+		if let Some(ref hash) = hash {
+			path.app_id = hash.to_owned();
+		}
+
+		trace!(target: "dapps", "Handling /api request: {:?}/{:?}", endpoint, hash);
+		match endpoint.as_ref().map(String::as_str) {
+			Some("ping") => Box::new(future::ok(response::ping(req))),
+			Some("health") => self.health(),
+			Some("content") => self.resolve_content(hash.as_ref().map(String::as_str), path, req),
+			_ => Box::new(future::ok(response::not_found())),
+		}
+	}
+}
+
+impl RestApi {
+	pub fn new(
+		fetcher: Arc<Fetcher>,
+		health: NodeHealth,
+	) -> Box<Endpoint> {
+		Box::new(RestApi {
+			fetcher,
+			health,
+		})
+	}
+
+	fn resolve_content(&self, hash: Option<&str>, path: EndpointPath, req: Request) -> Response {
+		trace!(target: "dapps", "Resolving content: {:?} from path: {:?}", hash, path);
+		match hash {
+			Some(hash) if self.fetcher.contains(hash) => {
+				self.fetcher.respond(path, req)
+			},
+			_ => Box::new(future::ok(response::not_found())),
+		}
+	}
+
+	fn health(&self) -> Response {
+		Box::new(self.health.health()
+			.then(|health| {
+				let status = match health {
+					Ok(ref health) => {
+						if [&health.peers.status, &health.sync.status].iter().any(|x| *x != &HealthStatus::Ok) {
+							StatusCode::PreconditionFailed // HTTP 412
+						} else {
+							StatusCode::Ok // HTTP 200
+						}
+					},
+					_ => StatusCode::ServiceUnavailable, // HTTP 503
+				};
+
+				Ok(response::as_json(status, &health).into())
+			})
+		)
+	}
+}

dapps/src/api/mod.rs

@@ -0,0 +1,23 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! REST API
+
+mod api;
+mod response;
+mod types;
+
+pub use self::api::RestApi;

dapps/src/api/response.rs

@@ -0,0 +1,43 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use serde::Serialize;
+use serde_json;
+use hyper::{self, mime, StatusCode};
+
+use handlers::{ContentHandler, EchoHandler};
+
+pub fn empty() -> hyper::Response {
+	ContentHandler::ok("".into(), mime::TEXT_PLAIN).into()
+}
+
+pub fn as_json<T: Serialize>(status: StatusCode, val: &T) -> hyper::Response {
+	let json = serde_json::to_string(val)
+		.expect("serialization to string is infallible; qed");
+	ContentHandler::new(status, json, mime::APPLICATION_JSON).into()
+}
+
+pub fn ping(req: hyper::Request) -> hyper::Response {
+	EchoHandler::new(req).into()
+}
+
+pub fn not_found() -> hyper::Response {
+	as_json(StatusCode::NotFound, &::api::types::ApiError {
+		code: "404".into(),
+		title: "Not Found".into(),
+		detail: "Resource you requested has not been found.".into(),
+	})
+}

dapps/src/api/types.rs

@@ -0,0 +1,27 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+/// A structure representing any error in REST API.
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct ApiError {
+	/// Error code.
+	pub code: String,
+	/// Human-readable error summary.
+	pub title: String,
+	/// More technical error details.
+	pub detail: String,
+}

dapps/src/apps/app.rs

@@ -0,0 +1,59 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use endpoint::EndpointInfo;
+
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct App {
+	pub id: String,
+	pub name: String,
+	pub description: String,
+	pub version: String,
+	pub author: String,
+	#[serde(rename="iconUrl")]
+	pub icon_url: String,
+	#[serde(rename="localUrl")]
+	pub local_url: Option<String>,
+}
+
+impl App {
+	/// Creates `App` instance from `EndpointInfo` and `id`.
+	pub fn from_info(id: &str, info: &EndpointInfo) -> Self {
+		App {
+			id: id.to_owned(),
+			name: info.name.to_owned(),
+			description: info.description.to_owned(),
+			version: info.version.to_owned(),
+			author: info.author.to_owned(),
+			icon_url: info.icon_url.to_owned(),
+			local_url: info.local_url.to_owned(),
+		}
+	}
+}
+
+impl Into<EndpointInfo> for App {
+	fn into(self) -> EndpointInfo {
+		EndpointInfo {
+			name: self.name,
+			description: self.description,
+			version: self.version,
+			author: self.author,
+			icon_url: self.icon_url,
+			local_url: self.local_url,
+		}
+	}
+}

dapps/src/apps/cache.rs

@@ -0,0 +1,128 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Fetchable Dapps support.
+
+use std::fs;
+
+use linked_hash_map::LinkedHashMap;
+use page::local;
+use handlers::FetchControl;
+
+pub enum ContentStatus {
+	Fetching(FetchControl),
+	Ready(local::Dapp),
+}
+
+#[derive(Default)]
+pub struct ContentCache {
+	cache: LinkedHashMap<String, ContentStatus>,
+}
+
+impl ContentCache {
+	pub fn insert(&mut self, content_id: String, status: ContentStatus) -> Option<ContentStatus> {
+		self.cache.insert(content_id, status)
+	}
+
+	pub fn remove(&mut self, content_id: &str) -> Option<ContentStatus> {
+		self.cache.remove(content_id)
+	}
+
+	pub fn get(&mut self, content_id: &str) -> Option<&mut ContentStatus> {
+		self.cache.get_refresh(content_id)
+	}
+
+	pub fn clear_garbage(&mut self, expected_size: usize) -> Vec<(String, ContentStatus)> {
+		let len = self.cache.len();
+
+		if len <= expected_size {
+			return Vec::new();
+		}
+
+		let mut removed = Vec::with_capacity(len - expected_size);
+
+		while self.cache.len() > expected_size {
+			let entry = self.cache.pop_front().expect("expected_size bounded at 0, len is greater; qed");
+
+			match entry.1 {
+				ContentStatus::Fetching(ref fetch) => {
+					trace!(target: "dapps", "Aborting {} because of limit.", entry.0);
+					// Mark as aborted
+					fetch.abort()
+				},
+				ContentStatus::Ready(ref endpoint) => {
+					trace!(target: "dapps", "Removing {} because of limit.", entry.0);
+					// Remove path (dir or file)
+					let res = fs::remove_dir_all(&endpoint.path()).or_else(|_| fs::remove_file(&endpoint.path()));
+					if let Err(e) = res {
+						warn!(target: "dapps", "Unable to remove dapp/content from cache: {:?}", e);
+					}
+				}
+			}
+
+			removed.push(entry);
+		}
+		removed
+	}
+
+	#[cfg(test)]
+	pub fn len(&self) -> usize {
+		self.cache.len()
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	fn only_keys(data: Vec<(String, ContentStatus)>) -> Vec<String> {
+		data.into_iter().map(|x| x.0).collect()
+	}
+
+	#[test]
+	fn should_remove_least_recently_used() {
+		// given
+		let mut cache = ContentCache::default();
+		cache.insert("a".into(), ContentStatus::Fetching(Default::default()));
+		cache.insert("b".into(), ContentStatus::Fetching(Default::default()));
+		cache.insert("c".into(), ContentStatus::Fetching(Default::default()));
+
+		// when
+		let res = cache.clear_garbage(2);
+
+		// then
+		assert_eq!(cache.len(), 2);
+		assert_eq!(only_keys(res), vec!["a"]);
+	}
+
+	#[test]
+	fn should_update_lru_if_accessed() {
+		// given
+		let mut cache = ContentCache::default();
+		cache.insert("a".into(), ContentStatus::Fetching(Default::default()));
+		cache.insert("b".into(), ContentStatus::Fetching(Default::default()));
+		cache.insert("c".into(), ContentStatus::Fetching(Default::default()));
+
+		// when
+		cache.get("a");
+		let res = cache.clear_garbage(2);
+
+		// then
+		assert_eq!(cache.len(), 2);
+		assert_eq!(only_keys(res), vec!["b"]);
+	}
+
+}

dapps/src/apps/fetcher/installers.rs

@@ -0,0 +1,267 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use zip;
+use std::{fs, fmt};
+use std::io::{self, Read, Write};
+use std::path::PathBuf;
+use bigint::hash::H256;
+use fetch::{self, Mime};
+use futures_cpupool::CpuPool;
+use hash::keccak_buffer;
+
+use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest, serialize_manifest, Manifest};
+use handlers::{ContentValidator, ValidatorResponse};
+use page::{local, PageCache};
+use Embeddable;
+
+type OnDone = Box<Fn(Option<local::Dapp>) + Send>;
+
+fn write_response_and_check_hash(
+	id: &str,
+	mut content_path: PathBuf,
+	filename: &str,
+	response: fetch::Response
+) -> Result<(fs::File, PathBuf), ValidationError> {
+	// try to parse id
+	let id = id.parse().map_err(|_| ValidationError::InvalidContentId)?;
+
+	// check if content exists
+	if content_path.exists() {
+		warn!(target: "dapps", "Overwriting existing content at 0x{:?}", id);
+		fs::remove_dir_all(&content_path)?
+	}
+
+	// create directory
+	fs::create_dir_all(&content_path)?;
+
+	// append filename
+	content_path.push(filename);
+
+	// Now write the response
+	let mut file = io::BufWriter::new(fs::File::create(&content_path)?);
+	let mut reader = io::BufReader::new(response);
+	io::copy(&mut reader, &mut file)?;
+	file.flush()?;
+
+	// Validate hash
+	// TODO [ToDr] calculate keccak in-flight while reading the response
+	let mut file = io::BufReader::new(fs::File::open(&content_path)?);
+	let hash = keccak_buffer(&mut file)?;
+	if id == hash {
+		Ok((file.into_inner(), content_path))
+	} else {
+		Err(ValidationError::HashMismatch {
+			expected: id,
+			got: hash,
+		})
+	}
+}
+
+pub struct Content {
+	id: String,
+	mime: Mime,
+	content_path: PathBuf,
+	on_done: OnDone,
+	pool: CpuPool,
+}
+
+impl Content {
+	pub fn new(id: String, mime: Mime, content_path: PathBuf, on_done: OnDone, pool: CpuPool) -> Self {
+		Content {
+			id,
+			mime,
+			content_path,
+			on_done,
+			pool,
+		}
+	}
+}
+
+impl ContentValidator for Content {
+	type Error = ValidationError;
+
+	fn validate_and_install(self, response: fetch::Response) -> Result<ValidatorResponse, ValidationError> {
+		let pool = self.pool;
+		let id = self.id.clone();
+		let mime = self.mime;
+		let validate = move |content_path: PathBuf| {
+			// Create dir
+			let (_, content_path) = write_response_and_check_hash(&id, content_path, &id, response)?;
+
+			Ok(local::Dapp::single_file(pool, content_path, mime, PageCache::Enabled))
+		};
+
+		// Prepare path for a file
+		let content_path = self.content_path.join(&self.id);
+		// Make sure to always call on_done (even in case of errors)!
+		let result = validate(content_path.clone());
+		// remove the file if there was an error
+		if result.is_err() {
+			// Ignore errors since the file might not exist
+			let _ = fs::remove_dir_all(&content_path);
+		}
+		(self.on_done)(result.as_ref().ok().cloned());
+		result.map(ValidatorResponse::Local)
+	}
+}
+
+pub struct Dapp {
+	id: String,
+	dapps_path: PathBuf,
+	on_done: OnDone,
+	embeddable_on: Embeddable,
+	pool: CpuPool,
+}
+
+impl Dapp {
+	pub fn new(id: String, dapps_path: PathBuf, on_done: OnDone, embeddable_on: Embeddable, pool: CpuPool) -> Self {
+		Dapp {
+			id,
+			dapps_path,
+			on_done,
+			embeddable_on,
+			pool,
+		}
+	}
+
+	fn find_manifest(zip: &mut zip::ZipArchive<fs::File>) -> Result<(Manifest, PathBuf), ValidationError> {
+		for i in 0..zip.len() {
+			let mut file = zip.by_index(i)?;
+
+			if !file.name().ends_with(MANIFEST_FILENAME) {
+				continue;
+			}
+
+			// try to read manifest
+			let mut manifest = String::new();
+			let manifest = file
+				.read_to_string(&mut manifest).ok()
+				.and_then(|_| deserialize_manifest(manifest).ok());
+
+			if let Some(manifest) = manifest {
+				let mut manifest_location = PathBuf::from(file.name());
+				manifest_location.pop(); // get rid of filename
+				return Ok((manifest, manifest_location));
+			}
+		}
+
+		Err(ValidationError::ManifestNotFound)
+	}
+}
+
+impl ContentValidator for Dapp {
+	type Error = ValidationError;
+
+	fn validate_and_install(self, response: fetch::Response) -> Result<ValidatorResponse, ValidationError> {
+		let id = self.id.clone();
+		let pool = self.pool;
+		let embeddable_on = self.embeddable_on;
+		let validate = move |dapp_path: PathBuf| {
+			let (file, zip_path) = write_response_and_check_hash(&id, dapp_path.clone(), &format!("{}.zip", id), response)?;
+			trace!(target: "dapps", "Opening dapp bundle at {:?}", zip_path);
+			// Unpack archive
+			let mut zip = zip::ZipArchive::new(file)?;
+			// First find manifest file
+			let (mut manifest, manifest_dir) = Self::find_manifest(&mut zip)?;
+			// Overwrite id to match hash
+			manifest.id = id;
+
+			// Unpack zip
+			for i in 0..zip.len() {
+				let mut file = zip.by_index(i)?;
+				let is_dir = file.name().chars().rev().next() == Some('/');
+
+				let file_path = PathBuf::from(file.name());
+				let location_in_manifest_base = file_path.strip_prefix(&manifest_dir);
+				// Create files that are inside manifest directory
+				if let Ok(location_in_manifest_base) = location_in_manifest_base {
+					let p = dapp_path.join(location_in_manifest_base);
+					// Check if it's a directory
+					if is_dir {
+						fs::create_dir_all(p)?;
+					} else {
+						let mut target = fs::File::create(p)?;
+						io::copy(&mut file, &mut target)?;
+					}
+				}
+			}
+
+			// Remove zip
+			fs::remove_file(&zip_path)?;
+
+			// Write manifest
+			let manifest_str = serialize_manifest(&manifest).map_err(ValidationError::ManifestSerialization)?;
+			let manifest_path = dapp_path.join(MANIFEST_FILENAME);
+			let mut manifest_file = fs::File::create(manifest_path)?;
+			manifest_file.write_all(manifest_str.as_bytes())?;
+			// Create endpoint
+			let endpoint = local::Dapp::new(pool, dapp_path, manifest.into(), PageCache::Enabled, embeddable_on);
+			Ok(endpoint)
+		};
+
+		// Prepare directory for dapp
+		let target = self.dapps_path.join(&self.id);
+		// Validate the dapp
+		let result = validate(target.clone());
+		// remove the file if there was an error
+		if result.is_err() {
+			// Ignore errors since the file might not exist
+			let _ = fs::remove_dir_all(&target);
+		}
+		(self.on_done)(result.as_ref().ok().cloned());
+		result.map(ValidatorResponse::Local)
+	}
+}
+
+#[derive(Debug)]
+pub enum ValidationError {
+	Io(io::Error),
+	Zip(zip::result::ZipError),
+	InvalidContentId,
+	ManifestNotFound,
+	ManifestSerialization(String),
+	HashMismatch { expected: H256, got: H256, },
+}
+
+impl fmt::Display for ValidationError {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		match *self {
+			ValidationError::Io(ref io) => write!(f, "Unexpected IO error occured: {:?}", io),
+			ValidationError::Zip(ref zip) => write!(f, "Unable to read ZIP archive: {:?}", zip),
+			ValidationError::InvalidContentId => write!(f, "ID is invalid. It should be 256 bits keccak hash of content."),
+			ValidationError::ManifestNotFound => write!(f, "Downloaded Dapp bundle did not contain valid manifest.json file."),
+			ValidationError::ManifestSerialization(ref err) => {
+				write!(f, "There was an error during Dapp Manifest serialization: {:?}", err)
+			},
+			ValidationError::HashMismatch { ref expected, ref got } => {
+				write!(f, "Hash of downloaded content did not match. Expected:{:?}, Got:{:?}.", expected, got)
+			},
+		}
+	}
+}
+
+impl From<io::Error> for ValidationError {
+	fn from(err: io::Error) -> Self {
+		ValidationError::Io(err)
+	}
+}
+
+impl From<zip::result::ZipError> for ValidationError {
+	fn from(err: zip::result::ZipError) -> Self {
+		ValidationError::Zip(err)
+	}
+}

dapps/src/apps/fetcher/mod.rs

@@ -0,0 +1,339 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Fetchable Dapps support.
+//! Manages downloaded (cached) Dapps and downloads them when necessary.
+//! Uses `URLHint` to resolve addresses into Dapps bundle file location.
+
+mod installers;
+
+use std::{fs, env};
+use std::path::PathBuf;
+use std::sync::Arc;
+use rustc_hex::FromHex;
+use futures::{future, Future};
+use futures_cpupool::CpuPool;
+use fetch::{Client as FetchClient, Fetch};
+use hash_fetch::urlhint::{URLHintContract, URLHint, URLHintResult};
+
+use hyper::StatusCode;
+
+use {Embeddable, SyncStatus, random_filename};
+use parking_lot::Mutex;
+use page::local;
+use handlers::{ContentHandler, ContentFetcherHandler};
+use endpoint::{self, Endpoint, EndpointPath};
+use apps::cache::{ContentCache, ContentStatus};
+
+/// Limit of cached dapps/content
+const MAX_CACHED_DAPPS: usize = 20;
+
+pub trait Fetcher: Endpoint + 'static {
+	fn contains(&self, content_id: &str) -> bool;
+}
+
+pub struct ContentFetcher<F: Fetch = FetchClient, R: URLHint + 'static = URLHintContract> {
+	cache_path: PathBuf,
+	resolver: R,
+	cache: Arc<Mutex<ContentCache>>,
+	sync: Arc<SyncStatus>,
+	embeddable_on: Embeddable,
+	fetch: F,
+	pool: CpuPool,
+	only_content: bool,
+}
+
+impl<R: URLHint + 'static, F: Fetch> Drop for ContentFetcher<F, R> {
+	fn drop(&mut self) {
+		// Clear cache path
+		let _ = fs::remove_dir_all(&self.cache_path);
+	}
+}
+
+impl<R: URLHint + 'static, F: Fetch> ContentFetcher<F, R> {
+	pub fn new(
+		resolver: R,
+		sync: Arc<SyncStatus>,
+		fetch: F,
+		pool: CpuPool,
+	) -> Self {
+		let mut cache_path = env::temp_dir();
+		cache_path.push(random_filename());
+
+		ContentFetcher {
+			cache_path,
+			resolver,
+			sync,
+			cache: Arc::new(Mutex::new(ContentCache::default())),
+			embeddable_on: None,
+			fetch,
+			pool,
+			only_content: true,
+		}
+	}
+
+	pub fn allow_dapps(mut self, dapps: bool) -> Self {
+		self.only_content = !dapps;
+		self
+	}
+
+	pub fn embeddable_on(mut self, embeddable_on: Embeddable) -> Self {
+		self.embeddable_on = embeddable_on;
+		self
+	}
+
+	fn not_found(embeddable: Embeddable) -> endpoint::Response {
+		Box::new(future::ok(ContentHandler::error(
+			StatusCode::NotFound,
+			"Resource Not Found",
+			"Requested resource was not found.",
+			None,
+			embeddable,
+		).into()))
+	}
+
+	fn still_syncing(embeddable: Embeddable) -> endpoint::Response {
+		Box::new(future::ok(ContentHandler::error(
+			StatusCode::ServiceUnavailable,
+			"Sync In Progress",
+			"Your node is still syncing. We cannot resolve any content before it's fully synced.",
+			Some("<a href=\"javascript:window.location.reload()\">Refresh</a>"),
+			embeddable,
+		).into()))
+	}
+
+	fn dapps_disabled(address: Embeddable) -> endpoint::Response {
+		Box::new(future::ok(ContentHandler::error(
+			StatusCode::ServiceUnavailable,
+			"Network Dapps Not Available",
+			"This interface doesn't support network dapps for security reasons.",
+			None,
+			address,
+		).into()))
+	}
+
+	#[cfg(test)]
+	fn set_status(&self, content_id: &str, status: ContentStatus) {
+		self.cache.lock().insert(content_id.to_owned(), status);
+	}
+
+	// resolve contract call synchronously.
+	// TODO: port to futures-based hyper and make it all async.
+	fn resolve(&self, content_id: Vec<u8>) -> Option<URLHintResult> {
+		self.resolver.resolve(content_id)
+			.wait()
+			.unwrap_or_else(|e| { warn!("Error resolving content-id: {}", e); None })
+	}
+}
+
+impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
+	fn contains(&self, content_id: &str) -> bool {
+		{
+			let mut cache = self.cache.lock();
+			// Check if we already have the app
+			if cache.get(content_id).is_some() {
+				return true;
+			}
+		}
+		// fallback to resolver
+		if let Ok(content_id) = content_id.from_hex() {
+			// if there is content or we are syncing return true
+			self.sync.is_major_importing() || self.resolve(content_id).is_some()
+		} else {
+			false
+		}
+	}
+}
+
+impl<R: URLHint + 'static, F: Fetch> Endpoint for ContentFetcher<F, R> {
+	fn respond(&self, path: EndpointPath, req: endpoint::Request) -> endpoint::Response {
+		let mut cache = self.cache.lock();
+		let content_id = path.app_id.clone();
+
+		let (new_status, handler) = {
+			let status = cache.get(&content_id);
+			match status {
+				// Just serve the content
+				Some(&mut ContentStatus::Ready(ref endpoint)) => {
+					(None, endpoint.to_response(&path))
+				},
+				// Content is already being fetched
+				Some(&mut ContentStatus::Fetching(ref fetch_control)) if !fetch_control.is_deadline_reached() => {
+					trace!(target: "dapps", "Content fetching in progress. Waiting...");
+					(None, fetch_control.to_response(path))
+				},
+				// We need to start fetching the content
+				_ => {
+					trace!(target: "dapps", "Content unavailable. Fetching... {:?}", content_id);
+					let content_hex = content_id.from_hex().expect("to_handler is called only when `contains` returns true.");
+					let content = self.resolve(content_hex);
+
+					let cache = self.cache.clone();
+					let id = content_id.clone();
+					let on_done = move |result: Option<local::Dapp>| {
+						let mut cache = cache.lock();
+						match result {
+							Some(endpoint) => cache.insert(id.clone(), ContentStatus::Ready(endpoint)),
+							// In case of error
+							None => cache.remove(&id),
+						};
+					};
+
+					match content {
+						// Don't serve dapps if we are still syncing (but serve content)
+						Some(URLHintResult::Dapp(_)) if self.sync.is_major_importing() => {
+							(None, Self::still_syncing(self.embeddable_on.clone()))
+						},
+						Some(URLHintResult::Dapp(_)) if self.only_content => {
+							(None, Self::dapps_disabled(self.embeddable_on.clone()))
+						},
+						Some(content) => {
+							let handler = match content {
+								URLHintResult::Dapp(dapp) => {
+									ContentFetcherHandler::new(
+										req.method(),
+										&dapp.url(),
+										path,
+										installers::Dapp::new(
+											content_id.clone(),
+											self.cache_path.clone(),
+											Box::new(on_done),
+											self.embeddable_on.clone(),
+											self.pool.clone(),
+										),
+										self.embeddable_on.clone(),
+										self.fetch.clone(),
+									)
+								},
+							    URLHintResult::GithubDapp(content) => {
+									ContentFetcherHandler::new(
+										req.method(),
+										&content.url,
+										path,
+										installers::Dapp::new(
+											content_id.clone(),
+											self.cache_path.clone(),
+											Box::new(on_done),
+											self.embeddable_on.clone(),
+											self.pool.clone(),
+										),
+										self.embeddable_on.clone(),
+										self.fetch.clone(),
+									)
+							    },
+								URLHintResult::Content(content) => {
+									ContentFetcherHandler::new(
+										req.method(),
+										&content.url,
+										path,
+										installers::Content::new(
+											content_id.clone(),
+											content.mime,
+											self.cache_path.clone(),
+											Box::new(on_done),
+											self.pool.clone(),
+										),
+										self.embeddable_on.clone(),
+										self.fetch.clone(),
+									)
+								},
+							};
+
+							(Some(ContentStatus::Fetching(handler.fetch_control())), Box::new(handler) as endpoint::Response)
+						},
+						None if self.sync.is_major_importing() => {
+							(None, Self::still_syncing(self.embeddable_on.clone()))
+						},
+						None => {
+							// This may happen when sync status changes in between
+							// `contains` and `to_handler`
+							(None, Self::not_found(self.embeddable_on.clone()))
+						},
+					}
+				},
+			}
+		};
+
+		if let Some(status) = new_status {
+			cache.clear_garbage(MAX_CACHED_DAPPS);
+			cache.insert(content_id, status);
+		}
+
+		handler
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use std::env;
+	use std::sync::Arc;
+	use bytes::Bytes;
+	use fetch::{Fetch, Client};
+	use futures::future;
+	use hash_fetch::urlhint::{URLHint, URLHintResult, BoxFuture};
+
+	use apps::cache::ContentStatus;
+	use endpoint::EndpointInfo;
+	use page::local;
+	use super::{ContentFetcher, Fetcher};
+	use {SyncStatus};
+
+	#[derive(Clone)]
+	struct FakeResolver;
+	impl URLHint for FakeResolver {
+		fn resolve(&self, _id: Bytes) -> BoxFuture<Option<URLHintResult>, String> {
+			Box::new(future::ok(None))
+		}
+	}
+
+	#[derive(Debug)]
+	struct FakeSync(bool);
+	impl SyncStatus for FakeSync {
+		fn is_major_importing(&self) -> bool { self.0 }
+		fn peers(&self) -> (usize, usize) { (0, 5) }
+	}
+
+	#[test]
+	fn should_true_if_contains_the_app() {
+		// given
+		let pool = ::futures_cpupool::CpuPool::new(1);
+		let path = env::temp_dir();
+		let fetcher = ContentFetcher::new(
+			FakeResolver,
+			Arc::new(FakeSync(false)),
+			Client::new().unwrap(),
+			pool.clone(),
+		).allow_dapps(true);
+
+		let handler = local::Dapp::new(pool, path, EndpointInfo {
+			name: "fake".into(),
+			description: "".into(),
+			version: "".into(),
+			author: "".into(),
+			icon_url: "".into(),
+			local_url: Some("".into()),
+		}, Default::default(), None);
+
+		// when
+		fetcher.set_status("test", ContentStatus::Ready(handler));
+		fetcher.set_status("test2", ContentStatus::Fetching(Default::default()));
+
+		// then
+		assert_eq!(fetcher.contains("test"), true);
+		assert_eq!(fetcher.contains("test2"), true);
+		assert_eq!(fetcher.contains("test3"), false);
+	}
+}

dapps/src/apps/fs.rs

@@ -0,0 +1,138 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::collections::BTreeMap;
+use std::io;
+use std::io::Read;
+use std::fs;
+use std::path::{Path, PathBuf};
+use futures_cpupool::CpuPool;
+
+use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest};
+use endpoint::{Endpoint, EndpointInfo};
+use page::{local, PageCache};
+use Embeddable;
+
+struct LocalDapp {
+	id: String,
+	path: PathBuf,
+	info: EndpointInfo,
+}
+
+/// Tries to find and read manifest file in given `path` to extract `EndpointInfo`
+/// If manifest is not found sensible default `EndpointInfo` is returned based on given `name`.
+fn read_manifest(name: &str, mut path: PathBuf) -> EndpointInfo {
+	path.push(MANIFEST_FILENAME);
+
+	fs::File::open(path.clone())
+		.map_err(|e| format!("{:?}", e))
+		.and_then(|mut f| {
+			// Reat file
+			let mut s = String::new();
+			f.read_to_string(&mut s).map_err(|e| format!("{:?}", e))?;
+			// Try to deserialize manifest
+			deserialize_manifest(s)
+		})
+		.map(Into::into)
+		.unwrap_or_else(|e| {
+			warn!(target: "dapps", "Cannot read manifest file at: {:?}. Error: {:?}", path, e);
+
+			EndpointInfo {
+				name: name.into(),
+				description: name.into(),
+				version: "0.0.0".into(),
+				author: "?".into(),
+				icon_url: "icon.png".into(),
+				local_url: None,
+			}
+		})
+}
+
+/// Returns Dapp Id and Local Dapp Endpoint for given filesystem path.
+/// Parses the path to extract last component (for name).
+/// `None` is returned when path is invalid or non-existent.
+pub fn local_endpoint<P: AsRef<Path>>(path: P, embeddable: Embeddable, pool: CpuPool) -> Option<(String, Box<local::Dapp>)> {
+	let path = path.as_ref().to_owned();
+	path.canonicalize().ok().and_then(|path| {
+		let name = path.file_name().and_then(|name| name.to_str());
+		name.map(|name| {
+			let dapp = local_dapp(name.into(), path.clone());
+			(dapp.id, Box::new(local::Dapp::new(
+				pool.clone(), dapp.path, dapp.info, PageCache::Disabled, embeddable.clone())
+			))
+		})
+	})
+}
+
+
+fn local_dapp(name: String, path: PathBuf) -> LocalDapp {
+	// try to get manifest file
+	let info = read_manifest(&name, path.clone());
+	LocalDapp {
+		id: name,
+		path: path,
+		info: info,
+	}
+}
+
+/// Returns endpoints for Local Dapps found for given filesystem path.
+/// Scans the directory and collects `local::Dapp`.
+pub fn local_endpoints<P: AsRef<Path>>(dapps_path: P, embeddable: Embeddable, pool: CpuPool) -> BTreeMap<String, Box<Endpoint>> {
+	let mut pages = BTreeMap::<String, Box<Endpoint>>::new();
+	for dapp in local_dapps(dapps_path.as_ref()) {
+		pages.insert(
+			dapp.id,
+			Box::new(local::Dapp::new(pool.clone(), dapp.path, dapp.info, PageCache::Disabled, embeddable.clone()))
+		);
+	}
+	pages
+}
+
+
+fn local_dapps(dapps_path: &Path) -> Vec<LocalDapp> {
+	let files = fs::read_dir(dapps_path);
+	if let Err(e) = files {
+		warn!(target: "dapps", "Unable to load local dapps from: {}. Reason: {:?}", dapps_path.display(), e);
+		return vec![];
+	}
+
+	let files = files.expect("Check is done earlier");
+	files.map(|dir| {
+			let entry = dir?;
+			let file_type = entry.file_type()?;
+
+			// skip files
+			if file_type.is_file() {
+				return Err(io::Error::new(io::ErrorKind::NotFound, "Not a file"));
+			}
+
+			// take directory name and path
+			entry.file_name().into_string()
+				.map(|name| (name, entry.path()))
+				.map_err(|e| {
+					info!(target: "dapps", "Unable to load dapp: {:?}. Reason: {:?}", entry.path(), e);
+					io::Error::new(io::ErrorKind::NotFound, "Invalid name")
+				})
+		})
+		.filter_map(|m| {
+			if let Err(ref e) = m {
+				debug!(target: "dapps", "Ignoring local dapp: {:?}", e);
+			}
+			m.ok()
+		})
+		.map(|(name, path)| local_dapp(name, path))
+		.collect()
+}

dapps/src/apps/manifest.rs

@@ -0,0 +1,29 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use serde_json;
+pub use apps::App as Manifest;
+
+pub const MANIFEST_FILENAME: &'static str = "manifest.json";
+
+pub fn deserialize_manifest(manifest: String) -> Result<Manifest, String> {
+	serde_json::from_str::<Manifest>(&manifest).map_err(|e| format!("{:?}", e))
+	// TODO [todr] Manifest validation (especialy: id (used as path))
+}
+
+pub fn serialize_manifest(manifest: &Manifest) -> Result<String, String> {
+	serde_json::to_string_pretty(manifest).map_err(|e| format!("{:?}", e))
+}

dapps/src/apps/mod.rs

@@ -0,0 +1,100 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use endpoint::{Endpoints, Endpoint};
+use futures_cpupool::CpuPool;
+use page;
+use proxypac::ProxyPac;
+use web::Web;
+use fetch::Fetch;
+use parity_dapps::WebApp;
+use parity_ui;
+use {WebProxyTokens, ParentFrameSettings};
+
+mod app;
+mod cache;
+mod ui;
+pub mod fs;
+pub mod fetcher;
+pub mod manifest;
+
+pub use self::app::App;
+
+pub const HOME_PAGE: &'static str = "home";
+pub const RPC_PATH: &'static str =  "rpc";
+pub const API_PATH: &'static str =  "api";
+pub const UTILS_PATH: &'static str =  "parity-utils";
+pub const WEB_PATH: &'static str = "web";
+pub const URL_REFERER: &'static str = "__referer=";
+
+pub fn utils(pool: CpuPool) -> Box<Endpoint> {
+	Box::new(page::builtin::Dapp::new(pool, parity_ui::App::default()))
+}
+
+pub fn ui(pool: CpuPool) -> Box<Endpoint> {
+	Box::new(page::builtin::Dapp::with_fallback_to_index(pool, parity_ui::App::default()))
+}
+
+pub fn ui_redirection(embeddable: Option<ParentFrameSettings>) -> Box<Endpoint> {
+	Box::new(ui::Redirection::new(embeddable))
+}
+
+pub fn all_endpoints<F: Fetch>(
+	dapps_path: PathBuf,
+	extra_dapps: Vec<PathBuf>,
+	dapps_domain: &str,
+	embeddable: Option<ParentFrameSettings>,
+	web_proxy_tokens: Arc<WebProxyTokens>,
+	fetch: F,
+	pool: CpuPool,
+) -> (Vec<String>, Endpoints) {
+	// fetch fs dapps at first to avoid overwriting builtins
+	let mut pages = fs::local_endpoints(dapps_path.clone(), embeddable.clone(), pool.clone());
+	let local_endpoints: Vec<String> = pages.keys().cloned().collect();
+	for path in extra_dapps {
+		if let Some((id, endpoint)) = fs::local_endpoint(path.clone(), embeddable.clone(), pool.clone()) {
+			pages.insert(id, endpoint);
+		} else {
+			warn!(target: "dapps", "Ignoring invalid dapp at {}", path.display());
+		}
+	}
+
+	// NOTE [ToDr] Dapps will be currently embeded on 8180
+	insert::<parity_ui::App>(&mut pages, "ui", Embeddable::Yes(embeddable.clone()), pool.clone());
+	// old version
+	insert::<parity_ui::old::App>(&mut pages, "v1", Embeddable::Yes(embeddable.clone()), pool.clone());
+
+	pages.insert("proxy".into(), ProxyPac::boxed(embeddable.clone(), dapps_domain.to_owned()));
+	pages.insert(WEB_PATH.into(), Web::boxed(embeddable.clone(), web_proxy_tokens.clone(), fetch.clone()));
+
+	(local_endpoints, pages)
+}
+
+fn insert<T : WebApp + Default + 'static>(pages: &mut Endpoints, id: &str, embed_at: Embeddable, pool: CpuPool) {
+	pages.insert(id.to_owned(), Box::new(match embed_at {
+		Embeddable::Yes(address) => page::builtin::Dapp::new_safe_to_embed(pool, T::default(), address),
+		Embeddable::No => page::builtin::Dapp::new(pool, T::default()),
+	}));
+}
+
+enum Embeddable {
+	Yes(Option<ParentFrameSettings>),
+	#[allow(dead_code)]
+	No,
+}