v 1.6.2

* Added React Hot Reload to dapps + TokenDeplpoy fix (#4846)

* Fix method decoding (#4845)

* Fix contract deployment method decoding in Signer

* Linting

* Fix TxViewer when no `to` (contract deployment) (#4847)

* Added React Hot Reload to dapps + TokenDeplpoy fix

* Fixes to the LocalTx dapp

* Don't send the nonce for mined transactions

* Don't encode empty to values for options

* Pull steps from actual available steps (#4848)

* Wait for the value to have changed in the input (#4844)

* Backport Regsirty changes from #4589

* Test fixes for #4589

.cargo/config

@@ -1,3 +0,0 @@
-[target.x86_64-pc-windows-msvc]
-# Link the C runtime statically ; https://github.com/paritytech/parity-ethereum/issues/6643
-rustflags = ["-Ctarget-feature=+crt-static"]

.dockerignore

@@ -1,22 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-target
-
-*.swp
-*.swo
-*.swn
-*.DS_Store
-
-# Visual Studio Code stuff
-.vscode
-
-# GitEye stuff
-.project
-
-# idea ide
-.idea
-
-# 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

@@ -1,84 +0,0 @@
-# Code of Conduct
-
-## 1. Purpose
-
-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 Parity to help us create safe and positive experiences for everyone.
-
-## 2. Open Source Citizenship
-
-A supplemental goal of this Code of Conduct is to increase open source citizenship by encouraging participants to recognize and strengthen the relationships between our actions and their effects on our community.
-
-Communities mirror the societies in which they exist and positive action is essential to counteract the many forms of inequality and abuses of power that exist in society.
-
-If you see someone who is making an extra effort to ensure our community is welcoming, friendly, and encourages all participants to contribute to the fullest extent, we want to know.
-
-## 3. Expected Behavior
-
-The following behaviors are expected and requested of all community members:
-
-*   Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
-*   Exercise consideration and respect in your speech and actions.
-*   Attempt collaboration before conflict.
-*   Refrain from demeaning, discriminatory, or harassing behavior and speech.
-*   Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
-*   Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
-
-## 4. Unacceptable Behavior
-
-The following behaviors are considered harassment and are unacceptable within our community:
-
-*   Violence, threats of violence or violent language directed against another person.
-*   Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
-*   Posting or displaying sexually explicit or violent material.
-*   Posting or threatening to post other people’s personally identifying information ("doxing").
-*   Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
-*   Inappropriate photography or recording.
-*   Inappropriate physical contact. You should have someone’s consent before touching them.
-*   Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
-*   Deliberate intimidation, stalking or following (online or in person).
-*   Advocating for, or encouraging, any of the above behavior.
-*   Sustained disruption of community events, including talks and presentations.
-
-## 5. Consequences of Unacceptable Behavior
-
-Unacceptable behavior from any community member, including sponsors and those with decision-making authority, will not be tolerated.
-
-Anyone asked to stop unacceptable behavior is expected to comply immediately.
-
-If a community member engages in unacceptable behavior, the community organizers may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from the community without warning (and without refund in the case of a paid event).
-
-## 6. Reporting Guidelines
-
-If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. community@parity.io.
-
-Link to reporting guidelines: [CONTRIBUTING.md](CONTRIBUTING.md)
-
-Link to security policy: [SECURITY.md](../SECURITY.md)
-
-Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behavior feel safe. In the context of in-person events, organizers will also provide escorts as desired by the person experiencing distress.
-
-## 7. Addressing Grievances
-
-If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify Parity Technologies with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
-
-## 8. Scope
-
-We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues–online and in-person–as well as in all one-on-one communications pertaining to community business.
-
-This code of conduct and its related procedures also applies to unacceptable behavior occurring outside the scope of community activities when such behavior has the potential to adversely affect the safety and well-being of community members.
-
-## 9. Contact info
-
-You can contact Parity via Email: community@parity.io
-
-## 10. License and attribution
-
-This Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).
-
-Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).
-
-Retrieved on November 22, 2016 from [http://citizencodeofconduct.org/](http://citizencodeofconduct.org/)

.github/CONTRIBUTING.md

@@ -1,33 +0,0 @@
-# Contributing Guidelines
-
-## 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/)!
-
-See also frequently asked questions [tagged with `parity`](https://ethereum.stackexchange.com/questions/tagged/parity?sort=votes&pageSize=50) on Stack Exchange.
-
-## Report bugs!
-
-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/paritytech/parity-ethereum/issues/new) in our repository and state:
-
-- What's your Parity Ethereum version?
-- What's your operating system and version?
-- How did you install Parity Ethereum?
-- Is your node fully synchronized?
-- Did you try turning it off and on again?
-
-Also, try to include **steps to reproduce** the issue and expand on the **actual versus expected behavior**.
-
-## Contribute!
-
-If you would like to contribute to Parity Ethereum, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/paritytech/parity-ethereum/compare).
-
-Please, refer to the [Coding Guide](https://wiki.parity.io/Coding-guide) in our wiki for more details about hacking on Parity.
-
-## License.
-
-By contributing to Parity Ethereum, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).
-
-Each contributor has to sign our Contributor License Agreement. The purpose of the CLA is to ensure that the guardian of a project's outputs has the necessary ownership or grants of rights over all contributions to allow them to distribute under the chosen license. You can read and sign our full Contributor License Agreement at [cla.parity.io](https://cla.parity.io) before submitting a pull request.

.github/ISSUE_TEMPLATE.md

@@ -1,11 +0,0 @@
-_Before filing a new issue, please **provide the following information**._
-
-- **Parity Ethereum version**: 0.0.0
-- **Operating system**: Windows / MacOS / Linux
-- **Installation**: homebrew / one-line installer / built from source
-- **Fully synchronized**: no / yes
-- **Network**: ethereum / ropsten / kovan / ...
-- **Restarted**: no / yes
-
-_Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._
-

.gitignore

@@ -15,18 +15,10 @@
 
 # vim stuff
 *.swp
-*.swo
 
 # mac stuff
 .DS_Store
 
-# npm stuff
-npm-debug.log
-node_modules
-
-# js build artifacts
-.git-release.log
-
 # gdb files
 .gdb_history
 
@@ -38,8 +30,7 @@ node_modules
 
 # Build artifacts
 out/
-parity-clib-examples/cpp/build/
 
 .vscode
-rls/
+
 /parity.*

.gitlab-ci.yml

@@ -1,171 +1,610 @@
 stages:
   - test
+  - js-build
+  - push-release
   - build
-  - publish
-  - optional
-
-image:                             parity/rust:gitlab-ci
-
 variables:
-  CI_SERVER_NAME:                  "GitLab CI"
-  CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
-  CARGO_TARGET:                    x86_64-unknown-linux-gnu
-
-.releaseable_branches:             # list of git refs for building GitLab artifacts (think "pre-release binaries")
-  only:                            &releaseable_branches
-    - stable
+  GIT_DEPTH: "3"
+  SIMPLECOV: "true"
+  RUST_BACKTRACE: "1"
+  RUSTFLAGS: ""
+  CARGOFLAGS: ""
+cache:
+  key: "$CI_BUILD_STAGE/$CI_BUILD_REF_NAME"
+  untracked: true
+linux-stable:
+  stage: build
+  image: ethcore/rust:stable
+  only:
     - beta
     - tags
-    - schedules
-
-
-.collect_artifacts:                &collect_artifacts
+    - stable
+    - triggers
+  script:
+    - cargo build -j $(nproc) --release --features final $CARGOFLAGS
+    - cargo build -j $(nproc) --release -p evmbin
+    - cargo build -j $(nproc) --release -p ethstore
+    - cargo build -j $(nproc) --release -p ethkey
+    - strip target/release/parity
+    - strip target/release/evm
+    - strip target/release/ethstore
+    - strip target/release/ethkey
+    - export SHA3=$(target/release/parity tools hash target/release/parity)
+    - md5sum target/release/parity > parity.md5
+    - sh scripts/deb-build.sh amd64
+    - cp target/release/parity deb/usr/bin/parity
+    - cp target/release/evm deb/usr/bin/evm
+    - cp target/release/ethstore deb/usr/bin/ethstore
+    - cp target/release/ethkey deb/usr/bin/ethkey
+    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
+    - dpkg-deb -b deb "parity_"$VER"_amd64.deb"
+    - md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
+    - aws configure set aws_access_key_id $s3_key
+    - aws configure set aws_secret_access_key $s3_secret
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity --body target/release/parity
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity.md5 --body parity.md5
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.deb" --body "parity_"$VER"_amd64.deb"
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.deb.md5" --body "parity_"$VER"_amd64.deb.md5"
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
+  tags:
+    - rust
+    - rust-stable
   artifacts:
-    name:                          "${CI_JOB_NAME}_${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}"
-    when:                          on_success
-    expire_in:                     1 mos
     paths:
-    - artifacts/
-
-.determine_version:                &determine_version
-  - VERSION="$(sed -r -n '1,/^version/s/^version = "([^"]+)".*$/\1/p' Cargo.toml)"
-  - DATE_STR="$(date +%Y%m%d)"
-  - ID_SHORT="$(echo ${CI_COMMIT_SHA} | cut -c 1-7)"
-  - test "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" = "nightly" && VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"
-  - export VERSION
-  - echo "Version = ${VERSION}"
-
-test-linux:
-  stage:                           test
-  variables:
-    RUN_TESTS:                     all
+    - target/release/parity
+    - target/release/parity/evmbin
+    - target/release/parity/ethstore
+    - target/release/parity/ethkey
+    name: "stable-x86_64-unknown-linux-gnu_parity"
+linux-stable-debian:
+  stage: build
+  image: ethcore/rust-debian:latest
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
   script:
-    - scripts/gitlab/test-all.sh stable
+    - cargo build -j $(nproc) --release --features final $CARGOFLAGS
+    - cargo build -j $(nproc) --release -p evmbin
+    - cargo build -j $(nproc) --release -p ethstore
+    - cargo build -j $(nproc) --release -p ethkey
+    - strip target/release/parity
+    - strip target/release/evm
+    - strip target/release/ethstore
+    - strip target/release/ethkey
+    - export SHA3=$(target/release/parity tools hash target/release/parity)
+    - md5sum target/release/parity > parity.md5
+    - sh scripts/deb-build.sh amd64
+    - cp target/release/parity deb/usr/bin/parity
+    - cp target/release/evm deb/usr/bin/evm
+    - cp target/release/ethstore deb/usr/bin/ethstore
+    - cp target/release/ethkey deb/usr/bin/ethkey
+    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
+    - dpkg-deb -b deb "parity_"$VER"_amd64.deb"
+    - md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
+    - aws configure set aws_access_key_id $s3_key
+    - aws configure set aws_secret_access_key $s3_secret
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/parity --body target/release/parity
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/parity.md5 --body parity.md5
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/"parity_"$VER"_amd64.deb" --body "parity_"$VER"_amd64.deb"
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/"parity_"$VER"_amd64.deb.md5" --body "parity_"$VER"_amd64.deb.md5"
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu
   tags:
-    - rust-stable
-
-test-audit:
-  stage:                           test
+    - rust
+    - rust-debian
+  artifacts:
+    paths:
+    - target/release/parity
+    name: "stable-x86_64-unknown-debian-gnu_parity"
+linux-beta:
+  stage: build
+  image: ethcore/rust:beta
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
   script:
-    - scripts/gitlab/cargo-audit.sh
+    - cargo build -j $(nproc) --release $CARGOFLAGS
+    - strip target/release/parity
   tags:
-    - rust-stable
-
-build-linux:
-  stage:                           build
-  only:                            *releaseable_branches
+    - rust
+    - rust-beta
+  artifacts:
+    paths:
+    - target/release/parity
+    name: "beta-x86_64-unknown-linux-gnu_parity"
+  allow_failure: true
+linux-nightly:
+  stage: build
+  image: ethcore/rust:nightly
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
   script:
-    - scripts/gitlab/build-unix.sh
-  <<:                              *collect_artifacts
+    - cargo build -j $(nproc) --release $CARGOFLAGS
+    - strip target/release/parity
   tags:
-    - rust-stable
-
-build-darwin:
-  stage:                           build
-  only:                            *releaseable_branches
-  variables:
-    CARGO_TARGET:                  x86_64-apple-darwin
-    CC:                            gcc
-    CXX:                           g++
+    - rust
+    - rust-nightly
+  artifacts:
+    paths:
+    - target/release/parity
+    name: "nigthly-x86_64-unknown-linux-gnu_parity"
+  allow_failure: true
+linux-centos:
+  stage: build
+  image: ethcore/rust-centos:latest
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
   script:
-    - scripts/gitlab/build-unix.sh
+    - export CXX="g++"
+    - export CC="gcc"
+    - export PLATFORM=x86_64-unknown-centos-gnu
+    - cargo build -j $(nproc) --release --features final $CARGOFLAGS
+    - strip target/release/parity
+    - md5sum target/release/parity > parity.md5
+    - export SHA3=$(target/release/parity tools hash target/release/parity)
+    - aws configure set aws_access_key_id $s3_key
+    - aws configure set aws_secret_access_key $s3_secret
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu
+    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity --body target/release/parity
+    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity.md5 --body parity.md5
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
   tags:
-    - rust-osx
-  <<:                              *collect_artifacts
-
-build-windows:
-  stage:                           build
-  only:                            *releaseable_branches
-  variables:
-    CARGO_TARGET:                  x86_64-pc-windows-msvc
+    - rust
+    - rust-centos
+  artifacts:
+    paths:
+    - target/release/parity
+    name: "x86_64-unknown-centos-gnu_parity"
+linux-i686:
+  stage: build
+  image: ethcore/rust-i686:latest
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
   script:
-    - sh scripts/gitlab/build-windows.sh
+    - export HOST_CC=gcc
+    - export HOST_CXX=g++
+    - export COMMIT=$(git rev-parse HEAD)
+    - export PLATFORM=i686-unknown-linux-gnu
+    - cargo build -j $(nproc) --target i686-unknown-linux-gnu --features final --release $CARGOFLAGS
+    - strip target/$PLATFORM/release/parity
+    - md5sum target/$PLATFORM/release/parity > parity.md5
+    - export SHA3=$(target/$PLATFORM/release/parity tools hash target/$PLATFORM/release/parity)
+    - sh scripts/deb-build.sh i386
+    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
+    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
+    - dpkg-deb -b deb "parity_"$VER"_i386.deb"
+    - md5sum "parity_"$VER"_i386.deb" > "parity_"$VER"_i386.deb.md5"
+    - aws configure set aws_access_key_id $s3_key
+    - aws configure set aws_secret_access_key $s3_secret
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_i386.deb" --body "parity_"$VER"_i386.deb"
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_i386.deb.md5" --body "parity_"$VER"_i386.deb.md5"
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+  tags:
+    - rust
+    - rust-i686
+  artifacts:
+    paths:
+      - target/i686-unknown-linux-gnu/release/parity
+    name: "i686-unknown-linux-gnu"
+  allow_failure: true
+linux-armv7:
+  stage: build
+  image: ethcore/rust-armv7:latest
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - export CC=arm-linux-gnueabihf-gcc
+    - export CXX=arm-linux-gnueabihf-g++
+    - export HOST_CC=gcc
+    - export HOST_CXX=g++
+    - export PLATFORM=armv7-unknown-linux-gnueabihf
+    - rm -rf .cargo
+    - mkdir -p .cargo
+    - echo "[target.$PLATFORM]" >> .cargo/config
+    - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
+    - cat .cargo/config
+    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
+    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity
+    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
+    - md5sum target/$PLATFORM/release/parity > parity.md5
+    - sh scripts/deb-build.sh armhf
+    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
+    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
+    - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
+    - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
+    - aws configure set aws_access_key_id $s3_key
+    - aws configure set aws_secret_access_key $s3_secret
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+  tags:
+    - rust
+    - rust-arm
+  artifacts:
+    paths:
+    - target/armv7-unknown-linux-gnueabihf/release/parity
+    name: "armv7_unknown_linux_gnueabihf_parity"
+  allow_failure: true
+linux-arm:
+  stage: build
+  image: ethcore/rust-arm:latest
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - export CC=arm-linux-gnueabihf-gcc
+    - export CXX=arm-linux-gnueabihf-g++
+    - export HOST_CC=gcc
+    - export HOST_CXX=g++
+    - export PLATFORM=arm-unknown-linux-gnueabihf
+    - rm -rf .cargo
+    - mkdir -p .cargo
+    - echo "[target.$PLATFORM]" >> .cargo/config
+    - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
+    - cat .cargo/config
+    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
+    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity
+    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
+    - md5sum target/$PLATFORM/release/parity > parity.md5
+    - sh scripts/deb-build.sh armhf
+    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
+    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
+    - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
+    - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
+    - aws configure set aws_access_key_id $s3_key
+    - aws configure set aws_secret_access_key $s3_secret
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+  tags:
+    - rust
+    - rust-arm
+  artifacts:
+    paths:
+    - target/arm-unknown-linux-gnueabihf/release/parity
+    name: "arm-unknown-linux-gnueabihf_parity"
+  allow_failure: true
+linux-armv6:
+  stage: build
+  image: ethcore/rust-armv6:latest
+  only:
+    - beta
+#    - tags
+#    - stable
+#    - triggers
+  script:
+    - export CC=arm-linux-gnueabi-gcc
+    - export CXX=arm-linux-gnueabi-g++
+    - export HOST_CC=gcc
+    - export HOST_CXX=g++
+    - export PLATFORM=arm-unknown-linux-gnueabi
+    - rm -rf .cargo
+    - mkdir -p .cargo
+    - echo "[target.$PLATFORM]" >> .cargo/config
+    - echo "linker= \"arm-linux-gnueabi-gcc\"" >> .cargo/config
+    - cat .cargo/config
+    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
+    - arm-linux-gnueabi-strip target/$PLATFORM/release/parity
+    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
+    - md5sum target/$PLATFORM/release/parity > parity.md5
+    - aws configure set aws_access_key_id $s3_key
+    - aws configure set aws_secret_access_key $s3_secret
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+  tags:
+    - rust
+    - rust-arm
+  artifacts:
+    paths:
+    - target/arm-unknown-linux-gnueabi/release/parity
+    name: "arm-unknown-linux-gnueabi_parity"
+  allow_failure: true
+linux-aarch64:
+  stage: build
+  image: ethcore/rust-aarch64:latest
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - export CC=aarch64-linux-gnu-gcc
+    - export CXX=aarch64-linux-gnu-g++
+    - export HOST_CC=gcc
+    - export HOST_CXX=g++
+    - export PLATFORM=aarch64-unknown-linux-gnu
+    - rm -rf .cargo
+    - mkdir -p .cargo
+    - echo "[target.$PLATFORM]" >> .cargo/config
+    - echo "linker= \"aarch64-linux-gnu-gcc\"" >> .cargo/config
+    - cat .cargo/config
+    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
+    - aarch64-linux-gnu-strip target/$PLATFORM/release/parity
+    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
+    - md5sum target/$PLATFORM/release/parity > parity.md5
+    - sh scripts/deb-build.sh arm64
+    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
+    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
+    - dpkg-deb -b deb "parity_"$VER"_arm64.deb"
+    - md5sum "parity_"$VER"_arm64.deb" > "parity_"$VER"_arm64.deb.md5"
+    - aws configure set aws_access_key_id $s3_key
+    - aws configure set aws_secret_access_key $s3_secret
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_arm64.deb" --body "parity_"$VER"_arm64.deb"
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_arm64.deb.md5" --body "parity_"$VER"_arm64.deb.md5"
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+  tags:
+    - rust
+    - rust-arm
+  artifacts:
+    paths:
+    - target/aarch64-unknown-linux-gnu/release/parity
+    name: "aarch64-unknown-linux-gnu_parity"
+  allow_failure: true
+darwin:
+  stage: build
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script: |
+      export COMMIT=$(git rev-parse HEAD)
+      export PLATFORM=x86_64-apple-darwin
+      cargo build -j 8 --features final --release #$CARGOFLAGS
+      cargo build -j 8 --features final --release -p ethstore #$CARGOFLAGS
+      rm -rf parity.md5
+      md5sum target/release/parity > parity.md5
+      export SHA3=$(target/release/parity tools hash target/release/parity)
+      cd mac
+      xcodebuild -configuration Release
+      cd ..
+      packagesbuild -v mac/Parity.pkgproj
+      productsign --sign 'Developer ID Installer: PARITY TECHNOLOGIES LIMITED (P2PX3JU8FT)' target/release/Parity\ Ethereum.pkg target/release/Parity\ Ethereum-signed.pkg
+      export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
+      mv target/release/Parity\ Ethereum-signed.pkg "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg"
+      md5sum "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg" >> "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg.md5"
+      aws configure set aws_access_key_id $s3_key
+      aws configure set aws_secret_access_key $s3_secret
+      if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+      aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
+      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/release/parity
+      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
+      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity-"$VER"-osx-installer-EXPERIMENTAL.pkg" --body "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg"
+      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity-"$VER"-osx-installer-EXPERIMENTAL.pkg.md5" --body "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg.md5"
+      curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+      curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+  tags:
+    - osx
+  artifacts:
+    paths:
+    - target/release/parity
+    name: "x86_64-apple-darwin_parity"
+windows:
+  cache:
+    key: "%CI_BUILD_STAGE%/%CI_BUILD_REF_NAME%"
+    untracked: true
+  stage: build
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - set PLATFORM=x86_64-pc-windows-msvc
+    - set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt
+    - set LIB=C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64
+    - set RUST_BACKTRACE=1
+    - set RUSTFLAGS=%RUSTFLAGS%
+    - rustup default stable-x86_64-pc-windows-msvc
+    - cargo build --features final --release #%CARGOFLAGS%
+    - signtool sign /f %keyfile% /p %certpass% target\release\parity.exe
+    - target\release\parity.exe tools hash target\release\parity.exe > parity.sha3
+    - set /P SHA3=<parity.sha3
+    - curl -sL --url "https://github.com/ethcore/win-build/raw/master/SimpleFC.dll" -o nsis\SimpleFC.dll
+    - curl -sL --url "https://github.com/ethcore/win-build/raw/master/vc_redist.x64.exe" -o nsis\vc_redist.x64.exe
+    - msbuild windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release
+    - signtool sign /f %keyfile% /p %certpass% windows\ptray\x64\release\ptray.exe
+    - cd nsis
+    - makensis.exe installer.nsi
+    - copy installer.exe InstallParity.exe
+    - signtool sign /f %keyfile% /p %certpass% InstallParity.exe
+    - md5sums InstallParity.exe > InstallParity.exe.md5
+    - zip win-installer.zip InstallParity.exe InstallParity.exe.md5
+    - md5sums win-installer.zip > win-installer.zip.md5
+    - cd ..\target\release\
+    - md5sums parity.exe > parity.exe.md5
+    - zip parity.zip parity.exe parity.md5
+    - md5sums parity.zip > parity.zip.md5
+    - cd ..\..
+    - aws configure set aws_access_key_id %s3_key%
+    - aws configure set aws_secret_access_key %s3_secret%
+    - echo %CI_BUILD_REF_NAME%
+    - echo %CI_BUILD_REF_NAME% | findstr /R "master" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
+    - echo %CI_BUILD_REF_NAME% | findstr /R "beta" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
+    - echo %CI_BUILD_REF_NAME% | findstr /R "stable" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
+    - echo %S3_BUCKET%
+    - aws s3 rm --recursive s3://%S3_BUCKET%/%CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe --body target\release\parity.exe
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe.md5 --body target\release\parity.exe.md5
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip --body target\release\parity.zip
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip.md5 --body target\release\parity.zip.md5
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe --body nsis\InstallParity.exe
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe.md5 --body nsis\InstallParity.exe.md5
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip --body nsis\win-installer.zip
+    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip.md5 --body nsis\win-installer.zip.md5
+    - curl --data "commit=%CI_BUILD_REF%&sha3=%SHA3%&filename=parity.exe&secret=%RELEASES_SECRET%" http://update.parity.io:1337/push-build/%CI_BUILD_REF_NAME%/%PLATFORM%
+    - curl --data "commit=%CI_BUILD_REF%&sha3=%SHA3%&filename=parity.exe&secret=%RELEASES_SECRET%" http://update.parity.io:1338/push-build/%CI_BUILD_REF_NAME%/%PLATFORM%
   tags:
    - rust-windows
-  <<:                              *collect_artifacts
-
-publish-docker:
-  stage:                           publish
-  only:                            *releaseable_branches
-  cache: {}
-  dependencies:
-    - build-linux
-  tags:
-    - shell
-  script:
-    - scripts/gitlab/publish-docker.sh parity
-
-publish-snap:
-  stage:                           publish
-  only:                            *releaseable_branches
-  image:                           parity/snapcraft:gitlab-ci
-  variables:
-    BUILD_ARCH:                  amd64
-  cache: {}
-  before_script:                   *determine_version
-  dependencies:
-    - build-linux
-  tags:
-    - rust-stable
-  script:
-    - scripts/gitlab/publish-snap.sh
-  allow_failure:                   true
-  <<:                              *collect_artifacts
-
-publish-awss3:
-  stage:                           publish
-  only:                            *releaseable_branches
-  cache: {}
-  dependencies:
-    - build-linux
-    - build-darwin
-    - build-windows
-  before_script:                   *determine_version
-  script:
-    - scripts/gitlab/publish-awss3.sh
-  tags:
-    - shell
-
-publish-docs:
-  stage:                            publish
+  artifacts:
+    paths:
+    - target/release/parity.exe
+    - nsis/InstallParity.exe
+    name: "x86_64-pc-windows-msvc_parity"
+docker-build:
+  stage: build
   only:
     - tags
-  except:
-    - nightly
-  cache: {}
+    - triggers
+  before_script:
+    - docker info
   script:
-    - scripts/gitlab/publish-docs.sh
+    - if [ "$CI_BUILD_REF_NAME" == "beta-release" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
+    - docker login -u $Docker_Hub_User -p $Docker_Hub_Pass
+    - sh scripts/docker-build.sh $DOCKER_TAG
   tags:
-    - linux-docker
-
-build-android:
-  stage:                           optional
-  image:                           parity/rust-android:gitlab-ci
-  variables:
-    CARGO_TARGET:                  armv7-linux-androideabi
+    - docker
+test-darwin:
+  stage: test
+  only:
+    - triggers
+  before_script:
+    - git submodule update --init --recursive
+    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
   script:
-    - scripts/gitlab/build-unix.sh
+    - export RUST_BACKTRACE=1
+    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
   tags:
-    - linux-docker
-  allow_failure:                   true
-  <<:                              *collect_artifacts
-
-test-beta:
-  stage:                           optional
-  variables:
-    RUN_TESTS:                     cargo
+    - osx
+  allow_failure: true
+test-windows:
+  stage: test
+  only:
+    - triggers
+  before_script:
+    - git submodule update --init --recursive
   script:
-    - scripts/gitlab/test-all.sh beta
+    - set RUST_BACKTRACE=1
+    - echo cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p ethcore-dapps -p ethcore-rpc -p ethcore-signer -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity %CARGOFLAGS% --verbose --release
   tags:
+    - rust-windows
+  allow_failure: true
+test-rust-stable:
+  stage: test
+  image: ethcore/rust:stable
+  before_script:
+    - git submodule update --init --recursive
+    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
+  script:
+    - export RUST_BACKTRACE=1
+    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS&&./scripts/cov.sh "$KCOV_CMD"; fi
+  tags:
+    - rust
+    - rust-stable
+js-test:
+  stage: test
+  image: ethcore/rust:stable
+  before_script:
+    - git submodule update --init --recursive
+    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
+    - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS deps install since no JS files modified."; else ./js/scripts/install-deps.sh;fi
+  script:
+    - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS lint since no JS files modified."; else ./js/scripts/lint.sh && ./js/scripts/test.sh && ./js/scripts/build.sh; fi
+  tags:
+    - rust
+    - rust-stable
+test-rust-beta:
+  stage: test
+  only:
+    - triggers
+  image: ethcore/rust:beta
+  before_script:
+    - git submodule update --init --recursive
+    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
+  script:
+    - export RUST_BACKTRACE=1
+    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
+  tags:
+    - rust
     - rust-beta
-  allow_failure:                   true
-
-test-nightly:
-  stage:                           optional
-  variables:
-    RUN_TESTS:                     all
+  allow_failure: true
+test-rust-nightly:
+  stage: test
+  only:
+    - triggers
+  image: ethcore/rust:nightly
+  before_script:
+    - git submodule update --init --recursive
+    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
   script:
-    - scripts/gitlab/test-all.sh nightly
+    - export RUST_BACKTRACE=1
+    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
   tags:
+    - rust
     - rust-nightly
-  allow_failure:                   true
+  allow_failure: true
+js-release:
+  stage: js-build
+  only:
+    - master
+    - beta
+    - stable
+    - tags
+  image: ethcore/rust:stable
+  before_script:
+    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
+    - echo $JS_FILES_MODIFIED
+    - if [ $JS_FILES_MODIFIED -eq 0  ]; then echo "Skipping JS deps install since no JS files modified."; else ./js/scripts/install-deps.sh;fi
+  script:
+    - echo $JS_FILES_MODIFIED
+    - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS rebuild since no JS files modified."; else ./js/scripts/build.sh && ./js/scripts/release.sh; fi
+  tags:
+    - javascript
+push-release:
+  stage: push-release
+  only:
+    - tags
+  image: ethcore/rust:stable
+  script:
+    - 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

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

CHANGELOG.md

@@ -1,287 +0,0 @@
-## Parity-Ethereum [v2.2.5](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.5) (2018-12-14)
-Parity-Ethereum 2.2.5-beta is an important release that introduces Constantinople fork at block 7080000 on Mainnet. 
-This release also contains a fix for chains using AuRa + EmptySteps. Read carefully if this applies to you. 
-If you have a chain with`empty_steps` already running, some blocks most likely contain non-strict entries (unordered or duplicated empty steps). In this release`strict_empty_steps_transition` **is enabled by default at block 0** for any chain with `empty_steps`.
-If your network uses `empty_steps` you **must**:
-- plan a hard fork and change `strict_empty_steps_transition` to the desire fork block
-- update the clients of the whole network to 2.2.5-beta / 2.1.10-stable.
-If for some reason you don't want to do this please set`strict_empty_steps_transition` to `0xfffffffff` to disable it.
-
-The full list of included changes: 
-- Backports for beta 2.2.5 ([#10047](https://github.com/paritytech/parity-ethereum/pull/10047))
-	- Bump beta to 2.2.5 ([#10047](https://github.com/paritytech/parity-ethereum/pull/10047))
-	- Fix empty steps ([#9939](https://github.com/paritytech/parity-ethereum/pull/9939))
-		- Prevent sending empty step message twice
-		- Prevent sending empty step and then block in the same step
-		- Don't accept double empty steps
-		- Do basic validation of self-sealed blocks
-	- Strict empty steps validation ([#10041](https://github.com/paritytech/parity-ethereum/pull/10041))
-		- Enables strict verification of empty steps - there can be no duplicates and empty steps should be ordered inside the seal.
-		- Note that authorities won't produce invalid seals after [#9939](https://github.com/paritytech/parity-ethereum/pull/9939), this PR just adds verification to the seal to prevent forging incorrect blocks and potentially causing consensus issues.
-		- This features is enabled by default so any AuRa + EmptySteps chain should set strict_empty_steps_transition fork block number in their spec and upgrade to v2.2.5-beta or v2.1.10-stable.
-	- ethcore: enable constantinople on ethereum ([#10031](https://github.com/paritytech/parity-ethereum/pull/10031))
-		- ethcore: change blockreward to 2e18 for foundation after constantinople
-		- ethcore: delay diff bomb by 2e6 blocks for foundation after constantinople
-		- ethcore: enable eip-{145,1014,1052,1283} for foundation after constantinople
-	- Change test miner max memory to malloc reports. ([#10024](https://github.com/paritytech/parity-ethereum/pull/10024))
-	- Fix: test corpus_inaccessible panic ([#10019](https://github.com/paritytech/parity-ethereum/pull/10019))
-
-## Parity-Ethereum [v2.2.2](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.2) (2018-11-29)
-
-Parity-Ethereum 2.2.2-beta is an exciting release. Among others, it improves sync performance, peering stability, block propagation, and transaction propagation times. Also, a warp-sync no longer removes existing blocks from the database, but rather reuses locally available information to decrease sync times and reduces required bandwidth.
-
-Before upgrading to 2.2.2, please also verify the validity of your chain specs. Parity Ethereum now denies unknown fields in the specification. To do this, use the chainspec tool:
-
-```
-cargo build --release -p chainspec
-./target/release/chainspec /path/to/spec.json
-```
-
-Last but not least, JSONRPC APIs which are not yet accepted as an EIP in the `eth`, `personal`, or `web3` namespace, are now considere experimental as their final specification might change in future. These APIs have to be manually enabled by explicitly running `--jsonrpc-experimental`.
-
-The full list of included changes:
-
-- Backports For beta 2.2.2 ([#9976](https://github.com/paritytech/parity-ethereum/pull/9976))
-  - Version: bump beta to 2.2.2
-  - Add experimental RPCs flag ([#9928](https://github.com/paritytech/parity-ethereum/pull/9928))
-  - Keep existing blocks when restoring a Snapshot ([#8643](https://github.com/paritytech/parity-ethereum/pull/8643))
-    - Rename db_restore => client
-    - First step: make it compile!
-    - Second step: working implementation!
-    - Refactoring
-    - Fix tests
-    - Migrate ancient blocks interacting backward
-    - Early return in block migration if snapshot is aborted
-    - Remove RwLock getter (PR Grumble I)
-    - Remove dependency on `Client`: only used Traits
-    - Add test for recovering aborted snapshot recovery
-    - Add test for migrating old blocks
-    - Release RwLock earlier
-    - Revert Cargo.lock
-    - Update _update ancient block_ logic: set local in `commit`
-    - Update typo in ethcore/src/snapshot/service.rs
-  - Adjust requests costs for light client ([#9925](https://github.com/paritytech/parity-ethereum/pull/9925))
-    - Pip Table Cost relative to average peers instead of max peers
-    - Add tracing in PIP new_cost_table
-    - Update stat peer_count
-    - Use number of leeching peers for Light serve costs
-    - Fix test::light_params_load_share_depends_on_max_peers (wrong type)
-    - Remove (now) useless test
-    - Remove `load_share` from LightParams.Config
-    - Add LEECHER_COUNT_FACTOR
-    - Pr Grumble: u64 to u32 for f64 casting
-    - Prevent u32 overflow for avg_peer_count
-    - Add tests for LightSync::Statistics
-  - Fix empty steps ([#9939](https://github.com/paritytech/parity-ethereum/pull/9939))
-    - Don't send empty step twice or empty step then block.
-    - Perform basic validation of locally sealed blocks.
-    - Don't include empty step twice.
-  - Prevent silent errors in daemon mode, closes [#9367](https://github.com/paritytech/parity-ethereum/issues/9367) ([#9946](https://github.com/paritytech/parity-ethereum/pull/9946))
-  - Fix a deadlock ([#9952](https://github.com/paritytech/parity-ethereum/pull/9952))
-    - Update informant:
-      - Decimal in Mgas/s
-      - Print every 5s (not randomly between 5s and 10s)
-    - Fix dead-lock in `blockchain.rs`
-    - Update locks ordering
-  - Fix light client informant while syncing ([#9932](https://github.com/paritytech/parity-ethereum/pull/9932))
-    - Add `is_idle` to LightSync to check importing status
-    - Use SyncStateWrapper to make sure is_idle gets updates
-    - Update is_major_import to use verified queue size as well
-    - Add comment for `is_idle`
-    - Add Debug to `SyncStateWrapper`
-    - `fn get` -> `fn into_inner`
-  -  Ci: rearrange pipeline by logic ([#9970](https://github.com/paritytech/parity-ethereum/pull/9970))
-    - Ci: rearrange pipeline by logic
-    - Ci: rename docs script
-  - Fix docker build ([#9971](https://github.com/paritytech/parity-ethereum/pull/9971))
-  - Deny unknown fields for chainspec ([#9972](https://github.com/paritytech/parity-ethereum/pull/9972))
-    - Add deny_unknown_fields to chainspec
-    - Add tests and fix existing one
-    - Remove serde_ignored dependency for chainspec
-    - Fix rpc test eth chain spec
-    - Fix starting_nonce_test spec
-  - Improve block and transaction propagation ([#9954](https://github.com/paritytech/parity-ethereum/pull/9954))
-    - Refactor sync to add priority tasks.
-    - Send priority tasks notifications.
-    - Propagate blocks, optimize transactions.
-    - Implement transaction propagation. Use sync_channel.
-    - Tone down info.
-    - Prevent deadlock by not waiting forever for sync lock.
-    - Fix lock order.
-    - Don't use sync_channel to prevent deadlocks.
-    - Fix tests.
-  - Fix unstable peers and slowness in sync ([#9967](https://github.com/paritytech/parity-ethereum/pull/9967))
-    - Don't sync all peers after each response
-    - Update formating
-    - Fix tests: add `continue_sync` to `Sync_step`
-    - Update ethcore/sync/src/chain/mod.rs
-    - Fix rpc middlewares
-  - Fix Cargo.lock
-  - Json: resolve merge in spec
-  - Rpc: fix starting_nonce_test
-  - Ci: allow nightl job to fail
-
-## Parity-Ethereum [v2.2.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.1) (2018-11-15)
-
-Parity-Ethereum 2.2.1-beta is the first v2.2 release, and might introduce features that break previous work flows, among others:
-
-- Prevent zero network ID ([#9763](https://github.com/paritytech/parity-ethereum/pull/9763)) and drop support for Olympic testnet ([#9801](https://github.com/paritytech/parity-ethereum/pull/9801)): The Olympic test net is dead for years and never used a chain ID but network ID zero. Parity Ethereum is now preventing the network ID to be zero, thus Olympic support is dropped. Make sure to chose positive non-zero network IDs in future.
-- Multithreaded snapshot creation ([#9239](https://github.com/paritytech/parity-ethereum/pull/9239)): adds a CLI argument `--snapshot-threads` which specifies the number of threads. This helps improving the performance of full nodes that wish to provide warp-snapshots for the network. The gain in performance comes with a slight drawback in increased snapshot size.
-- Expose config max-round-blocks-to-import ([#9439](https://github.com/paritytech/parity-ethereum/pull/9439)): Parity Ethereum imports blocks in rounds. If at the end of any round, the queue is not empty, we consider it to be _importing_ and won't notify pubsub. On large re-orgs (10+ blocks), this is possible. The default `max_round_blocks_to_import` is increased to 12 and configurable via the `--max-round-blocks-to-import` CLI flag. With unstable network conditions, it is advised to increase the number. This shouldn't have any noticeable performance impact unless the number is set to really large.
-- Increase Gas-floor-target and Gas Cap ([#9564](https://github.com/paritytech/parity-ethereum/pull/9564)): the default values for gas floor target are `8_000_000` and gas cap `10_000_000`, similar to Geth 1.8.15+.
-- Produce portable binaries ([#9725](https://github.com/paritytech/parity-ethereum/pull/9725)): we now produce portable binaries, but it may incur some performance degradation. For ultimate performance it's now better to compile Parity Ethereum from source with `PORTABLE=OFF` environment variable.
-- RPC: `parity_allTransactionHashes` ([#9745](https://github.com/paritytech/parity-ethereum/pull/9745)): Get all pending transactions from the queue with the high performant `parity_allTransactionHashes` RPC method.
-- Support `eth_chainId` RPC method ([#9783](https://github.com/paritytech/parity-ethereum/pull/9783)): implements EIP-695 to get the chainID via RPC.
-- AuRa: finalize blocks ([#9692](https://github.com/paritytech/parity-ethereum/pull/9692)): The AuRa engine was updated to emit ancestry actions to finalize blocks. The full client stores block finality in the database, the engine builds finality from an ancestry of `ExtendedHeader`; `is_epoch_end` was updated to take a vec of recently finalized headers; `is_epoch_end_light` was added which maintains the previous interface and is used by the light client since the client itself doesn't track finality.
-
-The full list of included changes:
-
-- Backport to parity 2.2.1 beta ([#9905](https://github.com/paritytech/parity-ethereum/pull/9905))
-  - Bump version to 2.2.1
-  - Fix: Intermittent failing CI due to addr in use ([#9885](https://github.com/paritytech/parity-ethereum/pull/9885))
-  - Fix Parity not closing on Ctrl-C ([#9886](https://github.com/paritytech/parity-ethereum/pull/9886))
-  - Fix json tracer overflow ([#9873](https://github.com/paritytech/parity-ethereum/pull/9873))
-  - Fix docker script ([#9854](https://github.com/paritytech/parity-ethereum/pull/9854))
-  - Add hardcoded headers for light client ([#9907](https://github.com/paritytech/parity-ethereum/pull/9907))
-  - Gitlab-ci: make android release build succeed ([#9743](https://github.com/paritytech/parity-ethereum/pull/9743))
-  - Allow to seal work on latest block ([#9876](https://github.com/paritytech/parity-ethereum/pull/9876))
-  - Remove rust-toolchain file ([#9906](https://github.com/paritytech/parity-ethereum/pull/9906))
-  - Light-fetch: Differentiate between out-of-gas/manual throw and use required gas from response on failure ([#9824](https://github.com/paritytech/parity-ethereum/pull/9824))
-  - Eip-712 implementation ([#9631](https://github.com/paritytech/parity-ethereum/pull/9631))
-  - Eip-191 implementation ([#9701](https://github.com/paritytech/parity-ethereum/pull/9701))
-  - Simplify cargo audit ([#9918](https://github.com/paritytech/parity-ethereum/pull/9918))
-  - Fix performance issue importing Kovan blocks ([#9914](https://github.com/paritytech/parity-ethereum/pull/9914))
-  - Ci: nuke the gitlab caches ([#9855](https://github.com/paritytech/parity-ethereum/pull/9855))
-- Backports to parity beta 2.2.0 ([#9820](https://github.com/paritytech/parity-ethereum/pull/9820))
-  - Ci: remove failing tests for android, windows, and macos ([#9788](https://github.com/paritytech/parity-ethereum/pull/9788))
-  - Implement NoProof for json tests and update tests reference ([#9814](https://github.com/paritytech/parity-ethereum/pull/9814))
-  - Move state root verification before gas used ([#9841](https://github.com/paritytech/parity-ethereum/pull/9841))
-  - Classic.json Bootnode Update ([#9828](https://github.com/paritytech/parity-ethereum/pull/9828))
-- Rpc: parity_allTransactionHashes ([#9745](https://github.com/paritytech/parity-ethereum/pull/9745))
-- Revert "prevent zero networkID ([#9763](https://github.com/paritytech/parity-ethereum/pull/9763))" ([#9815](https://github.com/paritytech/parity-ethereum/pull/9815))
-- Allow zero chain id in EIP155 signing process ([#9792](https://github.com/paritytech/parity-ethereum/pull/9792))
-- Add readiness check for docker container ([#9804](https://github.com/paritytech/parity-ethereum/pull/9804))
-- Insert dev account before unlocking ([#9813](https://github.com/paritytech/parity-ethereum/pull/9813))
-- Removed "rustup" & added new runner tag ([#9731](https://github.com/paritytech/parity-ethereum/pull/9731))
-- Expose config max-round-blocks-to-import ([#9439](https://github.com/paritytech/parity-ethereum/pull/9439))
-- Aura: finalize blocks ([#9692](https://github.com/paritytech/parity-ethereum/pull/9692))
-- Sync: retry different peer after empty subchain heads response ([#9753](https://github.com/paritytech/parity-ethereum/pull/9753))
-- Fix(light-rpc/parity) : Remove unused client ([#9802](https://github.com/paritytech/parity-ethereum/pull/9802))
-- Drops support for olympic testnet, closes [#9800](https://github.com/paritytech/parity-ethereum/issues/9800) ([#9801](https://github.com/paritytech/parity-ethereum/pull/9801))
-- Replace `tokio_core` with `tokio` (`ring` -> 0.13) ([#9657](https://github.com/paritytech/parity-ethereum/pull/9657))
-- Support eth_chainId RPC method ([#9783](https://github.com/paritytech/parity-ethereum/pull/9783))
-- Ethcore: bump ropsten forkblock checkpoint ([#9775](https://github.com/paritytech/parity-ethereum/pull/9775))
-- Docs: changelogs for 2.0.8 and 2.1.3 ([#9758](https://github.com/paritytech/parity-ethereum/pull/9758))
-- Prevent zero networkID ([#9763](https://github.com/paritytech/parity-ethereum/pull/9763))
-- Skip seal fields count check when --no-seal-check is used ([#9757](https://github.com/paritytech/parity-ethereum/pull/9757))
-- Aura: fix panic on extra_info with unsealed block ([#9755](https://github.com/paritytech/parity-ethereum/pull/9755))
-- Docs: update changelogs ([#9742](https://github.com/paritytech/parity-ethereum/pull/9742))
-- Removed extra assert in generation_session_is_removed_when_succeeded ([#9738](https://github.com/paritytech/parity-ethereum/pull/9738))
-- Make checkpoint_storage_at use plain loop instead of recursion ([#9734](https://github.com/paritytech/parity-ethereum/pull/9734))
-- Use signed 256-bit integer for sstore gas refund substate ([#9746](https://github.com/paritytech/parity-ethereum/pull/9746))
-- Heads ref not present for branches beta and stable ([#9741](https://github.com/paritytech/parity-ethereum/pull/9741))
-- Add Callisto support ([#9534](https://github.com/paritytech/parity-ethereum/pull/9534))
-- Add --force to cargo audit install script ([#9735](https://github.com/paritytech/parity-ethereum/pull/9735))
-- Remove unused expired value from Handshake ([#9732](https://github.com/paritytech/parity-ethereum/pull/9732))
-- Add hardcoded headers ([#9730](https://github.com/paritytech/parity-ethereum/pull/9730))
-- Produce portable binaries ([#9725](https://github.com/paritytech/parity-ethereum/pull/9725))
-- Gitlab ci: releasable_branches: change variables condition to schedule ([#9729](https://github.com/paritytech/parity-ethereum/pull/9729))
-- Update a few parity-common dependencies ([#9663](https://github.com/paritytech/parity-ethereum/pull/9663))
-- Hf in POA Core (2018-10-22) ([#9724](https://github.com/paritytech/parity-ethereum/pull/9724))
-- Schedule nightly builds ([#9717](https://github.com/paritytech/parity-ethereum/pull/9717))
-- Fix ancient blocks sync ([#9531](https://github.com/paritytech/parity-ethereum/pull/9531))
-- Ci: Skip docs job for nightly ([#9693](https://github.com/paritytech/parity-ethereum/pull/9693))
-- Fix (light/provider) : Make `read_only executions` read-only ([#9591](https://github.com/paritytech/parity-ethereum/pull/9591))
-- Ethcore: fix detection of major import ([#9552](https://github.com/paritytech/parity-ethereum/pull/9552))
-- Return 0 on error ([#9705](https://github.com/paritytech/parity-ethereum/pull/9705))
-- Ethcore: delay ropsten hardfork ([#9704](https://github.com/paritytech/parity-ethereum/pull/9704))
-- Make instantSeal engine backwards compatible, closes [#9696](https://github.com/paritytech/parity-ethereum/issues/9696) ([#9700](https://github.com/paritytech/parity-ethereum/pull/9700))
-- Implement CREATE2 gas changes and fix some potential overflowing ([#9694](https://github.com/paritytech/parity-ethereum/pull/9694))
-- Don't hash the init_code of CREATE. ([#9688](https://github.com/paritytech/parity-ethereum/pull/9688))
-- Ethcore: minor optimization of modexp by using LR exponentiation ([#9697](https://github.com/paritytech/parity-ethereum/pull/9697))
-- Removed redundant clone before each block import ([#9683](https://github.com/paritytech/parity-ethereum/pull/9683))
-- Add Foundation Bootnodes ([#9666](https://github.com/paritytech/parity-ethereum/pull/9666))
-- Docker: run as parity user ([#9689](https://github.com/paritytech/parity-ethereum/pull/9689))
-- Ethcore: mcip3 block reward contract ([#9605](https://github.com/paritytech/parity-ethereum/pull/9605))
-- Verify block syncing responses against requests ([#9670](https://github.com/paritytech/parity-ethereum/pull/9670))
-- Add a new RPC `parity_submitWorkDetail` similar `eth_submitWork` but return block hash ([#9404](https://github.com/paritytech/parity-ethereum/pull/9404))
-- Resumable EVM and heap-allocated callstack ([#9360](https://github.com/paritytech/parity-ethereum/pull/9360))
-- Update parity-wordlist library ([#9682](https://github.com/paritytech/parity-ethereum/pull/9682))
-- Ci: Remove unnecessary pipes ([#9681](https://github.com/paritytech/parity-ethereum/pull/9681))
-- Test.sh: use cargo --target for platforms other than linux, win or mac ([#9650](https://github.com/paritytech/parity-ethereum/pull/9650))
-- Ci: fix push script ([#9679](https://github.com/paritytech/parity-ethereum/pull/9679))
-- Hardfork the testnets ([#9562](https://github.com/paritytech/parity-ethereum/pull/9562))
-- Calculate sha3 instead of sha256 for push-release. ([#9673](https://github.com/paritytech/parity-ethereum/pull/9673))
-- Ethcore-io retries failed work steal ([#9651](https://github.com/paritytech/parity-ethereum/pull/9651))
-- Fix(light_fetch): avoid race with BlockNumber::Latest ([#9665](https://github.com/paritytech/parity-ethereum/pull/9665))
-- Test fix for windows cache name... ([#9658](https://github.com/paritytech/parity-ethereum/pull/9658))
-- Refactor(fetch) : light use only one `DNS` thread ([#9647](https://github.com/paritytech/parity-ethereum/pull/9647))
-- Ethereum libfuzzer integration small change ([#9547](https://github.com/paritytech/parity-ethereum/pull/9547))
-- Cli: remove reference to --no-ui in --unlock flag help ([#9616](https://github.com/paritytech/parity-ethereum/pull/9616))
-- Remove master from releasable branches ([#9655](https://github.com/paritytech/parity-ethereum/pull/9655))
-- Ethcore/VerificationQueue don't spawn up extra `worker-threads` when explictly specified not to ([#9620](https://github.com/paritytech/parity-ethereum/pull/9620))
-- Rpc: parity_getBlockReceipts ([#9527](https://github.com/paritytech/parity-ethereum/pull/9527))
-- Remove unused dependencies ([#9589](https://github.com/paritytech/parity-ethereum/pull/9589))
-- Ignore key_server_cluster randomly failing tests ([#9639](https://github.com/paritytech/parity-ethereum/pull/9639))
-- Ethcore: handle vm exception when estimating gas ([#9615](https://github.com/paritytech/parity-ethereum/pull/9615))
-- Fix bad-block reporting no reason ([#9638](https://github.com/paritytech/parity-ethereum/pull/9638))
-- Use static call and apparent value transfer for block reward contract code ([#9603](https://github.com/paritytech/parity-ethereum/pull/9603))
-- Hf in POA Sokol (2018-09-19) ([#9607](https://github.com/paritytech/parity-ethereum/pull/9607))
-- Bump smallvec to 0.6 in ethcore-light, ethstore and whisper ([#9588](https://github.com/paritytech/parity-ethereum/pull/9588))
-- Add constantinople conf to EvmTestClient. ([#9570](https://github.com/paritytech/parity-ethereum/pull/9570))
-- Fix(network): don't disconnect reserved peers ([#9608](https://github.com/paritytech/parity-ethereum/pull/9608))
-- Fix failing node-table tests on mac os, closes [#9632](https://github.com/paritytech/parity-ethereum/issues/9632) ([#9633](https://github.com/paritytech/parity-ethereum/pull/9633))
-- Update ropsten.json ([#9602](https://github.com/paritytech/parity-ethereum/pull/9602))
-- Simplify ethcore errors by removing BlockImportError ([#9593](https://github.com/paritytech/parity-ethereum/pull/9593))
-- Fix windows compilation, replaces [#9561](https://github.com/paritytech/parity-ethereum/issues/9561) ([#9621](https://github.com/paritytech/parity-ethereum/pull/9621))
-- Master: rpc-docs set github token ([#9610](https://github.com/paritytech/parity-ethereum/pull/9610))
-- Docs: add changelogs for 1.11.10, 1.11.11, 2.0.3, 2.0.4, 2.0.5, 2.0.6, 2.1.0, and 2.1.1 ([#9554](https://github.com/paritytech/parity-ethereum/pull/9554))
-- Docs(rpc): annotate tag with the provided message ([#9601](https://github.com/paritytech/parity-ethereum/pull/9601))
-- Ci: fix regex roll_eyes ([#9597](https://github.com/paritytech/parity-ethereum/pull/9597))
-- Remove snapcraft clean ([#9585](https://github.com/paritytech/parity-ethereum/pull/9585))
-- Add snapcraft package image (master) ([#9584](https://github.com/paritytech/parity-ethereum/pull/9584))
-- Docs(rpc): push the branch along with tags ([#9578](https://github.com/paritytech/parity-ethereum/pull/9578))
-- Fix typo for jsonrpc-threads flag ([#9574](https://github.com/paritytech/parity-ethereum/pull/9574))
-- Fix informant compile ([#9571](https://github.com/paritytech/parity-ethereum/pull/9571))
-- Added ropsten bootnodes ([#9569](https://github.com/paritytech/parity-ethereum/pull/9569))
-- Increase Gas-floor-target and Gas Cap ([#9564](https://github.com/paritytech/parity-ethereum/pull/9564))
-- While working on the platform tests make them non-breaking ([#9563](https://github.com/paritytech/parity-ethereum/pull/9563))
-- Improve P2P discovery ([#9526](https://github.com/paritytech/parity-ethereum/pull/9526))
-- Move dockerfile for android build container to scripts repo ([#9560](https://github.com/paritytech/parity-ethereum/pull/9560))
-- Simultaneous platform tests WIP ([#9557](https://github.com/paritytech/parity-ethereum/pull/9557))
-- Update ethabi-derive, serde, serde_json, serde_derive, syn && quote ([#9553](https://github.com/paritytech/parity-ethereum/pull/9553))
-- Ci: fix rpc docs generation 2 ([#9550](https://github.com/paritytech/parity-ethereum/pull/9550))
-- Ci: always run build pipelines for win, mac, linux, and android ([#9537](https://github.com/paritytech/parity-ethereum/pull/9537))
-- Multithreaded snapshot creation ([#9239](https://github.com/paritytech/parity-ethereum/pull/9239))
-- New ethabi ([#9511](https://github.com/paritytech/parity-ethereum/pull/9511))
-- Remove initial token for WS. ([#9545](https://github.com/paritytech/parity-ethereum/pull/9545))
-- Net_version caches network_id to avoid redundant aquire of sync readlock ([#9544](https://github.com/paritytech/parity-ethereum/pull/9544))
-- Correct before_script for nightly build versions ([#9543](https://github.com/paritytech/parity-ethereum/pull/9543))
-- Deps: bump kvdb-rocksdb to 0.1.4 ([#9539](https://github.com/paritytech/parity-ethereum/pull/9539))
-- State: test when contract creation fails, old storage values should re-appear ([#9532](https://github.com/paritytech/parity-ethereum/pull/9532))
-- Allow dropping light client RPC query with no results ([#9318](https://github.com/paritytech/parity-ethereum/pull/9318))
-- Bump master to 2.2.0 ([#9517](https://github.com/paritytech/parity-ethereum/pull/9517))
-- Enable all Constantinople hard fork changes in constantinople_test.json ([#9505](https://github.com/paritytech/parity-ethereum/pull/9505))
-- [Light] Validate `account balance` before importing transactions ([#9417](https://github.com/paritytech/parity-ethereum/pull/9417))
-- In create memory calculation is the same for create2 because the additional parameter was popped before. ([#9522](https://github.com/paritytech/parity-ethereum/pull/9522))
-- Update patricia trie to 0.2.2 ([#9525](https://github.com/paritytech/parity-ethereum/pull/9525))
-- Replace hardcoded JSON with serde json! macro ([#9489](https://github.com/paritytech/parity-ethereum/pull/9489))
-- Fix typo in version string ([#9516](https://github.com/paritytech/parity-ethereum/pull/9516))
-
-## Previous releases
-
-- [CHANGELOG-2.1](docs/CHANGELOG-2.1.md) (_stable_)
-- [CHANGELOG-2.0](docs/CHANGELOG-2.0.md) (EOL: 2018-11-15)
-- [CHANGELOG-1.11](docs/CHANGELOG-1.11.md) (EOL: 2018-09-19)
-- [CHANGELOG-1.10](docs/CHANGELOG-1.10.md) (EOL: 2018-07-18)
-- [CHANGELOG-1.9](docs/CHANGELOG-1.9.md) (EOL: 2018-05-09)
-- [CHANGELOG-1.8](docs/CHANGELOG-1.8.md) (EOL: 2018-03-22)
-- [CHANGELOG-1.7](docs/CHANGELOG-1.7.md) (EOL: 2018-01-25)
-- [CHANGELOG-1.6](docs/CHANGELOG-1.6.md) (EOL: 2017-10-15)
-- [CHANGELOG-1.5](docs/CHANGELOG-1.5.md) (EOL: 2017-07-28)
-- [CHANGELOG-1.4](docs/CHANGELOG-1.4.md) (EOL: 2017-03-13)
-- [CHANGELOG-1.3](docs/CHANGELOG-1.3.md) (EOL: 2017-01-19)
-- [CHANGELOG-1.2](docs/CHANGELOG-1.2.md) (EOL: 2016-11-07)
-- [CHANGELOG-1.1](docs/CHANGELOG-1.1.md) (EOL: 2016-08-12)
-- [CHANGELOG-1.0](docs/CHANGELOG-1.0.md) (EOL: 2016-06-24)
-- [CHANGELOG-0.9](docs/CHANGELOG-0.9.md) (EOL: 2016-05-02)

Cargo.toml

@@ -1,138 +1,97 @@
 [package]
 description = "Parity Ethereum client"
-name = "parity-ethereum"
-# NOTE Make sure to update util/version/Cargo.toml as well
-version = "2.3.2"
+name = "parity"
+version = "1.6.2"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-blooms-db = { path = "util/blooms-db" }
-log = "0.4"
-rustc-hex = "1.0"
-docopt = "1.0"
-clap = "2"
-term_size = "0.3"
-textwrap = "0.9"
-num_cpus = "1.2"
+log = "0.3"
+env_logger = "0.3"
+rustc-serialize = "0.3"
+docopt = "0.6"
+time = "0.1"
+num_cpus = "0.2"
 number_prefix = "0.2"
-rpassword = "1.0"
-semver = "0.9"
-ansi_term = "0.10"
-parking_lot = "0.7"
-regex = "1.0"
-atty = "0.2.8"
-toml = "0.4"
-serde = "1.0"
-serde_json = "1.0"
-serde_derive = "1.0"
-futures = "0.1"
+rpassword = "0.2.1"
+semver = "0.5"
+ansi_term = "0.7"
+regex = "0.1"
+isatty = "0.1"
+toml = "0.2"
+serde = "0.9"
+serde_json = "0.9"
+app_dirs = "1.1.1"
 fdlimit = "0.1"
-ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" }
-ethcore = { path = "ethcore", features = ["parity"] }
-parity-bytes = "0.1"
-common-types = { path = "ethcore/types" }
-ethcore-blockchain = { path = "ethcore/blockchain" }
-ethcore-db = { path = "ethcore/db" }
+hyper = { default-features = false, git = "https://github.com/ethcore/hyper" }
+ctrlc = { git = "https://github.com/ethcore/rust-ctrlc.git" }
+jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc.git" }
+ethsync = { path = "sync" }
+ethcore = { path = "ethcore" }
+ethcore-util = { path = "util" }
 ethcore-io = { path = "util/io" }
+ethcore-devtools = { path = "devtools" }
+ethcore-rpc = { path = "rpc" }
+ethcore-signer = { path = "signer" }
+ethcore-ipc = { path = "ipc/rpc" }
+ethcore-ipc-nano = { path = "ipc/nano" }
+ethcore-ipc-hypervisor = { path = "ipc/hypervisor" }
 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" }
-ethstore = { path = "accounts/ethstore" }
-ethereum-types = "0.4"
-node-filter = { path = "ethcore/node-filter" }
-ethkey = { path = "accounts/ethkey" }
-rlp = { version = "0.3.0", features = ["ethereum"] }
-cli-signer= { path = "cli-signer" }
-parity-hash-fetch = { path = "updater/hash-fetch" }
+ethcore-logger = { path = "logger" }
+ethcore-stratum = { path = "stratum" }
+evmbin = { path = "evmbin" }
+rlp = { path = "util/rlp" }
+rpc-cli = { path = "rpc_cli" }
+parity-rpc-client = { path = "rpc_client" }
+parity-hash-fetch = { path = "hash-fetch" }
 parity-ipfs-api = { path = "ipfs" }
-parity-local-store = { path = "miner/local-store" }
-parity-runtime = { path = "util/runtime" }
-parity-rpc = { path = "rpc" }
 parity-updater = { path = "updater" }
-parity-version = { path = "util/version" }
-parity-whisper = { path = "whisper" }
-parity-path = "0.1"
-dir = { path = "util/dir" }
-panic_hook = { path = "util/panic-hook" }
-keccak-hash = "0.1"
-migration-rocksdb = { path = "util/migration-rocksdb" }
-kvdb = "0.1"
-kvdb-rocksdb = "0.1.3"
-journaldb = { path = "util/journaldb" }
-
-ethcore-secretstore = { path = "secret-store", optional = true }
-
-registrar = { path = "util/registrar" }
-
-[build-dependencies]
-rustc_version = "0.2"
+parity-reactor = { path = "util/reactor" }
+parity-local-store = { path = "local-store" }
+ethcore-dapps = { path = "dapps", optional = true }
+clippy = { version = "0.0.103", optional = true}
+ethcore-secretstore = { path = "secret_store", optional = true }
 
 [dev-dependencies]
-pretty_assertions = "0.1"
-ipnetwork = "0.12.6"
-tempdir = "0.3"
-fake-fetch = { path = "util/fake-fetch" }
+ethcore-ipc-tests = { path = "ipc/tests" }
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.4", features = ["winsock2", "winuser", "shellapi"] }
+winapi = "0.2"
 
 [target.'cfg(not(windows))'.dependencies]
-daemonize = "0.3"
+daemonize = "0.2"
 
 [features]
-miner-debug = ["ethcore/miner-debug"]
+default = ["ui-precompiled"]
+ui = [
+	"dapps",
+	"ethcore-dapps/ui",
+	"ethcore-signer/ui",
+]
+ui-precompiled = [
+	"dapps",
+	"ethcore-signer/ui-precompiled",
+	"ethcore-dapps/ui-precompiled",
+]
+dapps = ["ethcore-dapps"]
+ipc = ["ethcore/ipc", "ethsync/ipc"]
+jit = ["ethcore/jit"]
+dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "ethcore-rpc/dev", "ethcore-dapps/dev", "ethcore-signer/dev"]
 json-tests = ["ethcore/json-tests"]
-ci-skip-issue = ["ethcore/ci-skip-issue"]
 test-heavy = ["ethcore/test-heavy"]
+ethkey-cli = ["ethcore/ethkey-cli"]
+ethstore-cli = ["ethcore/ethstore-cli"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
+final = ["ethcore-util/final"]
 secretstore = ["ethcore-secretstore"]
-final = ["parity-version/final"]
-deadlock_detection = ["parking_lot/deadlock_detection"]
-# to create a memory profile (requires nightly rust), use e.g.
-# `heaptrack /path/to/parity <parity params>`,
-# to visualize a memory profile, use `heaptrack_gui`
-# or
-# `valgrind --tool=massif /path/to/parity <parity params>`
-# and `massif-visualizer` for visualization
-memory_profiling = []
-# hardcode version number 1.3.7 of parity to force an update
-# in order to manually test that parity fall-over to the local version
-# in case of invalid or deprecated command line arguments are entered
-test-updater = ["parity-updater/test-updater"]
-
-[lib]
-path = "parity/lib.rs"
 
 [[bin]]
 path = "parity/main.rs"
 name = "parity"
 
-[profile.dev]
-
 [profile.release]
 debug = false
-
-[workspace]
-# This should only list projects that are not
-# in the dependency tree in any other way
-# (i.e. pretty much only standalone CLI tools)
-members = [
-	"accounts/ethkey/cli",
-	"accounts/ethstore/cli",
-	"chainspec",
-	"ethcore/wasm/run",
-	"evmbin",
-	"parity-clib",
-	"whisper/cli",
-]
-
-[patch.crates-io]
-heapsize = { git = "https://github.com/cheme/heapsize.git", branch = "ec-macfix" }
+lto = false
+panic = "abort"

README.md

@@ -1,155 +1,133 @@
-![Parity Ethereum](docs/logo-parity-ethereum.svg)
+# [Parity](https://ethcore.io/parity.html)
+### Fast, light, and robust Ethereum implementation
 
-<h2 align="center">The Fastest and most Advanced Ethereum Client.</h2>
+[![build status](https://gitlab.ethcore.io/parity/parity/badges/master/build.svg)](https://gitlab.ethcore.io/parity/parity/commits/master) [![Coverage Status][coveralls-image]][coveralls-url]  [![GPLv3][license-image]][license-url]
 
-<p align="center"><strong><a href="https://github.com/paritytech/parity-ethereum/releases/latest">» Download the latest release «</a></strong></p>
+### Join the chat!
 
-<p align="center"><a href="https://gitlab.parity.io/parity/parity-ethereum/commits/master" target="_blank"><img src="https://gitlab.parity.io/parity/parity-ethereum/badges/master/build.svg" /></a>
-<a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank"><img src="https://img.shields.io/badge/license-GPL%20v3-green.svg" /></a></p>
+Parity [![Join the chat at https://gitter.im/ethcore/parity][gitter-image]][gitter-url] and
+parity.js [![Join the chat at https://gitter.im/ethcore/parity.js](https://badges.gitter.im/ethcore/parity.js.svg)](https://gitter.im/ethcore/parity.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-**Built for mission-critical use**: Miners, service providers, and exchanges need fast synchronisation and maximum uptime. Parity Ethereum provides the core infrastructure essential for speedy and reliable services.
+[Internal Documentation][doc-url]
 
-- 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
 
-## Technical Overview
+Be sure to check out [our wiki][wiki-url] for more information.
 
-Parity Ethereum's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing Parity Ethereum using the sophisticated and cutting-edge **Rust programming language**. Parity Ethereum is licensed under the GPLv3 and can be used for all your Ethereum needs.
+[coveralls-image]: https://coveralls.io/repos/github/ethcore/parity/badge.svg?branch=master
+[coveralls-url]: https://coveralls.io/github/ethcore/parity?branch=master
+[gitter-image]: https://badges.gitter.im/Join%20Chat.svg
+[gitter-url]: https://gitter.im/ethcore/parity?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+[license-image]: https://img.shields.io/badge/license-GPL%20v3-green.svg
+[license-url]: https://www.gnu.org/licenses/gpl-3.0.en.html
+[doc-url]: https://ethcore.github.io/parity/ethcore/index.html
+[wiki-url]: https://github.com/ethcore/parity/wiki
 
-By default, Parity Ethereum runs a JSON-RPC HTTP server on port `:8545` and a Web-Sockets server on port `:8546`. This is fully configurable and supports a number of APIs.
+**Parity requires Rust version 1.15.0 to build**
 
-If you run into problems while using Parity Ethereum, check out the [wiki for documentation](https://wiki.parity.io/), feel free to [file an issue in this repository](https://github.com/paritytech/parity-ethereum/issues/new), or hop on our [Gitter](https://gitter.im/paritytech/parity) or [Riot](https://riot.im/app/#/group/+parity:matrix.parity.io) chat room to ask a question. We are glad to help! **For security-critical issues**, please refer to the security policy outlined in [SECURITY.md](SECURITY.md).
+----
 
-Parity Ethereum's current beta-release is 2.1. You can download it at [the releases page](https://github.com/paritytech/parity-ethereum/releases) or follow the instructions below to build from source. Please, mind the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions.
 
-## Build Dependencies
+## About Parity
 
-Parity Ethereum requires **latest stable Rust version** to build.
+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.
 
-We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have `rustup`, you can install it like this:
+Parity comes with a built-in wallet. To access [Parity Wallet](http://127.0.0.1:8080/) simply go to http://127.0.0.1:8080/. It
+includes various functionality allowing you to:
+- create and manage your Ethereum accounts;
+- manage your Ether and any Ethereum tokens;
+- create and register your own tokens;
+- and much more.    
+
+By default, Parity will also run a JSONRPC server on `127.0.0.1:8545`. This is fully configurable and supports a number
+of RPC APIs.
+
+If you run into an issue while using parity, feel free to file one in this repository
+or hop on our [gitter chat room][gitter-url] to ask a question. We are glad to help!
+
+Parity's current release is 1.5. You can download it at https://ethcore.io/parity.html or follow the instructions
+below to build from source.
+
+----
+
+## Build dependencies
+
+Parity is fully compatible with Stable Rust.
+
+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
-  ```
-
-  Parity Ethereum also requires `gcc`, `g++`, `libudev-dev`, `pkg-config`, `file`, `make`, and `cmake` packages to be installed.
-
+	```bash
+	$ curl https://sh.rustup.rs -sSf | sh
+	```
+	
+	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.
+	```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
-  $ 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)
+    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:
+    ```
+	$ rustup default stable-x86_64-pc-windows-msvc
+    ```
 
-Make sure that these binaries are in your `PATH`. After that, you should be able to build Parity Ethereum from source.
+Once you have rustup, install parity or download and build from source
 
-## Build from Source Code
+----
+
+## Quick install
 
 ```bash
-# download Parity Ethereum code
-$ git clone https://github.com/paritytech/parity-ethereum
-$ cd parity-ethereum
-
-# build in release mode
-$ cargo build --release --features final
+cargo install --git https://github.com/ethcore/parity.git parity
 ```
 
-This produces an executable in the `./target/release` subdirectory.
+----
 
+## Build from source
+
+```bash
+# download Parity code
+$ git clone https://github.com/ethcore/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:
 
 ```bash
 $ ~/.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:
+## Simple one-line installer for Mac and Ubuntu
 
 ```bash
-$ cargo clean
+bash <(curl https://get.parity.io -Lk)
 ```
 
-This always compiles the latest nightly builds. If you want to build stable or beta, do a
-
-```bash
-$ git checkout stable
-```
-
-or
-
-```bash
-$ git checkout beta
-```
-
-## Simple One-Line Installer for Mac and Linux
-
-```bash
-bash <(curl https://get.parity.io -L)
-```
-
-The one-line installer always defaults to the latest beta release. To install a stable release, run:
-
-```bash
-bash <(curl https://get.parity.io -L) -r stable
-```
-
-## Start Parity Ethereum
-
+## Start Parity
 ### Manually
-
-To start Parity Ethereum manually, just run
-
+To start Parity manually, just run
 ```bash
 $ ./target/release/parity
 ```
 
-so Parity Ethereum begins syncing the Ethereum blockchain.
+and Parity will begin syncing the Ethereum blockchain.
 
-### Using `systemd` service file
+### Using systemd service file
+To start Parity as a regular user using systemd init:
 
-To start Parity Ethereum as a regular user using `systemd` init:
+1. Copy `parity/scripts/parity.service` to your
+systemd user directory (usually `~/.config/systemd/user`).
+2. To pass any argument to Parity, write a `~/.parity/parity.conf` file this way:
+`ARGS="ARG1 ARG2 ARG3"`.
 
-1. Copy `./scripts/parity.service` to your
-`systemd` user directory (usually `~/.config/systemd/user`).
-2. To configure Parity Ethereum, write a `/etc/parity/config.toml` config file, see [Configuring Parity Ethereum](https://paritytech.github.io/wiki/Configuring-Parity) for details.
-
-## Parity Ethereum toolchain
-
-In addition to the Parity Ethereum client, there are additional tools in this repository available:
-
-- [evmbin](https://github.com/paritytech/parity-ethereum/blob/master/evmbin/) - EVM implementation for Parity Ethereum.
-- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding.
-- [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethstore) - Parity Ethereum key management.
-- [ethkey](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethkey) - Parity Ethereum keys generator.
-- [whisper](https://github.com/paritytech/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.
-
-## Join the chat!
-
-Questions? Get in touch with us on Gitter:
-[![Gitter: Parity](https://img.shields.io/badge/gitter-parity-4AB495.svg)](https://gitter.im/paritytech/parity)
-[![Gitter: Parity.js](https://img.shields.io/badge/gitter-parity.js-4AB495.svg)](https://gitter.im/paritytech/parity.js)
-[![Gitter: Parity/Miners](https://img.shields.io/badge/gitter-parity/miners-4AB495.svg)](https://gitter.im/paritytech/parity/miners)
-[![Gitter: Parity-PoA](https://img.shields.io/badge/gitter-parity--poa-4AB495.svg)](https://gitter.im/paritytech/parity-poa)
-
-Alternatively, join our community on Matrix:
-[![Riot: +Parity](https://img.shields.io/badge/riot-%2Bparity%3Amatrix.parity.io-orange.svg)](https://riot.im/app/#/group/+parity:matrix.parity.io)
-
-## Documentation
-
-Official website: https://parity.io
-
-Be sure to [check out our wiki](https://wiki.parity.io) for more information.
+	Example: `ARGS="ui --identity MyMachine"`.

SECURITY.md

@@ -1,80 +0,0 @@
-# Security Policy
-
-Parity Technologies is committed to resolving security vulnerabilities in our software quickly and carefully. We take the necessary steps to minimize risk, provide timely information, and deliver vulnerability fixes and mitigations required to address security issues.
-
-## Reporting a Vulnerability
-
-Security vulnerabilities in Parity software should be reported by email to security@parity.io. If you think your report might be eligible for the Parity Bug Bounty Program, your email should be send to bugbounty@parity.io. 
-
-Your report should include the following:
-
-- your name
-- description of the vulnerability
-- attack scenario (if any)
-- components
-- reproduction
-- other details
-
-Try to include as much information in your report as you can, including a description of the vulnerability, its potential impact, and steps for reproducing it. Be sure to use a descriptive subject line.
-
-You'll receive a response to your email within two business days indicating the next steps in handling your report. We encourage finders to use encrypted communication channels to protect the confidentiality of vulnerability reports. You can encrypt your report using our public key. This key is [on MIT's key server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73) server and reproduced below.
-
-After the initial reply to your report, our team will endeavor to keep you informed of the progress being made towards a fix. These updates will be sent at least every five business days. 
-
-Thank you for taking the time to responsibly disclose any vulnerabilities you find.
-
-## Responsible Investigation and Reporting
-
-Responsible investigation and reporting includes, but isn't limited to, the following:
-
-- Don't violate the privacy of other users, destroy data, etc.
-- Don’t defraud or harm Parity Technologies Ltd or its users during your research; you should make a good faith effort to not interrupt or degrade our services.
-- Don't target our physical security measures, or attempt to use social engineering, spam, distributed denial of service (DDOS) attacks, etc.
-- Initially report the bug only to us and not to anyone else.
-- Give us a reasonable amount of time to fix the bug before disclosing it to anyone else, and give us adequate written warning before disclosing it to anyone else.
-- In general, please investigate and report bugs in a way that makes a reasonable, good faith effort not to be disruptive or harmful to us or our users. Otherwise your actions might be interpreted as an attack rather than an effort to be helpful.
-
-## Bug Bounty Program
-
-Our Bug Bounty Program allows us to recognise and reward members of the Parity community for helping us find and address significant bugs, in accordance with the terms of the Parity Bug Bounty Program. A detailed description on eligibility, rewards, legal information and terms & conditions for contributors can be found on [our website](https://paritytech.io/bug-bounty.html). 
-
-
-
-
-
-
-## Plaintext PGP Key
-
-```
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFlyIAwBCACe0keNPjgYzZ1Oy/8t3zj/Qw9bHHqrzx7FWy8NbXnYBM19NqOZ
-DIP7Oe0DvCaf/uruBskCS0iVstHlEFQ2AYe0Ei0REt9lQdy61GylU/DEB3879IG+
-6FO0SnFeYeerv1/hFI2K6uv8v7PyyVDiiJSW0I1KIs2OBwJicTKmWxLAeQsRgx9G
-yRGalrVk4KP+6pWTA7k3DxmDZKZyfYV/Ej10NtuzmsemwDbv98HKeomp/kgFOfSy
-3AZjeCpctlsNqpjUuXa0/HudmH2WLxZ0fz8XeoRh8XM9UudNIecjrDqmAFrt/btQ
-/3guvlzhFCdhYPVGsUusKMECk/JG+Xx1/1ZjABEBAAG0LFBhcml0eSBTZWN1cml0
-eSBDb250YWN0IDxzZWN1cml0eUBwYXJpdHkuaW8+iQFUBBMBCAA+FiEE2uUVYCjP
-N6B8aTiDXQ8DAY0H3nMFAllyIAwCGwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwEC
-HgECF4AACgkQXQ8DAY0H3nM60wgAkS3A36Zc+upiaxU7tumcGv+an17j7gin0sif
-+0ELSjVfrXInM6ovai+NhUdcLkJ7tCrKS90fvlaELK5Sg9CXBWCTFccKN4A/B7ey
-rOg2NPXUecnyBB/XqQgKYH7ujYlOlqBDXMfz6z8Hj6WToxg9PPMGGomyMGh8AWxM
-3yRPFs5RKt0VKgN++5N00oly5Y8ri5pgCidDvCLYMGTVDHFKwkuc9w6BlWlu1R1e
-/hXFWUFAP1ffTAul3QwyKhjPn2iotCdxXjvt48KaU8DN4iL7aMBN/ZBKqGS7yRdF
-D/JbJyaaJ0ZRvFSTSXy/sWY3z1B5mtCPBxco8hqqNfRkCwuZ6LkBDQRZciAMAQgA
-8BP8xrwe12TOUTqL/Vrbxv/FLdhKh53J6TrPKvC2TEEKOrTNo5ahRq+XOS5E7G2N
-x3b+fq8gR9BzFcldAx0XWUtGs/Wv++ulaSNqTBxj13J3G3WGsUfMKxRgj//piCUD
-bCFLQfGZdKk0M1o9QkPVARwwmvCNiNB/l++xGqPtfc44H5jWj3GoGvL2MkShPzrN
-yN/bJ+m+R5gtFGdInqa5KXBuxxuW25eDKJ+LzjbgUgeC76wNcfOiQHTdMkcupjdO
-bbGFwo10hcbRAOcZEv6//Zrlmk/6nPxEd2hN20St2bSN0+FqfZ267mWEu3ejsgF8
-ArdCpv5h4fBvJyNwiTZwIQARAQABiQE8BBgBCAAmFiEE2uUVYCjPN6B8aTiDXQ8D
-AY0H3nMFAllyIAwCGwwFCQPCZwAACgkQXQ8DAY0H3nNisggAl4fqhRlA34wIb190
-sqXHVxiCuzPaqS6krE9xAa1+gncX485OtcJNqnjugHm2rFE48lv7oasviuPXuInE
-/OgVFnXYv9d/Xx2JUeDs+bFTLouCDRY2Unh7KJZasfqnMcCHWcxHx5FvRNZRssaB
-WTZVo6sizPurGUtbpYe4/OLFhadBqAE0EUmVRFEUMc1YTnu4eLaRBzoWN4d2UWwi
-LN25RSrVSke7LTSFbgn9ntQrQ2smXSR+cdNkkfRCjFcpUaecvFl9HwIqoyVbT4Ym
-0hbpbbX/cJdc91tKa+psa29uMeGL/cgL9fAu19yNFRyOTMxjZnvql1X/WE1pLmoP
-ETBD1Q==
-=K9Qw
------END PGP PUBLIC KEY BLOCK-----
-```

accounts/ethkey/Cargo.toml

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

accounts/ethkey/README.md

@@ -1,221 +0,0 @@
-## ethkey-cli
-
-Parity Ethereum keys generator.
-
-### Usage
-
-```
-Parity Ethereum keys generator.
-  Copyright 2015-2018 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
-```
-
-## Parity Ethereum toolchain
-_This project is a part of the Parity Ethereum toolchain._
-
-- [evmbin](https://github.com/paritytech/parity-ethereum/blob/master/evmbin/) - EVM implementation for Parity Ethereum.
-- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding.
-- [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethstore) - Parity Ethereum key management.
-- [ethkey](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethkey) - Parity Ethereum keys generator.
-- [whisper](https://github.com/paritytech/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.

accounts/ethkey/cli/Cargo.toml

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

accounts/ethkey/src/brain.rs

@@ -1,73 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use keccak::Keccak256;
-use super::{KeyPair, Generator, Secret};
-use parity_wordlist;
-
-/// Simple brainwallet.
-pub struct Brain(String);
-
-impl Brain {
-	pub fn new(s: String) -> Self {
-		Brain(s)
-	}
-
-	pub fn validate_phrase(phrase: &str, expected_words: usize) -> Result<(), ::WordlistError> {
-		parity_wordlist::validate_phrase(phrase, expected_words)
-	}
-}
-
-impl Generator for Brain {
-    type Error = ::Void;
-
-	fn generate(&mut self) -> Result<KeyPair, Self::Error> {
-		let seed = self.0.clone();
-		let mut secret = seed.into_bytes().keccak256();
-
-		let mut i = 0;
-		loop {
-			secret = secret.keccak256();
-
-			match i > 16384 {
-				false => i += 1,
-				true => {
-					if let Ok(pair) = Secret::from_unsafe_slice(&secret)
-						.and_then(KeyPair::from_secret)
-					{
-						if pair.address()[0] == 0 {
-							trace!("Testing: {}, got: {:?}", self.0, pair.address());
-							return Ok(pair)
-						}
-					}
-				},
-			}
-		}
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use {Brain, Generator};
-
-	#[test]
-	fn test_brain() {
-		let words = "this is sparta!".to_owned();
-		let first_keypair = Brain::new(words.clone()).generate().unwrap();
-		let second_keypair = Brain::new(words.clone()).generate().unwrap();
-		assert_eq!(first_keypair.secret(), second_keypair.secret());
-	}
-}

accounts/ethkey/src/brain_prefix.rs

@@ -1,70 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use super::{Generator, KeyPair, Error, Brain};
-use parity_wordlist as wordlist;
-
-/// Tries to find brain-seed keypair with address starting with given prefix.
-pub struct BrainPrefix {
-	prefix: Vec<u8>,
-	iterations: usize,
-	no_of_words: usize,
-	last_phrase: String,
-}
-
-impl BrainPrefix {
-	pub fn new(prefix: Vec<u8>, iterations: usize, no_of_words: usize) -> Self {
-		BrainPrefix {
-			prefix,
-			iterations,
-			no_of_words,
-			last_phrase: String::new(),
-		}
-	}
-
-	pub fn phrase(&self) -> &str {
-		&self.last_phrase
-	}
-}
-
-impl Generator for BrainPrefix {
-	type Error = Error;
-
-	fn generate(&mut self) -> Result<KeyPair, Error> {
-		for _ in 0..self.iterations {
-			let phrase = wordlist::random_phrase(self.no_of_words);
-			let keypair = Brain::new(phrase.clone()).generate().unwrap();
-			if keypair.address().starts_with(&self.prefix) {
-				self.last_phrase = phrase;
-				return Ok(keypair)
-			}
-		}
-
-		Err(Error::Custom("Could not find keypair".into()))
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use {Generator, BrainPrefix};
-
-	#[test]
-	fn prefix_generator() {
-		let prefix = vec![0x00u8];
-		let keypair = BrainPrefix::new(prefix.clone(), usize::max_value(), 12).generate().unwrap();
-		assert!(keypair.address().starts_with(&prefix));
-	}
-}

accounts/ethkey/src/brain_recover.rs

@@ -1,173 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::collections::HashSet;
-
-use edit_distance::edit_distance;
-use parity_wordlist;
-
-use super::{Address, Brain, Generator};
-
-/// Tries to find a phrase for address, given the number
-/// of expected words and a partial phrase.
-///
-/// Returns `None` if phrase couldn't be found.
-pub fn brain_recover(
-	address: &Address,
-	known_phrase: &str,
-	expected_words: usize,
-) -> Option<String> {
-	let it = PhrasesIterator::from_known_phrase(known_phrase, expected_words);
-	for phrase in it {
-		let keypair = Brain::new(phrase.clone()).generate().expect("Brain wallets are infallible; qed");
-		trace!("Testing: {}, got: {:?}", phrase, keypair.address());
-		if &keypair.address() == address {
-			return Some(phrase);
-		}
-	}
-
-	None
-}
-
-fn generate_substitutions(word: &str) -> Vec<&'static str> {
-	let mut words = parity_wordlist::WORDS.iter().cloned()
-		.map(|w| (edit_distance(w, word), w))
-		.collect::<Vec<_>>();
-	words.sort_by(|a, b| a.0.cmp(&b.0));
-
-	words.into_iter()
-		.map(|pair| pair.1)
-		.collect()
-}
-
-/// Iterator over possible
-pub struct PhrasesIterator {
-	words: Vec<Vec<&'static str>>,
-	combinations: u64,
-	indexes: Vec<usize>,
-	has_next: bool,
-}
-
-impl PhrasesIterator {
-	pub fn from_known_phrase(known_phrase: &str, expected_words: usize) -> Self {
-		let known_words = parity_wordlist::WORDS.iter().cloned().collect::<HashSet<_>>();
-		let mut words = known_phrase.split(' ')
-			.map(|word| match known_words.get(word) {
-				None => {
-					info!("Invalid word '{}', looking for potential substitutions.", word);
-					let substitutions = generate_substitutions(word);
-					info!("Closest words: {:?}", &substitutions[..10]);
-					substitutions
-				},
-				Some(word) => vec![*word],
-			})
-		.collect::<Vec<_>>();
-
-		// add missing words
-		if words.len() < expected_words {
-			let to_add = expected_words - words.len();
-			info!("Number of words is insuficcient adding {} more.", to_add);
-			for _ in 0..to_add {
-				words.push(parity_wordlist::WORDS.iter().cloned().collect());
-			}
-		}
-
-		// start searching
-		PhrasesIterator::new(words)
-	}
-
-	pub fn new(words: Vec<Vec<&'static str>>) -> Self {
-		let combinations = words.iter().fold(1u64, |acc, x| acc * x.len() as u64);
-		let indexes = words.iter().map(|_| 0).collect();
-		info!("Starting to test {} possible combinations.", combinations);
-
-		PhrasesIterator {
-			words,
-			combinations,
-			indexes,
-			has_next: combinations > 0,
-		}
-	}
-
-	pub fn combinations(&self) -> u64 {
-		self.combinations
-	}
-
-	fn current(&self) -> String {
-		let mut s = self.words[0][self.indexes[0]].to_owned();
-		for i in 1..self.indexes.len() {
-			s.push(' ');
-			s.push_str(self.words[i][self.indexes[i]]);
-		}
-		s
-	}
-
-	fn next_index(&mut self) -> bool {
-		let mut pos = self.indexes.len();
-		while pos > 0 {
-			pos -= 1;
-			self.indexes[pos] += 1;
-			if self.indexes[pos] >= self.words[pos].len() {
-				self.indexes[pos] = 0;
-			} else {
-				return true;
-			}
-		}
-
-		false
-	}
-}
-
-impl Iterator for PhrasesIterator {
-	type Item = String;
-
-	fn next(&mut self) -> Option<String> {
-		if !self.has_next {
-			return None;
-		}
-
-		let phrase = self.current();
-		self.has_next = self.next_index();
-		Some(phrase)
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::PhrasesIterator;
-
-	#[test]
-	fn should_generate_possible_combinations() {
-		let mut it = PhrasesIterator::new(vec![
-			vec!["1", "2", "3"],
-			vec!["test"],
-			vec!["a", "b", "c"],
-		]);
-
-		assert_eq!(it.combinations(), 9);
-		assert_eq!(it.next(), Some("1 test a".to_owned()));
-		assert_eq!(it.next(), Some("1 test b".to_owned()));
-		assert_eq!(it.next(), Some("1 test c".to_owned()));
-		assert_eq!(it.next(), Some("2 test a".to_owned()));
-		assert_eq!(it.next(), Some("2 test b".to_owned()));
-		assert_eq!(it.next(), Some("2 test c".to_owned()));
-		assert_eq!(it.next(), Some("3 test a".to_owned()));
-		assert_eq!(it.next(), Some("3 test b".to_owned()));
-		assert_eq!(it.next(), Some("3 test c".to_owned()));
-		assert_eq!(it.next(), None);
-	}
-
-}

accounts/ethkey/src/crypto.rs

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

accounts/ethkey/src/error.rs

@@ -1,81 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{fmt, error};
-
-#[derive(Debug)]
-/// Crypto error
-pub enum Error {
-	/// Invalid secret key
-	InvalidSecret,
-	/// Invalid public key
-	InvalidPublic,
-	/// Invalid address
-	InvalidAddress,
-	/// Invalid EC signature
-	InvalidSignature,
-	/// Invalid AES message
-	InvalidMessage,
-	/// IO Error
-	Io(::std::io::Error),
-	/// Custom
-	Custom(String),
-}
-
-impl fmt::Display for Error {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		let msg = match *self {
-			Error::InvalidSecret => "Invalid secret".into(),
-			Error::InvalidPublic => "Invalid public".into(),
-			Error::InvalidAddress => "Invalid address".into(),
-			Error::InvalidSignature => "Invalid EC signature".into(),
-			Error::InvalidMessage => "Invalid AES message".into(),
-			Error::Io(ref err) => format!("I/O error: {}", err),
-			Error::Custom(ref s) => s.clone(),
-		};
-
-		f.write_fmt(format_args!("Crypto error ({})", msg))
-	}
-}
-
-impl error::Error for Error {
-	fn description(&self) -> &str {
-		"Crypto error"
-	}
-}
-
-impl Into<String> for Error {
-	fn into(self) -> String {
-		format!("{}", self)
-	}
-}
-
-impl From<::secp256k1::Error> for Error {
-	fn from(e: ::secp256k1::Error) -> Error {
-		match e {
-			::secp256k1::Error::InvalidMessage => Error::InvalidMessage,
-			::secp256k1::Error::InvalidPublicKey => Error::InvalidPublic,
-			::secp256k1::Error::InvalidSecretKey => Error::InvalidSecret,
-			_ => Error::InvalidSignature,
-		}
-	}
-}
-
-impl From<::std::io::Error> for Error {
-	fn from(err: ::std::io::Error) -> Error {
-		Error::Io(err)
-	}
-}

accounts/ethkey/src/keccak.rs

@@ -1,31 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use tiny_keccak::Keccak;
-
-pub trait Keccak256<T> {
-	fn keccak256(&self) -> T where T: Sized;
-}
-
-impl Keccak256<[u8; 32]> for [u8] {
-	fn keccak256(&self) -> [u8; 32] {
-		let mut keccak = Keccak::new_keccak256();
-		let mut result = [0u8; 32];
-		keccak.update(self);
-		keccak.finalize(&mut result);
-		result
-	}
-}

accounts/ethkey/src/lib.rs

@@ -1,88 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-// #![warn(missing_docs)]
-
-extern crate byteorder;
-extern crate edit_distance;
-extern crate parity_crypto;
-extern crate ethereum_types;
-extern crate memzero;
-extern crate parity_wordlist;
-#[macro_use]
-extern crate quick_error;
-extern crate rand;
-extern crate rustc_hex;
-extern crate secp256k1;
-extern crate serde;
-extern crate tiny_keccak;
-
-#[macro_use]
-extern crate lazy_static;
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate serde_derive;
-
-mod brain;
-mod brain_prefix;
-mod error;
-mod keypair;
-mod keccak;
-mod password;
-mod prefix;
-mod random;
-mod signature;
-mod secret;
-mod extended;
-
-pub mod brain_recover;
-pub mod crypto;
-pub mod math;
-
-pub use self::parity_wordlist::Error as WordlistError;
-pub use self::brain::Brain;
-pub use self::brain_prefix::BrainPrefix;
-pub use self::error::Error;
-pub use self::keypair::{KeyPair, public_to_address};
-pub use self::math::public_is_valid;
-pub use self::password::Password;
-pub use self::prefix::Prefix;
-pub use self::random::Random;
-pub use self::signature::{sign, verify_public, verify_address, recover, Signature};
-pub use self::secret::Secret;
-pub use self::extended::{ExtendedPublic, ExtendedSecret, ExtendedKeyPair, DerivationError, Derivation};
-
-use ethereum_types::H256;
-
-pub use ethereum_types::{Address, Public};
-pub type Message = H256;
-
-lazy_static! {
-	pub static ref SECP256K1: secp256k1::Secp256k1 = secp256k1::Secp256k1::new();
-}
-
-/// Uninstantiatable error type for infallible generators.
-#[derive(Debug)]
-pub enum Void {}
-
-/// Generates new keypair.
-pub trait Generator {
-	type Error;
-
-	/// Should be called to generate new keypair.
-	fn generate(&mut self) -> Result<KeyPair, Self::Error>;
-}

accounts/ethkey/src/math.rs

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

accounts/ethkey/src/password.rs

@@ -1,59 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{fmt, ptr};
-
-#[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Password(String);
-
-impl fmt::Debug for Password {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Password(******)")
-    }
-}
-
-impl Password {
-	pub fn as_bytes(&self) -> &[u8] {
-		self.0.as_bytes()
-	}
-
-	pub fn as_str(&self) -> &str {
-		self.0.as_str()
-	}
-}
-
-// Custom drop impl to zero out memory.
-impl Drop for Password {
-	fn drop(&mut self) {
-		unsafe {
-			for byte_ref in self.0.as_mut_vec() {
-				ptr::write_volatile(byte_ref, 0)
-			}
-		}
-	}
-}
-
-impl From<String> for Password {
-	fn from(s: String) -> Password {
-		Password(s)
-	}
-}
-
-impl<'a> From<&'a str> for Password {
-	fn from(s: &'a str) -> Password {
-		Password::from(String::from(s))
-	}
-}

accounts/ethkey/src/random.rs

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

accounts/ethkey/src/secret.rs

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

accounts/ethkey/src/signature.rs

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

accounts/ethstore/Cargo.toml

@@ -1,29 +0,0 @@
-[package]
-name = "ethstore"
-version = "0.2.1"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-log = "0.4"
-libc = "0.2"
-rand = "0.4"
-ethkey = { path = "../ethkey" }
-serde = "1.0"
-serde_json = "1.0"
-serde_derive = "1.0"
-rustc-hex = "1.0"
-tiny-keccak = "1.4"
-time = "0.1.34"
-itertools = "0.5"
-parking_lot = "0.7"
-parity-crypto = "0.2"
-ethereum-types = "0.4"
-dir = { path = "../../util/dir" }
-smallvec = "0.6"
-parity-wordlist = "1.0"
-tempdir = "0.3"
-
-[dev-dependencies]
-matches = "0.1"
-
-[lib]

accounts/ethstore/README.md

@@ -1,340 +0,0 @@
-## ethstore-cli
-
-Parity Ethereum key management.
-
-### Usage
-
-```
-Parity Ethereum key management tool.
-  Copyright 2015-2018 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
-```
-
-## Parity Ethereum toolchain
-_This project is a part of the Parity Ethereum toolchain._
-
-- [evmbin](https://github.com/paritytech/parity-ethereum/blob/master/evmbin/) - EVM implementation for Parity Ethereum.
-- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding.
-- [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethstore) - Parity Ethereum key management.
-- [ethkey](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethkey) - Parity Ethereum keys generator.
-- [whisper](https://github.com/paritytech/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.

accounts/ethstore/cli/Cargo.toml

@@ -1,24 +0,0 @@
-[package]
-name = "ethstore-cli"
-version = "0.1.1"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-docopt = "1.0"
-env_logger = "0.5"
-num_cpus = "1.6"
-rustc-hex = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
-parking_lot = "0.7"
-ethstore = { path = "../" }
-dir = { path = '../../../util/dir' }
-panic_hook = { path = "../../../util/panic-hook" }
-
-[[bin]]
-name = "ethstore"
-path = "src/main.rs"
-doc = false
-
-[dev-dependencies]
-tempdir = "0.3.5"

accounts/ethstore/cli/src/crack.rs

@@ -1,66 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{cmp, thread};
-use std::sync::Arc;
-use std::collections::VecDeque;
-use parking_lot::Mutex;
-
-use ethstore::{ethkey::Password, PresaleWallet, Error};
-use num_cpus;
-
-pub fn run(passwords: VecDeque<Password>, wallet_path: &str) -> Result<(), Error> {
-	let passwords = Arc::new(Mutex::new(passwords));
-
-	let mut handles = Vec::new();
-
-	for _ in 0..num_cpus::get() {
-		let passwords = passwords.clone();
-		let wallet = PresaleWallet::open(&wallet_path)?;
-		handles.push(thread::spawn(move || {
-			look_for_password(passwords, wallet);
-		}));
-	}
-
-	for handle in handles {
-		handle.join().map_err(|err| Error::Custom(format!("Error finishing thread: {:?}", err)))?;
-	}
-
-	Ok(())
-}
-
-fn look_for_password(passwords: Arc<Mutex<VecDeque<Password>>>, wallet: PresaleWallet) {
-	let mut counter = 0;
-	while !passwords.lock().is_empty() {
-		let package = {
-			let mut passwords = passwords.lock();
-			let len = passwords.len();
-			passwords.split_off(cmp::min(len, 32))
-		};
-		for pass in package {
-			counter += 1;
-			match wallet.decrypt(&pass) {
-				Ok(_) => {
-					println!("Found password: {}", pass.as_str());
-					passwords.lock().clear();
-					return;
-				},
-				_ if counter % 100 == 0 => print!("."),
-				_ => {},
-			}
-		}
-	}
-}

accounts/ethstore/cli/src/main.rs

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

accounts/ethstore/cli/tests/cli.rs

@@ -1,82 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate tempdir;
-use std::process::Command;
-use tempdir::TempDir;
-use std::fs::File;
-use std::io::Write;
-
-fn run(args: &[&str]) -> String {
-	let output = Command::new("cargo")
-		.args(&["run", "--"])
-		.args(args)
-		.output()
-		.unwrap();
-	assert!(output.status.success());
-	String::from_utf8(output.stdout).unwrap()
-}
-
-#[test]
-fn cli_cmd() {
-	Command::new("cargo")
-		.arg("build")
-		.output()
-		.unwrap();
-
-	let dir = TempDir::new("test-vault").unwrap();
-
-	let mut passwd = File::create(dir.path().join("test-password")).unwrap();
-	writeln!(passwd, "password").unwrap();
-
-	let mut passwd2 = File::create(dir.path().join("test-vault-addr")).unwrap();
-	writeln!(passwd2, "password2").unwrap();
-
-	let test_password_buf = dir.path().join("test-password");
-	let test_password: &str = test_password_buf.to_str().unwrap();
-	let dir_str: &str = dir.path().to_str().unwrap();
-	let test_vault_addr_buf = dir.path().join("test-vault-addr");
-	let test_vault_addr = test_vault_addr_buf.to_str().unwrap();
-
-	run(&["create-vault", "test-vault", test_password, "--dir", dir_str]);
-
-	let output = run(&["insert", "7d29fab185a33e2cd955812397354c472d2b84615b645aa135ff539f6b0d70d5",
-			    test_vault_addr,
-			    "--dir", dir_str,
-			    "--vault", "test-vault",
-			   "--vault-pwd", test_password]);
-	let address = output.trim();
-
-	let output = run(&["list",
-			   "--dir", dir_str,
-			   "--vault", "test-vault",
-			   "--vault-pwd", test_password]);
-	assert_eq!(output, " 0: 0xa8fa5dd30a87bb9e3288d604eb74949c515ab66e\n");
-
-	let output = run(&["sign", &address[2..],
-			   test_vault_addr,
-			   "7d29fab185a33e2cd955812397354c472d2b84615b645aa135ff539f6b0d70d5",
-			   "--dir", dir_str,
-			   "--vault", "test-vault",
-			   "--vault-pwd", test_password]);
-	assert_eq!(output, "0x54ab6e5cf0c5cb40043fdca5d15d611a3a94285414a076dafecc8dc9c04183f413296a3defff61092c0bb478dc9887ec01070e1275234211208fb8f4be4a9b0101\n");
-
-	let output = run(&["public", &address[2..], test_vault_addr,
-			   "--dir", dir_str,
-			   "--vault", "test-vault",
-			   "--vault-pwd", test_password]);
-	assert_eq!(output, "0x35f222d88b80151857a2877826d940104887376a94c1cbd2c8c7c192eb701df88a18a4ecb8b05b1466c5b3706042027b5e079fe3a3683e66d822b0e047aa3418\n");
-}

accounts/ethstore/src/account/cipher.rs

@@ -1,59 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use json;
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct Aes128Ctr {
-	pub iv: [u8; 16],
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub enum Cipher {
-	Aes128Ctr(Aes128Ctr),
-}
-
-impl From<json::Aes128Ctr> for Aes128Ctr {
-	fn from(json: json::Aes128Ctr) -> Self {
-		Aes128Ctr {
-			iv: json.iv.into()
-		}
-	}
-}
-
-impl Into<json::Aes128Ctr> for Aes128Ctr {
-	fn into(self) -> json::Aes128Ctr {
-		json::Aes128Ctr {
-			iv: From::from(self.iv)
-		}
-	}
-}
-
-impl From<json::Cipher> for Cipher {
-	fn from(json: json::Cipher) -> Self {
-		match json {
-			json::Cipher::Aes128Ctr(params) => Cipher::Aes128Ctr(From::from(params)),
-		}
-	}
-}
-
-impl Into<json::Cipher> for Cipher {
-	fn into(self) -> json::Cipher {
-		match self {
-			Cipher::Aes128Ctr(params) => json::Cipher::Aes128Ctr(params.into()),
-		}
-	}
-}

accounts/ethstore/src/account/crypto.rs

@@ -1,206 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::str;
-use ethkey::{Password, Secret};
-use {json, Error, crypto};
-use crypto::Keccak256;
-use random::Random;
-use smallvec::SmallVec;
-use account::{Cipher, Kdf, Aes128Ctr, Pbkdf2, Prf};
-
-/// Encrypted data
-#[derive(Debug, PartialEq, Clone)]
-pub struct Crypto {
-	/// Encryption parameters
-	pub cipher: Cipher,
-	/// Encrypted data buffer
-	pub ciphertext: Vec<u8>,
-	/// Key derivation function parameters
-	pub kdf: Kdf,
-	/// Message authentication code
-	pub mac: [u8; 32],
-}
-
-impl From<json::Crypto> for Crypto {
-	fn from(json: json::Crypto) -> Self {
-		Crypto {
-			cipher: json.cipher.into(),
-			ciphertext: json.ciphertext.into(),
-			kdf: json.kdf.into(),
-			mac: json.mac.into(),
-		}
-	}
-}
-
-impl From<Crypto> for json::Crypto {
-	fn from(c: Crypto) -> Self {
-		json::Crypto {
-			cipher: c.cipher.into(),
-			ciphertext: c.ciphertext.into(),
-			kdf: c.kdf.into(),
-			mac: c.mac.into(),
-		}
-	}
-}
-
-impl str::FromStr for Crypto {
-	type Err = <json::Crypto as str::FromStr>::Err;
-
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		s.parse::<json::Crypto>().map(Into::into)
-	}
-}
-
-impl From<Crypto> for String {
-	fn from(c: Crypto) -> Self {
-		json::Crypto::from(c).into()
-	}
-}
-
-impl Crypto {
-	/// Encrypt account secret
-	pub fn with_secret(secret: &Secret, password: &Password, iterations: u32) -> Result<Self, crypto::Error> {
-		Crypto::with_plain(&*secret, password, iterations)
-	}
-
-	/// Encrypt custom plain data
-	pub fn with_plain(plain: &[u8], password: &Password, iterations: u32) -> Result<Self, crypto::Error> {
-		let salt: [u8; 32] = Random::random();
-		let iv: [u8; 16] = Random::random();
-
-		// two parts of derived key
-		// DK = [ DK[0..15] DK[16..31] ] = [derived_left_bits, derived_right_bits]
-		let (derived_left_bits, derived_right_bits) =
-			crypto::derive_key_iterations(password.as_bytes(), &salt, iterations);
-
-		// preallocated (on-stack in case of `Secret`) buffer to hold cipher
-		// length = length(plain) as we are using CTR-approach
-		let plain_len = plain.len();
-		let mut ciphertext: SmallVec<[u8; 32]> = SmallVec::from_vec(vec![0; plain_len]);
-
-		// aes-128-ctr with initial vector of iv
-		crypto::aes::encrypt_128_ctr(&derived_left_bits, &iv, plain, &mut *ciphertext)?;
-
-		// KECCAK(DK[16..31] ++ <ciphertext>), where DK[16..31] - derived_right_bits
-		let mac = crypto::derive_mac(&derived_right_bits, &*ciphertext).keccak256();
-
-		Ok(Crypto {
-			cipher: Cipher::Aes128Ctr(Aes128Ctr {
-				iv: iv,
-			}),
-			ciphertext: ciphertext.into_vec(),
-			kdf: Kdf::Pbkdf2(Pbkdf2 {
-				dklen: crypto::KEY_LENGTH as u32,
-				salt: salt.to_vec(),
-				c: iterations,
-				prf: Prf::HmacSha256,
-			}),
-			mac: mac,
-		})
-	}
-
-	/// Try to decrypt and convert result to account secret
-	pub fn secret(&self, password: &Password) -> Result<Secret, Error> {
-		if self.ciphertext.len() > 32 {
-			return Err(Error::InvalidSecret);
-		}
-
-		let secret = self.do_decrypt(password, 32)?;
-		Ok(Secret::from_unsafe_slice(&secret)?)
-	}
-
-	/// Try to decrypt and return result as is
-	pub fn decrypt(&self, password: &Password) -> Result<Vec<u8>, Error> {
-		let expected_len = self.ciphertext.len();
-		self.do_decrypt(password, expected_len)
-	}
-
-	fn do_decrypt(&self, password: &Password, expected_len: usize) -> Result<Vec<u8>, Error> {
-		let (derived_left_bits, derived_right_bits) = match self.kdf {
-			Kdf::Pbkdf2(ref params) => crypto::derive_key_iterations(password.as_bytes(), &params.salt, params.c),
-			Kdf::Scrypt(ref params) => crypto::scrypt::derive_key(password.as_bytes(), &params.salt, params.n, params.p, params.r)?,
-		};
-
-		let mac = crypto::derive_mac(&derived_right_bits, &self.ciphertext).keccak256();
-
-		if !crypto::is_equal(&mac, &self.mac) {
-			return Err(Error::InvalidPassword)
-		}
-
-		let mut plain: SmallVec<[u8; 32]> = SmallVec::from_vec(vec![0; expected_len]);
-
-		match self.cipher {
-			Cipher::Aes128Ctr(ref params) => {
-				// checker by callers
-				debug_assert!(expected_len >= self.ciphertext.len());
-
-				let from = expected_len - self.ciphertext.len();
-				crypto::aes::decrypt_128_ctr(&derived_left_bits, &params.iv, &self.ciphertext, &mut plain[from..])?;
-				Ok(plain.into_iter().collect())
-			},
-		}
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use ethkey::{Generator, Random};
-	use super::{Crypto, Error};
-
-	#[test]
-	fn crypto_with_secret_create() {
-		let keypair = Random.generate().unwrap();
-		let passwd = "this is sparta".into();
-		let crypto = Crypto::with_secret(keypair.secret(), &passwd, 10240).unwrap();
-		let secret = crypto.secret(&passwd).unwrap();
-		assert_eq!(keypair.secret(), &secret);
-	}
-
-	#[test]
-	fn crypto_with_secret_invalid_password() {
-		let keypair = Random.generate().unwrap();
-		let crypto = Crypto::with_secret(keypair.secret(), &"this is sparta".into(), 10240).unwrap();
-		assert_matches!(crypto.secret(&"this is sparta!".into()), Err(Error::InvalidPassword))
-	}
-
-	#[test]
-	fn crypto_with_null_plain_data() {
-		let original_data = b"";
-		let passwd = "this is sparta".into();
-		let crypto = Crypto::with_plain(&original_data[..], &passwd, 10240).unwrap();
-		let decrypted_data = crypto.decrypt(&passwd).unwrap();
-		assert_eq!(original_data[..], *decrypted_data);
-	}
-
-	#[test]
-	fn crypto_with_tiny_plain_data() {
-		let original_data = b"{}";
-		let passwd = "this is sparta".into();
-		let crypto = Crypto::with_plain(&original_data[..], &passwd, 10240).unwrap();
-		let decrypted_data = crypto.decrypt(&passwd).unwrap();
-		assert_eq!(original_data[..], *decrypted_data);
-	}
-
-	#[test]
-	fn crypto_with_huge_plain_data() {
-		let original_data: Vec<_> = (1..65536).map(|i| (i % 256) as u8).collect();
-		let passwd = "this is sparta".into();
-		let crypto = Crypto::with_plain(&original_data, &passwd, 10240).unwrap();
-		let decrypted_data = crypto.decrypt(&passwd).unwrap();
-		assert_eq!(&original_data, &decrypted_data);
-	}
-}

accounts/ethstore/src/account/kdf.rs

@@ -1,125 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use json;
-
-#[derive(Debug, PartialEq, Clone)]
-pub enum Prf {
-	HmacSha256,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct Pbkdf2 {
-	pub c: u32,
-	pub dklen: u32,
-	pub prf: Prf,
-	pub salt: Vec<u8>,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct Scrypt {
-	pub dklen: u32,
-	pub p: u32,
-	pub n: u32,
-	pub r: u32,
-	pub salt: Vec<u8>,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub enum Kdf {
-	Pbkdf2(Pbkdf2),
-	Scrypt(Scrypt),
-}
-
-impl From<json::Prf> for Prf {
-	fn from(json: json::Prf) -> Self {
-		match json {
-			json::Prf::HmacSha256 => Prf::HmacSha256,
-		}
-	}
-}
-
-impl Into<json::Prf> for Prf {
-	fn into(self) -> json::Prf {
-		match self {
-			Prf::HmacSha256 => json::Prf::HmacSha256,
-		}
-	}
-}
-
-impl From<json::Pbkdf2> for Pbkdf2 {
-	fn from(json: json::Pbkdf2) -> Self {
-		Pbkdf2 {
-			c: json.c,
-			dklen: json.dklen,
-			prf: From::from(json.prf),
-			salt: json.salt.into(),
-		}
-	}
-}
-
-impl Into<json::Pbkdf2> for Pbkdf2 {
-	fn into(self) -> json::Pbkdf2 {
-		json::Pbkdf2 {
-			c: self.c,
-			dklen: self.dklen,
-			prf: self.prf.into(),
-			salt: From::from(self.salt),
-		}
-	}
-}
-
-impl From<json::Scrypt> for Scrypt {
-	fn from(json: json::Scrypt) -> Self {
-		Scrypt {
-			dklen: json.dklen,
-			p: json.p,
-			n: json.n,
-			r: json.r,
-			salt: json.salt.into(),
-		}
-	}
-}
-
-impl Into<json::Scrypt> for Scrypt {
-	fn into(self) -> json::Scrypt {
-		json::Scrypt {
-			dklen: self.dklen,
-			p: self.p,
-			n: self.n,
-			r: self.r,
-			salt: From::from(self.salt),
-		}
-	}
-}
-
-impl From<json::Kdf> for Kdf {
-	fn from(json: json::Kdf) -> Self {
-		match json {
-			json::Kdf::Pbkdf2(params) => Kdf::Pbkdf2(From::from(params)),
-			json::Kdf::Scrypt(params) => Kdf::Scrypt(From::from(params)),
-		}
-	}
-}
-
-impl Into<json::Kdf> for Kdf {
-	fn into(self) -> json::Kdf {
-		match self {
-			Kdf::Pbkdf2(params) => json::Kdf::Pbkdf2(params.into()),
-			Kdf::Scrypt(params) => json::Kdf::Scrypt(params.into()),
-		}
-	}
-}

accounts/ethstore/src/account/mod.rs

@@ -1,27 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-mod cipher;
-mod crypto;
-mod kdf;
-mod safe_account;
-mod version;
-
-pub use self::cipher::{Cipher, Aes128Ctr};
-pub use self::crypto::Crypto;
-pub use self::kdf::{Kdf, Pbkdf2, Scrypt, Prf};
-pub use self::safe_account::SafeAccount;
-pub use self::version::Version;

accounts/ethstore/src/account/safe_account.rs

@@ -1,229 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use ethkey::{self, KeyPair, sign, Address, Password, Signature, Message, Public, Secret};
-use ethkey::crypto::ecdh::agree;
-use {json, Error};
-use account::Version;
-use crypto;
-use super::crypto::Crypto;
-
-/// Account representation.
-#[derive(Debug, PartialEq, Clone)]
-pub struct SafeAccount {
-	/// Account ID
-	pub id: [u8; 16],
-	/// Account version
-	pub version: Version,
-	/// Account address
-	pub address: Address,
-	/// Account private key derivation definition.
-	pub crypto: Crypto,
-	/// Account filename
-	pub filename: Option<String>,
-	/// Account name
-	pub name: String,
-	/// Account metadata
-	pub meta: String,
-}
-
-impl Into<json::KeyFile> for SafeAccount {
-	fn into(self) -> json::KeyFile {
-		json::KeyFile {
-			id: From::from(self.id),
-			version: self.version.into(),
-			address: Some(self.address.into()),
-			crypto: self.crypto.into(),
-			name: Some(self.name.into()),
-			meta: Some(self.meta.into()),
-		}
-	}
-}
-
-impl SafeAccount {
-	/// Create a new account
-	pub fn create(
-		keypair: &KeyPair,
-		id: [u8; 16],
-		password: &Password,
-		iterations: u32,
-		name: String,
-		meta: String
-	) -> Result<Self, crypto::Error> {
-		Ok(SafeAccount {
-			id: id,
-			version: Version::V3,
-			crypto: Crypto::with_secret(keypair.secret(), password, iterations)?,
-			address: keypair.address(),
-			filename: None,
-			name: name,
-			meta: meta,
-		})
-	}
-
-	/// Create a new `SafeAccount` from the given `json`; if it was read from a
-	/// file, the `filename` should be `Some` name. If it is as yet anonymous, then it
-	/// can be left `None`.
-	/// In case `password` is provided, we will attempt to read the secret from the keyfile
-	/// and derive the address from it instead of reading it directly.
-	/// Providing password is required for `json::KeyFile`s with no address.
-	pub fn from_file(json: json::KeyFile, filename: Option<String>, password: &Option<Password>) -> Result<Self, Error> {
-		let crypto = Crypto::from(json.crypto);
-		let address = match (password, &json.address) {
-			(None, Some(json_address)) => json_address.into(),
-			(None, None) => Err(Error::Custom(
-				"This keystore does not contain address. You need to provide password to import it".into()))?,
-			(Some(password), json_address) => {
-				let derived_address = KeyPair::from_secret(
-					crypto.secret(&password).map_err(|_| Error::InvalidPassword)?
-				)?.address();
-
-				match json_address {
-					Some(json_address) => {
-						let json_address = json_address.into();
-						if derived_address != json_address {
-							warn!("Detected address mismatch when opening an account. Derived: {:?}, in json got: {:?}",
-								derived_address, json_address);
-						}
-					},
-					_ => {},
-				}
-				derived_address
-			}
-		};
-
-		Ok(SafeAccount {
-			id: json.id.into(),
-			version: json.version.into(),
-			address,
-			crypto,
-			filename,
-			name: json.name.unwrap_or(String::new()),
-			meta: json.meta.unwrap_or("{}".to_owned()),
-		})
-	}
-
-	/// Create a new `SafeAccount` from the given vault `json`; if it was read from a
-	/// file, the `filename` should be `Some` name. If it is as yet anonymous, then it
-	/// can be left `None`.
-	pub fn from_vault_file(password: &Password, json: json::VaultKeyFile, filename: Option<String>) -> Result<Self, Error> {
-		let meta_crypto: Crypto = json.metacrypto.into();
-		let meta_plain = meta_crypto.decrypt(password)?;
-		let meta_plain = json::VaultKeyMeta::load(&meta_plain).map_err(|e| Error::Custom(format!("{:?}", e)))?;
-
-		SafeAccount::from_file(json::KeyFile {
-			id: json.id,
-			version: json.version,
-			crypto: json.crypto,
-			address: Some(meta_plain.address),
-			name: meta_plain.name,
-			meta: meta_plain.meta,
-		}, filename, &None)
-	}
-
-	/// Create a new `VaultKeyFile` from the given `self`
-	pub fn into_vault_file(self, iterations: u32, password: &Password) -> Result<json::VaultKeyFile, Error> {
-		let meta_plain = json::VaultKeyMeta {
-			address: self.address.into(),
-			name: Some(self.name),
-			meta: Some(self.meta),
-		};
-		let meta_plain = meta_plain.write().map_err(|e| Error::Custom(format!("{:?}", e)))?;
-		let meta_crypto = Crypto::with_plain(&meta_plain, password, iterations)?;
-
-		Ok(json::VaultKeyFile {
-			id: self.id.into(),
-			version: self.version.into(),
-			crypto: self.crypto.into(),
-			metacrypto: meta_crypto.into(),
-		})
-	}
-
-	/// Sign a message.
-	pub fn sign(&self, password: &Password, message: &Message) -> Result<Signature, Error> {
-		let secret = self.crypto.secret(password)?;
-		sign(&secret, message).map_err(From::from)
-	}
-
-	/// Decrypt a message.
-	pub fn decrypt(&self, password: &Password, shared_mac: &[u8], message: &[u8]) -> Result<Vec<u8>, Error> {
-		let secret = self.crypto.secret(password)?;
-		ethkey::crypto::ecies::decrypt(&secret, shared_mac, message).map_err(From::from)
-	}
-
-	/// Agree on shared key.
-	pub fn agree(&self, password: &Password, other: &Public) -> Result<Secret, Error> {
-		let secret = self.crypto.secret(password)?;
-		agree(&secret, other).map_err(From::from)
-	}
-
-	/// Derive public key.
-	pub fn public(&self, password: &Password) -> Result<Public, Error> {
-		let secret = self.crypto.secret(password)?;
-		Ok(KeyPair::from_secret(secret)?.public().clone())
-	}
-
-	/// Change account's password.
-	pub fn change_password(&self, old_password: &Password, new_password: &Password, iterations: u32) -> Result<Self, Error> {
-		let secret = self.crypto.secret(old_password)?;
-		let result = SafeAccount {
-			id: self.id.clone(),
-			version: self.version.clone(),
-			crypto: Crypto::with_secret(&secret, new_password, iterations)?,
-			address: self.address.clone(),
-			filename: self.filename.clone(),
-			name: self.name.clone(),
-			meta: self.meta.clone(),
-		};
-		Ok(result)
-	}
-
-	/// Check if password matches the account.
-	pub fn check_password(&self, password: &Password) -> bool {
-		self.crypto.secret(password).is_ok()
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use ethkey::{Generator, Random, verify_public, Message};
-	use super::SafeAccount;
-
-	#[test]
-	fn sign_and_verify_public() {
-		let keypair = Random.generate().unwrap();
-		let password = "hello world".into();
-		let message = Message::default();
-		let account = SafeAccount::create(&keypair, [0u8; 16], &password, 10240, "Test".to_owned(), "{}".to_owned());
-		let signature = account.unwrap().sign(&password, &message).unwrap();
-		assert!(verify_public(keypair.public(), &signature, &message).unwrap());
-	}
-
-	#[test]
-	fn change_password() {
-		let keypair = Random.generate().unwrap();
-		let first_password = "hello world".into();
-		let sec_password = "this is sparta".into();
-		let i = 10240;
-		let message = Message::default();
-		let account = SafeAccount::create(&keypair, [0u8; 16], &first_password, i, "Test".to_owned(), "{}".to_owned()).unwrap();
-		let new_account = account.change_password(&first_password, &sec_password, i).unwrap();
-		assert!(account.sign(&first_password, &message).is_ok());
-		assert!(account.sign(&sec_password, &message).is_err());
-		assert!(new_account.sign(&first_password, &message).is_err());
-		assert!(new_account.sign(&sec_password, &message).is_ok());
-	}
-}

accounts/ethstore/src/account/version.rs

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

accounts/ethstore/src/accounts_dir/memory.rs

@@ -1,74 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::collections::HashMap;
-use parking_lot::RwLock;
-use itertools;
-use ethkey::Address;
-
-use {SafeAccount, Error};
-use super::KeyDirectory;
-
-/// Accounts in-memory storage.
-#[derive(Default)]
-pub struct MemoryDirectory {
-	accounts: RwLock<HashMap<Address, Vec<SafeAccount>>>,
-}
-
-impl KeyDirectory for MemoryDirectory {
-	fn load(&self) -> Result<Vec<SafeAccount>, Error> {
-		Ok(itertools::Itertools::flatten(self.accounts.read().values().cloned()).collect())
-	}
-
-	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
-		let mut lock = self.accounts.write();
-		let accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new);
-		// If the filename is the same we just need to replace the entry
-		accounts.retain(|acc| acc.filename != account.filename);
-		accounts.push(account.clone());
-		Ok(account)
-	}
-
-	fn insert(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
-		let mut lock = self.accounts.write();
-		let accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new);
-		accounts.push(account.clone());
-		Ok(account)
-	}
-
-	fn remove(&self, account: &SafeAccount) -> Result<(), Error> {
-		let mut accounts = self.accounts.write();
-		let is_empty = if let Some(accounts) = accounts.get_mut(&account.address) {
-			if let Some(position) = accounts.iter().position(|acc| acc == account) {
-				accounts.remove(position);
-			}
-			accounts.is_empty()
-		} else {
-			false
-		};
-		if is_empty {
-			accounts.remove(&account.address);
-		}
-		Ok(())
-	}
-
-	fn unique_repr(&self) -> Result<u64, Error> {
-		let mut val = 0u64;
-		let accounts = self.accounts.read();
-		for acc in accounts.keys() { val = val ^ acc.low_u64() }
-		Ok(val)
-	}
-}

accounts/ethstore/src/accounts_dir/mod.rs

@@ -1,105 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Accounts Directory
-
-use ethkey::Password;
-use std::path::{PathBuf};
-use {SafeAccount, Error};
-
-mod disk;
-mod memory;
-mod vault;
-
-/// `VaultKeyDirectory::set_key` error
-#[derive(Debug)]
-pub enum SetKeyError {
-	/// Error is fatal and directory is probably in inconsistent state
-	Fatal(Error),
-	/// Error is non fatal, directory is reverted to pre-operation state
-	NonFatalOld(Error),
-	/// Error is non fatal, directory is consistent with new key
-	NonFatalNew(Error),
-}
-
-/// Vault key
-#[derive(Clone, PartialEq, Eq)]
-pub struct VaultKey {
-	/// Vault password
-	pub password: Password,
-	/// Number of iterations to produce a derived key from password
-	pub iterations: u32,
-}
-
-/// Keys directory
-pub trait KeyDirectory: Send + Sync {
-	/// Read keys from directory
-	fn load(&self) -> Result<Vec<SafeAccount>, Error>;
-	/// Insert new key to directory
-	fn insert(&self, account: SafeAccount) -> Result<SafeAccount, Error>;
-	/// Update key in the directory
-	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error>;
-	/// Remove key from directory
-	fn remove(&self, account: &SafeAccount) -> Result<(), Error>;
-	/// Get directory filesystem path, if available
-	fn path(&self) -> Option<&PathBuf> { None }
-	/// Return vault provider, if available
-	fn as_vault_provider(&self) -> Option<&VaultKeyDirectoryProvider> { None }
-	/// Unique representation of directory account collection
-	fn unique_repr(&self) -> Result<u64, Error>;
-}
-
-/// Vaults provider
-pub trait VaultKeyDirectoryProvider {
-	/// Create new vault with given key
-	fn create(&self, name: &str, key: VaultKey) -> Result<Box<VaultKeyDirectory>, Error>;
-	/// Open existing vault with given key
-	fn open(&self, name: &str, key: VaultKey) -> Result<Box<VaultKeyDirectory>, Error>;
-	/// List all vaults
-	fn list_vaults(&self) -> Result<Vec<String>, Error>;
-	/// Get vault meta
-	fn vault_meta(&self, name: &str) -> Result<String, Error>;
-}
-
-/// Vault directory
-pub trait VaultKeyDirectory: KeyDirectory {
-	/// Cast to `KeyDirectory`
-	fn as_key_directory(&self) -> &KeyDirectory;
-	/// Vault name
-	fn name(&self) -> &str;
-	/// Get vault key
-	fn key(&self) -> VaultKey;
-	/// Set new key for vault
-	fn set_key(&self, key: VaultKey) -> Result<(), SetKeyError>;
-	/// Get vault meta
-	fn meta(&self) -> String;
-	/// Set vault meta
-	fn set_meta(&self, meta: &str) -> Result<(), Error>;
-}
-
-pub use self::disk::{RootDiskDirectory, DiskKeyFileManager, KeyFileManager};
-pub use self::memory::MemoryDirectory;
-pub use self::vault::VaultDiskDirectory;
-
-impl VaultKey {
-	/// Create new vault key
-	pub fn new(password: &Password, iterations: u32) -> Self {
-		VaultKey {
-			password: password.clone(),
-			iterations: iterations,
-		}
-	}
-}

accounts/ethstore/src/error.rs

@@ -1,128 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-use std::io::Error as IoError;
-use ethkey::{self, Error as EthKeyError};
-use crypto::{self, Error as EthCryptoError};
-use ethkey::DerivationError;
-
-/// Account-related errors.
-#[derive(Debug)]
-pub enum Error {
-	/// IO error
-	Io(IoError),
-	/// Invalid Password
-	InvalidPassword,
-	/// Account's secret is invalid.
-	InvalidSecret,
-	/// Invalid Vault Crypto meta.
-	InvalidCryptoMeta,
-	/// Invalid Account.
-	InvalidAccount,
-	/// Invalid Message.
-	InvalidMessage,
-	/// Invalid Key File
-	InvalidKeyFile(String),
-	/// Vaults are not supported.
-	VaultsAreNotSupported,
-	/// Unsupported vault
-	UnsupportedVault,
-	/// Invalid vault name
-	InvalidVaultName,
-	/// Vault not found
-	VaultNotFound,
-	/// Account creation failed.
-	CreationFailed,
-	/// `EthKey` error
-	EthKey(EthKeyError),
-	/// `ethkey::crypto::Error`
-	EthKeyCrypto(ethkey::crypto::Error),
-	/// `EthCrypto` error
-	EthCrypto(EthCryptoError),
-	/// Derivation error
-	Derivation(DerivationError),
-	/// Custom error
-	Custom(String),
-}
-
-impl fmt::Display for Error {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		let s = match *self {
-			Error::Io(ref err) => err.to_string(),
-			Error::InvalidPassword => "Invalid password".into(),
-			Error::InvalidSecret => "Invalid secret".into(),
-			Error::InvalidCryptoMeta => "Invalid crypted metadata".into(),
-			Error::InvalidAccount => "Invalid account".into(),
-			Error::InvalidMessage => "Invalid message".into(),
-			Error::InvalidKeyFile(ref reason) => format!("Invalid key file: {}", reason),
-			Error::VaultsAreNotSupported => "Vaults are not supported".into(),
-			Error::UnsupportedVault => "Vault is not supported for this operation".into(),
-			Error::InvalidVaultName => "Invalid vault name".into(),
-			Error::VaultNotFound => "Vault not found".into(),
-			Error::CreationFailed => "Account creation failed".into(),
-			Error::EthKey(ref err) => err.to_string(),
-			Error::EthKeyCrypto(ref err) => err.to_string(),
-			Error::EthCrypto(ref err) => err.to_string(),
-			Error::Derivation(ref err) => format!("Derivation error: {:?}", err),
-			Error::Custom(ref s) => s.clone(),
-		};
-
-		write!(f, "{}", s)
-	}
-}
-
-impl From<IoError> for Error {
-	fn from(err: IoError) -> Self {
-		Error::Io(err)
-	}
-}
-
-impl From<EthKeyError> for Error {
-	fn from(err: EthKeyError) -> Self {
-		Error::EthKey(err)
-	}
-}
-
-impl From<ethkey::crypto::Error> for Error {
-	fn from(err: ethkey::crypto::Error) -> Self {
-		Error::EthKeyCrypto(err)
-	}
-}
-
-impl From<EthCryptoError> for Error {
-	fn from(err: EthCryptoError) -> Self {
-		Error::EthCrypto(err)
-	}
-}
-
-impl From<crypto::error::ScryptError> for Error {
-	fn from(err: crypto::error::ScryptError) -> Self {
-		Error::EthCrypto(err.into())
-	}
-}
-
-impl From<crypto::error::SymmError> for Error {
-	fn from(err: crypto::error::SymmError) -> Self {
-		Error::EthCrypto(err.into())
-	}
-}
-
-impl From<DerivationError> for Error {
-	fn from(err: DerivationError) -> Self {
-		Error::Derivation(err)
-	}
-}

accounts/ethstore/src/ethkey.rs

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

accounts/ethstore/src/import.rs

@@ -1,80 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::collections::HashSet;
-use std::path::Path;
-use std::fs;
-
-use ethkey::Address;
-use accounts_dir::{KeyDirectory, RootDiskDirectory, DiskKeyFileManager, KeyFileManager};
-use dir;
-use Error;
-
-/// Import an account from a file.
-pub fn import_account(path: &Path, dst: &KeyDirectory) -> Result<Address, Error> {
-	let key_manager = DiskKeyFileManager::default();
-	let existing_accounts = dst.load()?.into_iter().map(|a| a.address).collect::<HashSet<_>>();
-	let filename = path.file_name().and_then(|n| n.to_str()).map(|f| f.to_owned());
-	let account = fs::File::open(&path)
-		.map_err(Into::into)
-		.and_then(|file| key_manager.read(filename, file))?;
-
-	let address = account.address.clone();
-	if !existing_accounts.contains(&address) {
-		dst.insert(account)?;
-	}
-	Ok(address)
-}
-
-/// Import all accounts from one directory to the other.
-pub fn import_accounts(src: &KeyDirectory, dst: &KeyDirectory) -> Result<Vec<Address>, Error> {
-	let accounts = src.load()?;
-	let existing_accounts = dst.load()?.into_iter()
-		.map(|a| a.address)
-		.collect::<HashSet<_>>();
-
-	accounts.into_iter()
-		.filter(|a| !existing_accounts.contains(&a.address))
-		.map(|a| {
-			let address = a.address.clone();
-			dst.insert(a)?;
-			Ok(address)
-		}).collect()
-}
-
-/// Provide a `HashSet` of all accounts available for import from the Geth keystore.
-pub fn read_geth_accounts(testnet: bool) -> Vec<Address> {
-	RootDiskDirectory::at(dir::geth(testnet))
-		.load()
-		.map(|d| d.into_iter().map(|a| a.address).collect())
-		.unwrap_or_else(|_| Vec::new())
-}
-
-/// Import specific `desired` accounts from the Geth keystore into `dst`.
-pub fn import_geth_accounts(dst: &KeyDirectory, desired: HashSet<Address>, testnet: bool) -> Result<Vec<Address>, Error> {
-	let src = RootDiskDirectory::at(dir::geth(testnet));
-	let accounts = src.load()?;
-	let existing_accounts = dst.load()?.into_iter().map(|a| a.address).collect::<HashSet<_>>();
-
-	accounts.into_iter()
-		.filter(|a| !existing_accounts.contains(&a.address))
-		.filter(|a| desired.contains(&a.address))
-		.map(|a| {
-			let address = a.address.clone();
-			dst.insert(a)?;
-			Ok(address)
-		}).collect()
-}

accounts/ethstore/src/json/bytes.rs

@@ -1,74 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{ops, str};
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use serde::de::Error;
-use rustc_hex::{ToHex, FromHex, FromHexError};
-
-#[derive(Debug, PartialEq)]
-pub struct Bytes(Vec<u8>);
-
-impl ops::Deref for Bytes {
-	type Target = [u8];
-
-	fn deref(&self) -> &Self::Target {
-		&self.0
-	}
-}
-
-impl<'a> Deserialize<'a> for Bytes {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-		where D: Deserializer<'a>
-	{
-		let s = String::deserialize(deserializer)?;
-		let data = s.from_hex().map_err(|e| Error::custom(format!("Invalid hex value {}", e)))?;
-		Ok(Bytes(data))
-	}
-}
-
-impl Serialize for Bytes {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where S: Serializer {
-		serializer.serialize_str(&self.0.to_hex())
-	}
-}
-
-impl str::FromStr for Bytes {
-	type Err = FromHexError;
-
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		s.from_hex().map(Bytes)
-	}
-}
-
-impl From<&'static str> for Bytes {
-	fn from(s: &'static str) -> Self {
-		s.parse().expect(&format!("invalid string literal for {}: '{}'", stringify!(Self), s))
-	}
-}
-
-impl From<Vec<u8>> for Bytes {
-	fn from(v: Vec<u8>) -> Self {
-		Bytes(v)
-	}
-}
-
-impl From<Bytes> for Vec<u8> {
-	fn from(b: Bytes) -> Self {
-		b.0
-	}
-}

accounts/ethstore/src/json/cipher.rs

@@ -1,96 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-use serde::{Serialize, Serializer, Deserialize, Deserializer};
-use serde::de::{Visitor, Error as SerdeError};
-use super::{Error, H128};
-
-#[derive(Debug, PartialEq)]
-pub enum CipherSer {
-	Aes128Ctr,
-}
-
-impl Serialize for CipherSer {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where S: Serializer {
-		match *self {
-			CipherSer::Aes128Ctr => serializer.serialize_str("aes-128-ctr"),
-		}
-	}
-}
-
-impl<'a> Deserialize<'a> for CipherSer {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-	where D: Deserializer<'a> {
-		deserializer.deserialize_any(CipherSerVisitor)
-	}
-}
-
-struct CipherSerVisitor;
-
-impl<'a> Visitor<'a> for CipherSerVisitor {
-	type Value = CipherSer;
-
-	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-		write!(formatter, "a valid cipher identifier")
-	}
-
-	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-		match value {
-			"aes-128-ctr" => Ok(CipherSer::Aes128Ctr),
-			_ => Err(SerdeError::custom(Error::UnsupportedCipher))
-		}
-	}
-
-	fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
-		self.visit_str(value.as_ref())
-	}
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct Aes128Ctr {
-	pub iv: H128,
-}
-
-#[derive(Debug, PartialEq)]
-pub enum CipherSerParams {
-	Aes128Ctr(Aes128Ctr),
-}
-
-impl Serialize for CipherSerParams {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where S: Serializer {
-		match *self {
-			CipherSerParams::Aes128Ctr(ref params) => params.serialize(serializer),
-		}
-	}
-}
-
-impl<'a> Deserialize<'a> for CipherSerParams {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-	where D: Deserializer<'a> {
-		Aes128Ctr::deserialize(deserializer)
-			.map(CipherSerParams::Aes128Ctr)
-			.map_err(|_| Error::InvalidCipherParams)
-			.map_err(SerdeError::custom)
-	}
-}
-
-#[derive(Debug, PartialEq)]
-pub enum Cipher {
-	Aes128Ctr(Aes128Ctr),
-}

accounts/ethstore/src/json/crypto.rs

@@ -1,194 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{fmt, str};
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use serde::ser::SerializeStruct;
-use serde::de::{Visitor, MapAccess, Error};
-use serde_json;
-use super::{Cipher, CipherSer, CipherSerParams, Kdf, KdfSer, KdfSerParams, H256, Bytes};
-
-pub type CipherText = Bytes;
-
-#[derive(Debug, PartialEq)]
-pub struct Crypto {
-	pub cipher: Cipher,
-	pub ciphertext: CipherText,
-	pub kdf: Kdf,
-	pub mac: H256,
-}
-
-impl str::FromStr for Crypto {
-	type Err = serde_json::error::Error;
-
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		serde_json::from_str(s)
-	}
-}
-
-impl From<Crypto> for String {
-	fn from(c: Crypto) -> Self {
-		serde_json::to_string(&c).expect("serialization cannot fail, cause 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-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-
-#[derive(Debug, PartialEq)]
-pub enum Error {
-	UnsupportedCipher,
-	InvalidCipherParams,
-	UnsupportedKdf,
-	InvalidUuid,
-	UnsupportedVersion,
-	InvalidCiphertext,
-	InvalidH256,
-	InvalidPrf,
-}
-
-impl fmt::Display for Error {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		match *self {
-			Error::InvalidUuid => write!(f, "Invalid Uuid"),
-			Error::UnsupportedVersion => write!(f, "Unsupported version"),
-			Error::UnsupportedKdf => write!(f, "Unsupported kdf"),
-			Error::InvalidCiphertext => write!(f, "Invalid ciphertext"),
-			Error::UnsupportedCipher => write!(f, "Unsupported cipher"),
-			Error::InvalidCipherParams => write!(f, "Invalid cipher params"),
-			Error::InvalidH256 => write!(f, "Invalid hash"),
-			Error::InvalidPrf => write!(f, "Invalid prf"),
-		}
-	}
-}
-
-impl Into<String> for Error {
-	fn into(self) -> String {
-		format!("{}", self)
-	}
-}

accounts/ethstore/src/json/hash.rs

@@ -1,119 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{ops, fmt, str};
-use rustc_hex::{FromHex, ToHex};
-use serde::{Serialize, Serializer, Deserialize, Deserializer};
-use serde::de::{Visitor, Error as SerdeError};
-use super::Error;
-
-macro_rules! impl_hash {
-	($name: ident, $size: expr) => {
-		pub struct $name([u8; $size]);
-
-		impl fmt::Debug for $name {
-			fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-				let self_ref: &[u8] = &self.0;
-				write!(f, "{:?}", self_ref)
-			}
-		}
-
-		impl PartialEq for $name {
-			fn eq(&self, other: &Self) -> bool {
-				let self_ref: &[u8] = &self.0;
-				let other_ref: &[u8] = &other.0;
-				self_ref == other_ref
-			}
-		}
-
-		impl ops::Deref for $name {
-			type Target = [u8];
-
-			fn deref(&self) -> &Self::Target {
-				&self.0
-			}
-		}
-
-		impl Serialize for $name {
-			fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-			where S: Serializer {
-				serializer.serialize_str(&self.0.to_hex())
-			}
-		}
-
-		impl<'a> Deserialize<'a> for $name {
-			fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-			where D: Deserializer<'a> {
-				struct HashVisitor;
-
-				impl<'b> Visitor<'b> for HashVisitor {
-					type Value = $name;
-
-					fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-						write!(formatter, "a hex-encoded {}", stringify!($name))
-					}
-
-					fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-						value.parse().map_err(SerdeError::custom)
-					}
-
-					fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
-						self.visit_str(value.as_ref())
-					}
-				}
-
-				deserializer.deserialize_any(HashVisitor)
-			}
-		}
-
-		impl str::FromStr for $name {
-			type Err = Error;
-
-			fn from_str(value: &str) -> Result<Self, Self::Err> {
-				match value.from_hex() {
-					Ok(ref hex) if hex.len() == $size => {
-						let mut hash = [0u8; $size];
-						hash.clone_from_slice(hex);
-						Ok($name(hash))
-					}
-					_ => Err(Error::InvalidH256),
-				}
-			}
-		}
-
-		impl From<&'static str> for $name {
-			fn from(s: &'static str) -> Self {
-				s.parse().expect(&format!("invalid string literal for {}: '{}'", stringify!($name), s))
-			}
-		}
-
-		impl From<[u8; $size]> for $name {
-			fn from(bytes: [u8; $size]) -> Self {
-				$name(bytes)
-			}
-		}
-
-		impl Into<[u8; $size]> for $name {
-			fn into(self) -> [u8; $size] {
-				self.0
-			}
-		}
-	}
-}
-
-impl_hash!(H128, 16);
-impl_hash!(H160, 20);
-impl_hash!(H256, 32);

accounts/ethstore/src/json/kdf.rs

@@ -1,159 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-use serde::{Serialize, Serializer, Deserialize, Deserializer};
-use serde::de::{Visitor, Error as SerdeError};
-use super::{Error, Bytes};
-
-#[derive(Debug, PartialEq)]
-pub enum KdfSer {
-	Pbkdf2,
-	Scrypt,
-}
-
-impl Serialize for KdfSer {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where S: Serializer {
-		match *self {
-			KdfSer::Pbkdf2 => serializer.serialize_str("pbkdf2"),
-			KdfSer::Scrypt => serializer.serialize_str("scrypt"),
-		}
-	}
-}
-
-impl<'a> Deserialize<'a> for KdfSer {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-	where D: Deserializer<'a> {
-		deserializer.deserialize_any(KdfSerVisitor)
-	}
-}
-
-struct KdfSerVisitor;
-
-impl<'a> Visitor<'a> for KdfSerVisitor {
-	type Value = KdfSer;
-
-	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-		write!(formatter, "a kdf algorithm identifier")
-	}
-
-	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-		match value {
-			"pbkdf2" => Ok(KdfSer::Pbkdf2),
-			"scrypt" => Ok(KdfSer::Scrypt),
-			_ => Err(SerdeError::custom(Error::UnsupportedKdf))
-		}
-	}
-
-	fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
-		self.visit_str(value.as_ref())
-	}
-}
-
-#[derive(Debug, PartialEq)]
-pub enum Prf {
-	HmacSha256,
-}
-
-impl Serialize for Prf {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where S: Serializer {
-		match *self {
-			Prf::HmacSha256 => serializer.serialize_str("hmac-sha256"),
-		}
-	}
-}
-
-impl<'a> Deserialize<'a> for Prf {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-	where D: Deserializer<'a> {
-		deserializer.deserialize_any(PrfVisitor)
-	}
-}
-
-struct PrfVisitor;
-
-impl<'a> Visitor<'a> for PrfVisitor {
-	type Value = Prf;
-
-	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-		write!(formatter, "a prf algorithm identifier")
-	}
-
-	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E> where E: SerdeError {
-		match value {
-			"hmac-sha256" => Ok(Prf::HmacSha256),
-			_ => Err(SerdeError::custom(Error::InvalidPrf)),
-		}
-	}
-
-	fn visit_string<E>(self, value: String) -> Result<Self::Value, E> where E: SerdeError {
-		self.visit_str(value.as_ref())
-	}
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct Pbkdf2 {
-	pub c: u32,
-	pub dklen: u32,
-	pub prf: Prf,
-	pub salt: Bytes,
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct Scrypt {
-	pub dklen: u32,
-	pub p: u32,
-	pub n: u32,
-	pub r: u32,
-	pub salt: Bytes,
-}
-
-#[derive(Debug, PartialEq)]
-pub enum KdfSerParams {
-	Pbkdf2(Pbkdf2),
-	Scrypt(Scrypt),
-}
-
-impl Serialize for KdfSerParams {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where S: Serializer {
-		match *self {
-			KdfSerParams::Pbkdf2(ref params) => params.serialize(serializer),
-			KdfSerParams::Scrypt(ref params) => params.serialize(serializer),
-		}
-	}
-}
-
-impl<'a> Deserialize<'a> for KdfSerParams {
-	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-	where D: Deserializer<'a> {
-		use serde_json::{Value, from_value};
-
-		let v: Value = Deserialize::deserialize(deserializer)?;
-
-		from_value(v.clone()).map(KdfSerParams::Pbkdf2)
-			.or_else(|_| from_value(v).map(KdfSerParams::Scrypt))
-			.map_err(|_| D::Error::custom("Invalid KDF algorithm"))
-	}
-}
-
-#[derive(Debug, PartialEq)]
-pub enum Kdf {
-	Pbkdf2(Pbkdf2),
-	Scrypt(Scrypt),
-}

accounts/ethstore/src/json/mod.rs

@@ -1,43 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Contract interface specification.
-
-mod bytes;
-mod cipher;
-mod crypto;
-mod error;
-mod hash;
-mod id;
-mod kdf;
-mod key_file;
-mod presale;
-mod vault_file;
-mod vault_key_file;
-mod version;
-
-pub use self::bytes::Bytes;
-pub use self::cipher::{Cipher, CipherSer, CipherSerParams, Aes128Ctr};
-pub use self::crypto::{Crypto, CipherText};
-pub use self::error::Error;
-pub use self::hash::{H128, H160, H256};
-pub use self::id::Uuid;
-pub use self::kdf::{Kdf, KdfSer, Prf, Pbkdf2, Scrypt, KdfSerParams};
-pub use self::key_file::{KeyFile, OpaqueKeyFile};
-pub use self::presale::{PresaleWallet, Encseed};
-pub use self::vault_file::VaultFile;
-pub use self::vault_key_file::{VaultKeyFile, VaultKeyMeta, insert_vault_name_to_json_meta, remove_vault_name_from_json_meta};
-pub use self::version::Version;

accounts/ethstore/src/json/presale.rs

@@ -1,80 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::io::Read;
-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-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-use serde::{Serialize, Serializer, Deserialize, Deserializer};
-use serde::de::{Error as SerdeError, Visitor};
-use super::Error;
-
-#[derive(Debug, PartialEq)]
-pub enum Version {
-	V3,
-}
-
-impl Serialize for Version {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-	where S: Serializer {
-		match *self {
-			Version::V3 => serializer.serialize_u64(3)
-		}
-	}
-}
-
-impl<'a> Deserialize<'a> for Version {
-	fn deserialize<D>(deserializer: D) -> Result<Version, D::Error>
-	where D: Deserializer<'a> {
-		deserializer.deserialize_any(VersionVisitor)
-	}
-}
-
-struct VersionVisitor;
-
-impl<'a> Visitor<'a> for VersionVisitor {
-	type Value = Version;
-
-	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-		write!(formatter, "a valid key version identifier")
-	}
-
-	fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E> where E: SerdeError {
-		match value {
-			3 => Ok(Version::V3),
-			_ => Err(SerdeError::custom(Error::UnsupportedVersion))
-		}
-	}
-}

accounts/ethstore/src/lib.rs

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

accounts/ethstore/src/presale.rs

@@ -1,99 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fs;
-use std::path::Path;
-use json;
-use ethkey::{Address, Secret, KeyPair, Password};
-use crypto::{Keccak256, pbkdf2};
-use {crypto, Error};
-
-/// Pre-sale wallet.
-pub struct PresaleWallet {
-	iv: [u8; 16],
-	ciphertext: Vec<u8>,
-	address: Address,
-}
-
-impl From<json::PresaleWallet> for PresaleWallet {
-	fn from(wallet: json::PresaleWallet) -> Self {
-		let mut iv = [0u8; 16];
-		iv.copy_from_slice(&wallet.encseed[..16]);
-
-		let mut ciphertext = vec![];
-		ciphertext.extend_from_slice(&wallet.encseed[16..]);
-
-		PresaleWallet {
-			iv: iv,
-			ciphertext: ciphertext,
-			address: Address::from(wallet.address),
-		}
-	}
-}
-
-impl PresaleWallet {
-	/// Open a pre-sale wallet.
-	pub fn open<P>(path: P) -> Result<Self, Error> where P: AsRef<Path> {
-		let file = fs::File::open(path)?;
-		let presale = json::PresaleWallet::load(file)
-			.map_err(|e| Error::InvalidKeyFile(format!("{}", e)))?;
-		Ok(PresaleWallet::from(presale))
-	}
-
-	/// Decrypt the wallet.
-	pub fn decrypt(&self, password: &Password) -> Result<KeyPair, Error> {
-		let mut derived_key = [0u8; 32];
-		let salt = pbkdf2::Salt(password.as_bytes());
-		let sec = pbkdf2::Secret(password.as_bytes());
-		pbkdf2::sha256(2000, salt, sec, &mut derived_key);
-
-		let mut key = vec![0; self.ciphertext.len()];
-		let len = crypto::aes::decrypt_128_cbc(&derived_key[0..16], &self.iv, &self.ciphertext, &mut key)
-			.map_err(|_| Error::InvalidPassword)?;
-		let unpadded = &key[..len];
-
-		let secret = Secret::from_unsafe_slice(&unpadded.keccak256())?;
-		if let Ok(kp) = KeyPair::from_secret(secret) {
-			if kp.address() == self.address {
-				return Ok(kp)
-			}
-		}
-
-		Err(Error::InvalidPassword)
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::PresaleWallet;
-	use json;
-
-	#[test]
-	fn test() {
-		let json = r#"
-		{
-			"encseed": "137103c28caeebbcea5d7f95edb97a289ded151b72159137cb7b2671f394f54cff8c121589dcb373e267225547b3c71cbdb54f6e48ec85cd549f96cf0dedb3bc0a9ac6c79b9c426c5878ca2c9d06ff42a23cb648312fc32ba83649de0928e066",
-			"ethaddr": "ede84640d1a1d3e06902048e67aa7db8d52c2ce1",
-			"email": "123@gmail.com",
-			"btcaddr": "1JvqEc6WLhg6GnyrLBe2ztPAU28KRfuseH"
-		} "#;
-
-		let wallet = json::PresaleWallet::load(json.as_bytes()).unwrap();
-		let wallet = PresaleWallet::from(wallet);
-		assert!(wallet.decrypt(&"123".into()).is_ok());
-		assert!(wallet.decrypt(&"124".into()).is_err());
-	}
-}

accounts/ethstore/src/random.rs

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

accounts/ethstore/src/secret_store.rs

@@ -1,190 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::hash::{Hash, Hasher};
-use std::path::PathBuf;
-use std::cmp::Ordering;
-use ethkey::{Address, Message, Signature, Secret, Password, Public};
-use Error;
-use json::{Uuid, OpaqueKeyFile};
-use ethereum_types::H256;
-use OpaqueSecret;
-
-/// Key directory reference
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub enum SecretVaultRef {
-	/// Reference to key in root directory
-	Root,
-	/// Referenc to key in specific vault
-	Vault(String),
-}
-
-/// Stored account reference
-#[derive(Debug, Clone, PartialEq, Eq, Ord)]
-pub struct StoreAccountRef {
-	/// Account address
-	pub address: Address,
-	/// Vault reference
-	pub vault: SecretVaultRef,
-}
-
-impl PartialOrd for StoreAccountRef {
-	fn partial_cmp(&self, other: &StoreAccountRef) -> Option<Ordering> {
-		Some(self.address.cmp(&other.address).then_with(|| self.vault.cmp(&other.vault)))
-	}
-}
-
-impl ::std::borrow::Borrow<Address> for StoreAccountRef {
-	fn borrow(&self) -> &Address {
-		&self.address
-	}
-}
-
-/// Simple Secret Store API
-pub trait SimpleSecretStore: Send + Sync {
-	/// Inserts new accounts to the store (or vault) with given password.
-	fn insert_account(&self, vault: SecretVaultRef, secret: Secret, password: &Password) -> Result<StoreAccountRef, Error>;
-	/// Inserts new derived account to the store (or vault) with given password.
-	fn insert_derived(&self, vault: SecretVaultRef, account_ref: &StoreAccountRef, password: &Password, derivation: Derivation) -> Result<StoreAccountRef, Error>;
-	/// Changes accounts password.
-	fn change_password(&self, account: &StoreAccountRef, old_password: &Password, new_password: &Password) -> Result<(), Error>;
-	/// Exports key details for account.
-	fn export_account(&self, account: &StoreAccountRef, password: &Password) -> Result<OpaqueKeyFile, Error>;
-	/// Entirely removes account from the store and underlying storage.
-	fn remove_account(&self, account: &StoreAccountRef, password: &Password) -> Result<(), Error>;
-	/// Generates new derived account.
-	fn generate_derived(&self, account_ref: &StoreAccountRef, password: &Password, derivation: Derivation) -> Result<Address, Error>;
-	/// Sign a message with given account.
-	fn sign(&self, account: &StoreAccountRef, password: &Password, message: &Message) -> Result<Signature, Error>;
-	/// Sign a message with derived account.
-	fn sign_derived(&self, account_ref: &StoreAccountRef, password: &Password, derivation: Derivation, message: &Message) -> Result<Signature, Error>;
-	/// Decrypt a messages with given account.
-	fn decrypt(&self, account: &StoreAccountRef, password: &Password, shared_mac: &[u8], message: &[u8]) -> Result<Vec<u8>, Error>;
-	/// Agree on shared key.
-	fn agree(&self, account: &StoreAccountRef, password: &Password, other: &Public) -> Result<Secret, Error>;
-
-	/// Returns all accounts in this secret store.
-	fn accounts(&self) -> Result<Vec<StoreAccountRef>, Error>;
-	/// Get reference to some account with given address.
-	/// This method could be removed if we will guarantee that there is max(1) account for given address.
-	fn account_ref(&self, address: &Address) -> Result<StoreAccountRef, Error>;
-
-	/// Create new vault with given password
-	fn create_vault(&self, name: &str, password: &Password) -> Result<(), Error>;
-	/// Open vault with given password
-	fn open_vault(&self, name: &str, password: &Password) -> Result<(), Error>;
-	/// Close vault
-	fn close_vault(&self, name: &str) -> Result<(), Error>;
-	/// List all vaults
-	fn list_vaults(&self) -> Result<Vec<String>, Error>;
-	/// List all currently opened vaults
-	fn list_opened_vaults(&self) -> Result<Vec<String>, Error>;
-	/// Change vault password
-	fn change_vault_password(&self, name: &str, new_password: &Password) -> Result<(), Error>;
-	/// Cnage account' vault
-	fn change_account_vault(&self, vault: SecretVaultRef, account: StoreAccountRef) -> Result<StoreAccountRef, Error>;
-	/// Get vault metadata string.
-	fn get_vault_meta(&self, name: &str) -> Result<String, Error>;
-	/// Set vault metadata string.
-	fn set_vault_meta(&self, name: &str, meta: &str) -> Result<(), Error>;
-}
-
-/// Secret Store API
-pub trait SecretStore: SimpleSecretStore {
-
-	/// Returns a raw opaque Secret that can be later used to sign a message.
-	fn raw_secret(&self, account: &StoreAccountRef, password: &Password) -> Result<OpaqueSecret, Error>;
-
-	/// Signs a message with raw secret.
-	fn sign_with_secret(&self, secret: &OpaqueSecret, message: &Message) -> Result<Signature, Error> {
-		Ok(::ethkey::sign(&secret.0, message)?)
-	}
-
-	/// Imports presale wallet
-	fn import_presale(&self, vault: SecretVaultRef, json: &[u8], password: &Password) -> Result<StoreAccountRef, Error>;
-	/// Imports existing JSON wallet
-	fn import_wallet(&self, vault: SecretVaultRef, json: &[u8], password: &Password, gen_id: bool) -> Result<StoreAccountRef, Error>;
-	/// Copies account between stores and vaults.
-	fn copy_account(&self, new_store: &SimpleSecretStore, new_vault: SecretVaultRef, account: &StoreAccountRef, password: &Password, new_password: &Password) -> Result<(), Error>;
-	/// Checks if password matches given account.
-	fn test_password(&self, account: &StoreAccountRef, password: &Password) -> Result<bool, Error>;
-
-	/// Returns a public key for given account.
-	fn public(&self, account: &StoreAccountRef, password: &Password) -> Result<Public, Error>;
-
-	/// Returns uuid of an account.
-	fn uuid(&self, account: &StoreAccountRef) -> Result<Uuid, Error>;
-	/// Returns account's name.
-	fn name(&self, account: &StoreAccountRef) -> Result<String, Error>;
-	/// Returns account's metadata.
-	fn meta(&self, account: &StoreAccountRef) -> Result<String, Error>;
-
-	/// Modifies account metadata.
-	fn set_name(&self, account: &StoreAccountRef, name: String) -> Result<(), Error>;
-	/// Modifies account name.
-	fn set_meta(&self, account: &StoreAccountRef, meta: String) -> Result<(), Error>;
-
-	/// Returns local path of the store.
-	fn local_path(&self) -> PathBuf;
-	/// Lists all found geth accounts.
-	fn list_geth_accounts(&self, testnet: bool) -> Vec<Address>;
-	/// Imports geth accounts to the store/vault.
-	fn import_geth_accounts(&self, vault: SecretVaultRef, desired: Vec<Address>, testnet: bool) -> Result<Vec<StoreAccountRef>, Error>;
-}
-
-impl StoreAccountRef {
-	/// Create reference to root account with given address
-	pub fn root(address: Address) -> Self {
-		StoreAccountRef::new(SecretVaultRef::Root, address)
-	}
-
-	/// Create reference to vault account with given address
-	pub fn vault(vault_name: &str, address: Address) -> Self {
-		StoreAccountRef::new(SecretVaultRef::Vault(vault_name.to_owned()), address)
-	}
-
-	/// Create new account reference
-	pub fn new(vault_ref: SecretVaultRef, address: Address) -> Self {
-		StoreAccountRef {
-			vault: vault_ref,
-			address: address,
-		}
-	}
-}
-
-impl Hash for StoreAccountRef {
-	fn hash<H: Hasher>(&self, state: &mut H) {
-		self.address.hash(state);
-	}
-}
-
-/// Node in hierarchical derivation.
-pub struct IndexDerivation {
-	/// Node is soft (allows proof of parent from parent node).
-	pub soft: bool,
-	/// Index sequence of the node.
-	pub index: u32,
-}
-
-/// Derivation scheme for keys
-pub enum Derivation {
-	/// Hierarchical derivation
-	Hierarchical(Vec<IndexDerivation>),
-	/// Hash derivation, soft.
-	SoftHash(H256),
-	/// Hash derivation, hard.
-	HardHash(H256),
-}

accounts/ethstore/tests/api.rs

@@ -1,154 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate rand;
-extern crate ethstore;
-
-mod util;
-
-use ethstore::{EthStore, SimpleSecretStore, SecretVaultRef, StoreAccountRef};
-use ethstore::ethkey::{Random, Generator, Secret, KeyPair, verify_address};
-use ethstore::accounts_dir::RootDiskDirectory;
-use util::TransientDir;
-
-#[test]
-fn secret_store_create() {
-	let dir = TransientDir::create().unwrap();
-	let _ = EthStore::open(Box::new(dir)).unwrap();
-}
-
-#[test]
-#[should_panic]
-fn secret_store_open_not_existing() {
-	let dir = TransientDir::open();
-	let _ = EthStore::open(Box::new(dir)).unwrap();
-}
-
-fn random_secret() -> Secret {
-	Random.generate().unwrap().secret().clone()
-}
-
-#[test]
-fn secret_store_create_account() {
-	let dir = TransientDir::create().unwrap();
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert_eq!(store.accounts().unwrap().len(), 0);
-	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
-	assert_eq!(store.accounts().unwrap().len(), 1);
-	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
-	assert_eq!(store.accounts().unwrap().len(), 2);
-}
-
-#[test]
-fn secret_store_sign() {
-	let dir = TransientDir::create().unwrap();
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
-	let accounts = store.accounts().unwrap();
-	assert_eq!(accounts.len(), 1);
-	assert!(store.sign(&accounts[0], &"".into(), &Default::default()).is_ok());
-	assert!(store.sign(&accounts[0], &"1".into(), &Default::default()).is_err());
-}
-
-#[test]
-fn secret_store_change_password() {
-	let dir = TransientDir::create().unwrap();
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
-	let accounts = store.accounts().unwrap();
-	assert_eq!(accounts.len(), 1);
-	assert!(store.sign(&accounts[0], &"".into(), &Default::default()).is_ok());
-	assert!(store.change_password(&accounts[0], &"".into(), &"1".into()).is_ok());
-	assert!(store.sign(&accounts[0], &"".into(), &Default::default()).is_err());
-	assert!(store.sign(&accounts[0], &"1".into(), &Default::default()).is_ok());
-}
-
-#[test]
-fn secret_store_remove_account() {
-	let dir = TransientDir::create().unwrap();
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
-	let accounts = store.accounts().unwrap();
-	assert_eq!(accounts.len(), 1);
-	assert!(store.remove_account(&accounts[0], &"".into()).is_ok());
-	assert_eq!(store.accounts().unwrap().len(), 0);
-	assert!(store.remove_account(&accounts[0], &"".into()).is_err());
-}
-
-fn test_path() -> &'static str {
-	match ::std::fs::metadata("ethstore") {
-		Ok(_) => "ethstore/tests/res/geth_keystore",
- 		Err(_) => "tests/res/geth_keystore",
-	}
-}
-
-fn pat_path() -> &'static str {
-	match ::std::fs::metadata("ethstore") {
-		Ok(_) => "ethstore/tests/res/pat",
-		Err(_) => "tests/res/pat",
-	}
-}
-
-fn ciphertext_path() -> &'static str {
-	match ::std::fs::metadata("ethstore") {
-		Ok(_) => "ethstore/tests/res/ciphertext",
-		Err(_) => "tests/res/ciphertext",
-	}
-}
-
-#[test]
-fn secret_store_laod_geth_files() {
-	let dir = RootDiskDirectory::at(test_path());
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert_eq!(store.accounts().unwrap(), vec![
-		StoreAccountRef::root("3f49624084b67849c7b4e805c5988c21a430f9d9".into()),
-		StoreAccountRef::root("5ba4dcf897e97c2bdf8315b9ef26c13c085988cf".into()),
-		StoreAccountRef::root("63121b431a52f8043c16fcf0d1df9cb7b5f66649".into()),
-	]);
-}
-
-#[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("3f49624084b67849c7b4e805c5988c21a430f9d9".into()),
-		StoreAccountRef::root("5ba4dcf897e97c2bdf8315b9ef26c13c085988cf".into()),
-	]);
-}
-
-#[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("31e9d1e6d844bd3a536800ef8d8be6a9975db509".into()),
-		StoreAccountRef::root("d1e64e5480bfaf733ba7d48712decb8227797a4e".into()),
-	]);
-
-	let message = Default::default();
-
-	let s1 = store.sign(&accounts[0], &"foo".into(), &message).unwrap();
-	let s2 = store.sign(&accounts[1], &"foo".into(), &message).unwrap();
-	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-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-mod transient_dir;
-
-pub use self::transient_dir::TransientDir;

accounts/fake-hardware-wallet/Cargo.toml

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

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

@@ -1,101 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Dummy module for platforms that does not provide support for hardware wallets (libusb)
-
-extern crate ethereum_types;
-extern crate ethkey;
-
-use std::fmt;
-use ethereum_types::U256;
-use ethkey::{Address, Signature};
-
-pub struct WalletInfo {
-	pub address: Address,
-	pub name: String,
-	pub manufacturer: String,
-}
-
-#[derive(Debug)]
-/// `ErrorType` for devices with no `hardware wallet`
-pub enum Error {
-	NoWallet,
-	KeyNotFound,
-}
-
-pub struct TransactionInfo {
-	/// Nonce
-	pub nonce: U256,
-	/// Gas price
-	pub gas_price: U256,
-	/// Gas limit
-	pub gas_limit: U256,
-	/// Receiver
-	pub to: Option<Address>,
-	/// Value
-	pub value: U256,
-	/// Data
-	pub data: Vec<u8>,
-	/// Chain ID
-	pub chain_id: Option<u64>,
-}
-
-pub enum KeyPath {
-	/// Ethereum.
-	Ethereum,
-	/// Ethereum classic.
-	EthereumClassic,
-}
-
-/// `HardwareWalletManager` for devices with no `hardware wallet`
-pub struct HardwareWalletManager;
-
-impl HardwareWalletManager {
-	pub fn new() -> Result<Self, Error> {
-		Err(Error::NoWallet)
-	}
-
-	pub fn set_key_path(&self, _key_path: KeyPath) {}
-
-	pub fn wallet_info(&self, _: &Address) -> Option<WalletInfo> { 
-		None 
-	}
-
-	pub fn list_wallets(&self) -> Vec<WalletInfo> {
-		Vec::with_capacity(0)
-	}
-
-	pub fn list_locked_wallets(&self) -> Result<Vec<String>, Error> {
-		Err(Error::NoWallet)
-	}
-
-	pub fn pin_matrix_ack(&self, _: &str, _: &str) -> Result<bool, Error> { 
-		Err(Error::NoWallet)
-	}
-	
-	pub fn sign_transaction(&self, _address: &Address, _transaction: &TransactionInfo, _rlp_transaction: &[u8]) -> Result<Signature, Error> { 
-		Err(Error::NoWallet) }
-	
-	pub fn sign_message(&self, _address: &Address, _msg: &[u8]) -> Result<Signature, Error> {
-		Err(Error::NoWallet)
-	}
-}
-
-impl fmt::Display for Error {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { 
-		write!(f, "No hardware wallet!!") 
-	}
-}

accounts/hw/Cargo.toml

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

accounts/hw/src/lib.rs

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

accounts/hw/src/trezor.rs

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

chainspec/Cargo.toml

@@ -1,8 +0,0 @@
-[package]
-name = "chainspec"
-version = "0.1.0"
-authors = ["Marek Kotewicz <marek@parity.io>"]
-
-[dependencies]
-ethjson = { path = "../json" }
-serde_json = "1.0"

chainspec/src/main.rs

@@ -1,49 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate serde_json;
-extern crate ethjson;
-
-use std::{fs, env, process};
-use ethjson::spec::Spec;
-
-fn quit(s: &str) -> ! {
-	println!("{}", s);
-	process::exit(1);
-}
-
-fn main() {
-	let mut args = env::args();
-	if args.len() != 2 {
-		quit("You need to specify chainspec.json\n\
-		\n\
-		./chainspec <chainspec.json>");
-	}
-
-	let path = args.nth(1).expect("args.len() == 2; qed");
-	let file = match fs::File::open(&path) {
-		Ok(file) => file,
-		Err(_) => quit(&format!("{} could not be opened", path)),
-	};
-
-	let spec: Result<Spec, _> = serde_json::from_reader(file);
-
-	if let Err(err) = spec {
-		quit(&format!("{} {}", path, err.to_string()));
-	}
-
-	println!("{} is valid", path);
-}

cli-signer/Cargo.toml

@@ -1,13 +0,0 @@
-[package]
-authors = ["Parity <admin@parity.io>"]
-description = "Parity Cli Tool"
-homepage = "http://parity.io"
-license = "GPL-3.0"
-name = "cli-signer"
-version = "1.4.0"
-
-[dependencies]
-futures = "0.1"
-rpassword = "1.0"
-parity-rpc = { path = "../rpc" }
-parity-rpc-client = { path = "rpc-client" }

cli-signer/rpc-client/Cargo.toml

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

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

@@ -1,347 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt::{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,90 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-pub mod client;
-pub mod signer_client;
-
-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<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,62 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use client::{Rpc, RpcError};
-use rpc::signer::{ConfirmationRequest, TransactionModification, U256, 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,195 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate futures;
-extern crate rpassword;
-
-extern crate parity_rpc as rpc;
-extern crate parity_rpc_client as client;
-
-use rpc::signer::{U256, 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,45 @@
+[package]
+description = "Parity Dapps crate"
+name = "ethcore-dapps"
+version = "1.6.0"
+license = "GPL-3.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[lib]
+
+[dependencies]
+rand = "0.3"
+log = "0.3"
+env_logger = "0.3"
+futures = "0.1"
+jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc.git" }
+jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc.git" }
+hyper = { default-features = false, git = "https://github.com/ethcore/hyper" }
+unicase = "1.3"
+url = "1.0"
+rustc-serialize = "0.3"
+serde = "0.9"
+serde_json = "0.9"
+serde_derive = "0.9"
+linked-hash-map = "0.3"
+parity-dapps-glue = "1.4"
+base32 = "0.3"
+mime = "0.2"
+mime_guess = "1.6.1"
+time = "0.1.35"
+zip = { version = "0.1", default-features = false }
+ethcore-devtools = { path = "../devtools" }
+ethcore-rpc = { path = "../rpc" }
+ethcore-util = { path = "../util" }
+fetch = { path = "../util/fetch" }
+parity-ui = { path = "./ui" }
+parity-hash-fetch = { path = "../hash-fetch" }
+parity-reactor = { path = "../util/reactor" }
+
+clippy = { version = "0.0.103", optional = true}
+
+[features]
+dev = ["clippy", "ethcore-rpc/dev", "ethcore-util/dev"]
+
+ui = ["parity-ui/no-precompiled-js"]
+ui-precompiled = ["parity-ui/use-precompiled-js"]

dapps/js-glue/Cargo.toml

@@ -0,0 +1,31 @@
+[package]
+description = "Base Package for all Parity built-in dapps"
+name = "parity-dapps-glue"
+version = "1.6.0"
+license = "GPL-3.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+build = "build.rs"
+
+[build-dependencies]
+quasi_codegen = { version = "0.11", optional = true }
+syntex = { version = "0.33", optional = true }
+
+[dependencies]
+glob = { version = "0.2.11" }
+mime_guess = { version = "1.6.1" }
+aster = { version = "0.17", default-features = false }
+quasi = { version = "0.11", default-features = false }
+quasi_macros = { version = "0.11", optional = true }
+syntex = { version = "0.33", optional = true }
+syntex_syntax = { version = "0.33", optional = true }
+clippy = { version = "0.0.90", optional = true }
+
+[features]
+dev = ["clippy"]
+default = ["with-syntex"]
+nightly = ["quasi_macros"]
+nightly-testing = ["clippy"]
+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/ethcore/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/ethcore/parity-ui/blob/master/status/Cargo.toml).
+
+   ```bash
+   $ git clone https://github.com/ethcore/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,45 @@
+// 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 mut registry = syntex::Registry::new();
+		quasi_codegen::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"))]
+mod inner {
+	pub fn main() {}
+}
+
+fn main() {
+	inner::main();
+}

dapps/js-glue/src/build.rs

@@ -0,0 +1,66 @@
+
+#[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> {
+				match attr.node.value.node {
+					ast::MetaItemKind::List(ref n, _) if n == &"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,189 @@
+// 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::ast::{MetaItem, Item};
+
+use syntax::ast;
+use syntax::attr;
+use syntax::codemap::Span;
+use syntax::ext::base::{Annotatable, ExtCtxt};
+use syntax::ptr::P;
+use syntax::print::pprust::{lit_to_string};
+use syntax::parse::token::{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 {
+			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 {
+			match meta_item.node {
+				ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"path" => {
+					if let Some(s) = get_str_from_lit(cx, name, lit) {
+						return s.deref().to_owned();
+					}
+				},
+				_ => {},
+			}
+		}
+	}
+
+	// default
+	"web".to_owned()
+}
+
+fn get_str_from_lit(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Option<InternedString> {
+	match lit.node {
+		ast::LitKind::Str(ref s, _) => Some(s.clone()),
+		_ => {
+			cx.span_err(
+				lit.span,
+				&format!("webapp annotation `{}` must be a string, not `{}`",
+					name,
+					lit_to_string(lit)
+				)
+			);
+			return None;
+		}
+	}
+}
+
+fn webapp_meta_items(attr: &ast::Attribute) -> Option<&[P<ast::MetaItem>]> {
+	match attr.node.value.node {
+		ast::MetaItemKind::List(ref name, ref items) if name == &"webapp" => {
+			attr::mark_used(&attr);
+			Some(items)
+		}
+		_ => 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_fd(cmd: &mut Command) -> &mut Command {
+		cmd
+	}
+}
+
+#[cfg(windows)]
+mod platform {
+	use std::process::{Command, Stdio};
+
+	pub static NPM_CMD: &'static str = "npm.cmd";
+	// NOTE [ToDr] For some reason on windows
+	// We cannot have any file descriptors open when running a child process
+	// during build phase.
+	pub fn handle_fd(cmd: &mut Command) -> &mut Command {
+		cmd.stdin(Stdio::null())
+			.stdout(Stdio::null())
+			.stderr(Stdio::null())
+	}
+}
+
+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_fd(&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_fd(&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,39 @@
+// 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")]
+#[macro_use]
+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/src/api/api.rs

@@ -0,0 +1,175 @@
+// 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 unicase::UniCase;
+use hyper::{server, net, Decoder, Encoder, Next, Control};
+use hyper::header;
+use hyper::method::Method;
+use hyper::header::AccessControlAllowOrigin;
+
+use api::types::{App, ApiError};
+use api::response;
+use apps::fetcher::Fetcher;
+
+use handlers::extract_url;
+use endpoint::{Endpoint, Endpoints, Handler, EndpointPath};
+use jsonrpc_http_server::cors;
+
+#[derive(Clone)]
+pub struct RestApi {
+	cors_domains: Option<Vec<AccessControlAllowOrigin>>,
+	endpoints: Arc<Endpoints>,
+	fetcher: Arc<Fetcher>,
+}
+
+impl RestApi {
+	pub fn new(cors_domains: Vec<String>, endpoints: Arc<Endpoints>, fetcher: Arc<Fetcher>) -> Box<Endpoint> {
+		Box::new(RestApi {
+			cors_domains: Some(cors_domains.into_iter().map(|domain| match domain.as_ref() {
+				"all" | "*" | "any" => AccessControlAllowOrigin::Any,
+				"null" => AccessControlAllowOrigin::Null,
+				other => AccessControlAllowOrigin::Value(other.into()),
+			}).collect()),
+			endpoints: endpoints,
+			fetcher: fetcher,
+		})
+	}
+
+	fn list_apps(&self) -> Vec<App> {
+		self.endpoints.iter().filter_map(|(ref k, ref e)| {
+			e.info().map(|ref info| App::from_info(k, info))
+		}).collect()
+	}
+}
+
+impl Endpoint for RestApi {
+	fn to_async_handler(&self, path: EndpointPath, control: Control) -> Box<Handler> {
+		Box::new(RestApiRouter::new(self.clone(), path, control))
+	}
+}
+
+struct RestApiRouter {
+	api: RestApi,
+	origin: Option<String>,
+	path: Option<EndpointPath>,
+	control: Option<Control>,
+	handler: Box<Handler>,
+}
+
+impl RestApiRouter {
+	fn new(api: RestApi, path: EndpointPath, control: Control) -> Self {
+		RestApiRouter {
+			path: Some(path),
+			origin: None,
+			control: Some(control),
+			api: api,
+			handler: response::as_json_error(&ApiError {
+				code: "404".into(),
+				title: "Not Found".into(),
+				detail: "Resource you requested has not been found.".into(),
+			}),
+		}
+	}
+
+	fn resolve_content(&self, hash: Option<&str>, path: EndpointPath, control: Control) -> Option<Box<Handler>> {
+		match hash {
+			Some(hash) if self.api.fetcher.contains(hash) => {
+				Some(self.api.fetcher.to_async_handler(path, control))
+			},
+			_ => None
+		}
+	}
+
+	/// Returns basic headers for a response (it may be overwritten by the handler)
+	fn response_headers(&self) -> header::Headers {
+		let mut headers = header::Headers::new();
+		headers.set(header::AccessControlAllowCredentials);
+		headers.set(header::AccessControlAllowMethods(vec![
+			Method::Options,
+			Method::Post,
+			Method::Get,
+		]));
+		headers.set(header::AccessControlAllowHeaders(vec![
+			UniCase("origin".to_owned()),
+			UniCase("content-type".to_owned()),
+			UniCase("accept".to_owned()),
+		]));
+
+		if let Some(cors_header) = cors::get_cors_header(&self.api.cors_domains, &self.origin) {
+			headers.set(cors_header);
+		}
+
+		headers
+	}
+}
+
+impl server::Handler<net::HttpStream> for RestApiRouter {
+
+	fn on_request(&mut self, request: server::Request<net::HttpStream>) -> Next {
+		self.origin = cors::read_origin(&request);
+
+		if let Method::Options = *request.method() {
+			self.handler = response::empty();
+			return Next::write();
+		}
+
+		// TODO [ToDr] Consider using `path.app_params` instead
+		let url = extract_url(&request);
+		if url.is_none() {
+			// Just return 404 if we can't parse URL
+			return Next::write();
+		}
+
+		let url = url.expect("Check for None early-exists above; qed");
+		let mut path = self.path.take().expect("on_request called only once, and path is always defined in new; qed");
+		let control = self.control.take().expect("on_request called only once, and control is always defined in new; qed");
+
+		let endpoint = url.path.get(1).map(|v| v.as_str());
+		let hash = url.path.get(2).map(|v| v.as_str());
+		// 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.clone().to_owned() }
+
+		let handler = endpoint.and_then(|v| match v {
+			"apps" => Some(response::as_json(&self.api.list_apps())),
+			"ping" => Some(response::ping()),
+			"content" => self.resolve_content(hash, path, control),
+			_ => None
+		});
+
+		// Overwrite default
+		if let Some(h) = handler {
+			self.handler = h;
+		}
+
+		self.handler.on_request(request)
+	}
+
+	fn on_request_readable(&mut self, decoder: &mut Decoder<net::HttpStream>) -> Next {
+		self.handler.on_request_readable(decoder)
+	}
+
+	fn on_response(&mut self, res: &mut server::Response) -> Next {
+		*res.headers_mut() = self.response_headers();
+		self.handler.on_response(res)
+	}
+
+	fn on_response_writable(&mut self, encoder: &mut Encoder<net::HttpStream>) -> Next {
+		self.handler.on_response_writable(encoder)
+	}
+
+}

dapps/src/api/mod.rs

@@ -0,0 +1,24 @@
+// 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;
+pub use self::types::App;

dapps/src/api/response.rs

@@ -0,0 +1,40 @@
+// 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 endpoint::Handler;
+use handlers::{ContentHandler, EchoHandler};
+
+pub fn empty() -> Box<Handler> {
+	Box::new(ContentHandler::ok("".into(), mime!(Text/Plain)))
+}
+
+pub fn as_json<T: Serialize>(val: &T) -> Box<Handler> {
+	let json = serde_json::to_string(val)
+		.expect("serialization to string is infallible; qed");
+	Box::new(ContentHandler::ok(json, mime!(Application/Json)))
+}
+
+pub fn as_json_error<T: Serialize>(val: &T) -> Box<Handler> {
+	let json = serde_json::to_string(val)
+		.expect("serialization to string is infallible; qed");
+	Box::new(ContentHandler::not_found(json, mime!(Application/Json)))
+}
+
+pub fn ping() -> Box<Handler> {
+	Box::new(EchoHandler::default())
+}

dapps/src/api/types.rs

@@ -0,0 +1,64 @@
+// 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,
+}
+
+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(),
+		}
+	}
+}
+
+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,
+		}
+	}
+}
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct ApiError {
+	pub code: String,
+	pub title: String,
+	pub detail: String,
+}
+

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::LocalPageEndpoint;
+use handlers::FetchControl;
+
+pub enum ContentStatus {
+	Fetching(FetchControl),
+	Ready(LocalPageEndpoint),
+}
+
+#[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,255 @@
+// 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 fetch::{self, Mime};
+use util::H256;
+
+use util::sha3::sha3;
+use page::{LocalPageEndpoint, PageCache};
+use handlers::{ContentValidator, ValidatorResponse};
+use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest, serialize_manifest, Manifest};
+
+type OnDone = Box<Fn(Option<LocalPageEndpoint>) + 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 sha3 in-flight while reading the response
+	let mut file = io::BufReader::new(fs::File::open(&content_path)?);
+	let hash = sha3(&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,
+}
+
+impl Content {
+	pub fn new(id: String, mime: Mime, content_path: PathBuf, on_done: OnDone) -> Self {
+		Content {
+			id: id,
+			mime: mime,
+			content_path: content_path,
+			on_done: on_done,
+		}
+	}
+}
+
+impl ContentValidator for Content {
+	type Error = ValidationError;
+
+	fn validate_and_install(&self, response: fetch::Response) -> Result<ValidatorResponse, ValidationError> {
+		let validate = |content_path: PathBuf| {
+			// Create dir
+			let (_, content_path) = write_response_and_check_hash(self.id.as_str(), content_path.clone(), self.id.as_str(), response)?;
+
+			Ok(LocalPageEndpoint::single_file(content_path, self.mime.clone(), 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: Option<(String, u16)>,
+}
+
+impl Dapp {
+	pub fn new(id: String, dapps_path: PathBuf, on_done: OnDone, embeddable_on: Option<(String, u16)>) -> Self {
+		Dapp {
+			id: id,
+			dapps_path: dapps_path,
+			on_done: on_done,
+			embeddable_on: embeddable_on,
+		}
+	}
+
+	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 validate = |dapp_path: PathBuf| {
+			let (file, zip_path) = write_response_and_check_hash(self.id.as_str(), dapp_path.clone(), &format!("{}.zip", self.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 = self.id.clone();
+
+			// 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 = LocalPageEndpoint::new(dapp_path, manifest.clone().into(), PageCache::Enabled, self.embeddable_on.clone());
+			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,265 @@
+// 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_serialize::hex::FromHex;
+use fetch::{Client as FetchClient, Fetch};
+use hash_fetch::urlhint::{URLHintContract, URLHint, URLHintResult};
+use parity_reactor::Remote;
+
+use hyper;
+use hyper::status::StatusCode;
+
+use {SyncStatus, random_filename};
+use util::Mutex;
+use page::LocalPageEndpoint;
+use handlers::{ContentHandler, ContentFetcherHandler};
+use endpoint::{Endpoint, EndpointPath, Handler};
+use apps::cache::{ContentCache, ContentStatus};
+
+/// Limit of cached dapps/content
+const MAX_CACHED_DAPPS: usize = 20;
+
+pub trait Fetcher: Send + Sync + 'static {
+	fn contains(&self, content_id: &str) -> bool;
+
+	fn to_async_handler(&self, path: EndpointPath, control: hyper::Control) -> Box<Handler>;
+}
+
+pub struct ContentFetcher<F: Fetch = FetchClient, R: URLHint + Send + Sync + 'static = URLHintContract> {
+	dapps_path: PathBuf,
+	resolver: R,
+	cache: Arc<Mutex<ContentCache>>,
+	sync: Arc<SyncStatus>,
+	embeddable_on: Option<(String, u16)>,
+	remote: Remote,
+	fetch: F,
+}
+
+impl<R: URLHint + Send + Sync + 'static, F: Fetch> Drop for ContentFetcher<F, R> {
+	fn drop(&mut self) {
+		// Clear cache path
+		let _ = fs::remove_dir_all(&self.dapps_path);
+	}
+}
+
+impl<R: URLHint + Send + Sync + 'static, F: Fetch> ContentFetcher<F, R> {
+
+	pub fn new(resolver: R, sync_status: Arc<SyncStatus>, embeddable_on: Option<(String, u16)>, remote: Remote, fetch: F) -> Self {
+		let mut dapps_path = env::temp_dir();
+		dapps_path.push(random_filename());
+
+		ContentFetcher {
+			dapps_path: dapps_path,
+			resolver: resolver,
+			sync: sync_status,
+			cache: Arc::new(Mutex::new(ContentCache::default())),
+			embeddable_on: embeddable_on,
+			remote: remote,
+			fetch: fetch,
+		}
+	}
+
+	fn still_syncing(address: Option<(String, u16)>) -> Box<Handler> {
+		Box::new(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>"),
+			address,
+		))
+	}
+
+	#[cfg(test)]
+	fn set_status(&self, content_id: &str, status: ContentStatus) {
+		self.cache.lock().insert(content_id.to_owned(), status);
+	}
+}
+
+impl<R: URLHint + Send + Sync + '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() {
+			// else try to resolve the app_id
+			let has_content = self.resolver.resolve(content_id).is_some();
+			// if there is content or we are syncing return true
+			has_content || self.sync.is_major_importing()
+		} else {
+			false
+		}
+	}
+
+	fn to_async_handler(&self, path: EndpointPath, control: hyper::Control) -> Box<Handler> {
+		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_async_handler(path, control))
+				},
+				// 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_async_handler(path, control))
+				},
+				// 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.resolver.resolve(content_hex);
+
+					let cache = self.cache.clone();
+					let id = content_id.clone();
+					let on_done = move |result: Option<LocalPageEndpoint>| {
+						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(dapp)) => {
+							let handler = ContentFetcherHandler::new(
+								dapp.url(),
+								path,
+								control,
+								installers::Dapp::new(
+									content_id.clone(),
+									self.dapps_path.clone(),
+									Box::new(on_done),
+									self.embeddable_on.clone(),
+								),
+								self.embeddable_on.clone(),
+								self.remote.clone(),
+								self.fetch.clone(),
+							);
+
+							(Some(ContentStatus::Fetching(handler.fetch_control())), Box::new(handler) as Box<Handler>)
+						},
+						Some(URLHintResult::Content(content)) => {
+							let handler = ContentFetcherHandler::new(
+								content.url,
+								path,
+								control,
+								installers::Content::new(
+									content_id.clone(),
+									content.mime,
+									self.dapps_path.clone(),
+									Box::new(on_done),
+								),
+								self.embeddable_on.clone(),
+								self.remote.clone(),
+								self.fetch.clone(),
+							);
+
+							(Some(ContentStatus::Fetching(handler.fetch_control())), Box::new(handler) as Box<Handler>)
+						},
+						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, Box::new(ContentHandler::error(
+								StatusCode::NotFound,
+								"Resource Not Found",
+								"Requested resource was not found.",
+								None,
+								self.embeddable_on.clone(),
+							)) as Box<Handler>)
+						},
+					}
+				},
+			}
+		};
+
+		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 util::Bytes;
+	use fetch::{Fetch, Client};
+	use hash_fetch::urlhint::{URLHint, URLHintResult};
+	use parity_reactor::Remote;
+
+	use apps::cache::ContentStatus;
+	use endpoint::EndpointInfo;
+	use page::LocalPageEndpoint;
+	use super::{ContentFetcher, Fetcher};
+
+	struct FakeResolver;
+	impl URLHint for FakeResolver {
+		fn resolve(&self, _id: Bytes) -> Option<URLHintResult> {
+			None
+		}
+	}
+
+	#[test]
+	fn should_true_if_contains_the_app() {
+		// given
+		let path = env::temp_dir();
+		let fetcher = ContentFetcher::new(FakeResolver, Arc::new(|| false), None, Remote::new_sync(), Client::new().unwrap());
+		let handler = LocalPageEndpoint::new(path, EndpointInfo {
+			name: "fake".into(),
+			description: "".into(),
+			version: "".into(),
+			author: "".into(),
+			icon_url: "".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,133 @@
+// 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::io;
+use std::io::Read;
+use std::fs;
+use std::path::{Path, PathBuf};
+use page::{LocalPageEndpoint, PageCache};
+use endpoint::{Endpoints, EndpointInfo};
+use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest};
+
+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(),
+			}
+		})
+}
+
+/// 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, signer_address: Option<(String, u16)>) -> Option<(String, Box<LocalPageEndpoint>)> {
+	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(LocalPageEndpoint::new(
+				dapp.path, dapp.info, PageCache::Disabled, signer_address.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 `LocalPageEndpoints`.
+pub fn local_endpoints<P: AsRef<Path>>(dapps_path: P, signer_address: Option<(String, u16)>) -> Endpoints {
+	let mut pages = Endpoints::new();
+	for dapp in local_dapps(dapps_path.as_ref()) {
+		pages.insert(
+			dapp.id,
+			Box::new(LocalPageEndpoint::new(dapp.path, dapp.info, PageCache::Disabled, signer_address.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 api::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,84 @@
+// 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 page::PageEndpoint;
+use proxypac::ProxyPac;
+use web::Web;
+use fetch::Fetch;
+use parity_dapps::WebApp;
+use parity_reactor::Remote;
+use {WebProxyTokens};
+
+mod cache;
+mod fs;
+pub mod fetcher;
+pub mod manifest;
+
+extern crate parity_ui;
+
+pub const HOME_PAGE: &'static str = "parity";
+pub const DAPPS_DOMAIN: &'static str = ".web3.site";
+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() -> Box<Endpoint> {
+	Box::new(PageEndpoint::with_prefix(parity_ui::App::default(), UTILS_PATH.to_owned()))
+}
+
+pub fn all_endpoints<F: Fetch>(
+	dapps_path: PathBuf,
+	extra_dapps: Vec<PathBuf>,
+	signer_address: Option<(String, u16)>,
+	web_proxy_tokens: Arc<WebProxyTokens>,
+	remote: Remote,
+	fetch: F,
+) -> Endpoints {
+	// fetch fs dapps at first to avoid overwriting builtins
+	let mut pages = fs::local_endpoints(dapps_path, signer_address.clone());
+	for path in extra_dapps {
+		if let Some((id, endpoint)) = fs::local_endpoint(path.clone(), signer_address.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(signer_address.clone()));
+	pages.insert("proxy".into(), ProxyPac::boxed(signer_address.clone()));
+	pages.insert(WEB_PATH.into(), Web::boxed(signer_address.clone(), web_proxy_tokens.clone(), remote.clone(), fetch.clone()));
+
+	pages
+}
+
+fn insert<T : WebApp + Default + 'static>(pages: &mut Endpoints, id: &str, embed_at: Embeddable) {
+	pages.insert(id.to_owned(), Box::new(match embed_at {
+		Embeddable::Yes(address) => PageEndpoint::new_safe_to_embed(T::default(), address),
+		Embeddable::No => PageEndpoint::new(T::default()),
+	}));
+}
+
+enum Embeddable {
+	Yes(Option<(String, u16)>),
+	#[allow(dead_code)]
+	No,
+}

dapps/src/endpoint.rs

@@ -0,0 +1,53 @@
+// 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/>.
+
+//! URL Endpoint traits
+
+use hyper::{self, server, net};
+use std::collections::BTreeMap;
+
+#[derive(Debug, PartialEq, Default, Clone)]
+pub struct EndpointPath {
+	pub app_id: String,
+	pub app_params: Vec<String>,
+	pub host: String,
+	pub port: u16,
+	pub using_dapps_domains: bool,
+}
+
+#[derive(Debug, PartialEq, Clone)]
+pub struct EndpointInfo {
+	pub name: String,
+	pub description: String,
+	pub version: String,
+	pub author: String,
+	pub icon_url: String,
+}
+
+pub type Endpoints = BTreeMap<String, Box<Endpoint>>;
+pub type Handler = server::Handler<net::HttpStream> + Send;
+
+pub trait Endpoint : Send + Sync {
+	fn info(&self) -> Option<&EndpointInfo> { None }
+
+	fn to_handler(&self, _path: EndpointPath) -> Box<Handler> {
+		panic!("This Endpoint is asynchronous and requires Control object.");
+	}
+
+	fn to_async_handler(&self, path: EndpointPath, _control: hyper::Control) -> Box<Handler> {
+		self.to_handler(path)
+	}
+}

dapps/src/error_tpl.html

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width">
+		<title>{title}</title>
+		<link rel="stylesheet" href="/parity-utils/styles.css">
+	</head>
+	<body>
+		<div class="parity-navbar">
+		</div>
+		<div class="parity-box">
+			<h1>{title}</h1>
+			<h3>{message}</h3>
+			<p><code>{details}</code></p>
+		</div>
+		<div class="parity-status">
+			<small>{version}</small>
+		</div>
+	</body>
+</html>