[beta] Backports + HF block update (#7244 )

* Reduce max block timestamp drift to 15 seconds (#7240) * reduce max block timestamp drift to 15 seconds * add test for block timestamp validation within allowed drift * Update kovan HF block number.
[beta] Kovan HF (#7234 )
2017-12-11 14:11:41 +01:00 · 2017-12-08 13:08:15 +01:00 · 2017-12-06 15:18:45 +01:00 · 2017-12-05 16:01:52 +01:00 · 2017-12-05 16:01:44 +01:00 · 2017-12-04 16:18:22 +01:00
3386 changed files with 322402 additions and 188167 deletions
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,27 +0,0 @@
-# NOTE: if you make changes here, remember to also update:
-#	scripts/test-linux.sh
-#	scripts/build-linux.sh
-#	scripts/build-windows.sh
-
-# Using 'cfg` is broken, see https://github.com/rust-lang/cargo/issues/6858
-#[target.'cfg(target_arch = "x86_64")']
-#rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
-# …so instead we list all target triples (Tier 1 64-bit platforms)
-[target.x86_64-unknown-linux-gnu]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
-[target.x86_64-pc-windows-gnu]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
-[target.x86_64-pc-windows-msvc]
-# Enables the aes-ni instructions for RustCrypto dependency.
-# Link the C runtime statically ; https://github.com/paritytech/parity-ethereum/issues/6643
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3", "-Ctarget-feature=+crt-static"]
-
-[target.x86_64-apple-darwin]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
--- a/.editorconfig
+++ b/.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
--- a/.github/CODE_OF_CONDUCT.md
+++ b/.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/)
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,68 +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).
-
-### Labels & Milestones
-
-We use [labels](https://github.com/paritytech/parity-ethereum/labels) to manage PRs and issues and communicate the state of a PR. Please familiarize yourself with them. Furthermore we are organizing issues in [milestones](https://github.com/paritytech/parity-ethereum/milestones). Best way to get started is to a pick a ticket from the current milestone tagged [`easy`](https://github.com/paritytech/parity-ethereum/labels/Q2-easy%20%F0%9F%92%83) and get going, or [`mentor`](https://github.com/paritytech/parity-ethereum/labels/Q1-mentor%20%F0%9F%95%BA) and get in contact with the mentor offering their support on that larger task.
-
-### Rules
-
-There are a few basic ground-rules for contributors (including the maintainer(s) of the project):
-
-* **No pushing directly to the master branch**.
-* **All modifications** must be made in a **pull-request** to solicit feedback from other contributors.
-* Pull-requests cannot be merged before CI runs green and two reviewers have given their approval.
-* Contributors should adhere to the [Parity Ethereum Style Guide](https://wiki.parity.io/Parity-Ethereum-Style-Guide).
-
-### Recommendations
-
-* **Non-master branch names** *should* be prefixed with a short name moniker, followed by the associated Github Issue ID (if any), and a brief description of the task using the format `<GITHUB_USERNAME>-<ISSUE_ID>-<BRIEF_DESCRIPTION>` (e.g. `gavin-123-readme`). The name moniker helps people to inquiry about their unfinished work, and the GitHub Issue ID helps your future self and other developers (particularly those who are onboarding) find out about and understand the original scope of the task, and where it fits into Parity Ethereum [Projects](https://github.com/paritytech/parity-ethereum/projects).
-* **Remove stale branches periodically**
-
-### Preparing Pull Requests
-
-* If your PR does not alter any logic (e.g. comments, dependencies, docs), then it may be tagged [`insubstantial`](https://github.com/paritytech/parity-ethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22).
-
-* Once a PR is ready for review please add the [`pleasereview`](https://github.com/paritytech/parity-ethereum/pulls?utf8=%E2%9C%93&q=is%3Aopen+is%3Apr+label%3A%22A0-pleasereview+%F0%9F%A4%93%22+) label.
-
-### Reviewing Pull Requests*:
-
-* At least two reviewers are required to review PRs (even for PRs tagged [`insubstantial`](https://github.com/paritytech/parity-ethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22)).
-
-When doing a review, make sure to look for any:
-
-* Buggy behavior.
-* Undue maintenance burden.
-* Breaking with house coding style.
-* Pessimization (i.e. reduction of speed as measured in the projects benchmarks).
-* Breaking changes should be carefuly reviewed and tagged as such so they end up in the [changelog](../CHANGELOG.md).
-* Uselessness (i.e. it does not strictly add a feature or fix a known issue).
-
-## 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.
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,15 +1,12 @@
 _Before filing a new issue, please **provide the following information**._

-_If you think that your issue is an exploitable security vulnerability, please mail your bugreport to security@parity.io instead; your submission might be eligible for our Bug Bounty._
-_You can find mode info on the reporting process in [SECURITY.md](https://github.com/paritytech/parity-ethereum/blob/master/SECURITY.md)_
-
-
- **Parity Ethereum version**: 0.0.0
- **Operating system**: Windows / MacOS / Linux
- **Installation**: homebrew / one-line installer / built from source
- **Fully synchronized**: no / yes
- **Network**: ethereum / ropsten / goerli / ...
- **Restarted**: no / yes
+> I'm running:
+>
+> - **Parity version**: 0.0.0
+> - **Operating system**: Windows / MacOS / Linux
+> - **And installed**: via installer / homebrew / binaries / from source

 _Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._

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

-# js build artifacts
-.git-release.log
-
 # gdb files
 .gdb_history

@@ -38,8 +35,7 @@ node_modules

 # Build artifacts
 out/
-parity-clib-examples/cpp/build/

 .vscode
-rls/
+
 /parity.*
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,218 +1,652 @@
- ## Parity-Ethereum [v2.6.3](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.3)
+## Parity [v1.7.3](https://github.com/paritytech/parity/releases/tag/v1.7.3) (2017-10-09)

-Parity Ethereum v2.6.3-stable is a patch release that improves security, stability and performance.
+Parity 1.7.3 enables the Byzantium fork for Ethereum main network on Block 4_370_000 and offers a variety of bug fixes and stability improvements. Among them:

-* The most noteworthy improvement in this release is incorporating all the EIPs required for the Istanbul hard fork.
-* This release also fixes certain security and performance issues, one of which was suspected to be consensus-threatening but turned out to be benign. Thanks to Martin Holst Swende and Felix Lange from the Ethereum Foundation for bringing the suspicious issue to our attention.
+- Fixed network protocol version negotiation with Geth nodes v1.7.1+.
+- Fixed `RETURNDATA` size for built-ins. (Built-ins in some cases overwrite only a portion of the output memory slice.)
+- Multisig Wallet View now loads if multiple transactions happened within one block.
+- Improved stability of snapshot-sycns (warp).
+- Revised timeout and batch size constants for bigger blocks.
+- Renamed RPC receipt `statusCode` field to `status`.

-The full list of included changes:
+Full list of included changes:

-* add more tx tests (#11038)
-* Fix parallel transactions race-condition (#10995)
-* Add blake2_f precompile (#11017)
-* [trace] introduce trace failed to Ext (#11019)
-* Edit publish-onchain.sh to use https (#11016)
-* Fix deadlock in network-devp2p (#11013)
-* EIP 1108: Reduce alt_bn128 precompile gas costs (#11008)
-* xDai chain support and nodes list update (#10989)
-* EIP 2028: transaction gas lowered from 68 to 16 (#10987)
-* EIP-1344 Add CHAINID op-code (#10983)
-* manual publish jobs for releases, no changes for nightlies (#10977)
-* [blooms-db] Fix benchmarks (#10974)
-* Verify transaction against its block during import (#10954)
-* Better error message for rpc gas price errors (#10931)
-* Fix fork choice (#10837)
-* Fix compilation on recent nightlies (#10991)
-* Don't build rpc with ethcore test-helpers (#11048) 
-* EIP 1884 Re-pricing of trie-size dependent operations  (#10992)
-* Implement EIP-1283 reenable transition, EIP-1706 and EIP-2200  (#10191)
+- Backporting ([#6676](https://github.com/paritytech/parity/pull/6676))
+  - Fix wallet view ([#6597](https://github.com/paritytech/parity/pull/6597))
+    - Add safe fail for empty logs
+    - Filter transactions
+    - Add more logging
+    - Fix Wallet Creation and wallet tx list
+    - Remove logs
+    - Prevent selecting twice same wallet owner
+    - Fix tests
+    - Remove unused props
+  - Disallow pasting recovery phrases on first run ([#6602](https://github.com/paritytech/parity/pull/6602))
+    - Fix disallowing paste of recovery phrase on first run, ref [#6581](https://github.com/paritytech/parity/issues/6581)
+    - Allow the leader of CATS pasting recovery phrases.
+  - Updated systemd files for linux ([#6592](https://github.com/paritytech/parity/pull/6592))
+    - Previous version put $BASE directory in root directory.
+    - This version clearly explains how to run as root or as specific user.
+    - Additional configuration:
+      - send SIGHUP for clean exit,
+      - restart on fail.
+    - Tested on Ubuntu 16.04.3 LTS with 4.10.0-33-generic x86_64 kernel
+  - Don't expose port 80 for parity anymore ([#6633](https://github.com/paritytech/parity/pull/6633))
+- Backporting ([#6675](https://github.com/paritytech/parity/pull/6675))
+  - Required validators >= num owners ([#6551](https://github.com/paritytech/parity/pull/6551))
+  - Debounce sync status. ([#6572](https://github.com/paritytech/parity/pull/6572))
+  - Fixed network protocol version negotiation ([#6649](https://github.com/paritytech/parity/pull/6649))
+  - Renamed RPC receipt statusCode field to status ([#6650](https://github.com/paritytech/parity/pull/6650))
+  - Fixed RETURNDATA size for built-ins ([#6652](https://github.com/paritytech/parity/pull/6652))
+- Byzantium fork block number ([#6661](https://github.com/paritytech/parity/pull/6661))
+- Refreshing block number on status view ([#6610](https://github.com/paritytech/parity/pull/6610))
+- Tweaked block download timeouts ([#6595](https://github.com/paritytech/parity/pull/6595))
+- Backports ([#6563](https://github.com/paritytech/parity/pull/6563))
+  - Sync progress and error handling fixes ([#6560](https://github.com/paritytech/parity/pull/6560))
+  - Fixed receipt serialization and RPC ([#6555](https://github.com/paritytech/parity/pull/6555))
+- Bump to v1.7.3

-## Parity-Ethereum [v2.6.2](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.2)
+## Parity [v1.7.2](https://github.com/paritytech/parity/releases/tag/v1.7.2) (2017-09-18)

-Parity Ethereum v2.6.2-stable is a bugfix release that fixes a potential DoS attack in the trace_call RPC method. This is a critical upgrade for anyone running Parity nodes with RPC exposed to the public internet (and highly recommended for anyone else). For details see this blog post.
+Parity 1.7.2 is a bug-fix release to improve performance and stability. Among others, it addresses the following:

-## Parity-Ethereum [v2.6.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.1)
+- Byzantium fork support for the Ropsten and Foundation networks.
+- Added support for the ConsenSys and Gnosis multi-signature wallets.
+- Significantly increased token registry and token balance lookup performance.
+- Fixed issues with the health status indicator in the wallet.
+- Tweaked warp-sync to quickly catch up with chains fallen back more than 10,000 blocks.
+- Fixes to the Chrome extension and macOS installer upgrades.

-Parity-Ethereum 2.6.1-beta is a patch release that improves stability.
+Full list of included changes:

-This release includes:
-  * Allow specifying hostnames for node URLs
-  * Fix a bug where archive nodes were losing peers
-  * Add support for Energy Web Foundations new chains 'Volta' and 'EWC', and remove their deprecated 'Tobalaba' chain.
+- Fix output from eth_call. ([#6538](https://github.com/paritytech/parity/pull/6538))
+- Ropsten fork ([#6532](https://github.com/paritytech/parity/pull/6532))
+- Byzantium updates ([#6529](https://github.com/paritytech/parity/pull/6529))
+  - Fix modexp bug: return 0 if base=0 ([#6424](https://github.com/paritytech/parity/pull/6424))
+  - Running state test using parity-evm ([#6355](https://github.com/paritytech/parity/pull/6355))
+    - Initial version of state tests.
+    - Refactor state to support tracing.
+    - Unify TransactResult.
+    - Add test.
+  - Byzantium updates ([#5855](https://github.com/paritytech/parity/pull/5855))
+    - EIP-211 updates
+    - Benchmarks
+    - Blockhash instruction gas cost updated
+    - More benches
+    - EIP-684
+    - EIP-649
+    - EIP-658
+    - Updated some tests
+    - Modexp fixes
+    - STATICCALL fixes
+    - Pairing fixes
+    - More STATICALL fixes
+    - Use paritytech/bn
+    - Fixed REVERTing of contract creation
+    - Fixed more tests
+    - Fixed more tests
+    - Blockchain tests
+    - Enable previously broken tests
+    - Transition test
+    - Updated tests
+    - Fixed modexp reading huge numbers
+    - Enabled max_code_size test
+    - Review fixes
+    - Updated pairing pricing
+    - Missing commas (style)
+    - Update test.rs
+    - Small improvements
+    - Eip161abc
+- Fix extension detection ([#6452](https://github.com/paritytech/parity/pull/6452)) ([#6524](https://github.com/paritytech/parity/pull/6524))
+  - Fix extension detection.
+  - Fix mobx quirks.
+  - Update submodule.
+- Fix detecting hardware wallets. ([#6509](https://github.com/paritytech/parity/pull/6509))
+- Allow hardware device reads without lock. ([#6517](https://github.com/paritytech/parity/pull/6517))
+- Backports [#6497](https://github.com/paritytech/parity/pull/6497)
+  - Fix slow balances ([#6471](https://github.com/paritytech/parity/pull/6471))
+    - Update token updates
+    - Update token info fetching
+    - Update logger
+    - Minor fixes to updates and notifications for balances
+    - Use Pubsub
+    - Fix timeout.
+    - Use pubsub for status.
+    - Fix signer subscription.
+    - Process tokens in chunks.
+    - Fix tokens loaded by chunks
+    - Dispatch tokens asap
+    - Fix chunks processing.
+    - Better filter options
+    - Parallel log fetching.
+    - Fix signer polling.
+    - Fix initial block query.
+    - Token balances updates : the right(er) way
+    - Better tokens info fetching
+    - Fixes in token data fetching
+    - Only fetch what's needed (tokens)
+    - Fix linting issues
+    - Update wasm-tests.
+    - Fixing balances fetching
+    - Fix requests tracking in UI
+    - Fix request watching
+    - Update the Logger
+    - PR Grumbles Fixes
+  - Eth_call returns output of contract creations ([#6420](https://github.com/paritytech/parity/pull/6420))
+    - Eth_call returns output of contract creations
+    - Fix parameters order.
+    - Save outputs for light client as well.
+  - Don't accept transactions above block gas limit.
+  - Expose health status over RPC ([#6274](https://github.com/paritytech/parity/pull/6274))
+     - Node-health to a separate crate.
+     - Initialize node_health outside of dapps.
+     - Expose health over RPC.
+     - Bring back 412 and fix JS.
+     - Add health to workspace and tests.
+     - Fix compilation without default features.
+     - Fix borked merge.
+     - Revert to generics to avoid virtual calls.
+     - Fix node-health tests.
+     - Add missing trailing comma.
+  - Fixing/removing failing JS tests.
+  - Do not activate genesis epoch in immediate transition validator contract ([#6349](https://github.com/paritytech/parity/pull/6349))
+  - Fix memory tracing.
+  - Add test to cover that.
+  - Ensure balances of constructor accounts are kept
+  - Test balance of spec-constructed account is kept
+- Fix warning spam. [#6369](https://github.com/paritytech/parity/pull/6369)
+- Bump to 1.7.2
+- Fix eth_call [#6366](https://github.com/paritytech/parity/pull/6366)
+- Backporting [#6352](https://github.com/paritytech/parity/pull/6352)
+  - Better check the created accounts before showing Startup Wizard [#6331](https://github.com/paritytech/parity/pull/6331)
+  - Tweaked snapshot params [#6344](https://github.com/paritytech/parity/pull/6344)
+- Increase default gas limit for eth_call [#6337](https://github.com/paritytech/parity/pull/6337)
+  - Fix balance increase.
+  - Cap gas limit for dapp-originating requests.
+- Backports [#6333](https://github.com/paritytech/parity/pull/6333)
+  - Overflow check in addition
+  - Unexpose methods on UI RPC. [#6295](https://github.com/paritytech/parity/pull/6295)
+  - Add more descriptive error when signing/decrypting using hw wallet.
+  - Format instant change proofs correctly
+  - Propagate stratum submit share error upstream [#6260](https://github.com/paritytech/parity/pull/6260)
+  - Updated jsonrpc [#6264](https://github.com/paritytech/parity/pull/6264)
+  - Using multiple NTP servers [#6173](https://github.com/paritytech/parity/pull/6173)
+    - Small improvements to time estimation.
+    - Allow multiple NTP servers to be used.
+    - Removing boxing.
+    - Update list of servers and add reference.
+  - Fix dapps CSP when UI is exposed externally [#6178](https://github.com/paritytech/parity/pull/6178)
+    - Allow embeding on any page when ui-hosts=all and fix dev_ui
+  - Fix cache path when using --base-path [#6212](https://github.com/paritytech/parity/pull/6212)
+  - Bump to v1.7.1
+- UI backports [#6332](https://github.com/paritytech/parity/pull/6332)
+  - Time should not contribue to overall status. [#6276](https://github.com/paritytech/parity/pull/6276)
+  - Add warning to web browser and fix links. [#6232](https://github.com/paritytech/parity/pull/6232)
+  - Extension fixes [#6284](https://github.com/paritytech/parity/pull/6284)
+    - Fix token symbols in extension.
+    - Allow connections from firefox extension.
+  - Add support for ConsenSys multisig wallet [#6153](https://github.com/paritytech/parity/pull/6153)
+    - First draft of ConsenSys wallet
+    - Fix transfer store // WIP Consensys Wallet
+    - Rename walletABI JSON file
+    - Fix wrong daylimit in wallet modal
+    - Confirm/Revoke ConsensysWallet txs
+    - Change of settings for the Multisig Wallet
+- Update README for beta [#6270](https://github.com/paritytech/parity/pull/6270)
+- Fixed macOS installer upgrade [#6221](https://github.com/paritytech/parity/pull/6221)

-The full list of included changes:
-  * Add support for Energy Web Foundation's new chains (#10957)
-  * Kaspersky AV whitelisting (#10919)
-  * Avast whitelist script (#10900)
-  * Docker images renaming (#10863)
-  * Remove excessive warning (#10831)
-  * Allow --nat extip:your.host.here.org (#10830)
-  * When updating the client or when called from RPC, sleep should mean sleep (#10814)
-  * added new ropsten-bootnode and removed old one (#10794)
-  * ethkey no longer uses byteorder (#10786)
-  * docs: Update Readme with TOC, Contributor Guideline. Update Cargo package descriptions (#10652)
+## Parity [v1.7.0](https://github.com/paritytech/parity/releases/tag/v1.7.0) (2017-07-28)

-## Parity-Ethereum [v2.6.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.0)
+Parity 1.7.0 is a major release introducing several important features:

-Parity-Ethereum 2.6.0-beta is a minor release that stabilizes the 2.6 branch by
-marking it as a beta release.
+- **Experimental [Light client](https://github.com/paritytech/parity/wiki/The-Parity-Light-Protocol-(PIP)) support**. Start Parity with `--light` to enable light mode. Please, note: The wallet UI integration for the light client is not included, yet.
+- **Experimental web wallet**. A hosted version of Parity that keeps the keys and signs transactions using your browser storage. Try it at https://wallet.parity.io or run your own with `--public-node`.
+- **WASM contract support**. Private networks can run contracts compiled into WASM bytecode. _More information and documentation to follow_.
+- **DApps and RPC server merge**. DApp and RPC are now available through a single API endpoint. DApp server related settings are deprecated.
+- **Export accounts from the wallet**. Backing up your keys can now simply be managed through the wallet interface.
+- **PoA/Kovan validator set contract**. The PoA network validator-set management via smart contract is now supported by warp and, in the near future, light sync.
+- **PubSub API**. https://github.com/paritytech/parity/wiki/JSONRPC-Parity-Pub-Sub-module
+- **Signer apps for IOS and Android**.

-This release includes:
-  * Major refactoring of the codebase
-  * Many bugfixes
-  * Significant improvements to logging, error and warning message clarity.
-  * SecretStore: remove support of old database formats (#10757)
-      * This is a potentially breaking change if you have not upgraded for
-          quite some time.
+Full list of included changes:

- As of today, Parity-Ethereum 2.4 reaches end of life, and everyone is
- encouraged to upgrade.
+- Backports [#6163](https://github.com/paritytech/parity/pull/6163)
+  - Light client improvements ([#6156](https://github.com/paritytech/parity/pull/6156))
+    - No seal checking
+    - Import command and --no-seal-check for light client
+    - Fix eth_call
+    - Tweak registry dapps lookup
+    - Ignore failed requests to non-server peers
+  - Fix connecting to wildcard addresses. ([#6167](https://github.com/paritytech/parity/pull/6167))
+  - Don't display an overlay in case the time sync check fails. ([#6164](https://github.com/paritytech/parity/pull/6164))
+    - Small improvements to time estimation.
+    - Temporarily disable NTP time check by default.
+- Light client fixes ([#6148](https://github.com/paritytech/parity/pull/6148)) [#6151](https://github.com/paritytech/parity/pull/6151)
+  - Light client fixes
+  - Fix memory-lru-cache
+  - Clear pending reqs on disconnect
+- Filter tokens logs from current block, not genesis ([#6128](https://github.com/paritytech/parity/pull/6128)) [#6141](https://github.com/paritytech/parity/pull/6141)
+- Fix QR scanner returning null on confirm [#6122](https://github.com/paritytech/parity/pull/6122)
+- Check QR before lowercase ([#6119](https://github.com/paritytech/parity/pull/6119)) [#6120](https://github.com/paritytech/parity/pull/6120)
+- Remove chunk to restore from pending set only upon successful import [#6117](https://github.com/paritytech/parity/pull/6117)
+- Fixed node address detection on incoming connection [#6094](https://github.com/paritytech/parity/pull/6094)
+- Place RETURNDATA behind block number gate [#6095](https://github.com/paritytech/parity/pull/6095)
+- Update wallet library binaries [#6108](https://github.com/paritytech/parity/pull/6108)
+- Backported wallet fix [#6105](https://github.com/paritytech/parity/pull/6105)
+  - Fix initialisation bug. ([#6102](https://github.com/paritytech/parity/pull/6102))
+  - Update wallet library modifiers ([#6103](https://github.com/paritytech/parity/pull/6103))
+- Place RETURNDATA behind block number gate [#6095](https://github.com/paritytech/parity/pull/6095)
+- Fixed node address detection on incoming connection [#6094](https://github.com/paritytech/parity/pull/6094)
+- Bump snap version and tweak importing detection logic ([#6079](https://github.com/paritytech/parity/pull/6079)) [#6081](https://github.com/paritytech/parity/pull/6081)
+  - bump last tick just before printing info and restore sync detection
+  - bump kovan snapshot version
+  - Fixed sync tests
+  - Fixed rpc tests
+- Acquire client report under lock in informant [#6071](https://github.com/paritytech/parity/pull/6071)
+- Show busy indicator on Address forget [#6069](https://github.com/paritytech/parity/pull/6069)
+- Add CSP for worker-src ([#6059](https://github.com/paritytech/parity/pull/6059)) [#6064](https://github.com/paritytech/parity/pull/6064)
+  - Specify worker-src seperately, add blob
+  - Upgrade react-qr-scan to latest version
+- Set release channel to beta
+- Limit transaction queue memory & limit future queue [#6038](https://github.com/paritytech/parity/pull/6038)
+- Fix CI build issue [#6050](https://github.com/paritytech/parity/pull/6050)
+- New contract PoA sync fixes [#5991](https://github.com/paritytech/parity/pull/5991)
+- Fixed link to Multisig Contract Wallet on master [#5984](https://github.com/paritytech/parity/pull/5984)
+- Ethcore crate split part 1 [#6041](https://github.com/paritytech/parity/pull/6041)
+- Fix status icon [#6039](https://github.com/paritytech/parity/pull/6039)
+- Errors & warnings for inappropriate RPCs [#6029](https://github.com/paritytech/parity/pull/6029)
+- Add missing CSP for web3.site [#5992](https://github.com/paritytech/parity/pull/5992)
+- Remove cargo install --git from README.md [#6037](https://github.com/paritytech/parity/pull/6037)
+- Node Health warnings [#5951](https://github.com/paritytech/parity/pull/5951)
+- RPC cpu pool [#6023](https://github.com/paritytech/parity/pull/6023)
+- Use crates.io dependencies for parity-wasm [#6036](https://github.com/paritytech/parity/pull/6036)
+- Add test for loading the chain specs [#6028](https://github.com/paritytech/parity/pull/6028)
+- Whitelist APIs for generic Pub-Sub [#5840](https://github.com/paritytech/parity/pull/5840)
+- WASM contracts MVP [#5679](https://github.com/paritytech/parity/pull/5679)
+- Fix valid QR scan not advancing [#6033](https://github.com/paritytech/parity/pull/6033)
+- --reseal-on-uncle [#5940](https://github.com/paritytech/parity/pull/5940)
+- Support comments in reserved peers file ([#6004](https://github.com/paritytech/parity/pull/6004)) [#6012](https://github.com/paritytech/parity/pull/6012)
+- Add new md tnc [#5937](https://github.com/paritytech/parity/pull/5937)
+- Fix output of parity-evm in case of bad instruction [#5955](https://github.com/paritytech/parity/pull/5955)
+- Don't send notifications to unsubscribed clients of PubSub [#5960](https://github.com/paritytech/parity/pull/5960)
+- Proper light client informant and more verification of imported headers [#5897](https://github.com/paritytech/parity/pull/5897)
+- New Kovan bootnodes [#6017](https://github.com/paritytech/parity/pull/6017)
+- Use standard paths for Ethash cache [#5881](https://github.com/paritytech/parity/pull/5881)
+- Defer code hash calculation. [#5959](https://github.com/paritytech/parity/pull/5959)
+- Fix first run wizard. [#6000](https://github.com/paritytech/parity/pull/6000)
+- migration to serde 1.0 [#5996](https://github.com/paritytech/parity/pull/5996)
+- SecretStore: generating signatures [#5764](https://github.com/paritytech/parity/pull/5764)
+- bigint upgraded to version 3.0 [#5986](https://github.com/paritytech/parity/pull/5986)
+- config: don't allow dev chain with force sealing option [#5965](https://github.com/paritytech/parity/pull/5965)
+- Update lockfile for miniz-sys and gcc [#5969](https://github.com/paritytech/parity/pull/5969)
+- Clean up function naming in RPC error module [#5995](https://github.com/paritytech/parity/pull/5995)
+- Fix underflow in gas calculation [#5975](https://github.com/paritytech/parity/pull/5975)
+- PubSub for parity-js [#5830](https://github.com/paritytech/parity/pull/5830)
+- Report whether a peer was kept from `Handler::on_connect` [#5958](https://github.com/paritytech/parity/pull/5958)
+- Implement skeleton for transaction index and epoch transition proof PIP messages [#5908](https://github.com/paritytech/parity/pull/5908)
+- TransactionQueue improvements [#5917](https://github.com/paritytech/parity/pull/5917)
+- constant time HMAC comparison and clarify docs in ethkey [#5952](https://github.com/paritytech/parity/pull/5952)
+- Avoid pre-computing jump destinations [#5954](https://github.com/paritytech/parity/pull/5954)
+- Upgrade elastic array [#5949](https://github.com/paritytech/parity/pull/5949)
+- PoA: Wait for transition finality before applying [#5774](https://github.com/paritytech/parity/pull/5774)
+- Logs Pub-Sub [#5705](https://github.com/paritytech/parity/pull/5705)
+- Add the command to install the parity snap [#5945](https://github.com/paritytech/parity/pull/5945)
+- Reduce unnecessary allocations [#5944](https://github.com/paritytech/parity/pull/5944)
+- Clarify confusing messages. [#5935](https://github.com/paritytech/parity/pull/5935)
+- Content Security Policy [#5790](https://github.com/paritytech/parity/pull/5790)
+- CLI: Export error message and less verbose peer counter. [#5870](https://github.com/paritytech/parity/pull/5870)
+- network: make it more explicit about StreamToken and TimerToken [#5939](https://github.com/paritytech/parity/pull/5939)
+- sync: make it more idiomatic rust [#5938](https://github.com/paritytech/parity/pull/5938)
+- Prioritize accounts over address book [#5909](https://github.com/paritytech/parity/pull/5909)
+- Fixing failing compilation of RPC test on master. [#5916](https://github.com/paritytech/parity/pull/5916)
+- Empty local middleware, until explicitly requested [#5912](https://github.com/paritytech/parity/pull/5912)
+- Cancel propagated TX [#5899](https://github.com/paritytech/parity/pull/5899)
+- fix minor race condition in aura seal generation [#5910](https://github.com/paritytech/parity/pull/5910)
+- Docs for Pub-Sub, optional parameter for parity_subscribe [#5833](https://github.com/paritytech/parity/pull/5833)
+- Fix gas editor doubling-up on gas [#5820](https://github.com/paritytech/parity/pull/5820)
+- Information about used paths added to general output block [#5904](https://github.com/paritytech/parity/pull/5904)
+- Domain-locked web tokens. [#5894](https://github.com/paritytech/parity/pull/5894)
+- Removed panic handlers [#5895](https://github.com/paritytech/parity/pull/5895)
+- Latest changes from Rust RocksDB binding merged [#5905](https://github.com/paritytech/parity/pull/5905)
+- Adjust keyethereum/secp256 aliasses [#5903](https://github.com/paritytech/parity/pull/5903)
+- Keyethereum fs dependency [#5902](https://github.com/paritytech/parity/pull/5902)
+- Ethereum Classic Monetary Policy [#5741](https://github.com/paritytech/parity/pull/5741)
+- Initial token should allow full access. [#5873](https://github.com/paritytech/parity/pull/5873)
+- Fixed account selection for Dapps on public node [#5856](https://github.com/paritytech/parity/pull/5856)
+- blacklist bad snapshot manifest hashes upon failure [#5874](https://github.com/paritytech/parity/pull/5874)
+- Fix wrongly called timeouts [#5838](https://github.com/paritytech/parity/pull/5838)
+- ArchiveDB and other small fixes [#5867](https://github.com/paritytech/parity/pull/5867)
+- convert try!() to ? [#5866](https://github.com/paritytech/parity/pull/5866)
+- Make config file optional in systemd [#5847](https://github.com/paritytech/parity/pull/5847)
+- EIP-116 (214), [#4833](https://github.com/paritytech/parity/issues/4833) [#4851](https://github.com/paritytech/parity/pull/4851)
+- all executables are workspace members [#5865](https://github.com/paritytech/parity/pull/5865)
+- minor optimizations of the modexp builtin [#5860](https://github.com/paritytech/parity/pull/5860)
+- three small commits for HashDB and MemoryDB [#5766](https://github.com/paritytech/parity/pull/5766)
+- use rust 1.18's retain to boost the purge performance [#5801](https://github.com/paritytech/parity/pull/5801)
+- Allow IPFS server to accept POST requests [#5858](https://github.com/paritytech/parity/pull/5858)
+- Dutch i18n from [#5802](https://github.com/paritytech/parity/issues/5802) for master [#5836](https://github.com/paritytech/parity/pull/5836)
+- Typos in token deploy dapp ui [#5851](https://github.com/paritytech/parity/pull/5851)
+- A CLI flag to allow fast transaction signing when account is unlocked. [#5778](https://github.com/paritytech/parity/pull/5778)
+- Removing `additional` field from EVM instructions [#5821](https://github.com/paritytech/parity/pull/5821)
+- Don't fail on wrong log decoding [#5813](https://github.com/paritytech/parity/pull/5813)
+- Use randomized subscription ids for PubSub [#5756](https://github.com/paritytech/parity/pull/5756)
+- Fixed mem write for empty slice [#5827](https://github.com/paritytech/parity/pull/5827)
+- Fix party technologies [#5810](https://github.com/paritytech/parity/pull/5810)
+- Revert "Fixed mem write for empty slice" [#5826](https://github.com/paritytech/parity/pull/5826)
+- Fixed mem write for empty slice [#5825](https://github.com/paritytech/parity/pull/5825)
+- Fix JS tests [#5822](https://github.com/paritytech/parity/pull/5822)
+- Bump native-tls and openssl crates. [#5817](https://github.com/paritytech/parity/pull/5817)
+- Public node using WASM [#5734](https://github.com/paritytech/parity/pull/5734)
+- enforce block signer == author field in PoA [#5808](https://github.com/paritytech/parity/pull/5808)
+- Fix stack display in evmbin. [#5733](https://github.com/paritytech/parity/pull/5733)
+- Disable UI if it's not compiled in. [#5773](https://github.com/paritytech/parity/pull/5773)
+- Require phrase confirmation. [#5731](https://github.com/paritytech/parity/pull/5731)
+- Duration limit made optional for EthashParams [#5777](https://github.com/paritytech/parity/pull/5777)
+- Update Changelog for 1.6.8 [#5798](https://github.com/paritytech/parity/pull/5798)
+- Replace Ethcore comany name in T&C and some other places [#5796](https://github.com/paritytech/parity/pull/5796)
+- PubSub for IPC. [#5800](https://github.com/paritytech/parity/pull/5800)
+- Fix terminology distributed -> decentralized applications [#5797](https://github.com/paritytech/parity/pull/5797)
+- Disable compression for RLP strings [#5786](https://github.com/paritytech/parity/pull/5786)
+- update the source for the snapcraft package [#5781](https://github.com/paritytech/parity/pull/5781)
+- Fixed default UI port for mac installer [#5782](https://github.com/paritytech/parity/pull/5782)
+- Block invalid account name creation [#5784](https://github.com/paritytech/parity/pull/5784)
+- Update Cid/multihash/ring/tinykeccak [#5785](https://github.com/paritytech/parity/pull/5785)
+- use NULL_RLP, remove NULL_RLP_STATIC [#5742](https://github.com/paritytech/parity/pull/5742)
+- Blacklist empty phrase account. [#5730](https://github.com/paritytech/parity/pull/5730)
+- EIP-211 RETURNDATACOPY and RETURNDATASIZE [#5678](https://github.com/paritytech/parity/pull/5678)
+- Bump mio [#5763](https://github.com/paritytech/parity/pull/5763)
+- Fixing UI issues after UI server refactor [#5710](https://github.com/paritytech/parity/pull/5710)
+- Fix WS server expose issue. [#5728](https://github.com/paritytech/parity/pull/5728)
+- Fix local transactions without condition. [#5716](https://github.com/paritytech/parity/pull/5716)
+- Bump parity-wordlist. [#5748](https://github.com/paritytech/parity/pull/5748)
+- two small changes in evm [#5700](https://github.com/paritytech/parity/pull/5700)
+- Evmbin: JSON format printing pre-state. [#5712](https://github.com/paritytech/parity/pull/5712)
+- Recover from empty phrase in dev mode [#5698](https://github.com/paritytech/parity/pull/5698)
+- EIP-210 BLOCKHASH changes [#5505](https://github.com/paritytech/parity/pull/5505)
+- fixes typo [#5708](https://github.com/paritytech/parity/pull/5708)
+- Bump rocksdb [#5707](https://github.com/paritytech/parity/pull/5707)
+- Fixed --datadir option [#5697](https://github.com/paritytech/parity/pull/5697)
+- rpc -> weak to arc [#5688](https://github.com/paritytech/parity/pull/5688)
+- typo fix [#5699](https://github.com/paritytech/parity/pull/5699)
+- Revamping parity-evmbin [#5696](https://github.com/paritytech/parity/pull/5696)
+- Update dependencies and bigint api [#5685](https://github.com/paritytech/parity/pull/5685)
+- UI server refactoring [#5580](https://github.com/paritytech/parity/pull/5580)
+- Fix from/into electrum in ethkey [#5686](https://github.com/paritytech/parity/pull/5686)
+- Add unit tests [#5668](https://github.com/paritytech/parity/pull/5668)
+- Guanqun add unit tests [#5671](https://github.com/paritytech/parity/pull/5671)
+- Parity-PubSub as a separate API. [#5676](https://github.com/paritytech/parity/pull/5676)
+- EIP-140 REVERT opcode [#5477](https://github.com/paritytech/parity/pull/5477)
+- Update CHANGELOG for 1.6.7 [#5683](https://github.com/paritytech/parity/pull/5683)
+- Updated docs slightly. [#5674](https://github.com/paritytech/parity/pull/5674)
+- Fix build [#5684](https://github.com/paritytech/parity/pull/5684)
+- Back-references for the on-demand service [#5573](https://github.com/paritytech/parity/pull/5573)
+- Dynamically adjust PIP request costs based on gathered data [#5603](https://github.com/paritytech/parity/pull/5603)
+- use cargo workspace [#5601](https://github.com/paritytech/parity/pull/5601)
+- Latest headers Pub-Sub [#5655](https://github.com/paritytech/parity/pull/5655)
+- improved dockerfile builds [#5659](https://github.com/paritytech/parity/pull/5659)
+- Adding CLI options: port shift and unsafe expose. [#5677](https://github.com/paritytech/parity/pull/5677)
+- Report missing author in Aura [#5583](https://github.com/paritytech/parity/pull/5583)
+- typo fix [#5669](https://github.com/paritytech/parity/pull/5669)
+- Remove public middleware (temporary) [#5665](https://github.com/paritytech/parity/pull/5665)
+- Remove additional polyfill [#5663](https://github.com/paritytech/parity/pull/5663)
+- Importing accounts from files. [#5644](https://github.com/paritytech/parity/pull/5644)
+- remove the deprecated options in rustfmt.toml [#5616](https://github.com/paritytech/parity/pull/5616)
+- Update the Console dapp [#5602](https://github.com/paritytech/parity/pull/5602)
+- Create an account for chain=dev [#5612](https://github.com/paritytech/parity/pull/5612)
+- Use babel-runtime as opposed to babel-polyfill [#5662](https://github.com/paritytech/parity/pull/5662)
+- Connection dialog timestamp info [#5554](https://github.com/paritytech/parity/pull/5554)
+- use copy_from_slice instead of for loop [#5647](https://github.com/paritytech/parity/pull/5647)
+- Light friendly dapps [#5634](https://github.com/paritytech/parity/pull/5634)
+- Add Recover button to Accounts and warnings [#5645](https://github.com/paritytech/parity/pull/5645)
+- Update eth_sign docs. [#5631](https://github.com/paritytech/parity/pull/5631)
+- Proper signer Pub-Sub for pending requests. [#5594](https://github.com/paritytech/parity/pull/5594)
+- Bump bigint to 1.0.5 [#5641](https://github.com/paritytech/parity/pull/5641)
+- PoA warp implementation [#5488](https://github.com/paritytech/parity/pull/5488)
+- Improve on-demand dispatch and add support for batch requests [#5419](https://github.com/paritytech/parity/pull/5419)
+- Use default account for sending transactions [#5588](https://github.com/paritytech/parity/pull/5588)
+- Add peer management to the Status tab [#5566](https://github.com/paritytech/parity/pull/5566)
+- Add monotonic step transition [#5587](https://github.com/paritytech/parity/pull/5587)
+- Decrypting for external accounts. [#5581](https://github.com/paritytech/parity/pull/5581)
+- only enable warp sync when engine supports it [#5595](https://github.com/paritytech/parity/pull/5595)
+- fix the doc of installing rust [#5586](https://github.com/paritytech/parity/pull/5586)
+- Small fixes [#5584](https://github.com/paritytech/parity/pull/5584)
+- SecretStore: remove session on master node [#5545](https://github.com/paritytech/parity/pull/5545)
+- run-clean [#5607](https://github.com/paritytech/parity/pull/5607)
+- relicense RLP to MIT/Apache2 [#5591](https://github.com/paritytech/parity/pull/5591)
+- Fix eth_sign signature encoding. [#5597](https://github.com/paritytech/parity/pull/5597)
+- Check pending request on Node local transactions [#5564](https://github.com/paritytech/parity/pull/5564)
+- Add tooltips on ActionBar [#5562](https://github.com/paritytech/parity/pull/5562)
+- Can't deploy without compiling Contract [#5593](https://github.com/paritytech/parity/pull/5593)
+- Add a warning when node is syncing [#5565](https://github.com/paritytech/parity/pull/5565)
+- Update registry middleware [#5585](https://github.com/paritytech/parity/pull/5585)
+- Set block condition to BigNumber in MethodDecoding [#5592](https://github.com/paritytech/parity/pull/5592)
+- Load the sources immediately in Contract Dev [#5575](https://github.com/paritytech/parity/pull/5575)
+- Remove formal verification messages in Dev Contract [#5574](https://github.com/paritytech/parity/pull/5574)
+- Fix event params decoding when no names for parameters [#5567](https://github.com/paritytech/parity/pull/5567)
+- Do not convert to Dates twice [#5563](https://github.com/paritytech/parity/pull/5563)
+- Fix Multisig wallet settings [#5560](https://github.com/paritytech/parity/pull/5560)
+- Typo [#5547](https://github.com/paritytech/parity/pull/5547)
+- Generic PubSub implementation [#5456](https://github.com/paritytech/parity/pull/5456)
+- Fix CI paths. [#5570](https://github.com/paritytech/parity/pull/5570)
+- reorg into blocks before minimum history [#5558](https://github.com/paritytech/parity/pull/5558)
+- EIP-86 update [#5506](https://github.com/paritytech/parity/pull/5506)
+- Secretstore RPCs + integration [#5439](https://github.com/paritytech/parity/pull/5439)
+- Fixes Parity Bar position [#5557](https://github.com/paritytech/parity/pull/5557)
+- Fixes invalid log in BadgeReg events [#5556](https://github.com/paritytech/parity/pull/5556)
+- Fix issues in Contract Development view [#5555](https://github.com/paritytech/parity/pull/5555)
+- Added missing methods [#5542](https://github.com/paritytech/parity/pull/5542)
+- option to disable persistent txqueue [#5544](https://github.com/paritytech/parity/pull/5544)
+- Bump jsonrpc [#5552](https://github.com/paritytech/parity/pull/5552)
+- Retrieve block headers only for header-only info [#5480](https://github.com/paritytech/parity/pull/5480)
+- add snap to CI [#5519](https://github.com/paritytech/parity/pull/5519)
+- Pass additional data when reporting [#5527](https://github.com/paritytech/parity/pull/5527)
+- Calculate post-constructors state root in spec at load time [#5523](https://github.com/paritytech/parity/pull/5523)
+- Fix utf8 decoding [#5533](https://github.com/paritytech/parity/pull/5533)
+- Add CHANGELOG.md [#5513](https://github.com/paritytech/parity/pull/5513)
+- Change all occurrences of ethcore.io into parity.io [#5528](https://github.com/paritytech/parity/pull/5528)
+- Memory usage optimization [#5526](https://github.com/paritytech/parity/pull/5526)
+- Compose transaction RPC. [#5524](https://github.com/paritytech/parity/pull/5524)
+- Support external eth_sign  [#5481](https://github.com/paritytech/parity/pull/5481)
+- Treat block numbers as strings, not BigNums. [#5449](https://github.com/paritytech/parity/pull/5449)
+- npm cleanups [#5512](https://github.com/paritytech/parity/pull/5512)
+- Export acc js [#4973](https://github.com/paritytech/parity/pull/4973)
+- YARN [#5395](https://github.com/paritytech/parity/pull/5395)
+- Fix linting issues [#5511](https://github.com/paritytech/parity/pull/5511)
+- Chinese Translation [#5460](https://github.com/paritytech/parity/pull/5460)
+- Fixing secretstore TODOs - part 2 [#5416](https://github.com/paritytech/parity/pull/5416)
+- fix json format of state snapshot [#5504](https://github.com/paritytech/parity/pull/5504)
+- Bump jsonrpc version [#5489](https://github.com/paritytech/parity/pull/5489)
+- Groundwork for generalized warp sync [#5454](https://github.com/paritytech/parity/pull/5454)
+- Add the packaging metadata to build the parity snap [#5496](https://github.com/paritytech/parity/pull/5496)
+- Cancel tx JS [#4958](https://github.com/paritytech/parity/pull/4958)
+- EIP-212 (bn128 curve pairing) [#5307](https://github.com/paritytech/parity/pull/5307)
+- fix panickers in tree-route [#5479](https://github.com/paritytech/parity/pull/5479)
+- Update links to etherscan.io [#5455](https://github.com/paritytech/parity/pull/5455)
+- Refresh UI on nodeKind changes, e.g. personal -> public [#5312](https://github.com/paritytech/parity/pull/5312)
+- Correct contract address for EIP-86 [#5473](https://github.com/paritytech/parity/pull/5473)
+- Force two decimals for USD conversion rate [#5471](https://github.com/paritytech/parity/pull/5471)
+- Refactoring of Tokens & Balances [#5372](https://github.com/paritytech/parity/pull/5372)
+- Background-repeat round [#5475](https://github.com/paritytech/parity/pull/5475)
+- nl i18n updated [#5461](https://github.com/paritytech/parity/pull/5461)
+- Show ETH value (even 0) if ETH transfer in transaction list [#5406](https://github.com/paritytech/parity/pull/5406)
+- Store the pending requests per network version [#5405](https://github.com/paritytech/parity/pull/5405)
+- Use in-memory database for tests [#5451](https://github.com/paritytech/parity/pull/5451)
+- WebSockets RPC server [#5425](https://github.com/paritytech/parity/pull/5425)
+- Added missing docs [#5452](https://github.com/paritytech/parity/pull/5452)
+- Tests and tweaks for public node middleware [#5417](https://github.com/paritytech/parity/pull/5417)
+- Fix removal of hash-mismatched files. [#5440](https://github.com/paritytech/parity/pull/5440)
+- parity_getBlockHeaderByNumber and LightFetch utility [#5383](https://github.com/paritytech/parity/pull/5383)
+- New state tests [#5418](https://github.com/paritytech/parity/pull/5418)
+- Fix buffer length for QR code gen. [#5447](https://github.com/paritytech/parity/pull/5447)
+- Add raw hash signing [#5423](https://github.com/paritytech/parity/pull/5423)
+- Filters and block RPCs for the light client [#5320](https://github.com/paritytech/parity/pull/5320)
+- Work around mismatch for QR checksum [#5374](https://github.com/paritytech/parity/pull/5374)
+- easy to use conversion from and to string for ethstore::Crypto [#5437](https://github.com/paritytech/parity/pull/5437)
+- Tendermint fixes [#5415](https://github.com/paritytech/parity/pull/5415)
+- Adrianbrink lightclientcache branch. [#5428](https://github.com/paritytech/parity/pull/5428)
+- Add caching to HeaderChain struct [#5403](https://github.com/paritytech/parity/pull/5403)
+- Add decryption to the UI (in the Signer) [#5422](https://github.com/paritytech/parity/pull/5422)
+- Add CIDv0 RPC [#5414](https://github.com/paritytech/parity/pull/5414)
+- Updating documentation for RPCs [#5392](https://github.com/paritytech/parity/pull/5392)
+- Fixing secretstore TODOs - part 1 [#5386](https://github.com/paritytech/parity/pull/5386)
+- Fixing disappearing content. [#5399](https://github.com/paritytech/parity/pull/5399)
+- Snapshot chunks packed by size [#5318](https://github.com/paritytech/parity/pull/5318)
+- APIs wildcards and simple arithmetic. [#5402](https://github.com/paritytech/parity/pull/5402)
+- Fixing compilation without dapps. [#5410](https://github.com/paritytech/parity/pull/5410)
+- Don't use port 8080 anymore [#5397](https://github.com/paritytech/parity/pull/5397)
+- Quick'n'dirty CLI for the light client [#5002](https://github.com/paritytech/parity/pull/5002)
+- set gas limit before proving transactions [#5401](https://github.com/paritytech/parity/pull/5401)
+- Public node: perf and fixes [#5390](https://github.com/paritytech/parity/pull/5390)
+- Straight download path in the readme [#5393](https://github.com/paritytech/parity/pull/5393)
+- On-chain ACL checker for secretstore [#5015](https://github.com/paritytech/parity/pull/5015)
+- Allow empty-encoded values from QR encoding [#5385](https://github.com/paritytech/parity/pull/5385)
+- Update npm build for new inclusions [#5381](https://github.com/paritytech/parity/pull/5381)
+- Fix for Ubuntu Dockerfile [#5356](https://github.com/paritytech/parity/pull/5356)
+- Secretstore over network [#4974](https://github.com/paritytech/parity/pull/4974)
+- Dapps and RPC server merge [#5365](https://github.com/paritytech/parity/pull/5365)
+- trigger js build release [#5379](https://github.com/paritytech/parity/pull/5379)
+- Update expanse json with fork at block 600000 [#5351](https://github.com/paritytech/parity/pull/5351)
+- Futures-based native wrappers for contract ABIs [#5341](https://github.com/paritytech/parity/pull/5341)
+- Kovan warp sync fixed [#5337](https://github.com/paritytech/parity/pull/5337)
+- Aura eip155 validation transition [#5362](https://github.com/paritytech/parity/pull/5362)
+- Shared wordlist for brain wallets [#5331](https://github.com/paritytech/parity/pull/5331)
+- Allow signing via Qr [#4881](https://github.com/paritytech/parity/pull/4881)
+- Allow entry of url or hash for DappReg meta [#5360](https://github.com/paritytech/parity/pull/5360)
+- Adjust tx overlay colours [#5353](https://github.com/paritytech/parity/pull/5353)
+- Add ability to disallow API subscriptions [#5366](https://github.com/paritytech/parity/pull/5366)
+- EIP-213 (bn128 curve operations) [#4999](https://github.com/paritytech/parity/pull/4999)
+- Fix analize output file name [#5357](https://github.com/paritytech/parity/pull/5357)
+- Add default eip155 validation [#5346](https://github.com/paritytech/parity/pull/5346)
+- Add new seed nodes for Classic chain [#5345](https://github.com/paritytech/parity/pull/5345)
+- Shared wordlist for frontend [#5336](https://github.com/paritytech/parity/pull/5336)
+- fix rpc tests [#5338](https://github.com/paritytech/parity/pull/5338)
+- Public node with accounts and signing in Frontend [#5304](https://github.com/paritytech/parity/pull/5304)
+- Rename Status/Status -> Status/NodeStatus [#5332](https://github.com/paritytech/parity/pull/5332)
+- Updating paths to repos. [#5330](https://github.com/paritytech/parity/pull/5330)
+- Separate status for canceled local transactions. [#5319](https://github.com/paritytech/parity/pull/5319)
+- Cleanup the Status View [#5317](https://github.com/paritytech/parity/pull/5317)
+- Update UI minimised requests [#5324](https://github.com/paritytech/parity/pull/5324)
+- Order signer transactions FIFO [#5321](https://github.com/paritytech/parity/pull/5321)
+- updating dependencies [#5028](https://github.com/paritytech/parity/pull/5028)
+- Minimise transactions progress [#4942](https://github.com/paritytech/parity/pull/4942)
+- Fix eth_sign showing as wallet account [#5309](https://github.com/paritytech/parity/pull/5309)
+- Ropsten revival [#5302](https://github.com/paritytech/parity/pull/5302)
+- Strict validation transitions [#4988](https://github.com/paritytech/parity/pull/4988)
+- Fix default list sorting [#5303](https://github.com/paritytech/parity/pull/5303)
+- Use unique owners for multisig wallets [#5298](https://github.com/paritytech/parity/pull/5298)
+- Copy all existing i18n strings into zh (as-is translation aid) [#5305](https://github.com/paritytech/parity/pull/5305)
+- Fix booleans in Typedinput [#5295](https://github.com/paritytech/parity/pull/5295)
+- node kind RPC [#5025](https://github.com/paritytech/parity/pull/5025)
+- Fix the use of MobX in playground [#5294](https://github.com/paritytech/parity/pull/5294)
+- Fine grained snapshot chunking [#5019](https://github.com/paritytech/parity/pull/5019)
+- Add lint:i18n to find missing & extra keys [#5290](https://github.com/paritytech/parity/pull/5290)
+- Scaffolding for zh translations, including first-round by @btceth [#5289](https://github.com/paritytech/parity/pull/5289)
+- JS package bumps [#5287](https://github.com/paritytech/parity/pull/5287)
+- Auto-extract new i18n strings (update) [#5288](https://github.com/paritytech/parity/pull/5288)
+- eip100b [#5027](https://github.com/paritytech/parity/pull/5027)
+- Set earliest era in snapshot restoration [#5021](https://github.com/paritytech/parity/pull/5021)
+- Avoid clogging up tmp when updater dir has bad permissions. [#5024](https://github.com/paritytech/parity/pull/5024)
+- Resilient warp sync [#5018](https://github.com/paritytech/parity/pull/5018)
+- Create webpack analysis files (size) [#5009](https://github.com/paritytech/parity/pull/5009)
+- Dispatch an open event on drag of Parity Bar [#4987](https://github.com/paritytech/parity/pull/4987)
+- Various installer and tray apps fixes [#4970](https://github.com/paritytech/parity/pull/4970)
+- Export account RPC [#4967](https://github.com/paritytech/parity/pull/4967)
+- Switching ValidatorSet [#4961](https://github.com/paritytech/parity/pull/4961)
+- Implement PIP messages, request builder, and handlers [#4945](https://github.com/paritytech/parity/pull/4945)
+- auto lint [#5003](https://github.com/paritytech/parity/pull/5003)
+- Fix FireFox overflows [#5000](https://github.com/paritytech/parity/pull/5000)
+- Show busy indicator, focus first field in password change [#4997](https://github.com/paritytech/parity/pull/4997)
+- Consistent store naming in the Signer components [#4996](https://github.com/paritytech/parity/pull/4996)
+- second (and last) part of rlp refactor [#4901](https://github.com/paritytech/parity/pull/4901)
+- Double click to select account creation type [#4986](https://github.com/paritytech/parity/pull/4986)
+- Fixes to the Registry dapp [#4984](https://github.com/paritytech/parity/pull/4984)
+- Extend api.util [#4979](https://github.com/paritytech/parity/pull/4979)
+- Updating JSON-RPC crates [#4934](https://github.com/paritytech/parity/pull/4934)
+- splitting part of util into smaller crates [#4956](https://github.com/paritytech/parity/pull/4956)
+- Updating syntex et al [#4983](https://github.com/paritytech/parity/pull/4983)
+- EIP198 and built-in activation [#4926](https://github.com/paritytech/parity/pull/4926)
+- Fix MethodDecoding for Arrays [#4977](https://github.com/paritytech/parity/pull/4977)
+- Try to fix WS race condition connection [#4976](https://github.com/paritytech/parity/pull/4976)
+- eth_sign where account === undefined [#4964](https://github.com/paritytech/parity/pull/4964)
+- Fix references to api outside of `parity.js` [#4981](https://github.com/paritytech/parity/pull/4981)
+- Fix Password Dialog form overflow [#4968](https://github.com/paritytech/parity/pull/4968)
+- Changing Mutex into RwLock for transaction queue [#4951](https://github.com/paritytech/parity/pull/4951)
+- Disable max seal period for external sealing [#4927](https://github.com/paritytech/parity/pull/4927)
+- Attach hardware wallets already in addressbook [#4912](https://github.com/paritytech/parity/pull/4912)
+- rlp serialization refactor [#4873](https://github.com/paritytech/parity/pull/4873)
+- Bump nanomsg [#4965](https://github.com/paritytech/parity/pull/4965)
+- Fixed multi-chunk ledger transactions on windows [#4960](https://github.com/paritytech/parity/pull/4960)
+- Fix outputs in Contract Constant Queries [#4953](https://github.com/paritytech/parity/pull/4953)
+- systemd: Start parity after network.target [#4952](https://github.com/paritytech/parity/pull/4952)
+- Remove transaction RPC [#4949](https://github.com/paritytech/parity/pull/4949)
+- Swap out ethcore.io url for parity.io [#4947](https://github.com/paritytech/parity/pull/4947)
+- Don't remove confirmed requests to early. [#4933](https://github.com/paritytech/parity/pull/4933)
+- Ensure sealing work enabled in miner once subscribers added [#4930](https://github.com/paritytech/parity/pull/4930)
+- Add z-index to small modals as well [#4923](https://github.com/paritytech/parity/pull/4923)
+- Bump nanomsg [#4946](https://github.com/paritytech/parity/pull/4946)
+- Bumping multihash and libc [#4943](https://github.com/paritytech/parity/pull/4943)
+- Edit ETH value, gas and gas price in Contract Deployment [#4919](https://github.com/paritytech/parity/pull/4919)
+- Add ability to configure Secure API [#4922](https://github.com/paritytech/parity/pull/4922)
+- Add Token image from URL [#4916](https://github.com/paritytech/parity/pull/4916)
+- Use the registry fee in Token Deployment dapp [#4915](https://github.com/paritytech/parity/pull/4915)
+- Add reseal max period [#4903](https://github.com/paritytech/parity/pull/4903)
+- Detect rust compiler version in Parity build script, closes 4742 [#4907](https://github.com/paritytech/parity/pull/4907)
+- Add Vaults logic to First Run [#4914](https://github.com/paritytech/parity/pull/4914)
+- Updated gcc and rayon crates to remove outdated num_cpus dependency [#4909](https://github.com/paritytech/parity/pull/4909)
+- Renaming evm binary to avoid conflicts. [#4899](https://github.com/paritytech/parity/pull/4899)
+- Better error handling for traces RPC [#4849](https://github.com/paritytech/parity/pull/4849)
+- Safari SectionList fix [#4895](https://github.com/paritytech/parity/pull/4895)
+- Safari Dialog scrolling fix [#4893](https://github.com/paritytech/parity/pull/4893)
+- Spelling :) [#4900](https://github.com/paritytech/parity/pull/4900)
+- Additional kovan params [#4892](https://github.com/paritytech/parity/pull/4892)
+- trigger js-precompiled build [#4898](https://github.com/paritytech/parity/pull/4898)
+- Recalculate receipt roots in close_and_lock [#4884](https://github.com/paritytech/parity/pull/4884)
+- Reload UI on network switch [#4864](https://github.com/paritytech/parity/pull/4864)
+- Update parity-ui-precompiled with branch [#4850](https://github.com/paritytech/parity/pull/4850)
+- OSX Installer is no longer experimental [#4882](https://github.com/paritytech/parity/pull/4882)
+- Chain-selection from UI [#4859](https://github.com/paritytech/parity/pull/4859)
+- removed redundant (and unused) FromJson trait [#4871](https://github.com/paritytech/parity/pull/4871)
+- fix typos and grammar [#4880](https://github.com/paritytech/parity/pull/4880)
+- Remove old experimental remote-db code [#4872](https://github.com/paritytech/parity/pull/4872)
+- removed redundant FixedHash trait, fixes [#4029](https://github.com/paritytech/parity/issues/4029) [#4866](https://github.com/paritytech/parity/pull/4866)
+- Reference JSON-RPC more changes-friendly [#4870](https://github.com/paritytech/parity/pull/4870)
+- Better handling of Solidity compliation [#4860](https://github.com/paritytech/parity/pull/4860)
+- Go through contract links in Transaction List display [#4863](https://github.com/paritytech/parity/pull/4863)
+- Fix Gas Price Selector Tooltips [#4865](https://github.com/paritytech/parity/pull/4865)
+- Fix auto-updater [#4867](https://github.com/paritytech/parity/pull/4867)
+- Make the UI work offline [#4861](https://github.com/paritytech/parity/pull/4861)
+- Subscribe to accounts info in Signer / ParityBar [#4856](https://github.com/paritytech/parity/pull/4856)
+- Don't link libsnappy explicitly [#4841](https://github.com/paritytech/parity/pull/4841)
+- Fix paste in Inputs [#4854](https://github.com/paritytech/parity/pull/4854)
+- Extract i18n from shared UI components [#4834](https://github.com/paritytech/parity/pull/4834)
+- Fix paste in Inputs [#4844](https://github.com/paritytech/parity/pull/4844)
+- Pull contract deployment title from available steps [#4848](https://github.com/paritytech/parity/pull/4848)
+- Supress USB error message [#4839](https://github.com/paritytech/parity/pull/4839)
+- Fix getTransactionCount in --geth mode [#4837](https://github.com/paritytech/parity/pull/4837)
+- CI: test coverage (for core and js) [#4832](https://github.com/paritytech/parity/pull/4832)
+- Lowering threshold for transactions above gas limit [#4831](https://github.com/paritytech/parity/pull/4831)
+- Fix TxViewer when no `to` (contract deployment) [#4847](https://github.com/paritytech/parity/pull/4847)
+- Fix method decoding [#4845](https://github.com/paritytech/parity/pull/4845)
+- Add React Hot Reload to dapps + TokenDeploy fix [#4846](https://github.com/paritytech/parity/pull/4846)
+- Dapps show multiple times in some cases [#4843](https://github.com/paritytech/parity/pull/4843)
+- Fixes to the Registry dapp [#4838](https://github.com/paritytech/parity/pull/4838)
+- Show token icons on list summary pages [#4826](https://github.com/paritytech/parity/pull/4826)
+- Calibrate step before rejection [#4800](https://github.com/paritytech/parity/pull/4800)
+- Add replay protection [#4808](https://github.com/paritytech/parity/pull/4808)
+- Better icon on windows [#4804](https://github.com/paritytech/parity/pull/4804)
+- Better logic for contract deployments detection [#4821](https://github.com/paritytech/parity/pull/4821)
+- Fix wrong default values for contract queries inputs [#4819](https://github.com/paritytech/parity/pull/4819)
+- Adjust selection colours/display [#4811](https://github.com/paritytech/parity/pull/4811)
+- Update the Wallet Library Registry key [#4817](https://github.com/paritytech/parity/pull/4817)
+- Update Wallet to new Wallet Code [#4805](https://github.com/paritytech/parity/pull/4805)

-The full list of included changes:
-* update jsonrpc to 12.0 ([#10841](https://github.com/paritytech/parity-ethereum/pull/10841))
-* Move more code into state-account ([#10840](https://github.com/paritytech/parity-ethereum/pull/10840))
-* Extract AccountDB to account-db ([#10839](https://github.com/paritytech/parity-ethereum/pull/10839))
-* Extricate PodAccount and state Account to own crates ([#10838](https://github.com/paritytech/parity-ethereum/pull/10838))
-* Fix fork choice ([#10837](https://github.com/paritytech/parity-ethereum/pull/10837))
-* tests: Relates to #10655: Test instructions for Readme ([#10835](https://github.com/paritytech/parity-ethereum/pull/10835))
-* idiomatic changes to PodState ([#10834](https://github.com/paritytech/parity-ethereum/pull/10834))
-* Break circular dependency between Client and Engine (part 1) ([#10833](https://github.com/paritytech/parity-ethereum/pull/10833))
-* Remove excessive warning ([#10831](https://github.com/paritytech/parity-ethereum/pull/10831))
-* Allow --nat extip:your.host.here.org ([#10830](https://github.com/paritytech/parity-ethereum/pull/10830))
-* ethcore does not use byteorder ([#10829](https://github.com/paritytech/parity-ethereum/pull/10829))
-* Fix typo in README.md ([#10828](https://github.com/paritytech/parity-ethereum/pull/10828))
-* Update wordlist to v1.3 ([#10823](https://github.com/paritytech/parity-ethereum/pull/10823))
-* bump `smallvec 0.6.10` to fix vulnerability ([#10822](https://github.com/paritytech/parity-ethereum/pull/10822))
-* removed additional_params method ([#10818](https://github.com/paritytech/parity-ethereum/pull/10818))
-* Improve logging when remote peer is unknown ([#10817](https://github.com/paritytech/parity-ethereum/pull/10817))
-* replace memzero with zeroize crate ([#10816](https://github.com/paritytech/parity-ethereum/pull/10816))
-* When updating the client or when called from RPC, sleep should mean sleep ([#10814](https://github.com/paritytech/parity-ethereum/pull/10814))
-* Don't reimplement the logic from the Default impl ([#10813](https://github.com/paritytech/parity-ethereum/pull/10813))
-* refactor: whisper: Add type aliases and update rustdocs in message.rs ([#10812](https://github.com/paritytech/parity-ethereum/pull/10812))
-* test: whisper/cli `add invalid pool size test depending on processor` ([#10811](https://github.com/paritytech/parity-ethereum/pull/10811))
-* Add Constantinople EIPs to the dev (instant_seal) config ([#10809](https://github.com/paritytech/parity-ethereum/pull/10809))
-* fix spurious test failure ([#10808](https://github.com/paritytech/parity-ethereum/pull/10808))
-* revert temp changes to .gitlab-ci.yml ([#10807](https://github.com/paritytech/parity-ethereum/pull/10807))
-* removed redundant fmt::Display implementations ([#10806](https://github.com/paritytech/parity-ethereum/pull/10806))
-* removed EthEngine alias ([#10805](https://github.com/paritytech/parity-ethereum/pull/10805))
-* ethcore-bloom-journal updated to 2018 ([#10804](https://github.com/paritytech/parity-ethereum/pull/10804))
-* Fix a few typos and unused warnings. ([#10803](https://github.com/paritytech/parity-ethereum/pull/10803))
-* updated price-info to edition 2018 ([#10801](https://github.com/paritytech/parity-ethereum/pull/10801))
-* updated parity-local-store to edition 2018 ([#10800](https://github.com/paritytech/parity-ethereum/pull/10800))
-* updated project to ansi_term 0.11 ([#10799](https://github.com/paritytech/parity-ethereum/pull/10799))
-* ethcore-light uses bincode 1.1 ([#10798](https://github.com/paritytech/parity-ethereum/pull/10798))
-* ethcore-network-devp2p uses igd 0.9 ([#10797](https://github.com/paritytech/parity-ethereum/pull/10797))
-* Better logging when backfilling ancient blocks fail ([#10796](https://github.com/paritytech/parity-ethereum/pull/10796))
-* added new ropsten-bootnode and removed old one ([#10794](https://github.com/paritytech/parity-ethereum/pull/10794))
-* Removed machine abstraction from ethcore ([#10791](https://github.com/paritytech/parity-ethereum/pull/10791))
-* Removed redundant ethcore-service error type ([#10788](https://github.com/paritytech/parity-ethereum/pull/10788))
-* Cleanup unused vm dependencies ([#10787](https://github.com/paritytech/parity-ethereum/pull/10787))
-* ethkey no longer uses byteorder ([#10786](https://github.com/paritytech/parity-ethereum/pull/10786))
-* Updated blooms-db to rust 2018 and removed redundant deps ([#10785](https://github.com/paritytech/parity-ethereum/pull/10785))
-* Treat empty account the same as non-exist accounts in EIP-1052 ([#10775](https://github.com/paritytech/parity-ethereum/pull/10775))
-* Do not drop the peer with None difficulty ([#10772](https://github.com/paritytech/parity-ethereum/pull/10772))
-* EIP-1702: Generalized Account Versioning Scheme ([#10771](https://github.com/paritytech/parity-ethereum/pull/10771))
-* Move Engine::register_client to be before other I/O handler registration ([#10767](https://github.com/paritytech/parity-ethereum/pull/10767))
-* ethcore/res: activate atlantis classic hf on block 8772000 ([#10766](https://github.com/paritytech/parity-ethereum/pull/10766))
-* Updated Bn128PairingImpl to use optimized batch pairing  ([#10765](https://github.com/paritytech/parity-ethereum/pull/10765))
-* Remove unused code ([#10762](https://github.com/paritytech/parity-ethereum/pull/10762))
-* Initialize private tx logger only if private tx functionality is enabled ([#10758](https://github.com/paritytech/parity-ethereum/pull/10758))
-* SecretStore: remove support of old database formats ([#10757](https://github.com/paritytech/parity-ethereum/pull/10757))
-* Enable aesni ([#10756](https://github.com/paritytech/parity-ethereum/pull/10756))
-* updater: fix static id hashes initialization ([#10755](https://github.com/paritytech/parity-ethereum/pull/10755))
-* Use fewer threads for snapshotting ([#10752](https://github.com/paritytech/parity-ethereum/pull/10752))
-* Die error_chain, die ([#10747](https://github.com/paritytech/parity-ethereum/pull/10747))
-* Fix deprectation warnings on nightly ([#10746](https://github.com/paritytech/parity-ethereum/pull/10746))
-* Improve logging and cleanup in miner around block sealing ([#10745](https://github.com/paritytech/parity-ethereum/pull/10745))
-* Add a way to signal shutdown to snapshotting threads ([#10744](https://github.com/paritytech/parity-ethereum/pull/10744))
-* fix docker tags for publishing ([#10741](https://github.com/paritytech/parity-ethereum/pull/10741))
-* refactor: Fix indentation in ethjson ([#10740](https://github.com/paritytech/parity-ethereum/pull/10740))
-* Log validator set changes in EpochManager ([#10734](https://github.com/paritytech/parity-ethereum/pull/10734))
-* Print warnings when using dangerous settings for ValidatorSet ([#10733](https://github.com/paritytech/parity-ethereum/pull/10733))
-* ethcore: enable ECIP-1054 for classic ([#10731](https://github.com/paritytech/parity-ethereum/pull/10731))
-* Stop breaking out of loop if a non-canonical hash is found ([#10729](https://github.com/paritytech/parity-ethereum/pull/10729))
-* Removed secret_store folder ([#10722](https://github.com/paritytech/parity-ethereum/pull/10722))
-* Revert "enable lto for release builds (#10717)" ([#10721](https://github.com/paritytech/parity-ethereum/pull/10721))
-* fix: aura don't add `SystemTime::now()` ([#10720](https://github.com/paritytech/parity-ethereum/pull/10720))
-* Use RUSTFLAGS to set the optimization level ([#10719](https://github.com/paritytech/parity-ethereum/pull/10719))
-* enable lto for release builds ([#10717](https://github.com/paritytech/parity-ethereum/pull/10717))
-* [devp2p] Update to 2018 edition ([#10716](https://github.com/paritytech/parity-ethereum/pull/10716))
-* [devp2p] Don't use `rust-crypto` ([#10714](https://github.com/paritytech/parity-ethereum/pull/10714))
-* [devp2p] Fix warnings and re-org imports ([#10710](https://github.com/paritytech/parity-ethereum/pull/10710))
-* DevP2p: Get node IP address and udp port from Socket, if not included in PING packet ([#10705](https://github.com/paritytech/parity-ethereum/pull/10705))
-* introduce MissingParent Error, fixes #10699 ([#10700](https://github.com/paritytech/parity-ethereum/pull/10700))
-* Refactor Clique stepping ([#10691](https://github.com/paritytech/parity-ethereum/pull/10691))
-* add_sync_notifier in EthPubSubClient holds on to a Client for too long ([#10689](https://github.com/paritytech/parity-ethereum/pull/10689))
-* Fix compiler warning (that will become an error) ([#10683](https://github.com/paritytech/parity-ethereum/pull/10683))
-* Don't panic if extra_data is longer than VANITY_LENGTH ([#10682](https://github.com/paritytech/parity-ethereum/pull/10682))
-* Remove annoying compiler warnings ([#10679](https://github.com/paritytech/parity-ethereum/pull/10679))
-* Remove support for hardware wallets ([#10678](https://github.com/paritytech/parity-ethereum/pull/10678))
-* [CI] allow cargo audit to fail ([#10676](https://github.com/paritytech/parity-ethereum/pull/10676))
-* new image ([#10673](https://github.com/paritytech/parity-ethereum/pull/10673))
-* Upgrade ethereum types ([#10670](https://github.com/paritytech/parity-ethereum/pull/10670))
-* Reset blockchain properly ([#10669](https://github.com/paritytech/parity-ethereum/pull/10669))
-* fix: Move PR template into .github/ folder ([#10663](https://github.com/paritytech/parity-ethereum/pull/10663))
-* docs: evmbin - Update Rust docs ([#10658](https://github.com/paritytech/parity-ethereum/pull/10658))
-* refactor: Related #9459 - evmbin: replace untyped json! macro with fully typed serde serialization using Rust structs ([#10657](https://github.com/paritytech/parity-ethereum/pull/10657))
-* docs: Add PR template ([#10654](https://github.com/paritytech/parity-ethereum/pull/10654))
-* docs: Add ProgPoW Rust docs to ethash module ([#10653](https://github.com/paritytech/parity-ethereum/pull/10653))
-* docs: Update Readme with TOC, Contributor Guideline. Update Cargo package descriptions ([#10652](https://github.com/paritytech/parity-ethereum/pull/10652))
-* Upgrade to parity-crypto 0.4 ([#10650](https://github.com/paritytech/parity-ethereum/pull/10650))
-* fix(compilation warnings) ([#10649](https://github.com/paritytech/parity-ethereum/pull/10649))
-* [whisper] Move needed aes_gcm crypto in-crate ([#10647](https://github.com/paritytech/parity-ethereum/pull/10647))
-* Update publishing ([#10644](https://github.com/paritytech/parity-ethereum/pull/10644))
-* ci: publish docs debug ([#10638](https://github.com/paritytech/parity-ethereum/pull/10638))
-* Fix publish docs ([#10635](https://github.com/paritytech/parity-ethereum/pull/10635))
-* Fix rinkeby petersburg fork ([#10632](https://github.com/paritytech/parity-ethereum/pull/10632))
-* Update kovan.json to switch Kovan validator set to POA Consensus Contracts ([#10628](https://github.com/paritytech/parity-ethereum/pull/10628))
-* [ethcore] remove error_chain ([#10616](https://github.com/paritytech/parity-ethereum/pull/10616))
-* Remove unused import ([#10615](https://github.com/paritytech/parity-ethereum/pull/10615))
-* Adds parity_getRawBlockByNumber, parity_submitRawBlock ([#10609](https://github.com/paritytech/parity-ethereum/pull/10609))
-* adds rpc error message for --no-ancient-blocks ([#10608](https://github.com/paritytech/parity-ethereum/pull/10608))
-* Constantinople HF on POA Core ([#10606](https://github.com/paritytech/parity-ethereum/pull/10606))
-* Clique: zero-fill extradata when the supplied value is less than 32 bytes in length ([#10605](https://github.com/paritytech/parity-ethereum/pull/10605))
-* evm: add some mulmod benches ([#10600](https://github.com/paritytech/parity-ethereum/pull/10600))
-* sccache logs to stdout ([#10596](https://github.com/paritytech/parity-ethereum/pull/10596))
-* update bootnodes ([#10595](https://github.com/paritytech/parity-ethereum/pull/10595))
-* Merge `Notifier` and `TransactionsPoolNotifier` ([#10591](https://github.com/paritytech/parity-ethereum/pull/10591))
-* fix(whisper): change expiry `unix_time + ttl + work` ([#10587](https://github.com/paritytech/parity-ethereum/pull/10587))
-* fix(evmbin): make benches compile again ([#10586](https://github.com/paritytech/parity-ethereum/pull/10586))
-* fix issue with compilation when 'slow-blocks' feature enabled ([#10585](https://github.com/paritytech/parity-ethereum/pull/10585))
-* Allow CORS requests in Secret Store API ([#10584](https://github.com/paritytech/parity-ethereum/pull/10584))
-* CI improvements ([#10579](https://github.com/paritytech/parity-ethereum/pull/10579))
-* ethcore: improve timestamp handling ([#10574](https://github.com/paritytech/parity-ethereum/pull/10574))
-* Update Issue Template to direct security issue to email ([#10562](https://github.com/paritytech/parity-ethereum/pull/10562))
-* version: bump master to 2.6 ([#10560](https://github.com/paritytech/parity-ethereum/pull/10560))
-* fix(light cull): poll light cull instead of timer ([#10559](https://github.com/paritytech/parity-ethereum/pull/10559))
-* Watch transactions pool ([#10558](https://github.com/paritytech/parity-ethereum/pull/10558))
-* Add SealingState; don't prepare block when not ready. ([#10529](https://github.com/paritytech/parity-ethereum/pull/10529))
-* Explicitly enable or disable Stratum in config file (Issue 9785) ([#10521](https://github.com/paritytech/parity-ethereum/pull/10521))
-* Add filtering capability to `parity_pendingTransactions` (issue 8269) ([#10506](https://github.com/paritytech/parity-ethereum/pull/10506))
-* Remove calls to heapsize ([#10432](https://github.com/paritytech/parity-ethereum/pull/10432))
-* RPC: Implements eth_subscribe("syncing") ([#10311](https://github.com/paritytech/parity-ethereum/pull/10311))
-* SecretStore: non-blocking wait of session completion ([#10303](https://github.com/paritytech/parity-ethereum/pull/10303))
-* Node table limiting and cache for node filter ([#10288](https://github.com/paritytech/parity-ethereum/pull/10288))
-* SecretStore: expose restore_key_public in HTTP API ([#10241](https://github.com/paritytech/parity-ethereum/pull/10241))
-* Trivial journal for private transactions ([#10056](https://github.com/paritytech/parity-ethereum/pull/10056))
+### Previous releases

-## Previous releases
-
- [CHANGELOG-2.5](docs/CHANGELOG-2.5.md) (_stable_)
- [CHANGELOG-2.4](docs/CHANGELOG-2.4.md) (EOL: 2019-07-08)
- [CHANGELOG-2.3](docs/CHANGELOG-2.3.md) (EOL: 2019-04-09)
- [CHANGELOG-2.2](docs/CHANGELOG-2.2.md) (EOL: 2019-02-25)
- [CHANGELOG-2.1](docs/CHANGELOG-2.1.md) (EOL: 2019-01-16)
- [CHANGELOG-2.0](docs/CHANGELOG-2.0.md) (EOL: 2018-11-15)
- [CHANGELOG-1.11](docs/CHANGELOG-1.11.md) (EOL: 2018-09-19)
- [CHANGELOG-1.10](docs/CHANGELOG-1.10.md) (EOL: 2018-07-18)
- [CHANGELOG-1.9](docs/CHANGELOG-1.9.md) (EOL: 2018-05-09)
- [CHANGELOG-1.8](docs/CHANGELOG-1.8.md) (EOL: 2018-03-22)
- [CHANGELOG-1.7](docs/CHANGELOG-1.7.md) (EOL: 2018-01-25)
- [CHANGELOG-1.6](docs/CHANGELOG-1.6.md) (EOL: 2017-10-15)
- [CHANGELOG-1.5](docs/CHANGELOG-1.5.md) (EOL: 2017-07-28)
- [CHANGELOG-1.4](docs/CHANGELOG-1.4.md) (EOL: 2017-03-13)
- [CHANGELOG-1.3](docs/CHANGELOG-1.3.md) (EOL: 2017-01-19)
- [CHANGELOG-1.2](docs/CHANGELOG-1.2.md) (EOL: 2016-11-07)
- [CHANGELOG-1.1](docs/CHANGELOG-1.1.md) (EOL: 2016-08-12)
- [CHANGELOG-1.0](docs/CHANGELOG-1.0.md) (EOL: 2016-06-24)
- [CHANGELOG-0.9](docs/CHANGELOG-0.9.md) (EOL: 2016-05-02)
+- [CHANGELOG-1.6](docs/CHANGELOG-1.6.md)
+- [CHANGELOG-1.5](docs/CHANGELOG-1.5.md)
+- [CHANGELOG-1.4](docs/CHANGELOG-1.4.md)
+- [CHANGELOG-1.3](docs/CHANGELOG-1.3.md)
+- [CHANGELOG-1.2](docs/CHANGELOG-1.2.md)
+- [CHANGELOG-1.1](docs/CHANGELOG-1.1.md)
+- [CHANGELOG-1.0](docs/CHANGELOG-1.0.md)
+- [CHANGELOG-0.9](docs/CHANGELOG-0.9.md)
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,143 +1,122 @@
 [package]
 description = "Parity Ethereum client"
-name = "parity-ethereum"
-# NOTE Make sure to update util/version/Cargo.toml as well
-version = "2.6.3"
+name = "parity"
+version = "1.8.4"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
+build = "build.rs"

 [dependencies]
-blooms-db = { path = "util/blooms-db" }
-log = "0.4"
+log = "0.3"
+env_logger = "0.4"
 rustc-hex = "1.0"
-docopt = "1.0"
+docopt = "0.8"
 clap = "2"
-term_size = "0.3"
-textwrap = "0.9"
+time = "0.1"
 num_cpus = "1.2"
 number_prefix = "0.2"
-rpassword = "1.0"
-semver = "0.9"
-ansi_term = "0.11"
-parking_lot = "0.7"
-regex = "1.0"
-atty = "0.2.8"
+rpassword = "0.2.1"
+semver = "0.6"
+ansi_term = "0.9"
+parking_lot = "0.4"
+regex = "0.2"
+isatty = "0.1"
 toml = "0.4"
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
+app_dirs = "1.1.1"
 futures = "0.1"
+futures-cpupool = "0.1"
 fdlimit = "0.1"
+ws2_32-sys = "0.2"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
-jsonrpc-core = "12.0.0"
-parity-bytes = "0.1"
-common-types = { path = "ethcore/types" }
-ethcore = { path = "ethcore", features = ["parity"] }
-ethcore-accounts = { path = "accounts", optional = true }
-ethcore-blockchain = { path = "ethcore/blockchain" }
-ethcore-call-contract = { path = "ethcore/call-contract"}
-ethcore-db = { path = "ethcore/db" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.8" }
+ethsync = { path = "sync" }
+ethcore = { path = "ethcore" }
+ethcore-util = { path = "util" }
+ethcore-bytes = { path = "util/bytes" }
+ethcore-bigint = { path = "util/bigint" }
 ethcore-io = { path = "util/io" }
+ethcore-devtools = { path = "devtools" }
+ethcore-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-logger = { path = "logger" }
+ethcore-stratum = { path = "stratum" }
 ethcore-network = { path = "util/network" }
-ethcore-private-tx = { path = "ethcore/private-tx" }
-ethcore-service = { path = "ethcore/service" }
-ethcore-sync = { path = "ethcore/sync" }
-ethereum-types = "0.6.0"
-ethkey = { path = "accounts/ethkey" }
-ethstore = { path = "accounts/ethstore" }
-node-filter = { path = "ethcore/node-filter" }
-rlp = "0.4.0"
-cli-signer= { path = "cli-signer" }
-parity-daemonize = "0.3"
-parity-hash-fetch = { path = "updater/hash-fetch" }
+node-filter = { path = "ethcore/node_filter" }
+ethkey = { path = "ethkey" }
+node-health = { path = "dapps/node-health" }
+rlp = { path = "util/rlp" }
+rpc-cli = { path = "rpc_cli" }
+parity-hash-fetch = { path = "hash-fetch" }
 parity-ipfs-api = { path = "ipfs" }
-parity-local-store = { path = "miner/local-store" }
-parity-runtime = { path = "util/runtime" }
+parity-local-store = { path = "local-store" }
+parity-reactor = { path = "util/reactor" }
 parity-rpc = { path = "rpc" }
+parity-rpc-client = { path = "rpc_client" }
 parity-updater = { path = "updater" }
-parity-version = { path = "util/version" }
 parity-whisper = { path = "whisper" }
-parity-path = "0.1"
-dir = { path = "util/dir" }
-panic_hook = { path = "util/panic-hook" }
-keccak-hash = "0.2.0"
-migration-rocksdb = { path = "util/migration-rocksdb" }
-kvdb = "0.1"
-kvdb-rocksdb = "0.1.3"
-journaldb = { path = "util/journaldb" }
+path = { path = "util/path" }
+panic_hook = { path = "panic_hook" }
+hash = { path = "util/hash" }
+migration = { path = "util/migration" }
+kvdb = { path = "util/kvdb" }

-ethcore-secretstore = { path = "secret-store", optional = true }
-
-registrar = { path = "util/registrar" }
-
-parity-util-mem = { version = "0.1", features = ["jemalloc-global"] }
+parity-dapps = { path = "dapps", optional = true }
+clippy = { version = "0.0.103", optional = true}
+ethcore-secretstore = { path = "secret_store", optional = true }

 [build-dependencies]
 rustc_version = "0.2"

 [dev-dependencies]
+ethcore-ipc-tests = { path = "ipc/tests" }
 pretty_assertions = "0.1"
 ipnetwork = "0.12.6"
-tempdir = "0.3"
-fake-fetch = { path = "util/fake-fetch" }

 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.4", features = ["winsock2", "winuser", "shellapi"] }
+winapi = "0.2"
+
+[target.'cfg(not(windows))'.dependencies]
+daemonize = "0.2"

 [features]
-default = ["accounts"]
-accounts = ["ethcore-accounts", "parity-rpc/accounts"]
-miner-debug = ["ethcore/miner-debug"]
+default = ["ui-precompiled"]
+ui = [
+	"ui-enabled",
+	"parity-dapps/ui",
+]
+ui-precompiled = [
+	"ui-enabled",
+	"parity-dapps/ui-precompiled",
+]
+ui-enabled = ["dapps"]
+dapps = ["parity-dapps"]
+ipc = ["ethcore/ipc", "ethsync/ipc"]
+jit = ["ethcore/jit"]
+dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "parity-rpc/dev", "parity-dapps/dev"]
 json-tests = ["ethcore/json-tests"]
-ci-skip-tests = ["ethcore/ci-skip-tests"]
 test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
-secretstore = ["ethcore-secretstore", "ethcore-secretstore/accounts"]
-final = ["parity-version/final"]
-deadlock_detection = ["parking_lot/deadlock_detection"]
-# to create a memory profile (requires nightly rust), use e.g.
-# `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"
+final = ["ethcore-util/final"]
+secretstore = ["ethcore-secretstore"]

 [[bin]]
 path = "parity/main.rs"
 name = "parity"

+[profile.dev]
+panic = "abort"
+
 [profile.release]
 debug = false
-lto = true
+lto = false
+panic = "abort"

 [workspace]
-# This should only list projects that are not
-# in the dependency tree in any other way
-# (i.e. pretty much only standalone CLI tools)
-members = [
-	"accounts/ethkey/cli",
-	"accounts/ethstore/cli",
-	"chainspec",
-	"ethcore/wasm/run",
-	"evmbin",
-	"parity-clib",
-	"whisper/cli",
-	"util/triehash-ethereum",
-	"util/keccak-hasher",
-	"util/patricia-trie-ethereum",
-	"util/fastmap",
-	"util/time-utils",
-]
+members = ["ethstore/cli", "ethkey/cli", "evmbin", "whisper", "chainspec", "dapps/js-glue"]
--- a/README.md
+++ b/README.md
@@ -1,391 +1,126 @@
-![Parity Ethereum](docs/logo-parity-ethereum.svg)
+# [Parity](https://parity.io/) - fast, light, and robust Ethereum client

-<h2 align="center">The Fastest and most Advanced Ethereum Client.</h2>
+[![build status](https://gitlab.parity.io/parity/parity/badges/master/build.svg)](https://gitlab.parity.io/parity/parity/commits/master)
+[![Snap Status](https://build.snapcraft.io/badge/paritytech/parity.svg)](https://build.snapcraft.io/user/paritytech/parity)
+[![GPLv3](https://img.shields.io/badge/license-GPL%20v3-green.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)

-<p align="center"><strong><a href="https://github.com/paritytech/parity-ethereum/releases/latest">» Download the latest release «</a></strong></p>
-
-<p align="center"><a href="https://gitlab.parity.io/parity/parity-ethereum/commits/master" target="_blank"><img src="https://gitlab.parity.io/parity/parity-ethereum/badges/master/build.svg" /></a>
-<a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank"><img src="https://img.shields.io/badge/license-GPL%20v3-green.svg" /></a></p>
-
-## Table of Contents
-
-1. [Description](#chapter-001)
-2. [Technical Overview](#chapter-002)
-3. [Building](#chapter-003)<br>
-  3.1 [Building Dependencies](#chapter-0031)<br>
-  3.2 [Building from Source Code](#chapter-0032)<br>
-  3.3 [Simple One-Line Installer for Mac and Linux](#chapter-0033)<br>
-  3.4 [Starting Parity Ethereum](#chapter-0034)
-4. [Testing](#chapter-004)
-5. [Documentation](#chapter-005)
-6. [Toolchain](#chapter-006)
-7. [Community](#chapter-007)
-8. [Contributing](#chapter-008)
-9. [License](#chapter-009)
-
-
-## 1. Description <a id="chapter-001"></a>
-
-**Built for mission-critical use**: Miners, service providers, and exchanges need fast synchronisation and maximum uptime. Parity Ethereum provides the core infrastructure essential for speedy and reliable services.
-
- 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
-
-## 2. Technical Overview <a id="chapter-002"></a>
-
-Parity Ethereum's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing Parity Ethereum using the sophisticated and cutting-edge **Rust programming language**. Parity Ethereum is licensed under the GPLv3 and can be used for all your Ethereum needs.
-
-By default, Parity Ethereum runs a JSON-RPC HTTP server on port `:8545` and a Web-Sockets server on port `:8546`. This is fully configurable and supports a number of APIs.
-
-If you run into problems while using 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.
-
-## 3. Building <a id="chapter-003"></a>
-
-### 3.1 Build Dependencies <a id="chapter-0031"></a>
-
-Parity Ethereum requires **latest stable Rust version** to build.
-
-We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have `rustup`, you can install it like this:
-
- Linux:
-  ```bash
-  $ curl https://sh.rustup.rs -sSf | sh
-  ```
-
-  Parity Ethereum also requires `gcc`, `g++`, `pkg-config`, `file`, `make`, and `cmake` packages to be installed.
-
- OSX:
-  ```bash
-  $ curl https://sh.rustup.rs -sSf | sh
-  ```
-
-  `clang` is required. It comes with Xcode command line tools or can be installed with homebrew.
-
- Windows:  
-  Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the `rustup` installer from
-  https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe, start "VS2015 x64 Native Tools Command Prompt", and use the following command to install and set up the `msvc` toolchain:
-  ```bash
-  $ 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 that these binaries are in your `PATH`. After that, you should be able to build Parity Ethereum from source.
-
-### 3.2 Build from Source Code <a id="chapter-0032"></a>
-
-```bash
-# download Parity Ethereum code
-$ git clone https://github.com/paritytech/parity-ethereum
-$ cd parity-ethereum
-
-# build in release mode
-$ cargo build --release --features final
-```
-
-This produces 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:
-
-```bash
-$ cargo clean
-```
-
-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
-```
-
-### 3.3 Simple One-Line Installer for Mac and Linux <a id="chapter-0033"></a>
-
-```bash
-bash <(curl https://get.parity.io -L)
-```
-
-The one-line installer always defaults to the latest beta release. To install a stable release, run:
-
-```bash
-bash <(curl https://get.parity.io -L) -r stable
-```
-
-### 3.4 Starting Parity Ethereum <a id="chapter-0034"></a>
-
-#### Manually
-
-To start Parity Ethereum manually, just run
-
-```bash
-$ ./target/release/parity
-```
-
-so Parity Ethereum begins syncing the Ethereum blockchain.
-
-#### Using `systemd` service file
-
-To start Parity Ethereum as a regular user using `systemd` init:
-
-1. Copy `./scripts/parity.service` to your
-`systemd` user directory (usually `~/.config/systemd/user`).
-2. Copy release to bin folder, write `sudo install ./target/release/parity /usr/bin/parity`
-3. To configure Parity Ethereum, write a `/etc/parity/config.toml` config file, see [Configuring Parity Ethereum](https://paritytech.github.io/wiki/Configuring-Parity) for details.
-
-## 4. Testing <a id="chapter-004"></a>
-
-You can run tests with the following commands:
-
-* **All** packages
-  ```
-  cargo test --all
-  ```
-
-* Specific package
-  ```
-  cargo test --package <spec>
-  ```
-
-Replace `<spec>` with one of the packages from the [package list](#package-list) (e.g. `cargo test --package evmbin`).
-
-You can show your logs in the test output by passing `--nocapture` (i.e. `cargo test --package evmbin -- --nocapture`)
-
-## 5. Documentation <a id="chapter-005"></a>
-
-Official website: https://parity.io
-
-Be sure to [check out our wiki](https://wiki.parity.io) for more information.
-
-### Viewing documentation for Parity Ethereum packages
-
-You can generate documentation for Parity Ethereum Rust packages that automatically opens in your web browser using [rustdoc with Cargo](https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html#using-rustdoc-with-cargo) (of the The Rustdoc Book), by running the the following commands:
-
-* **All** packages
-  ```
-  cargo doc --document-private-items --open
-  ```
-
-* Specific package
-  ```
-  cargo doc --package <spec> -- --document-private-items --open
-  ```
-
-Use`--document-private-items` to also view private documentation and `--no-deps` to exclude building documentation for dependencies.
-
-Replacing `<spec>` with one of the following from the details section below (i.e. `cargo doc --package parity-ethereum --open`):
-
-<a id="package-list"></a>
-**Package List**
-<details><p>
-
-* Parity Ethereum (EthCore) Client Application
-  ```bash
-  parity-ethereum
-  ```
-* Parity Ethereum Account Management, Key Management Tool, and Keys Generator
-  ```bash
-  ethcore-accounts, ethkey-cli, ethstore, ethstore-cli
-  ```
-* Parity Chain Specification
-  ```bash
-  chainspec
-  ```
-* Parity CLI Signer Tool & RPC Client
-  ```bash
-  cli-signer parity-rpc-client
-  ```
-* Parity Ethereum Ethash & ProgPoW Implementations
-  ```bash
-  ethash
-  ```
-* Parity (EthCore) Library
-  ```bash
-  ethcore
-  ```
-  * Parity Ethereum Blockchain Database, Test Generator, Configuration,
-Caching, Importing Blocks, and Block Information
-    ```bash
-    ethcore-blockchain
-    ```
-  * Parity Ethereum (EthCore) Contract Calls and Blockchain Service & Registry Information
-    ```bash
-    ethcore-call-contract
-    ```
-  * Parity Ethereum (EthCore) Database Access & Utilities, Database Cache Manager
-    ```bash
-    ethcore-db
-    ```
-  * Parity Ethereum Virtual Machine (EVM) Rust Implementation
-    ```bash
-    evm
-    ```
-  * Parity Ethereum (EthCore) Light Client Implementation
-    ```bash
-    ethcore-light
-    ```
-  * Parity Smart Contract based Node Filter, Manage Permissions of Network Connections
-    ```bash
-    node-filter
-    ```
-  * Parity Private Transactions
-    ```bash
-    ethcore-private-tx
-    ```
-  * Parity Ethereum (EthCore) Client & Network Service Creation & Registration with the I/O Subsystem
-    ```bash
-    ethcore-service
-    ```
-  * Parity Ethereum (EthCore) Blockchain Synchronization
-    ```bash
-    ethcore-sync
-    ```
-  * Parity Ethereum Common Types
-    ```bash
-    common-types
-    ```
-  * Parity Ethereum Virtual Machines (VM) Support Library
-    ```bash
-    vm
-    ```
-  * Parity Ethereum WASM Interpreter
-    ```bash
-    wasm
-    ```
-  * Parity Ethereum WASM Test Runner
-    ```bash
-    pwasm-run-test
-    ```
-  * Parity EVM Implementation
-    ```bash
-    evmbin
-    ```
-  * Parity Ethereum IPFS-compatible API
-    ```bash
-    parity-ipfs-api
-    ```
-  * Parity Ethereum JSON Deserialization
-    ```bash
-    ethjson
-    ```
-  * Parity Ethereum State Machine Generalization for Consensus Engines
-    ```bash
-    parity-machine
-    ```
-* Parity Ethereum (EthCore) Miner Interface
-  ```bash
-  ethcore-miner parity-local-store price-info ethcore-stratum using_queue
-  ```
-* Parity Ethereum (EthCore) Logger Implementation
-  ```bash
-  ethcore-logger
-  ```
-* C bindings library for the Parity Ethereum client
-  ```bash
-  parity-clib
-  ```
-* Parity Ethereum JSON-RPC Servers
-  ```bash
-  parity-rpc
-  ```
-* Parity Ethereum (EthCore) Secret Store
-  ```bash
-  ethcore-secretstore
-  ```
-* Parity Updater Service
-  ```bash
-  parity-updater parity-hash-fetch
-  ```
-* Parity Core Libraries (Parity Util)
-  ```bash
-  ethcore-bloom-journal blooms-db dir eip-712 fake-fetch fastmap fetch ethcore-io
-  journaldb keccak-hasher len-caching-lock macros memory-cache memzero
-  migration-rocksdb ethcore-network ethcore-network-devp2p panic_hook
-  patricia-trie-ethereum registrar rlp_compress rlp_derive parity-runtime stats
-  time-utils triehash-ethereum unexpected parity-version
-  ```
-* Parity Whisper Protocol Implementation
-  ```bash
-  parity-whisper whisper-cli
-  ```
-
-</p></details>
-
-### Contributing to documentation for Parity Ethereum packages
-
-[Document source code](https://doc.rust-lang.org/1.9.0/book/documentation.html) for Parity Ethereum packages by annotating the source code with documentation comments.
-
-Example (generic documentation comment):
-```markdown
-/// Summary
-///
-/// Description
-///
-/// # Panics
-///
-/// # Errors
-///
-/// # Safety
-///
-/// # Examples
-///
-/// Summary of Example 1
-///
-/// ```rust
-/// // insert example 1 code here for use with documentation as tests
-/// ```
-///
-```
-
-## 6. Toolchain <a id="chapter-006"></a>
-
-In addition to the Parity Ethereum client, there are additional tools in this repository available:
-
- [evmbin](./evmbin) - Parity Ethereum EVM Implementation.
- [ethstore](./accounts/ethstore) - Parity Ethereum Key Management.
- [ethkey](./accounts/ethkey) - Parity Ethereum Keys Generator.
- [whisper](./whisper) - Parity Ethereum Whisper-v2 PoC Implementation.
-
-The following tool is available in a separate repository:
- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum Encoding of Function Calls. [Docs here](https://crates.io/crates/ethabi)
-
-## 7. Community <a id="chapter-007"></a>
+- [Download the latest release here.](https://github.com/paritytech/parity/releases)

 ### Join the chat!

-Questions? Get in touch with us on Gitter:
+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)
+Be sure to check out [our wiki](https://github.com/paritytech/parity/wiki) and the [internal documentation](https://paritytech.github.io/parity/ethcore/index.html) for more information.

-## 8. Contributing <a id="chapter-008"></a>
+----

-An introduction has been provided in the ["So You Want to be a Core Developer" presentation slides by Hernando Castano](http://tiny.cc/contrib-to-parity-eth). Additional guidelines are provided in [CONTRIBUTING](./.github/CONTRIBUTING.md).
+## About Parity

-### Contributor Code of Conduct
+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.

-[CODE_OF_CONDUCT](./.github/CODE_OF_CONDUCT.md)
+Parity comes with a built-in wallet. To access [Parity Wallet](http://web3.site/) simply go to http://web3.site/ (if you don't have access to the internet, but still want to use the service, you can also use http://127.0.0.1:8180/). It includes various functionality allowing you to:

-## 9. License <a id="chapter-009"></a>
+- create and manage your Ethereum accounts;
+- manage your Ether and any Ethereum tokens;
+- create and register your own tokens;
+- and much more.

-[LICENSE](./LICENSE)
+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](https://gitter.im/paritytech/parity) to ask a question. We are glad to help!
+
+**For security-critical issues**, please refer to the security policy outlined in `SECURITY.MD`.
+
+Parity's current release is 1.7. You can download it at https://github.com/paritytech/parity/releases or follow the instructions below to build from source.
+
+----
+
+## Build dependencies
+
+**Parity requires Rust version 1.19.0 to build**
+
+We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have rustup, you can install it like this:
+
+- Linux:
+	```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.
+- 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:
+    ```
+	$ rustup default stable-x86_64-pc-windows-msvc
+    ```
+
+Once you have rustup, install parity or download and build from source
+
+----
+
+## Install from the snap store
+
+In any of the [supported Linux distros](https://snapcraft.io/docs/core/install):
+
+```bash
+sudo snap install parity --edge
+```
+
+(Note that this is an experimental and unstable release, at the moment)
+
+----
+
+## Build from source
+
+```bash
+# download Parity code
+$ git clone https://github.com/paritytech/parity
+$ cd parity
+
+# build in release mode
+$ cargo build --release
+```
+
+This will produce an executable in the `./target/release` subdirectory.
+Note: if cargo fails to parse manifest try:
+
+```bash
+$ ~/.cargo/bin/cargo build --release
+```
+----
+
+## Simple one-line installer for Mac and Ubuntu
+
+```bash
+bash <(curl https://get.parity.io -Lk)
+```
+
+## Start Parity
+### Manually
+To start Parity manually, just run
+```bash
+$ ./target/release/parity
+```
+
+and Parity will begin syncing the Ethereum blockchain.
+
+### Using systemd service file
+To start Parity 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"`.
+
+	Example: `ARGS="ui --identity MyMachine"`.
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,49 +1,13 @@
 # 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.
+For security inquiries or vulnerability reports, please send a message to security@parity.io.

-## Reporting a Vulnerability
+Please use a descriptive subject line so we can identify the report as such.

-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. 
+If you send a report, we will respond to the e-mail within 48 hours, and provide regular updates from that time onwards.

-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
+If you would like to encrypt your report, please use the PGP key provided below.
+It is also reproduced [on MIT's key server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73)

 ```
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -78,3 +42,13 @@ ETBD1Q==
 =K9Qw
 -----END PGP PUBLIC KEY BLOCK-----
 ```
+
+Important Legal Information:
+
+Your submission might be eligible for a bug bounty. The bug bounty program is an experimental and discretionary rewards program for the Parity community to reward those who are helping to improve the Parity software. Rewards are at the sole discretion of Parity Technologies Ltd.. 
+
+We are not able to issue rewards to individuals who are on sanctions lists or who are in countries on sanctions lists (e.g. North Korea, Iran, etc). 
+
+You are responsible for all taxes. All rewards are subject to applicable law. 
+
+Finally, your testing must not violate any law or compromise any data that is not yours.
--- a/accounts/Cargo.toml
+++ b/accounts/Cargo.toml
@@ -1,21 +0,0 @@
-[package]
-description = "Parity Ethereum Account Management"
-homepage = "http://parity.io"
-license = "GPL-3.0"
-name = "ethcore-accounts"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-ethkey = { path = "ethkey" }
-ethstore = { path = "ethstore" }
-log = "0.4"
-parking_lot = "0.7"
-serde = "1.0"
-serde_derive = "1.0"
-serde_json = "1.0"
-
-[dev-dependencies]
-ethereum-types = "0.6.0"
-tempdir = "0.3"
--- a/accounts/ethkey/Cargo.toml
+++ b/accounts/ethkey/Cargo.toml
@@ -1,21 +0,0 @@
-[package]
-description = "Parity Ethereum Keys Generator"
-name = "ethkey"
-version = "0.3.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-edit-distance = "2.0"
-parity-crypto = "0.4.0"
-eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
-ethereum-types = "0.6.0"
-lazy_static = "1.0"
-log = "0.4"
-parity-wordlist = "1.3"
-quick-error = "1.2.2"
-rand = "0.6"
-rustc-hex = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
-tiny-keccak = "1.4"
-zeroize = "0.9.1"
--- a/accounts/ethkey/README.md
+++ b/accounts/ethkey/README.md
@@ -1,221 +0,0 @@
-## ethkey-cli
-
-Parity Ethereum keys generator.
-
-### Usage
-
-```
-Parity Ethereum Keys Generator.
-  Copyright 2015-2019 Parity Technologies (UK) Ltd.
-
-Usage:
-    ethkey info <secret-or-phrase> [options]
-    ethkey generate random [options]
-    ethkey generate prefix <prefix> [options]
-    ethkey sign <secret> <message>
-    ethkey verify public <public> <signature> <message>
-    ethkey verify address <address> <signature> <message>
-    ethkey recover <address> <known-phrase>
-    ethkey [-h | --help]
-
-Options:
-    -h, --help         Display this message and exit.
-    -s, --secret       Display only the secret key.
-    -p, --public       Display only the public key.
-    -a, --address      Display only the address.
-    -b, --brain        Use parity brain wallet algorithm. Not recommended.
-
-Commands:
-    info               Display public key and address of the secret.
-    generate random    Generates new random Ethereum key.
-    generate prefix    Random generation, but address must start with a prefix ("vanity address").
-    sign               Sign message using a secret key.
-    verify             Verify signer of the signature by public key or address.
-    recover            Try to find brain phrase matching given address from partial phrase.
-```
-
-### 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.
--- a/accounts/ethkey/cli/Cargo.toml
+++ b/accounts/ethkey/cli/Cargo.toml
@@ -1,21 +0,0 @@
-[package]
-description = "Parity Ethereum Keys Generator CLI"
-name = "ethkey-cli"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-docopt = "1.0"
-env_logger = "0.5"
-ethkey = { path = "../" }
-panic_hook = { path = "../../../util/panic-hook" }
-parity-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
--- a/accounts/ethkey/cli/src/main.rs
+++ b/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-2019 Parity Technologies (UK) Ltd.
-
-Usage:
-    ethkey info <secret-or-phrase> [options]
-    ethkey generate random [options]
-    ethkey generate prefix <prefix> [options]
-    ethkey sign <secret> <message>
-    ethkey verify public <public> <signature> <message>
-    ethkey verify address <address> <signature> <message>
-    ethkey recover <address> <known-phrase>
-    ethkey [-h | --help]
-
-Options:
-    -h, --help         Display this message and exit.
-    -s, --secret       Display only the secret key.
-    -p, --public       Display only the public key.
-    -a, --address      Display only the address.
-    -b, --brain        Use parity brain wallet algorithm. Not recommended.
-
-Commands:
-    info               Display public key and address of the secret.
-    generate random    Generates new random Ethereum key.
-    generate prefix    Random generation, but address must start with a prefix ("vanity address").
-    sign               Sign message using a secret key.
-    verify             Verify signer of the signature by public key or address.
-    recover            Try to find brain phrase matching given address from partial phrase.
-"#;
-
-#[derive(Debug, Deserialize)]
-struct Args {
-	cmd_info: bool,
-	cmd_generate: bool,
-	cmd_random: bool,
-	cmd_prefix: bool,
-	cmd_sign: bool,
-	cmd_verify: bool,
-	cmd_public: bool,
-	cmd_address: bool,
-	cmd_recover: bool,
-	arg_prefix: String,
-	arg_secret: String,
-	arg_secret_or_phrase: String,
-	arg_known_phrase: String,
-	arg_message: String,
-	arg_public: String,
-	arg_address: String,
-	arg_signature: String,
-	flag_secret: bool,
-	flag_public: bool,
-	flag_address: bool,
-	flag_brain: bool,
-}
-
-#[derive(Debug)]
-enum Error {
-	Ethkey(EthkeyError),
-	FromHex(FromHexError),
-	ParseInt(ParseIntError),
-	Docopt(docopt::Error),
-	Io(io::Error),
-}
-
-impl From<EthkeyError> for Error {
-	fn from(err: EthkeyError) -> Self {
-		Error::Ethkey(err)
-	}
-}
-
-impl From<FromHexError> for Error {
-	fn from(err: FromHexError) -> Self {
-		Error::FromHex(err)
-	}
-}
-
-impl From<ParseIntError> for Error {
-	fn from(err: ParseIntError) -> Self {
-		Error::ParseInt(err)
-	}
-}
-
-impl From<docopt::Error> for Error {
-	fn from(err: docopt::Error) -> Self {
-		Error::Docopt(err)
-	}
-}
-
-impl From<io::Error> for Error {
-	fn from(err: io::Error) -> Self {
-		Error::Io(err)
-	}
-}
-
-impl fmt::Display for Error {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		match *self {
-			Error::Ethkey(ref e) => write!(f, "{}", e),
-			Error::FromHex(ref e) => write!(f, "{}", e),
-			Error::ParseInt(ref e) => write!(f, "{}", e),
-			Error::Docopt(ref e) => write!(f, "{}", e),
-			Error::Io(ref e) => write!(f, "{}", e),
-		}
-	}
-}
-
-enum DisplayMode {
-	KeyPair,
-	Secret,
-	Public,
-	Address,
-}
-
-impl DisplayMode {
-	fn new(args: &Args) -> Self {
-		if args.flag_secret {
-			DisplayMode::Secret
-		} else if args.flag_public {
-			DisplayMode::Public
-		} else if args.flag_address {
-			DisplayMode::Address
-		} else {
-			DisplayMode::KeyPair
-		}
-	}
-}
-
-fn main() {
-	panic_hook::set_abort();
-	env_logger::try_init().expect("Logger initialized only once.");
-
-	match execute(env::args()) {
-		Ok(ok) => println!("{}", ok),
-		Err(Error::Docopt(ref e)) => e.exit(),
-		Err(err) => {
-			eprintln!("{}", err);
-			process::exit(1);
-		}
-	}
-}
-
-fn display(result: (KeyPair, Option<String>), mode: DisplayMode) -> String {
-	let keypair = result.0;
-	match mode {
-		DisplayMode::KeyPair => match result.1 {
-			Some(extra_data) => format!("{}\n{}", extra_data, keypair),
-			None => format!("{}", keypair)
-		},
-		DisplayMode::Secret => format!("{:x}", keypair.secret()),
-		DisplayMode::Public => format!("{:x}", keypair.public()),
-		DisplayMode::Address => format!("{:x}", keypair.address()),
-	}
-}
-
-fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item=S>, S: AsRef<str> {
-	let args: Args = Docopt::new(USAGE)
-		.and_then(|d| d.argv(command).deserialize())?;
-
-	return if args.cmd_info {
-		let display_mode = DisplayMode::new(&args);
-
-		let result = if args.flag_brain {
-			let phrase = args.arg_secret_or_phrase;
-			let phrase_info = validate_phrase(&phrase);
-			let keypair = Brain::new(phrase).generate().expect("Brain wallet generator is infallible; qed");
-			(keypair, Some(phrase_info))
-		} else {
-			let secret = args.arg_secret_or_phrase.parse().map_err(|_| EthkeyError::InvalidSecret)?;
-			(KeyPair::from_secret(secret)?, None)
-		};
-		Ok(display(result, display_mode))
-	} else if args.cmd_generate {
-		let display_mode = DisplayMode::new(&args);
-		let result = if args.cmd_random {
-			if args.flag_brain {
-				let mut brain = BrainPrefix::new(vec![0], usize::max_value(), BRAIN_WORDS);
-				let keypair = brain.generate()?;
-				let phrase = format!("recovery phrase: {}", brain.phrase());
-				(keypair, Some(phrase))
-			} else {
-				(Random.generate()?, None)
-			}
-		} else if args.cmd_prefix {
-			let prefix = args.arg_prefix.from_hex()?;
-			let brain = args.flag_brain;
-			in_threads(move || {
-				let iterations = 1024;
-				let prefix = prefix.clone();
-				move || {
-					let prefix = prefix.clone();
-					let res = if brain {
-						let mut brain = BrainPrefix::new(prefix, iterations, BRAIN_WORDS);
-						let result = brain.generate();
-						let phrase = format!("recovery phrase: {}", brain.phrase());
-						result.map(|keypair| (keypair, Some(phrase)))
-					} else {
-						let result = Prefix::new(prefix, iterations).generate();
-						result.map(|res| (res, None))
-					};
-
-					Ok(res.map(Some).unwrap_or(None))
-				}
-			})?
-		} else {
-			return Ok(format!("{}", USAGE))
-		};
-		Ok(display(result, display_mode))
-	} else if args.cmd_sign {
-		let secret = args.arg_secret.parse().map_err(|_| EthkeyError::InvalidSecret)?;
-		let message = args.arg_message.parse().map_err(|_| EthkeyError::InvalidMessage)?;
-		let signature = sign(&secret, &message)?;
-		Ok(format!("{}", signature))
-	} else if args.cmd_verify {
-		let signature = args.arg_signature.parse().map_err(|_| EthkeyError::InvalidSignature)?;
-		let message = args.arg_message.parse().map_err(|_| EthkeyError::InvalidMessage)?;
-		let ok = if args.cmd_public {
-			let public = args.arg_public.parse().map_err(|_| EthkeyError::InvalidPublic)?;
-			verify_public(&public, &signature, &message)?
-		} else if args.cmd_address {
-			let address = args.arg_address.parse().map_err(|_| EthkeyError::InvalidAddress)?;
-			verify_address(&address, &signature, &message)?
-		} else {
-			return Ok(format!("{}", USAGE))
-		};
-		Ok(format!("{}", ok))
-	} else if args.cmd_recover {
-		let display_mode = DisplayMode::new(&args);
-		let known_phrase = args.arg_known_phrase;
-		let address = args.arg_address.parse().map_err(|_| EthkeyError::InvalidAddress)?;
-		let (phrase, keypair) = in_threads(move || {
-			let mut it = brain_recover::PhrasesIterator::from_known_phrase(&known_phrase, BRAIN_WORDS);
-			move || {
-				let mut i = 0;
-				while let Some(phrase) = it.next() {
-					i += 1;
-
-					let keypair = Brain::new(phrase.clone()).generate().unwrap();
-					if keypair.address() == address {
-						return Ok(Some((phrase, keypair)))
-					}
-
-					if i >= 1024 {
-						return Ok(None)
-					}
-				}
-
-				Err(EthkeyError::Custom("Couldn't find any results.".into()))
-			}
-		})?;
-		Ok(display((keypair, Some(phrase)), display_mode))
-	} else {
-		Ok(format!("{}", USAGE))
-	}
-}
-
-const BRAIN_WORDS: usize = 12;
-
-fn validate_phrase(phrase: &str) -> String {
-	match Brain::validate_phrase(phrase, BRAIN_WORDS) {
-		Ok(()) => format!("The recovery phrase looks correct.\n"),
-		Err(err) => format!("The recover phrase was not generated by Parity: {}", err)
-	}
-}
-
-fn in_threads<F, X, O>(prepare: F) -> Result<O, EthkeyError> where
-	O: Send + 'static,
-	X: Send + 'static,
-	F: Fn() -> X,
-	X: FnMut() -> Result<Option<O>, EthkeyError>,
-{
-	let pool = threadpool::Builder::new().build();
-
-	let (tx, rx) = sync::mpsc::sync_channel(1);
-	let is_done = sync::Arc::new(sync::atomic::AtomicBool::default());
-
-	for _ in 0..pool.max_count() {
-		let is_done = is_done.clone();
-		let tx = tx.clone();
-		let mut task = prepare();
-		pool.execute(move || {
-			loop {
-				if is_done.load(sync::atomic::Ordering::SeqCst) {
-					return;
-				}
-
-				let res = match task() {
-					Ok(None) => continue,
-					Ok(Some(v)) => Ok(v),
-					Err(err) => Err(err),
-				};
-
-				// We are interested only in the first response.
-				let _ = tx.send(res);
-			}
-		});
-	}
-
-	if let Ok(solution) = rx.recv() {
-		is_done.store(true, sync::atomic::Ordering::SeqCst);
-		return solution;
-	}
-
-	Err(EthkeyError::Custom("No results found.".into()))
-}
-
-#[cfg(test)]
-mod tests {
-	use super::execute;
-
-	#[test]
-	fn info() {
-		let command = vec!["ethkey", "info", "17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected =
-"secret:  17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55
-public:  689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124
-address: 26d1ec50b4e62c1d1a40d16e7cacc6a6580757d5".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn brain() {
-		let command = vec!["ethkey", "info", "--brain", "this is sparta"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected =
-"The recover phrase was not generated by Parity: The word 'this' does not come from the dictionary.
-
-secret:  aa22b54c0cb43ee30a014afe5ef3664b1cde299feabca46cd3167a85a57c39f2
-public:  c4c5398da6843632c123f543d714d2d2277716c11ff612b2a2f23c6bda4d6f0327c31cd58c55a9572c3cc141dade0c32747a13b7ef34c241b26c84adbb28fcf4
-address: 006e27b6a72e1f34c626762f3c4761547aff1421".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn secret() {
-		let command = vec!["ethkey", "info", "--brain", "this is sparta", "--secret"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected = "aa22b54c0cb43ee30a014afe5ef3664b1cde299feabca46cd3167a85a57c39f2".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn public() {
-		let command = vec!["ethkey", "info", "--brain", "this is sparta", "--public"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected = "c4c5398da6843632c123f543d714d2d2277716c11ff612b2a2f23c6bda4d6f0327c31cd58c55a9572c3cc141dade0c32747a13b7ef34c241b26c84adbb28fcf4".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn address() {
-		let command = vec!["ethkey", "info", "-b", "this is sparta", "--address"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected = "006e27b6a72e1f34c626762f3c4761547aff1421".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn sign() {
-		let command = vec!["ethkey", "sign", "17d08f5fe8c77af811caa0c9a187e668ce3b74a99acc3f6d976f075fa8e0be55", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected = "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn verify_valid_public() {
-		let command = vec!["ethkey", "verify", "public", "689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124", "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected = "true".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn verify_valid_address() {
-		let command = vec!["ethkey", "verify", "address", "26d1ec50b4e62c1d1a40d16e7cacc6a6580757d5", "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec987"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected = "true".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-
-	#[test]
-	fn verify_invalid() {
-		let command = vec!["ethkey", "verify", "public", "689268c0ff57a20cd299fa60d3fb374862aff565b20b5f1767906a99e6e09f3ff04ca2b2a5cd22f62941db103c0356df1a8ed20ce322cab2483db67685afd124", "c1878cf60417151c766a712653d26ef350c8c75393458b7a9be715f053215af63dfd3b02c2ae65a8677917a8efa3172acb71cb90196e42106953ea0363c5aaf200", "bd50b7370c3f96733b31744c6c45079e7ae6c8d299613246d28ebcef507ec986"]
-			.into_iter()
-			.map(Into::into)
-			.collect::<Vec<String>>();
-
-		let expected = "false".to_owned();
-		assert_eq!(execute(command).unwrap(), expected);
-	}
-}
--- a/accounts/ethkey/src/brain.rs
+++ b/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());
-	}
-}
--- a/accounts/ethkey/src/brain_prefix.rs
+++ b/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().as_ref().starts_with(&self.prefix) {
-				self.last_phrase = phrase;
-				return Ok(keypair)
-			}
-		}
-
-		Err(Error::Custom("Could not find keypair".into()))
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use {Generator, BrainPrefix};
-
-	#[test]
-	fn prefix_generator() {
-		let prefix = vec![0x00u8];
-		let keypair = BrainPrefix::new(prefix.clone(), usize::max_value(), 12).generate().unwrap();
-		assert!(keypair.address().as_bytes().starts_with(&prefix));
-	}
-}
--- a/accounts/ethkey/src/brain_recover.rs
+++ b/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);
-	}
-
-}
--- a/accounts/ethkey/src/crypto.rs
+++ b/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.as_bytes())?;
-		let shared = ecdh::SharedSecret::new_raw(context, &publ, &sec);
-
-		Secret::from_unsafe_slice(&shared[0..32])
-			.map_err(|_| Error::Secp(secp256k1::Error::InvalidSecretKey))
-	}
-}
-
-/// ECIES function
-pub mod ecies {
-	use parity_crypto::{aes, digest, hmac, is_equal};
-	use ethereum_types::H128;
-	use super::{ecdh, Error};
-	use {Random, Generator, Public, Secret};
-
-	/// Encrypt a message with a public key, writing an HMAC covering both
-	/// the plaintext and authenticated data.
-	///
-	/// Authenticated data may be empty.
-	pub fn encrypt(public: &Public, auth_data: &[u8], plain: &[u8]) -> Result<Vec<u8>, Error> {
-		let r = Random.generate()?;
-		let z = ecdh::agree(r.secret(), public)?;
-		let mut key = [0u8; 32];
-		kdf(&z, &[0u8; 0], &mut key);
-
-		let ekey = &key[0..16];
-		let mkey = hmac::SigKey::sha256(&digest::sha256(&key[16..32]));
-
-		let mut msg = vec![0u8; 1 + 64 + 16 + plain.len() + 32];
-		msg[0] = 0x04u8;
-		{
-			let msgd = &mut msg[1..];
-			msgd[0..64].copy_from_slice(r.public().as_bytes());
-			let iv = H128::random();
-			msgd[64..80].copy_from_slice(iv.as_bytes());
-			{
-				let cipher = &mut msgd[(64 + 16)..(64 + 16 + plain.len())];
-				aes::encrypt_128_ctr(ekey, iv.as_bytes(), plain, cipher)?;
-			}
-			let mut hmac = hmac::Signer::with(&mkey);
-			{
-				let cipher_iv = &msgd[64..(64 + 16 + plain.len())];
-				hmac.update(cipher_iv);
-			}
-			hmac.update(auth_data);
-			let sig = hmac.sign();
-			msgd[(64 + 16 + plain.len())..].copy_from_slice(&sig);
-		}
-		Ok(msg)
-	}
-
-	/// Decrypt a message with a secret key, checking HMAC for ciphertext
-	/// and authenticated data validity.
-	pub fn decrypt(secret: &Secret, auth_data: &[u8], encrypted: &[u8]) -> Result<Vec<u8>, Error> {
-		let meta_len = 1 + 64 + 16 + 32;
-		if encrypted.len() < meta_len  || encrypted[0] < 2 || encrypted[0] > 4 {
-			return Err(Error::InvalidMessage); //invalid message: publickey
-		}
-
-		let e = &encrypted[1..];
-		let p = Public::from_slice(&e[0..64]);
-		let z = ecdh::agree(secret, &p)?;
-		let mut key = [0u8; 32];
-		kdf(&z, &[0u8; 0], &mut key);
-
-		let ekey = &key[0..16];
-		let mkey = hmac::SigKey::sha256(&digest::sha256(&key[16..32]));
-
-		let clen = encrypted.len() - meta_len;
-		let cipher_with_iv = &e[64..(64+16+clen)];
-		let cipher_iv = &cipher_with_iv[0..16];
-		let cipher_no_iv = &cipher_with_iv[16..];
-		let msg_mac = &e[(64+16+clen)..];
-
-		// Verify tag
-		let mut hmac = hmac::Signer::with(&mkey);
-		hmac.update(cipher_with_iv);
-		hmac.update(auth_data);
-		let mac = hmac.sign();
-
-		if !is_equal(&mac.as_ref()[..], msg_mac) {
-			return Err(Error::InvalidMessage);
-		}
-
-		let mut msg = vec![0u8; clen];
-		aes::decrypt_128_ctr(ekey, cipher_iv, cipher_no_iv, &mut msg[..])?;
-		Ok(msg)
-	}
-
-	fn kdf(secret: &Secret, s1: &[u8], dest: &mut [u8]) {
-		// SEC/ISO/Shoup specify counter size SHOULD be equivalent
-		// to size of hash output, however, it also notes that
-		// the 4 bytes is okay. NIST specifies 4 bytes.
-		let mut ctr = 1u32;
-		let mut written = 0usize;
-		while written < dest.len() {
-			let mut hasher = digest::Hasher::sha256();
-			let ctrs = [(ctr >> 24) as u8, (ctr >> 16) as u8, (ctr >> 8) as u8, ctr as u8];
-			hasher.update(&ctrs);
-			hasher.update(secret.as_bytes());
-			hasher.update(s1);
-			let d = hasher.finish();
-			&mut dest[written..(written + 32)].copy_from_slice(&d);
-			written += 32;
-			ctr += 1;
-		}
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::ecies;
-	use {Random, Generator};
-
-	#[test]
-	fn ecies_shared() {
-		let kp = Random.generate().unwrap();
-		let message = b"So many books, so little time";
-
-		let shared = b"shared";
-		let wrong_shared = b"incorrect";
-		let encrypted = ecies::encrypt(kp.public(), shared, message).unwrap();
-		assert!(encrypted[..] != message[..]);
-		assert_eq!(encrypted[0], 0x04);
-
-		assert!(ecies::decrypt(kp.secret(), wrong_shared, &encrypted).is_err());
-		let decrypted = ecies::decrypt(kp.secret(), shared, &encrypted).unwrap();
-		assert_eq!(decrypted[..message.len()], message[..]);
-	}
-}
--- a/accounts/ethkey/src/error.rs
+++ b/accounts/ethkey/src/error.rs
@@ -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)
-	}
-}
--- a/accounts/ethkey/src/keccak.rs
+++ b/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
-	}
-}
--- a/accounts/ethkey/src/lib.rs
+++ b/accounts/ethkey/src/lib.rs
@@ -1,87 +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 edit_distance;
-extern crate parity_crypto;
-extern crate ethereum_types;
-extern crate parity_wordlist;
-#[macro_use]
-extern crate quick_error;
-extern crate rand;
-extern crate rustc_hex;
-extern crate secp256k1;
-extern crate serde;
-extern crate tiny_keccak;
-extern crate zeroize;
-
-#[macro_use]
-extern crate lazy_static;
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate serde_derive;
-
-mod brain;
-mod brain_prefix;
-mod error;
-mod keypair;
-mod keccak;
-mod password;
-mod prefix;
-mod random;
-mod signature;
-mod secret;
-mod extended;
-
-pub mod brain_recover;
-pub mod crypto;
-pub mod math;
-
-pub use self::parity_wordlist::Error as WordlistError;
-pub use self::brain::Brain;
-pub use self::brain_prefix::BrainPrefix;
-pub use self::error::Error;
-pub use self::keypair::{KeyPair, public_to_address};
-pub use self::math::public_is_valid;
-pub use self::password::Password;
-pub use self::prefix::Prefix;
-pub use self::random::Random;
-pub use self::signature::{sign, verify_public, verify_address, recover, Signature};
-pub use self::secret::Secret;
-pub use self::extended::{ExtendedPublic, ExtendedSecret, ExtendedKeyPair, DerivationError, Derivation};
-
-use ethereum_types::H256;
-
-pub use ethereum_types::{Address, Public};
-pub type Message = H256;
-
-lazy_static! {
-	pub static ref SECP256K1: secp256k1::Secp256k1 = secp256k1::Secp256k1::new();
-}
-
-/// Uninstantiatable error type for infallible generators.
-#[derive(Debug)]
-pub enum Void {}
-
-/// Generates new keypair.
-pub trait Generator {
-	type Error;
-
-	/// Should be called to generate new keypair.
-	fn generate(&mut self) -> Result<KeyPair, Self::Error>;
-}
--- a/accounts/ethkey/src/math.rs
+++ b/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::{BigEndianHash as _, U256, H256};
-
-/// Whether the public key is valid.
-pub fn public_is_valid(public: &Public) -> bool {
-	to_secp256k1_public(public).ok()
-		.map_or(false, |p| p.is_valid())
-}
-
-/// Inplace multiply public key by secret key (EC point * scalar)
-pub fn public_mul_secret(public: &mut Public, secret: &Secret) -> Result<(), Error> {
-	let key_secret = secret.to_secp256k1_secret()?;
-	let mut key_public = to_secp256k1_public(public)?;
-	key_public.mul_assign(&SECP256K1, &key_secret)?;
-	set_public(public, &key_public);
-	Ok(())
-}
-
-/// Inplace add one public key to another (EC point + EC point)
-pub fn public_add(public: &mut Public, other: &Public) -> Result<(), Error> {
-	let mut key_public = to_secp256k1_public(public)?;
-	let other_public = to_secp256k1_public(other)?;
-	key_public.add_assign(&SECP256K1, &other_public)?;
-	set_public(public, &key_public);
-	Ok(())
-}
-
-/// Inplace sub one public key from another (EC point - EC point)
-pub fn public_sub(public: &mut Public, other: &Public) -> Result<(), Error> {
-	let mut key_neg_other = to_secp256k1_public(other)?;
-	key_neg_other.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
-
-	let mut key_public = to_secp256k1_public(public)?;
-	key_public.add_assign(&SECP256K1, &key_neg_other)?;
-	set_public(public, &key_public);
-	Ok(())
-}
-
-/// Replace public key with its negation (EC point = - EC point)
-pub fn public_negate(public: &mut Public) -> Result<(), Error> {
-	let mut key_public = to_secp256k1_public(public)?;
-	key_public.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
-	set_public(public, &key_public);
-	Ok(())
-}
-
-/// Return base point of secp256k1
-pub fn generation_point() -> Public {
-	let mut public_sec_raw = [0u8; 65];
-	public_sec_raw[0] = 4;
-	public_sec_raw[1..33].copy_from_slice(&GENERATOR_X);
-	public_sec_raw[33..65].copy_from_slice(&GENERATOR_Y);
-
-	let public_key = key::PublicKey::from_slice(&SECP256K1, &public_sec_raw)
-		.expect("constructing using predefined constants; qed");
-	let mut public = Public::default();
-	set_public(&mut public, &public_key);
-	public
-}
-
-/// Return secp256k1 elliptic curve order
-pub fn curve_order() -> U256 {
-	H256::from_slice(&CURVE_ORDER).into_uint()
-}
-
-fn to_secp256k1_public(public: &Public) -> Result<key::PublicKey, Error> {
-	let public_data = {
-		let mut temp = [4u8; 65];
-		(&mut temp[1..65]).copy_from_slice(&public[0..64]);
-		temp
-	};
-
-	Ok(key::PublicKey::from_slice(&SECP256K1, &public_data)?)
-}
-
-fn set_public(public: &mut Public, key_public: &key::PublicKey) {
-	let key_public_serialized = key_public.serialize_vec(&SECP256K1, false);
-	public.as_bytes_mut().copy_from_slice(&key_public_serialized[1..65]);
-}
-
-#[cfg(test)]
-mod tests {
-	use super::super::{Random, Generator};
-	use super::{public_add, public_sub};
-
-	#[test]
-	fn public_addition_is_commutative() {
-		let public1 = Random.generate().unwrap().public().clone();
-		let public2 = Random.generate().unwrap().public().clone();
-
-		let mut left = public1.clone();
-		public_add(&mut left, &public2).unwrap();
-
-		let mut right = public2.clone();
-		public_add(&mut right, &public1).unwrap();
-
-		assert_eq!(left, right);
-	}
-
-	#[test]
-	fn public_addition_is_reversible_with_subtraction() {
-		let public1 = Random.generate().unwrap().public().clone();
-		let public2 = Random.generate().unwrap().public().clone();
-
-		let mut sum = public1.clone();
-		public_add(&mut sum, &public2).unwrap();
-		public_sub(&mut sum, &public2).unwrap();
-
-		assert_eq!(sum, public1);
-	}
-}
--- a/accounts/ethkey/src/password.rs
+++ b/accounts/ethkey/src/password.rs
@@ -1,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))
-	}
-}
--- a/accounts/ethkey/src/prefix.rs
+++ b/accounts/ethkey/src/prefix.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 super::{Random, Generator, KeyPair, Error};
-
-/// Tries to find keypair with address starting with given prefix.
-pub struct Prefix {
-	prefix: Vec<u8>,
-	iterations: usize,
-}
-
-impl Prefix {
-	pub fn new(prefix: Vec<u8>, iterations: usize) -> Self {
-		Prefix {
-			prefix: prefix,
-			iterations: iterations,
-		}
-	}
-}
-
-impl Generator for Prefix {
-	type Error = Error;
-
-	fn generate(&mut self) -> Result<KeyPair, Error> {
-		for _ in 0..self.iterations {
-			let keypair = Random.generate()?;
-			if keypair.address().as_ref().starts_with(&self.prefix) {
-				return Ok(keypair)
-			}
-		}
-
-		Err(Error::Custom("Could not find keypair".into()))
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use {Generator, Prefix};
-
-	#[test]
-	fn prefix_generator() {
-		let prefix = vec![0xffu8];
-		let keypair = Prefix::new(prefix.clone(), usize::max_value()).generate().unwrap();
-		assert!(keypair.address().as_bytes().starts_with(&prefix));
-	}
-}
--- a/accounts/ethkey/src/random.rs
+++ b/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::rngs::OsRng;
-use super::{Generator, KeyPair, SECP256K1};
-
-/// Randomly generates new keypair, instantiating the RNG each time.
-pub struct Random;
-
-impl Generator for Random {
-	type Error = ::std::io::Error;
-
-	fn generate(&mut self) -> Result<KeyPair, Self::Error> {
-		let mut rng = OsRng::new()?;
-		match rng.generate() {
-			Ok(pair) => Ok(pair),
-			Err(void) => match void {}, // LLVM unreachable
-		}
-	}
-}
-
-impl Generator for OsRng {
-	type Error = ::Void;
-
-	fn generate(&mut self) -> Result<KeyPair, Self::Error> {
-		let (sec, publ) = SECP256K1.generate_keypair(self)
-			.expect("context always created with full capabilities; qed");
-
-		Ok(KeyPair::from_keypair(sec, publ))
-	}
-}
--- a/accounts/ethkey/src/secret.rs
+++ b/accounts/ethkey/src/secret.rs
@@ -1,304 +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 zeroize::Zeroize;
-use {Error, SECP256K1};
-
-#[derive(Clone, PartialEq, Eq)]
-pub struct Secret {
-	inner: H256,
-}
-
-impl Drop for Secret {
-	fn drop(&mut self) {
-		self.inner.0.zeroize()
-	}
-}
-
-impl ToHex for Secret {
-	fn to_hex(&self) -> String {
-		format!("{:x}", self.inner)
-	}
-}
-
-impl fmt::LowerHex for Secret {
-	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-		self.inner.fmt(fmt)
-	}
-}
-
-impl fmt::Debug for Secret {
-	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-		self.inner.fmt(fmt)
-	}
-}
-
-impl fmt::Display for Secret {
-	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-		write!(fmt, "Secret: 0x{:x}{:x}..{:x}{:x}", self.inner[0], self.inner[1], self.inner[30], self.inner[31])
-	}
-}
-
-impl Secret {
-	/// Creates a `Secret` from the given slice, returning `None` if the slice length != 32.
-	pub fn from_slice(key: &[u8]) -> Option<Self> {
-		if key.len() != 32 {
-			return None
-		}
-		let mut h = H256::zero();
-		h.as_bytes_mut().copy_from_slice(&key[0..32]);
-		Some(Secret { inner: h })
-	}
-
-	/// Creates zero key, which is invalid for crypto operations, but valid for math operation.
-	pub fn zero() -> Self {
-		Secret { inner: H256::zero() }
-	}
-
-	/// Imports and validates the key.
-	pub fn from_unsafe_slice(key: &[u8]) -> Result<Self, Error> {
-		let secret = key::SecretKey::from_slice(&super::SECP256K1, key)?;
-		Ok(secret.into())
-	}
-
-	/// Checks validity of this key.
-	pub fn check_validity(&self) -> Result<(), Error> {
-		self.to_secp256k1_secret().map(|_| ())
-	}
-
-	/// Inplace add one secret key to another (scalar + scalar)
-	pub fn add(&mut self, other: &Secret) -> Result<(), Error> {
-		match (self.is_zero(), other.is_zero()) {
-			(true, true) | (false, true) => Ok(()),
-			(true, false) => {
-				*self = other.clone();
-				Ok(())
-			},
-			(false, false) => {
-				let mut key_secret = self.to_secp256k1_secret()?;
-				let other_secret = other.to_secp256k1_secret()?;
-				key_secret.add_assign(&SECP256K1, &other_secret)?;
-
-				*self = key_secret.into();
-				Ok(())
-			},
-		}
-	}
-
-	/// Inplace subtract one secret key from another (scalar - scalar)
-	pub fn sub(&mut self, other: &Secret) -> Result<(), Error> {
-		match (self.is_zero(), other.is_zero()) {
-			(true, true) | (false, true) => Ok(()),
-			(true, false) => {
-				*self = other.clone();
-				self.neg()
-			},
-			(false, false) => {
-				let mut key_secret = self.to_secp256k1_secret()?;
-				let mut other_secret = other.to_secp256k1_secret()?;
-				other_secret.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
-				key_secret.add_assign(&SECP256K1, &other_secret)?;
-
-				*self = key_secret.into();
-				Ok(())
-			},
-		}
-	}
-
-	/// Inplace decrease secret key (scalar - 1)
-	pub fn dec(&mut self) -> Result<(), Error> {
-		match self.is_zero() {
-			true => {
-				*self = key::MINUS_ONE_KEY.into();
-				Ok(())
-			},
-			false => {
-				let mut key_secret = self.to_secp256k1_secret()?;
-				key_secret.add_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
-
-				*self = key_secret.into();
-				Ok(())
-			},
-		}
-	}
-
-	/// Inplace multiply one secret key to another (scalar * scalar)
-	pub fn mul(&mut self, other: &Secret) -> Result<(), Error> {
-		match (self.is_zero(), other.is_zero()) {
-			(true, true) | (true, false) => Ok(()),
-			(false, true) => {
-				*self = Self::zero();
-				Ok(())
-			},
-			(false, false) => {
-				let mut key_secret = self.to_secp256k1_secret()?;
-				let other_secret = other.to_secp256k1_secret()?;
-				key_secret.mul_assign(&SECP256K1, &other_secret)?;
-
-				*self = key_secret.into();
-				Ok(())
-			},
-		}
-	}
-
-	/// Inplace negate secret key (-scalar)
-	pub fn neg(&mut self) -> Result<(), Error> {
-		match self.is_zero() {
-			true => Ok(()),
-			false => {
-				let mut key_secret = self.to_secp256k1_secret()?;
-				key_secret.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
-
-				*self = key_secret.into();
-				Ok(())
-			},
-		}
-	}
-
-	/// Inplace inverse secret key (1 / scalar)
-	pub fn inv(&mut self) -> Result<(), Error> {
-		let mut key_secret = self.to_secp256k1_secret()?;
-		key_secret.inv_assign(&SECP256K1)?;
-
-		*self = key_secret.into();
-		Ok(())
-	}
-
-	/// Compute power of secret key inplace (secret ^ pow).
-	/// This function is not intended to be used with large powers.
-	pub fn pow(&mut self, pow: usize) -> Result<(), Error> {
-		if self.is_zero() {
-			return Ok(());
-		}
-
-		match pow {
-			0 => *self = key::ONE_KEY.into(),
-			1 => (),
-			_ => {
-				let c = self.clone();
-				for _ in 1..pow {
-					self.mul(&c)?;
-				}
-			},
-		}
-
-		Ok(())
-	}
-
-	/// Create `secp256k1::key::SecretKey` based on this secret
-	pub fn to_secp256k1_secret(&self) -> Result<key::SecretKey, Error> {
-		Ok(key::SecretKey::from_slice(&SECP256K1, &self[..])?)
-	}
-}
-
-impl FromStr for Secret {
-	type Err = Error;
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		Ok(H256::from_str(s).map_err(|e| Error::Custom(format!("{:?}", e)))?.into())
-	}
-}
-
-impl From<[u8; 32]> for Secret {
-	fn from(k: [u8; 32]) -> Self {
-		Secret { inner: H256(k) }
-	}
-}
-
-impl From<H256> for Secret {
-	fn from(s: H256) -> Self {
-		s.0.into()
-	}
-}
-
-impl From<&'static str> for Secret {
-	fn from(s: &'static str) -> Self {
-		s.parse().expect(&format!("invalid string literal for {}: '{}'", stringify!(Self), s))
-	}
-}
-
-impl From<key::SecretKey> for Secret {
-	fn from(key: key::SecretKey) -> Self {
-		let mut a = [0; SECP256K1_SECRET_KEY_SIZE];
-		a.copy_from_slice(&key[0 .. SECP256K1_SECRET_KEY_SIZE]);
-		a.into()
-	}
-}
-
-impl Deref for Secret {
-	type Target = H256;
-
-	fn deref(&self) -> &Self::Target {
-		&self.inner
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use std::str::FromStr;
-	use super::super::{Random, Generator};
-	use super::Secret;
-
-	#[test]
-	fn multiplicating_secret_inversion_with_secret_gives_one() {
-		let secret = Random.generate().unwrap().secret().clone();
-		let mut inversion = secret.clone();
-		inversion.inv().unwrap();
-		inversion.mul(&secret).unwrap();
-		assert_eq!(inversion, Secret::from_str("0000000000000000000000000000000000000000000000000000000000000001").unwrap());
-	}
-
-	#[test]
-	fn secret_inversion_is_reversible_with_inversion() {
-		let secret = Random.generate().unwrap().secret().clone();
-		let mut inversion = secret.clone();
-		inversion.inv().unwrap();
-		inversion.inv().unwrap();
-		assert_eq!(inversion, secret);
-	}
-
-	#[test]
-	fn secret_pow() {
-		let secret = Random.generate().unwrap().secret().clone();
-
-		let mut pow0 = secret.clone();
-		pow0.pow(0).unwrap();
-		assert_eq!(pow0, Secret::from_str("0000000000000000000000000000000000000000000000000000000000000001").unwrap());
-
-		let mut pow1 = secret.clone();
-		pow1.pow(1).unwrap();
-		assert_eq!(pow1, secret);
-
-		let mut pow2 = secret.clone();
-		pow2.pow(2).unwrap();
-		let mut pow2_expected = secret.clone();
-		pow2_expected.mul(&secret).unwrap();
-		assert_eq!(pow2, pow2_expected);
-
-		let mut pow3 = secret.clone();
-		pow3.pow(3).unwrap();
-		let mut pow3_expected = secret.clone();
-		pow3_expected.mul(&secret).unwrap();
-		pow3_expected.mul(&secret).unwrap();
-		assert_eq!(pow3, pow3_expected);
-	}
-}
--- a/accounts/ethkey/src/signature.rs
+++ b/accounts/ethkey/src/signature.rs
@@ -1,314 +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.as_ref());
-		sig[32..64].copy_from_slice(s.as_ref());
-		sig[64] = v;
-		Signature(sig)
-	}
-
-	/// Check if this is a "low" signature.
-	pub fn is_low_s(&self) -> bool {
-		// "7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5D576E7357A4501DDFE92F46681B20A0"
-		const MASK: H256 = H256([
-			0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-			0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-			0x5D, 0x57, 0x6E, 0x73, 0x57, 0xA4, 0x50, 0x1D,
-			0xDF, 0xE9, 0x2F, 0x46, 0x68, 0x1B, 0x20, 0xA0,
-		]);
-		H256::from_slice(self.s()) <= MASK
-	}
-
-	/// Check if each component of the signature is in range.
-	pub fn is_valid(&self) -> bool {
-		// "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"
-		const MASK: H256 = H256([
-			0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-			0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
-			0xba, 0xae, 0xdc, 0xe6, 0xaf, 0x48, 0xa0, 0x3b,
-			0xbf, 0xd2, 0x5e, 0x8c, 0xd0, 0x36, 0x41, 0x41,
-		]);
-		const ONE: H256 = H256([
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-		]);
-		let r = H256::from_slice(self.r());
-		let s = H256::from_slice(self.s());
-		self.v() <= 1 &&
-			r < MASK && r >= ONE &&
-			s < MASK && s >= ONE
-	}
-}
-
-// manual implementation large arrays don't have trait impls by default.
-// remove when integer generics exist
-impl PartialEq for Signature {
-	fn eq(&self, other: &Self) -> bool {
-		&self.0[..] == &other.0[..]
-	}
-}
-
-// manual implementation required in Rust 1.13+, see `std::cmp::AssertParamIsEq`.
-impl Eq for Signature { }
-
-// also manual for the same reason, but the pretty printing might be useful.
-impl fmt::Debug for Signature {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		f.debug_struct("Signature")
-			.field("r", &self.0[0..32].to_hex())
-			.field("s", &self.0[32..64].to_hex())
-			.field("v", &self.0[64..65].to_hex())
-		.finish()
-	}
-}
-
-impl fmt::Display for Signature {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		write!(f, "{}", self.to_hex())
-	}
-}
-
-impl FromStr for Signature {
-	type Err = Error;
-
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		match s.from_hex() {
-			Ok(ref hex) if hex.len() == 65 => {
-				let mut data = [0; 65];
-				data.copy_from_slice(&hex[0..65]);
-				Ok(Signature(data))
-			},
-			_ => Err(Error::InvalidSignature)
-		}
-	}
-}
-
-impl Default for Signature {
-	fn default() -> Self {
-		Signature([0; 65])
-	}
-}
-
-impl Hash for Signature {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-    	H520::from(self.0).hash(state);
-    }
-}
-
-impl Clone for Signature {
-    fn clone(&self) -> Self {
-		Signature(self.0)
-    }
-}
-
-impl From<[u8; 65]> for Signature {
-	fn from(s: [u8; 65]) -> Self {
-		Signature(s)
-	}
-}
-
-impl Into<[u8; 65]> for Signature {
-	fn into(self) -> [u8; 65] {
-		self.0
-	}
-}
-
-impl From<Signature> for H520 {
-	fn from(s: Signature) -> Self {
-		H520::from(s.0)
-	}
-}
-
-impl From<H520> for Signature {
-	fn from(bytes: H520) -> Self {
-		Signature(bytes.into())
-	}
-}
-
-impl Deref for Signature {
-	type Target = [u8; 65];
-
-	fn deref(&self) -> &Self::Target {
-		&self.0
-	}
-}
-
-impl DerefMut for Signature {
-	fn deref_mut(&mut self) -> &mut Self::Target {
-		&mut self.0
-	}
-}
-
-pub fn sign(secret: &Secret, message: &Message) -> Result<Signature, Error> {
-	let context = &SECP256K1;
-	let sec = SecretKey::from_slice(context, secret.as_ref())?;
-	let s = context.sign_recoverable(&SecpMessage::from_slice(&message[..])?, &sec)?;
-	let (rec_id, data) = s.serialize_compact(context);
-	let mut data_arr = [0; 65];
-
-	// no need to check if s is low, it always is
-	data_arr[0..64].copy_from_slice(&data[0..64]);
-	data_arr[64] = rec_id.to_i32() as u8;
-	Ok(Signature(data_arr))
-}
-
-pub fn verify_public(public: &Public, signature: &Signature, message: &Message) -> Result<bool, Error> {
-	let context = &SECP256K1;
-	let rsig = RecoverableSignature::from_compact(context, &signature[0..64], RecoveryId::from_i32(signature[64] as i32)?)?;
-	let sig = rsig.to_standard(context);
-
-	let pdata: [u8; 65] = {
-		let mut temp = [4u8; 65];
-		temp[1..65].copy_from_slice(public.as_bytes());
-		temp
-	};
-
-	let publ = PublicKey::from_slice(context, &pdata)?;
-	match context.verify(&SecpMessage::from_slice(&message[..])?, &sig, &publ) {
-		Ok(_) => Ok(true),
-		Err(SecpError::IncorrectSignature) => Ok(false),
-		Err(x) => Err(Error::from(x))
-	}
-}
-
-pub fn verify_address(address: &Address, signature: &Signature, message: &Message) -> Result<bool, Error> {
-	let public = recover(signature, message)?;
-	let recovered_address = public_to_address(&public);
-	Ok(address == &recovered_address)
-}
-
-pub fn recover(signature: &Signature, message: &Message) -> Result<Public, Error> {
-	let context = &SECP256K1;
-	let rsig = RecoverableSignature::from_compact(context, &signature[0..64], RecoveryId::from_i32(signature[64] as i32)?)?;
-	let pubkey = context.recover(&SecpMessage::from_slice(&message[..])?, &rsig)?;
-	let serialized = pubkey.serialize_vec(context, false);
-
-	let mut public = Public::default();
-	public.as_bytes_mut().copy_from_slice(&serialized[1..65]);
-	Ok(public)
-}
-
-#[cfg(test)]
-mod tests {
-	use std::str::FromStr;
-	use {Generator, Random, Message};
-	use super::{sign, verify_public, verify_address, recover, Signature};
-
-	#[test]
-	fn vrs_conversion() {
-		// given
-		let keypair = Random.generate().unwrap();
-		let message = Message::default();
-		let signature = sign(keypair.secret(), &message).unwrap();
-
-		// when
-		let vrs = signature.clone().into_electrum();
-		let from_vrs = Signature::from_electrum(&vrs);
-
-		// then
-		assert_eq!(signature, from_vrs);
-	}
-
-	#[test]
-	fn signature_to_and_from_str() {
-		let keypair = Random.generate().unwrap();
-		let message = Message::default();
-		let signature = sign(keypair.secret(), &message).unwrap();
-		let string = format!("{}", signature);
-		let deserialized = Signature::from_str(&string).unwrap();
-		assert_eq!(signature, deserialized);
-	}
-
-	#[test]
-	fn sign_and_recover_public() {
-		let keypair = Random.generate().unwrap();
-		let message = Message::default();
-		let signature = sign(keypair.secret(), &message).unwrap();
-		assert_eq!(keypair.public(), &recover(&signature, &message).unwrap());
-	}
-
-	#[test]
-	fn sign_and_verify_public() {
-		let keypair = Random.generate().unwrap();
-		let message = Message::default();
-		let signature = sign(keypair.secret(), &message).unwrap();
-		assert!(verify_public(keypair.public(), &signature, &message).unwrap());
-	}
-
-	#[test]
-	fn sign_and_verify_address() {
-		let keypair = Random.generate().unwrap();
-		let message = Message::default();
-		let signature = sign(keypair.secret(), &message).unwrap();
-		assert!(verify_address(&keypair.address(), &signature, &message).unwrap());
-	}
-}
--- a/accounts/ethstore/Cargo.toml
+++ b/accounts/ethstore/Cargo.toml
@@ -1,30 +0,0 @@
-[package]
-description = "Parity Ethereum Key Management"
-name = "ethstore"
-version = "0.2.1"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-log = "0.4"
-libc = "0.2"
-rand = "0.6"
-ethkey = { path = "../ethkey" }
-serde = "1.0"
-serde_json = "1.0"
-serde_derive = "1.0"
-rustc-hex = "1.0"
-tiny-keccak = "1.4"
-time = "0.1.34"
-itertools = "0.5"
-parking_lot = "0.7"
-parity-crypto = "0.4.0"
-ethereum-types = "0.6.0"
-dir = { path = "../../util/dir" }
-smallvec = "0.6"
-parity-wordlist = "1.0"
-tempdir = "0.3"
-
-[dev-dependencies]
-matches = "0.1"
-
-[lib]
--- a/accounts/ethstore/README.md
+++ b/accounts/ethstore/README.md
@@ -1,340 +0,0 @@
-## ethstore-cli
-
-Parity Ethereum key management.
-
-### Usage
-
-```
-Parity Ethereum key management tool.
-  Copyright 2015-2019 Parity Technologies (UK) Ltd.
-
-Usage:
-    ethstore insert <secret> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore change-pwd <address> <old-pwd> <new-pwd> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore list [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore import [--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.
--- a/accounts/ethstore/cli/Cargo.toml
+++ b/accounts/ethstore/cli/Cargo.toml
@@ -1,25 +0,0 @@
-[package]
-description = "Parity Ethereum Key Management CLI"
-name = "ethstore-cli"
-version = "0.1.1"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-docopt = "1.0"
-env_logger = "0.5"
-num_cpus = "1.6"
-rustc-hex = "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"
--- a/accounts/ethstore/cli/src/crack.rs
+++ b/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!("."),
-				_ => {},
-			}
-		}
-	}
-}
--- a/accounts/ethstore/cli/src/main.rs
+++ b/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-2019 Parity Technologies (UK) Ltd.
-
-Usage:
-    ethstore insert <secret> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore change-pwd <address> <old-pwd> <new-pwd> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore list [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore import [<password>] [--src DIR] [--dir DIR]
-    ethstore import-wallet <path> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore find-wallet-pass <path> <password>
-    ethstore remove <address> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore sign <address> <password> <message> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore public <address> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore list-vaults [--dir DIR]
-    ethstore create-vault <vault> <password> [--dir DIR]
-    ethstore change-vault-pwd <vault> <old-pwd> <new-pwd> [--dir DIR]
-    ethstore move-to-vault <address> <vault> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
-    ethstore move-from-vault <address> <vault> <password> [--dir DIR]
-    ethstore [-h | --help]
-
-Options:
-    -h, --help               Display this message and exit.
-    --dir DIR                Specify the secret store directory. It may be either
-                             parity, parity-(chain), geth, geth-test
-                             or a path [default: parity].
-    --vault VAULT            Specify vault to use in this operation.
-    --vault-pwd VAULTPWD     Specify vault password to use in this operation. Please note
-                             that this option is required when vault option is set.
-                             Otherwise it is ignored.
-    --src DIR                Specify import source. It may be either
-                             parity, parity-(chain), geth, geth-test
-                             or a path [default: geth].
-
-Commands:
-    insert             Save account with password.
-    change-pwd         Change password.
-    list               List accounts.
-    import             Import accounts from src.
-    import-wallet      Import presale wallet.
-    find-wallet-pass   Tries to open a wallet with list of passwords given.
-    remove             Remove account.
-    sign               Sign message.
-    public             Displays public key for an address.
-    list-vaults        List vaults.
-    create-vault       Create new vault.
-    change-vault-pwd   Change vault password.
-    move-to-vault      Move account to vault from another vault/root directory.
-    move-from-vault    Move account to root directory from given vault.
-"#;
-
-#[derive(Debug, Deserialize)]
-struct Args {
-	cmd_insert: bool,
-	cmd_change_pwd: bool,
-	cmd_list: bool,
-	cmd_import: bool,
-	cmd_import_wallet: bool,
-	cmd_find_wallet_pass: bool,
-	cmd_remove: bool,
-	cmd_sign: bool,
-	cmd_public: bool,
-	cmd_list_vaults: bool,
-	cmd_create_vault: bool,
-	cmd_change_vault_pwd: bool,
-	cmd_move_to_vault: bool,
-	cmd_move_from_vault: bool,
-	arg_secret: String,
-	arg_password: String,
-	arg_old_pwd: String,
-	arg_new_pwd: String,
-	arg_address: String,
-	arg_message: String,
-	arg_path: String,
-	arg_vault: String,
-	flag_src: String,
-	flag_dir: String,
-	flag_vault: String,
-	flag_vault_pwd: String,
-}
-
-enum Error {
-	Ethstore(ethstore::Error),
-	Docopt(docopt::Error),
-}
-
-impl From<ethstore::Error> for Error {
-	fn from(err: ethstore::Error) -> Self {
-		Error::Ethstore(err)
-	}
-}
-
-impl From<docopt::Error> for Error {
-	fn from(err: docopt::Error) -> Self {
-		Error::Docopt(err)
-	}
-}
-
-impl fmt::Display for Error {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		match *self {
-			Error::Ethstore(ref err) => fmt::Display::fmt(err, f),
-			Error::Docopt(ref err) => fmt::Display::fmt(err, f),
-		}
-	}
-}
-
-fn main() {
-	panic_hook::set_abort();
-	if env::var("RUST_LOG").is_err() {
-		env::set_var("RUST_LOG", "warn")
-	}
-	env_logger::try_init().expect("Logger initialized only once.");
-
-	match execute(env::args()) {
-		Ok(result) => println!("{}", result),
-		Err(Error::Docopt(ref e)) => e.exit(),
-		Err(err) => {
-			eprintln!("{}", err);
-			process::exit(1);
-		}
-	}
-}
-
-fn key_dir(location: &str, password: Option<Password>) -> Result<Box<KeyDirectory>, Error> {
-	let dir: RootDiskDirectory = match location {
-		"geth" => RootDiskDirectory::create(dir::geth(false))?,
-		"geth-test" => RootDiskDirectory::create(dir::geth(true))?,
-		path if path.starts_with("parity") => {
-			let chain = path.split('-').nth(1).unwrap_or("ethereum");
-			let path = dir::parity(chain);
-			RootDiskDirectory::create(path)?
-		},
-		path => RootDiskDirectory::create(path)?,
-	};
-
-	Ok(Box::new(dir.with_password(password)))
-}
-
-fn open_args_vault(store: &EthStore, args: &Args) -> Result<SecretVaultRef, Error> {
-	if args.flag_vault.is_empty() {
-		return Ok(SecretVaultRef::Root);
-	}
-
-	let vault_pwd = load_password(&args.flag_vault_pwd)?;
-	store.open_vault(&args.flag_vault, &vault_pwd)?;
-	Ok(SecretVaultRef::Vault(args.flag_vault.clone()))
-}
-
-fn open_args_vault_account(store: &EthStore, address: Address, args: &Args) -> Result<StoreAccountRef, Error> {
-	match open_args_vault(store, args)? {
-		SecretVaultRef::Root => Ok(StoreAccountRef::root(address)),
-		SecretVaultRef::Vault(name) => Ok(StoreAccountRef::vault(&name, address)),
-	}
-}
-
-fn format_accounts(accounts: &[Address]) -> String {
-	accounts.iter()
-		.enumerate()
-		.map(|(i, a)| format!("{:2}: 0x{:x}", i, a))
-		.collect::<Vec<String>>()
-		.join("\n")
-}
-
-fn format_vaults(vaults: &[String]) -> String {
-	vaults.join("\n")
-}
-
-fn load_password(path: &str) -> Result<Password, Error> {
-	let mut file = fs::File::open(path).map_err(|e| ethstore::Error::Custom(format!("Error opening password file '{}': {}", path, e)))?;
-	let mut password = String::new();
-	file.read_to_string(&mut password).map_err(|e| ethstore::Error::Custom(format!("Error reading password file '{}': {}", path, e)))?;
-	// drop EOF
-	let _ = password.pop();
-	Ok(password.into())
-}
-
-fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item=S>, S: AsRef<str> {
-	let args: Args = Docopt::new(USAGE)
-		.and_then(|d| d.argv(command).deserialize())?;
-
-	let store = EthStore::open(key_dir(&args.flag_dir, None)?)?;
-
-	return if args.cmd_insert {
-		let secret = args.arg_secret.parse().map_err(|_| ethstore::Error::InvalidSecret)?;
-		let password = load_password(&args.arg_password)?;
-		let vault_ref = open_args_vault(&store, &args)?;
-		let account_ref = store.insert_account(vault_ref, secret, &password)?;
-		Ok(format!("0x{:x}", account_ref.address))
-	} else if args.cmd_change_pwd {
-		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
-		let old_pwd = load_password(&args.arg_old_pwd)?;
-		let new_pwd = load_password(&args.arg_new_pwd)?;
-		let account_ref = open_args_vault_account(&store, address, &args)?;
-		let ok = store.change_password(&account_ref, &old_pwd, &new_pwd).is_ok();
-		Ok(format!("{}", ok))
-	} else if args.cmd_list {
-		let vault_ref = open_args_vault(&store, &args)?;
-		let accounts = store.accounts()?;
-		let accounts: Vec<_> = accounts
-			.into_iter()
-			.filter(|a| &a.vault == &vault_ref)
-			.map(|a| a.address)
-			.collect();
-		Ok(format_accounts(&accounts))
-	} else if args.cmd_import {
-		let password = match args.arg_password.as_ref() {
-			"" => None,
-			_ => Some(load_password(&args.arg_password)?)
-		};
-		let src = key_dir(&args.flag_src, password)?;
-		let dst = key_dir(&args.flag_dir, None)?;
-
-		let accounts = import_accounts(&*src, &*dst)?;
-		Ok(format_accounts(&accounts))
-	} else if args.cmd_import_wallet {
-		let wallet = PresaleWallet::open(&args.arg_path)?;
-		let password = load_password(&args.arg_password)?;
-		let kp = wallet.decrypt(&password)?;
-		let vault_ref = open_args_vault(&store, &args)?;
-		let account_ref = store.insert_account(vault_ref, kp.secret().clone(), &password)?;
-		Ok(format!("0x{:x}", account_ref.address))
-	} else if args.cmd_find_wallet_pass {
-		let passwords = load_password(&args.arg_password)?;
-		let passwords = passwords.as_str().lines().map(|line| str::to_owned(line).into()).collect::<VecDeque<_>>();
-		crack::run(passwords, &args.arg_path)?;
-		Ok(format!("Password not found."))
-	} else if args.cmd_remove {
-		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
-		let password = load_password(&args.arg_password)?;
-		let account_ref = open_args_vault_account(&store, address, &args)?;
-		let ok = store.remove_account(&account_ref, &password).is_ok();
-		Ok(format!("{}", ok))
-	} else if args.cmd_sign {
-		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
-		let message = args.arg_message.parse().map_err(|_| ethstore::Error::InvalidMessage)?;
-		let password = load_password(&args.arg_password)?;
-		let account_ref = open_args_vault_account(&store, address, &args)?;
-		let signature = store.sign(&account_ref, &password, &message)?;
-		Ok(format!("0x{}", signature))
-	} else if args.cmd_public {
-		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
-		let password = load_password(&args.arg_password)?;
-		let account_ref = open_args_vault_account(&store, address, &args)?;
-		let public = store.public(&account_ref, &password)?;
-		Ok(format!("0x{:x}", public))
-	} else if args.cmd_list_vaults {
-		let vaults = store.list_vaults()?;
-		Ok(format_vaults(&vaults))
-	} else if args.cmd_create_vault {
-		let password = load_password(&args.arg_password)?;
-		store.create_vault(&args.arg_vault, &password)?;
-		Ok("OK".to_owned())
-	} else if args.cmd_change_vault_pwd {
-		let old_pwd = load_password(&args.arg_old_pwd)?;
-		let new_pwd = load_password(&args.arg_new_pwd)?;
-		store.open_vault(&args.arg_vault, &old_pwd)?;
-		store.change_vault_password(&args.arg_vault, &new_pwd)?;
-		Ok("OK".to_owned())
-	} else if args.cmd_move_to_vault {
-		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
-		let password = load_password(&args.arg_password)?;
-		let account_ref = open_args_vault_account(&store, address, &args)?;
-		store.open_vault(&args.arg_vault, &password)?;
-		store.change_account_vault(SecretVaultRef::Vault(args.arg_vault), account_ref)?;
-		Ok("OK".to_owned())
-	} else if args.cmd_move_from_vault {
-		let address = args.arg_address.parse().map_err(|_| ethstore::Error::InvalidAccount)?;
-		let password = load_password(&args.arg_password)?;
-		store.open_vault(&args.arg_vault, &password)?;
-		store.change_account_vault(SecretVaultRef::Root, StoreAccountRef::vault(&args.arg_vault, address))?;
-		Ok("OK".to_owned())
-	} else {
-		Ok(format!("{}", USAGE))
-	}
-}
--- a/accounts/ethstore/cli/tests/cli.rs
+++ b/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");
-}
--- a/accounts/ethstore/src/account/cipher.rs
+++ b/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()),
-		}
-	}
-}
--- a/accounts/ethstore/src/account/crypto.rs
+++ b/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.as_ref(), password, iterations)
-	}
-
-	/// Encrypt custom plain data
-	pub fn with_plain(plain: &[u8], password: &Password, iterations: u32) -> Result<Self, crypto::Error> {
-		let salt: [u8; 32] = Random::random();
-		let iv: [u8; 16] = Random::random();
-
-		// two parts of derived key
-		// DK = [ DK[0..15] DK[16..31] ] = [derived_left_bits, derived_right_bits]
-		let (derived_left_bits, derived_right_bits) =
-			crypto::derive_key_iterations(password.as_bytes(), &salt, iterations);
-
-		// preallocated (on-stack in case of `Secret`) buffer to hold cipher
-		// length = length(plain) as we are using CTR-approach
-		let plain_len = plain.len();
-		let mut ciphertext: SmallVec<[u8; 32]> = SmallVec::from_vec(vec![0; plain_len]);
-
-		// aes-128-ctr with initial vector of iv
-		crypto::aes::encrypt_128_ctr(&derived_left_bits, &iv, plain, &mut *ciphertext)?;
-
-		// KECCAK(DK[16..31] ++ <ciphertext>), where DK[16..31] - derived_right_bits
-		let mac = crypto::derive_mac(&derived_right_bits, &*ciphertext).keccak256();
-
-		Ok(Crypto {
-			cipher: Cipher::Aes128Ctr(Aes128Ctr {
-				iv: iv,
-			}),
-			ciphertext: ciphertext.into_vec(),
-			kdf: Kdf::Pbkdf2(Pbkdf2 {
-				dklen: crypto::KEY_LENGTH as u32,
-				salt: salt.to_vec(),
-				c: iterations,
-				prf: Prf::HmacSha256,
-			}),
-			mac: mac,
-		})
-	}
-
-	/// Try to decrypt and convert result to account secret
-	pub fn secret(&self, password: &Password) -> Result<Secret, Error> {
-		if self.ciphertext.len() > 32 {
-			return Err(Error::InvalidSecret);
-		}
-
-		let secret = self.do_decrypt(password, 32)?;
-		Ok(Secret::from_unsafe_slice(&secret)?)
-	}
-
-	/// Try to decrypt and return result as is
-	pub fn decrypt(&self, password: &Password) -> Result<Vec<u8>, Error> {
-		let expected_len = self.ciphertext.len();
-		self.do_decrypt(password, expected_len)
-	}
-
-	fn do_decrypt(&self, password: &Password, expected_len: usize) -> Result<Vec<u8>, Error> {
-		let (derived_left_bits, derived_right_bits) = match self.kdf {
-			Kdf::Pbkdf2(ref params) => crypto::derive_key_iterations(password.as_bytes(), &params.salt, params.c),
-			Kdf::Scrypt(ref params) => crypto::scrypt::derive_key(password.as_bytes(), &params.salt, params.n, params.p, params.r)?,
-		};
-
-		let mac = crypto::derive_mac(&derived_right_bits, &self.ciphertext).keccak256();
-
-		if !crypto::is_equal(&mac, &self.mac) {
-			return Err(Error::InvalidPassword)
-		}
-
-		let mut plain: SmallVec<[u8; 32]> = SmallVec::from_vec(vec![0; expected_len]);
-
-		match self.cipher {
-			Cipher::Aes128Ctr(ref params) => {
-				// checker by callers
-				debug_assert!(expected_len >= self.ciphertext.len());
-
-				let from = expected_len - self.ciphertext.len();
-				crypto::aes::decrypt_128_ctr(&derived_left_bits, &params.iv, &self.ciphertext, &mut plain[from..])?;
-				Ok(plain.into_iter().collect())
-			},
-		}
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use ethkey::{Generator, Random};
-	use super::{Crypto, Error};
-
-	#[test]
-	fn crypto_with_secret_create() {
-		let keypair = Random.generate().unwrap();
-		let passwd = "this is sparta".into();
-		let crypto = Crypto::with_secret(keypair.secret(), &passwd, 10240).unwrap();
-		let secret = crypto.secret(&passwd).unwrap();
-		assert_eq!(keypair.secret(), &secret);
-	}
-
-	#[test]
-	fn crypto_with_secret_invalid_password() {
-		let keypair = Random.generate().unwrap();
-		let crypto = Crypto::with_secret(keypair.secret(), &"this is sparta".into(), 10240).unwrap();
-		assert_matches!(crypto.secret(&"this is sparta!".into()), Err(Error::InvalidPassword))
-	}
-
-	#[test]
-	fn crypto_with_null_plain_data() {
-		let original_data = b"";
-		let passwd = "this is sparta".into();
-		let crypto = Crypto::with_plain(&original_data[..], &passwd, 10240).unwrap();
-		let decrypted_data = crypto.decrypt(&passwd).unwrap();
-		assert_eq!(original_data[..], *decrypted_data);
-	}
-
-	#[test]
-	fn crypto_with_tiny_plain_data() {
-		let original_data = b"{}";
-		let passwd = "this is sparta".into();
-		let crypto = Crypto::with_plain(&original_data[..], &passwd, 10240).unwrap();
-		let decrypted_data = crypto.decrypt(&passwd).unwrap();
-		assert_eq!(original_data[..], *decrypted_data);
-	}
-
-	#[test]
-	fn crypto_with_huge_plain_data() {
-		let original_data: Vec<_> = (1..65536).map(|i| (i % 256) as u8).collect();
-		let passwd = "this is sparta".into();
-		let crypto = Crypto::with_plain(&original_data, &passwd, 10240).unwrap();
-		let decrypted_data = crypto.decrypt(&passwd).unwrap();
-		assert_eq!(&original_data, &decrypted_data);
-	}
-}
--- a/accounts/ethstore/src/account/kdf.rs
+++ b/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()),
-		}
-	}
-}
--- a/accounts/ethstore/src/account/mod.rs
+++ b/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;
--- a/accounts/ethstore/src/account/safe_account.rs
+++ b/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());
-	}
-}
--- a/accounts/ethstore/src/account/version.rs
+++ b/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,
-		}
-	}
-}
--- a/accounts/ethstore/src/accounts_dir/disk.rs
+++ b/accounts/ethstore/src/accounts_dir/disk.rs
@@ -1,484 +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 std::os::unix::fs::OpenOptionsExt;
-
-	fs::OpenOptions::new()
-		.write(true)
-		.create_new(true)
-		.mode((libc::S_IWUSR | libc::S_IRUSR) as u32)
-		.open(file_path)
-}
-
-/// Create a new file and restrict permissions to owner only. It errors if the file already exists.
-#[cfg(not(unix))]
-pub fn create_new_file_with_permissions_to_owner(file_path: &Path) -> io::Result<fs::File> {
-	fs::OpenOptions::new()
-		.write(true)
-		.create_new(true)
-		.open(file_path)
-}
-
-/// Create a new file and restrict permissions to owner only. It replaces the existing file if it already exists.
-#[cfg(unix)]
-pub fn replace_file_with_permissions_to_owner(file_path: &Path) -> io::Result<fs::File> {
-	use std::os::unix::fs::PermissionsExt;
-
-	let file = fs::File::create(file_path)?;
-	let mut permissions = file.metadata()?.permissions();
-	permissions.set_mode((libc::S_IWUSR | libc::S_IRUSR) as u32);
-	file.set_permissions(permissions)?;
-
-	Ok(file)
-}
-
-/// Create a new file and restrict permissions to owner only. It replaces the existing file if it already exists.
-#[cfg(not(unix))]
-pub fn replace_file_with_permissions_to_owner(file_path: &Path) -> io::Result<fs::File> {
-	fs::File::create(file_path)
-}
-
-/// Root keys directory implementation
-pub type RootDiskDirectory = DiskDirectory<DiskKeyFileManager>;
-
-/// Disk directory key file manager
-pub trait KeyFileManager: Send + Sync {
-	/// Read `SafeAccount` from given key file stream
-	fn read<T>(&self, filename: Option<String>, reader: T) -> Result<SafeAccount, Error> where T: io::Read;
-
-	/// Write `SafeAccount` to given key file stream
-	fn write<T>(&self, account: SafeAccount, writer: &mut T) -> Result<(), Error> where T: io::Write;
-}
-
-/// Disk-based keys directory implementation
-pub struct DiskDirectory<T> where T: KeyFileManager {
-	path: PathBuf,
-	key_manager: T,
-}
-
-/// Keys file manager for root keys directory
-#[derive(Default)]
-pub struct DiskKeyFileManager {
-	password: Option<Password>,
-}
-
-impl RootDiskDirectory {
-	pub fn create<P>(path: P) -> Result<Self, Error> where P: AsRef<Path> {
-		fs::create_dir_all(&path)?;
-		Ok(Self::at(path))
-	}
-
-	/// allows to read keyfiles with given password (needed for keyfiles w/o address)
-	pub fn with_password(&self, password: Option<Password>) -> Self {
-		DiskDirectory::new(&self.path, DiskKeyFileManager { password })
-	}
-
-	pub fn at<P>(path: P) -> Self where P: AsRef<Path> {
-		DiskDirectory::new(path, DiskKeyFileManager::default())
-	}
-}
-
-impl<T> DiskDirectory<T> where T: KeyFileManager {
-	/// Create new disk directory instance
-	pub fn new<P>(path: P, key_manager: T) -> Self where P: AsRef<Path> {
-		DiskDirectory {
-			path: path.as_ref().to_path_buf(),
-			key_manager: key_manager,
-		}
-	}
-
-	fn files(&self) -> Result<Vec<PathBuf>, Error>  {
-		Ok(fs::read_dir(&self.path)?
-			.flat_map(Result::ok)
-			.filter(|entry| {
-				let metadata = entry.metadata().ok();
-				let file_name = entry.file_name();
-				let name = file_name.to_string_lossy();
-				// filter directories
-				metadata.map_or(false, |m| !m.is_dir()) &&
-					// hidden files
-					!name.starts_with(".") &&
-					// other ignored files
-					!IGNORED_FILES.contains(&&*name)
-			})
-			.map(|entry| entry.path())
-			.collect::<Vec<PathBuf>>()
-		)
-	}
-
-	pub fn files_hash(&self) -> Result<u64, Error> {
-		use std::collections::hash_map::DefaultHasher;
-		use std::hash::Hasher;
-
-    	let mut hasher = DefaultHasher::new();
-		let files = self.files()?;
-		for file in files {
-			hasher.write(file.to_str().unwrap_or("").as_bytes())
-		}
-
-		Ok(hasher.finish())
-	}
-
-	fn last_modification_date(&self) -> Result<u64, Error> {
-		use std::time::{Duration, UNIX_EPOCH};
-		let duration = fs::metadata(&self.path)?.modified()?.duration_since(UNIX_EPOCH).unwrap_or(Duration::default());
-		let timestamp = duration.as_secs() ^ (duration.subsec_nanos() as u64);
-		Ok(timestamp)
-	}
-
-	/// all accounts found in keys directory
-	fn files_content(&self) -> Result<HashMap<PathBuf, SafeAccount>, Error> {
-		// it's not done using one iterator cause
-		// there is an issue with rustc and it takes tooo much time to compile
-		let paths = self.files()?;
-		Ok(paths
-			.into_iter()
-			.filter_map(|path| {
-				let filename = Some(path.file_name().and_then(|n| n.to_str()).expect("Keys have valid UTF8 names only.").to_owned());
-				fs::File::open(path.clone())
-					.map_err(Into::into)
-					.and_then(|file| self.key_manager.read(filename, file))
-					.map_err(|err| {
-						warn!("Invalid key file: {:?} ({})", path, err);
-						err
-					})
-					.map(|account| (path, account))
-					.ok()
-			})
-			.collect()
-		)
-	}
-
-	/// insert account with given filename. if the filename is a duplicate of any stored account and dedup is set to
-	/// true, a random suffix is appended to the filename.
-	pub fn insert_with_filename(&self, account: SafeAccount, mut filename: String, dedup: bool) -> Result<SafeAccount, Error> {
-		if dedup {
-			filename = find_unique_filename_using_random_suffix(&self.path, &filename)?;
-		}
-
-		// path to keyfile
-		let keyfile_path = self.path.join(filename.as_str());
-
-		// update account filename
-		let original_account = account.clone();
-		let mut account = account;
-		account.filename = Some(filename);
-
-		{
-			// save the file
-			let mut file = if dedup {
-				create_new_file_with_permissions_to_owner(&keyfile_path)?
-			} else {
-				replace_file_with_permissions_to_owner(&keyfile_path)?
-			};
-
-			// write key content
-			self.key_manager.write(original_account, &mut file).map_err(|e| Error::Custom(format!("{:?}", e)))?;
-
-			file.flush()?;
-			file.sync_all()?;
-		}
-
-		Ok(account)
-	}
-
-	/// Get key file manager referece
-	pub fn key_manager(&self) -> &T {
-		&self.key_manager
-	}
-}
-
-impl<T> KeyDirectory for DiskDirectory<T> where T: KeyFileManager {
-	fn load(&self) -> Result<Vec<SafeAccount>, Error> {
-		let accounts = self.files_content()?
-			.into_iter()
-			.map(|(_, account)| account)
-			.collect();
-		Ok(accounts)
-	}
-
-	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
-		// Disk store handles updates correctly iff filename is the same
-		let filename = account_filename(&account);
-		self.insert_with_filename(account, filename, false)
-	}
-
-	fn insert(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
-		let filename = account_filename(&account);
-		self.insert_with_filename(account, filename, true)
-	}
-
-	fn remove(&self, account: &SafeAccount) -> Result<(), Error> {
-		// enumerate all entries in keystore
-		// and find entry with given address
-		let to_remove = self.files_content()?
-			.into_iter()
-			.find(|&(_, ref acc)| acc.id == account.id && acc.address == account.address);
-
-		// remove it
-		match to_remove {
-			None => Err(Error::InvalidAccount),
-			Some((path, _)) => fs::remove_file(path).map_err(From::from)
-		}
-	}
-
-	fn path(&self) -> Option<&PathBuf> { Some(&self.path) }
-
-	fn as_vault_provider(&self) -> Option<&VaultKeyDirectoryProvider> {
-		Some(self)
-	}
-
-	fn unique_repr(&self) -> Result<u64, Error> {
-		self.last_modification_date()
-	}
-}
-
-impl<T> VaultKeyDirectoryProvider for DiskDirectory<T> where T: KeyFileManager {
-	fn create(&self, name: &str, key: VaultKey) -> Result<Box<VaultKeyDirectory>, Error> {
-		let vault_dir = VaultDiskDirectory::create(&self.path, name, key)?;
-		Ok(Box::new(vault_dir))
-	}
-
-	fn open(&self, name: &str, key: VaultKey) -> Result<Box<VaultKeyDirectory>, Error> {
-		let vault_dir = VaultDiskDirectory::at(&self.path, name, key)?;
-		Ok(Box::new(vault_dir))
-	}
-
-	fn list_vaults(&self) -> Result<Vec<String>, Error> {
-		Ok(fs::read_dir(&self.path)?
-			.filter_map(|e| e.ok().map(|e| e.path()))
-			.filter_map(|path| {
-				let mut vault_file_path = path.clone();
-				vault_file_path.push(VAULT_FILE_NAME);
-				if vault_file_path.is_file() {
-					path.file_name().and_then(|f| f.to_str()).map(|f| f.to_owned())
-				} else {
-					None
-				}
-			})
-			.collect())
-	}
-
-	fn vault_meta(&self, name: &str) -> Result<String, Error> {
-		VaultDiskDirectory::meta_at(&self.path, name)
-	}
-}
-
-impl KeyFileManager for DiskKeyFileManager {
-	fn read<T>(&self, filename: Option<String>, reader: T) -> Result<SafeAccount, Error> where T: io::Read {
-		let key_file = json::KeyFile::load(reader).map_err(|e| Error::Custom(format!("{:?}", e)))?;
-		SafeAccount::from_file(key_file, filename, &self.password)
-	}
-
-	fn write<T>(&self, mut account: SafeAccount, writer: &mut T) -> Result<(), Error> where T: io::Write {
-		// when account is moved back to root directory from vault
-		// => remove vault field from meta
-		account.meta = json::remove_vault_name_from_json_meta(&account.meta)
-			.map_err(|err| Error::Custom(format!("{:?}", err)))?;
-
-		let key_file: json::KeyFile = account.into();
-		key_file.write(writer).map_err(|e| Error::Custom(format!("{:?}", e)))
-	}
-}
-
-fn account_filename(account: &SafeAccount) -> String {
-	// build file path
-	account.filename.clone().unwrap_or_else(|| {
-		let timestamp = time::strftime("%Y-%m-%dT%H-%M-%S", &time::now_utc()).expect("Time-format string is valid.");
-		format!("UTC--{}Z--{}", timestamp, Uuid::from(account.id))
-	})
-}
-
-#[cfg(test)]
-mod test {
-	extern crate tempdir;
-
-	use std::{env, fs};
-	use super::{KeyDirectory, RootDiskDirectory, VaultKey};
-	use account::SafeAccount;
-	use ethkey::{Random, Generator};
-	use self::tempdir::TempDir;
-
-	#[test]
-	fn should_create_new_account() {
-		// given
-		let mut dir = env::temp_dir();
-		dir.push("ethstore_should_create_new_account");
-		let keypair = Random.generate().unwrap();
-		let password = "hello world".into();
-		let directory = RootDiskDirectory::create(dir.clone()).unwrap();
-
-		// when
-		let account = SafeAccount::create(&keypair, [0u8; 16], &password, 1024, "Test".to_owned(), "{}".to_owned());
-		let res = directory.insert(account.unwrap());
-
-		// then
-		assert!(res.is_ok(), "Should save account succesfuly.");
-		assert!(res.unwrap().filename.is_some(), "Filename has been assigned.");
-
-		// cleanup
-		let _ = fs::remove_dir_all(dir);
-	}
-
-	#[test]
-	fn should_handle_duplicate_filenames() {
-		// given
-		let mut dir = env::temp_dir();
-		dir.push("ethstore_should_handle_duplicate_filenames");
-		let keypair = Random.generate().unwrap();
-		let password = "hello world".into();
-		let directory = RootDiskDirectory::create(dir.clone()).unwrap();
-
-		// when
-		let account = SafeAccount::create(&keypair, [0u8; 16], &password, 1024, "Test".to_owned(), "{}".to_owned()).unwrap();
-		let filename = "test".to_string();
-		let dedup = true;
-
-		directory.insert_with_filename(account.clone(), "foo".to_string(), dedup).unwrap();
-		let file1 = directory.insert_with_filename(account.clone(), filename.clone(), dedup).unwrap().filename.unwrap();
-		let file2 = directory.insert_with_filename(account.clone(), filename.clone(), dedup).unwrap().filename.unwrap();
-		let file3 = directory.insert_with_filename(account.clone(), filename.clone(), dedup).unwrap().filename.unwrap();
-
-		// then
-		// the first file should have the original names
-		assert_eq!(file1, filename);
-
-		// the following duplicate files should have a suffix appended
-		assert!(file2 != file3);
-		assert_eq!(file2.len(), filename.len() + 5);
-		assert_eq!(file3.len(), filename.len() + 5);
-
-		// cleanup
-		let _ = fs::remove_dir_all(dir);
-	}
-
-	#[test]
-	fn should_manage_vaults() {
-		// given
-		let mut dir = env::temp_dir();
-		dir.push("should_create_new_vault");
-		let directory = RootDiskDirectory::create(dir.clone()).unwrap();
-		let vault_name = "vault";
-		let password = "password".into();
-
-		// then
-		assert!(directory.as_vault_provider().is_some());
-
-		// and when
-		let before_root_items_count = fs::read_dir(&dir).unwrap().count();
-		let vault = directory.as_vault_provider().unwrap().create(vault_name, VaultKey::new(&password, 1024));
-
-		// then
-		assert!(vault.is_ok());
-		let after_root_items_count = fs::read_dir(&dir).unwrap().count();
-		assert!(after_root_items_count > before_root_items_count);
-
-		// and when
-		let vault = directory.as_vault_provider().unwrap().open(vault_name, VaultKey::new(&password, 1024));
-
-		// then
-		assert!(vault.is_ok());
-		let after_root_items_count2 = fs::read_dir(&dir).unwrap().count();
-		assert!(after_root_items_count == after_root_items_count2);
-
-		// cleanup
-		let _ = fs::remove_dir_all(dir);
-	}
-
-	#[test]
-	fn should_list_vaults() {
-		// given
-		let temp_path = TempDir::new("").unwrap();
-		let directory = RootDiskDirectory::create(&temp_path).unwrap();
-		let vault_provider = directory.as_vault_provider().unwrap();
-		vault_provider.create("vault1", VaultKey::new(&"password1".into(), 1)).unwrap();
-		vault_provider.create("vault2", VaultKey::new(&"password2".into(), 1)).unwrap();
-
-		// then
-		let vaults = vault_provider.list_vaults().unwrap();
-		assert_eq!(vaults.len(), 2);
-		assert!(vaults.iter().any(|v| &*v == "vault1"));
-		assert!(vaults.iter().any(|v| &*v == "vault2"));
-	}
-
-	#[test]
-	fn hash_of_files() {
-		let temp_path = TempDir::new("").unwrap();
-		let directory = RootDiskDirectory::create(&temp_path).unwrap();
-
-		let hash = directory.files_hash().expect("Files hash should be calculated ok");
-		assert_eq!(
-			hash,
-			15130871412783076140
-		);
-
-		let keypair = Random.generate().unwrap();
-		let password = "test pass".into();
-		let account = SafeAccount::create(&keypair, [0u8; 16], &password, 1024, "Test".to_owned(), "{}".to_owned());
-		directory.insert(account.unwrap()).expect("Account should be inserted ok");
-
-		let new_hash = directory.files_hash().expect("New files hash should be calculated ok");
-
-		assert!(new_hash != hash, "hash of the file list should change once directory content changed");
-	}
-}
--- a/accounts/ethstore/src/accounts_dir/memory.rs
+++ b/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.to_low_u64_be() }
-		Ok(val)
-	}
-}
--- a/accounts/ethstore/src/accounts_dir/mod.rs
+++ b/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,
-		}
-	}
-}
--- a/accounts/ethstore/src/error.rs
+++ b/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)
-	}
-}
--- a/accounts/ethstore/src/ethkey.rs
+++ b/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)
-	}
-}
--- a/accounts/ethstore/src/ethstore.rs
+++ b/accounts/ethstore/src/ethstore.rs
--- a/accounts/ethstore/src/json/cipher.rs
+++ b/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),
-}
--- a/accounts/ethstore/src/json/crypto.rs
+++ b/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, because all crypto keys are strings")
-	}
-}
-
-enum CryptoField {
-	Cipher,
-	CipherParams,
-	CipherText,
-	Kdf,
-	KdfParams,
-	Mac,
-	Version,
-}
-
-impl<'a> Deserialize<'a> for CryptoField {
-	fn deserialize<D>(deserializer: D) -> Result<CryptoField, D::Error>
-		where D: Deserializer<'a>
-	{
-		deserializer.deserialize_any(CryptoFieldVisitor)
-	}
-}
-
-struct CryptoFieldVisitor;
-
-impl<'a> Visitor<'a> for CryptoFieldVisitor {
-	type Value = CryptoField;
-
-	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-		write!(formatter, "a valid crypto struct description")
-	}
-
-	fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
-		where E: Error
-	{
-		match value {
-			"cipher" => Ok(CryptoField::Cipher),
-			"cipherparams" => Ok(CryptoField::CipherParams),
-			"ciphertext" => Ok(CryptoField::CipherText),
-			"kdf" => Ok(CryptoField::Kdf),
-			"kdfparams" => Ok(CryptoField::KdfParams),
-			"mac" => Ok(CryptoField::Mac),
-			"version" => Ok(CryptoField::Version),
-			_ => Err(Error::custom(format!("Unknown field: '{}'", value))),
-		}
-	}
-}
-
-impl<'a> Deserialize<'a> for Crypto {
-	fn deserialize<D>(deserializer: D) -> Result<Crypto, D::Error>
-		where D: Deserializer<'a>
-	{
-		static FIELDS: &'static [&'static str] = &["id", "version", "crypto", "Crypto", "address"];
-		deserializer.deserialize_struct("Crypto", FIELDS, CryptoVisitor)
-	}
-}
-
-struct CryptoVisitor;
-
-impl<'a> Visitor<'a> for CryptoVisitor {
-	type Value = Crypto;
-
-	fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-		write!(formatter, "a valid vault crypto object")
-	}
-
-	fn visit_map<V>(self, mut visitor: V) -> Result<Self::Value, V::Error>
-		where V: MapAccess<'a>
-	{
-		let mut cipher = None;
-		let mut cipherparams = None;
-		let mut ciphertext = None;
-		let mut kdf = None;
-		let mut kdfparams = None;
-		let mut mac = None;
-
-		loop {
-			match visitor.next_key()? {
-				Some(CryptoField::Cipher) => { cipher = Some(visitor.next_value()?); }
-				Some(CryptoField::CipherParams) => { cipherparams = Some(visitor.next_value()?); }
-				Some(CryptoField::CipherText) => { ciphertext = Some(visitor.next_value()?); }
-				Some(CryptoField::Kdf) => { kdf = Some(visitor.next_value()?); }
-				Some(CryptoField::KdfParams) => { kdfparams = Some(visitor.next_value()?); }
-				Some(CryptoField::Mac) => { mac = Some(visitor.next_value()?); }
-				// skip not required version field (it appears in pyethereum generated keystores)
-				Some(CryptoField::Version) => { visitor.next_value().unwrap_or(()) }
-				None => { break; }
-			}
-		}
-
-		let cipher = match (cipher, cipherparams) {
-			(Some(CipherSer::Aes128Ctr), Some(CipherSerParams::Aes128Ctr(params))) => Cipher::Aes128Ctr(params),
-			(None, _) => return Err(V::Error::missing_field("cipher")),
-			(Some(_), None) => return Err(V::Error::missing_field("cipherparams")),
-		};
-
-		let ciphertext = match ciphertext {
-			Some(ciphertext) => ciphertext,
-			None => return Err(V::Error::missing_field("ciphertext")),
-		};
-
-		let kdf = match (kdf, kdfparams) {
-			(Some(KdfSer::Pbkdf2), Some(KdfSerParams::Pbkdf2(params))) => Kdf::Pbkdf2(params),
-			(Some(KdfSer::Scrypt), Some(KdfSerParams::Scrypt(params))) => Kdf::Scrypt(params),
-			(Some(_), Some(_)) => return Err(V::Error::custom("Invalid cipherparams")),
-			(None, _) => return Err(V::Error::missing_field("kdf")),
-			(Some(_), None) => return Err(V::Error::missing_field("kdfparams")),
-		};
-
-		let mac = match mac {
-			Some(mac) => mac,
-			None => return Err(V::Error::missing_field("mac")),
-		};
-
-		let result = Crypto {
-			cipher: cipher,
-			ciphertext: ciphertext,
-			kdf: kdf,
-			mac: mac,
-		};
-
-		Ok(result)
-	}
-}
-
-impl Serialize for Crypto {
-	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-		where S: Serializer
-	{
-		let mut crypto = serializer.serialize_struct("Crypto", 6)?;
-		match self.cipher {
-			Cipher::Aes128Ctr(ref params) => {
-				crypto.serialize_field("cipher", &CipherSer::Aes128Ctr)?;
-				crypto.serialize_field("cipherparams", params)?;
-			},
-		}
-		crypto.serialize_field("ciphertext", &self.ciphertext)?;
-		match self.kdf {
-			Kdf::Pbkdf2(ref params) => {
-				crypto.serialize_field("kdf", &KdfSer::Pbkdf2)?;
-				crypto.serialize_field("kdfparams", params)?;
-			},
-			Kdf::Scrypt(ref params) => {
-				crypto.serialize_field("kdf", &KdfSer::Scrypt)?;
-				crypto.serialize_field("kdfparams", params)?;
-			},
-		}
-
-		crypto.serialize_field("mac", &self.mac)?;
-		crypto.end()
-	}
-}
--- a/accounts/ethstore/src/json/error.rs
+++ b/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)
-	}
-}
--- a/accounts/ethstore/src/json/hash.rs
+++ b/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);
--- a/accounts/ethstore/src/json/kdf.rs
+++ b/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),
-}
--- a/accounts/ethstore/src/json/mod.rs
+++ b/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;
--- a/accounts/ethstore/src/json/presale.rs
+++ b/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);
-	}
-}
--- a/accounts/ethstore/src/json/version.rs
+++ b/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))
-		}
-	}
-}
--- a/accounts/ethstore/src/lib.rs
+++ b/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);
--- a/accounts/ethstore/src/presale.rs
+++ b/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());
-	}
-}
--- a/accounts/ethstore/src/random.rs
+++ b/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, RngCore, rngs::OsRng, distributions::Alphanumeric};
-
-pub trait Random {
-	fn random() -> Self where Self: Sized;
-}
-
-impl Random for [u8; 16] {
-	fn random() -> Self {
-		let mut result = [0u8; 16];
-		let mut rng = OsRng::new().unwrap();
-		rng.fill_bytes(&mut result);
-		result
-	}
-}
-
-impl Random for [u8; 32] {
-	fn random() -> Self {
-		let mut result = [0u8; 32];
-		let mut rng = OsRng::new().unwrap();
-		rng.fill_bytes(&mut result);
-		result
-	}
-}
-
-/// Generate a random string of given length.
-pub fn random_string(length: usize) -> String {
-	let mut rng = OsRng::new().expect("Not able to operate without random source.");
-	rng.sample_iter(&Alphanumeric).take(length).collect()
-}
--- a/accounts/ethstore/tests/api.rs
+++ b/accounts/ethstore/tests/api.rs
@@ -1,157 +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;
-extern crate ethereum_types;
-
-mod util;
-
-use ethstore::{EthStore, SimpleSecretStore, SecretVaultRef, StoreAccountRef};
-use ethstore::ethkey::{Random, Generator, Secret, KeyPair, verify_address};
-use ethstore::accounts_dir::RootDiskDirectory;
-use util::TransientDir;
-use ethereum_types::Address;
-use std::str::FromStr;
-
-#[test]
-fn secret_store_create() {
-	let dir = TransientDir::create().unwrap();
-	let _ = EthStore::open(Box::new(dir)).unwrap();
-}
-
-#[test]
-#[should_panic]
-fn secret_store_open_not_existing() {
-	let dir = TransientDir::open();
-	let _ = EthStore::open(Box::new(dir)).unwrap();
-}
-
-fn random_secret() -> Secret {
-	Random.generate().unwrap().secret().clone()
-}
-
-#[test]
-fn secret_store_create_account() {
-	let dir = TransientDir::create().unwrap();
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert_eq!(store.accounts().unwrap().len(), 0);
-	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
-	assert_eq!(store.accounts().unwrap().len(), 1);
-	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
-	assert_eq!(store.accounts().unwrap().len(), 2);
-}
-
-#[test]
-fn secret_store_sign() {
-	let dir = TransientDir::create().unwrap();
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
-	let accounts = store.accounts().unwrap();
-	assert_eq!(accounts.len(), 1);
-	assert!(store.sign(&accounts[0], &"".into(), &Default::default()).is_ok());
-	assert!(store.sign(&accounts[0], &"1".into(), &Default::default()).is_err());
-}
-
-#[test]
-fn secret_store_change_password() {
-	let dir = TransientDir::create().unwrap();
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
-	let accounts = store.accounts().unwrap();
-	assert_eq!(accounts.len(), 1);
-	assert!(store.sign(&accounts[0], &"".into(), &Default::default()).is_ok());
-	assert!(store.change_password(&accounts[0], &"".into(), &"1".into()).is_ok());
-	assert!(store.sign(&accounts[0], &"".into(), &Default::default()).is_err());
-	assert!(store.sign(&accounts[0], &"1".into(), &Default::default()).is_ok());
-}
-
-#[test]
-fn secret_store_remove_account() {
-	let dir = TransientDir::create().unwrap();
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
-	let accounts = store.accounts().unwrap();
-	assert_eq!(accounts.len(), 1);
-	assert!(store.remove_account(&accounts[0], &"".into()).is_ok());
-	assert_eq!(store.accounts().unwrap().len(), 0);
-	assert!(store.remove_account(&accounts[0], &"".into()).is_err());
-}
-
-fn test_path() -> &'static str {
-	match ::std::fs::metadata("ethstore") {
-		Ok(_) => "ethstore/tests/res/geth_keystore",
- 		Err(_) => "tests/res/geth_keystore",
-	}
-}
-
-fn pat_path() -> &'static str {
-	match ::std::fs::metadata("ethstore") {
-		Ok(_) => "ethstore/tests/res/pat",
-		Err(_) => "tests/res/pat",
-	}
-}
-
-fn ciphertext_path() -> &'static str {
-	match ::std::fs::metadata("ethstore") {
-		Ok(_) => "ethstore/tests/res/ciphertext",
-		Err(_) => "tests/res/ciphertext",
-	}
-}
-
-#[test]
-fn secret_store_laod_geth_files() {
-	let dir = RootDiskDirectory::at(test_path());
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert_eq!(store.accounts().unwrap(), vec![
-		StoreAccountRef::root(Address::from_str("3f49624084b67849c7b4e805c5988c21a430f9d9").unwrap()),
-		StoreAccountRef::root(Address::from_str("5ba4dcf897e97c2bdf8315b9ef26c13c085988cf").unwrap()),
-		StoreAccountRef::root(Address::from_str("63121b431a52f8043c16fcf0d1df9cb7b5f66649").unwrap()),
-	]);
-}
-
-#[test]
-fn secret_store_load_pat_files() {
-	let dir = RootDiskDirectory::at(pat_path());
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	assert_eq!(store.accounts().unwrap(), vec![
-		StoreAccountRef::root(Address::from_str("3f49624084b67849c7b4e805c5988c21a430f9d9").unwrap()),
-		StoreAccountRef::root(Address::from_str("5ba4dcf897e97c2bdf8315b9ef26c13c085988cf").unwrap()),
-	]);
-}
-
-#[test]
-fn test_decrypting_files_with_short_ciphertext() {
-	// 31e9d1e6d844bd3a536800ef8d8be6a9975db509, 30
-	let kp1 = KeyPair::from_secret("000081c29e8142bb6a81bef5a92bda7a8328a5c85bb2f9542e76f9b0f94fc018".parse().unwrap()).unwrap();
-	// d1e64e5480bfaf733ba7d48712decb8227797a4e , 31
-	let kp2 = KeyPair::from_secret("00fa7b3db73dc7dfdf8c5fbdb796d741e4488628c41fc4febd9160a866ba0f35".parse().unwrap()).unwrap();
-	let dir = RootDiskDirectory::at(ciphertext_path());
-	let store = EthStore::open(Box::new(dir)).unwrap();
-	let accounts = store.accounts().unwrap();
-	assert_eq!(accounts, vec![
-		StoreAccountRef::root(Address::from_str("31e9d1e6d844bd3a536800ef8d8be6a9975db509").unwrap()),
-		StoreAccountRef::root(Address::from_str("d1e64e5480bfaf733ba7d48712decb8227797a4e").unwrap()),
-	]);
-
-	let message = Default::default();
-
-	let s1 = store.sign(&accounts[0], &"foo".into(), &message).unwrap();
-	let s2 = store.sign(&accounts[1], &"foo".into(), &message).unwrap();
-	assert!(verify_address(&accounts[0].address, &s1, &message).unwrap());
-	assert!(verify_address(&kp1.address(), &s1, &message).unwrap());
-	assert!(verify_address(&kp2.address(), &s2, &message).unwrap());
-}
--- a/accounts/ethstore/tests/util/mod.rs
+++ b/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;
--- a/accounts/src/account_data.rs
+++ b/accounts/src/account_data.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/>.
-
-//! Account Metadata
-
-use std::{
-	collections::HashMap,
-	time::Instant,
-};
-
-use ethkey::{Address, Password};
-use serde_derive::{Serialize, Deserialize};
-use serde_json;
-
-/// Type of unlock.
-#[derive(Clone, PartialEq)]
-pub enum Unlock {
-	/// If account is unlocked temporarily, it should be locked after first usage.
-	OneTime,
-	/// Account unlocked permanently can always sign message.
-	/// Use with caution.
-	Perm,
-	/// Account unlocked with a timeout
-	Timed(Instant),
-}
-
-/// Data associated with account.
-#[derive(Clone)]
-pub struct AccountData {
-	pub unlock: Unlock,
-	pub password: Password,
-}
-
-/// Collected account metadata
-#[derive(Default, Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct AccountMeta {
-	/// The name of the account.
-	pub name: String,
-	/// The rest of the metadata of the account.
-	pub meta: String,
-	/// The 128-bit Uuid of the account, if it has one (brain-wallets don't).
-	pub uuid: Option<String>,
-}
-
-impl AccountMeta {
-	/// Read a hash map of Address -> AccountMeta
-	pub fn read<R>(reader: R) -> Result<HashMap<Address, Self>, serde_json::Error> where
-		R: ::std::io::Read,
-	{
-		serde_json::from_reader(reader)
-	}
-
-	/// Write a hash map of Address -> AccountMeta
-	pub fn write<W>(m: &HashMap<Address, Self>, writer: &mut W) -> Result<(), serde_json::Error> where
-		W: ::std::io::Write,
-	{
-		serde_json::to_writer(writer, m)
-	}
-}
-
--- a/accounts/src/error.rs
+++ b/accounts/src/error.rs
@@ -1,46 +0,0 @@
-// Copyright 2015-2018 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::fmt;
-
-use ethstore::{Error as SSError};
-
-/// Signing error
-#[derive(Debug)]
-pub enum SignError {
-	/// Account is not unlocked
-	NotUnlocked,
-	/// Account does not exist.
-	NotFound,
-	/// Low-level error from store
-	SStore(SSError),
-}
-
-impl fmt::Display for SignError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		match *self {
-			SignError::NotUnlocked => write!(f, "Account is locked"),
-			SignError::NotFound => write!(f, "Account does not exist"),
-			SignError::SStore(ref e) => write!(f, "{}", e),
-		}
-	}
-}
-
-impl From<SSError> for SignError {
-	fn from(e: SSError) -> Self {
-		SignError::SStore(e)
-	}
-}
--- a/accounts/src/lib.rs
+++ b/accounts/src/lib.rs
@@ -1,643 +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)]
-
-//! Account management.
-
-mod account_data;
-mod error;
-mod stores;
-
-use self::account_data::{Unlock, AccountData};
-use self::stores::AddressBook;
-
-use std::collections::HashMap;
-use std::time::{Instant, Duration};
-
-use ethkey::{Address, Message, Public, Secret, Password, Random, Generator};
-use ethstore::accounts_dir::MemoryDirectory;
-use ethstore::{
-	SimpleSecretStore, SecretStore, EthStore, EthMultiStore,
-	random_string, SecretVaultRef, StoreAccountRef, OpaqueSecret,
-};
-use log::warn;
-use parking_lot::RwLock;
-
-pub use ethkey::Signature;
-pub use ethstore::{Derivation, IndexDerivation, KeyFile, Error};
-
-pub use self::account_data::AccountMeta;
-pub use self::error::SignError;
-
-type AccountToken = Password;
-
-/// Account management settings.
-#[derive(Debug, Default)]
-pub struct AccountProviderSettings {
-	/// Store raw account secret when unlocking the account permanently.
-	pub unlock_keep_secret: bool,
-	/// Disallowed accounts.
-	pub blacklisted_accounts: Vec<Address>,
-}
-
-/// Account management.
-/// Responsible for unlocking accounts.
-pub struct AccountProvider {
-	/// For performance reasons some methods can re-use unlocked secrets.
-	unlocked_secrets: RwLock<HashMap<StoreAccountRef, OpaqueSecret>>,
-	/// Unlocked account data.
-	unlocked: RwLock<HashMap<StoreAccountRef, AccountData>>,
-	/// Address book.
-	address_book: RwLock<AddressBook>,
-	/// Accounts on disk
-	sstore: Box<SecretStore>,
-	/// Accounts unlocked with rolling tokens
-	transient_sstore: EthMultiStore,
-	/// When unlocking account permanently we additionally keep a raw secret in memory
-	/// to increase the performance of transaction signing.
-	unlock_keep_secret: bool,
-	/// Disallowed accounts.
-	blacklisted_accounts: Vec<Address>,
-}
-
-fn transient_sstore() -> EthMultiStore {
-	EthMultiStore::open(Box::new(MemoryDirectory::default())).expect("MemoryDirectory load always succeeds; qed")
-}
-
-impl AccountProvider {
-	/// Creates new account provider.
-	pub fn new(sstore: Box<SecretStore>, settings: AccountProviderSettings) -> Self {
-		if let Ok(accounts) = sstore.accounts() {
-			for account in accounts.into_iter().filter(|a| settings.blacklisted_accounts.contains(&a.address)) {
-				warn!("Local Account {} has a blacklisted (known to be weak) address and will be ignored",
-					account.address);
-			}
-		}
-
-		// Remove blacklisted accounts from address book.
-		let mut address_book = AddressBook::new(&sstore.local_path());
-		for addr in &settings.blacklisted_accounts {
-			address_book.remove(*addr);
-		}
-
-		AccountProvider {
-			unlocked_secrets: RwLock::new(HashMap::new()),
-			unlocked: RwLock::new(HashMap::new()),
-			address_book: RwLock::new(address_book),
-			sstore,
-			transient_sstore: transient_sstore(),
-			unlock_keep_secret: settings.unlock_keep_secret,
-			blacklisted_accounts: settings.blacklisted_accounts,
-		}
-	}
-
-	/// Creates not disk backed provider.
-	pub fn transient_provider() -> Self {
-		AccountProvider {
-			unlocked_secrets: RwLock::new(HashMap::new()),
-			unlocked: RwLock::new(HashMap::new()),
-			address_book: RwLock::new(AddressBook::transient()),
-			sstore: Box::new(EthStore::open(Box::new(MemoryDirectory::default())).expect("MemoryDirectory load always succeeds; qed")),
-			transient_sstore: transient_sstore(),
-			unlock_keep_secret: false,
-			blacklisted_accounts: vec![],
-		}
-	}
-
-	/// Creates new random account.
-	pub fn new_account(&self, password: &Password) -> Result<Address, Error> {
-		self.new_account_and_public(password).map(|d| d.0)
-	}
-
-	/// Creates new random account and returns address and public key
-	pub fn new_account_and_public(&self, password: &Password) -> Result<(Address, Public), Error> {
-		let acc = Random.generate().expect("secp context has generation capabilities; qed");
-		let public = acc.public().clone();
-		let secret = acc.secret().clone();
-		let account = self.sstore.insert_account(SecretVaultRef::Root, secret, password)?;
-		Ok((account.address, public))
-	}
-
-	/// Inserts new account into underlying store.
-	/// Does not unlock account!
-	pub fn insert_account(&self, secret: Secret, password: &Password) -> Result<Address, Error> {
-		let account = self.sstore.insert_account(SecretVaultRef::Root, secret, password)?;
-		if self.blacklisted_accounts.contains(&account.address) {
-			self.sstore.remove_account(&account, password)?;
-			return Err(Error::InvalidAccount.into());
-		}
-		Ok(account.address)
-	}
-
-	/// Generates new derived account based on the existing one
-	/// If password is not provided, account must be unlocked
-	/// New account will be created with the same password (if save: true)
-	pub fn derive_account(&self, address: &Address, password: Option<Password>, derivation: Derivation, save: bool)
-		-> Result<Address, SignError>
-	{
-		let account = self.sstore.account_ref(&address)?;
-		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
-		Ok(
-			if save { self.sstore.insert_derived(SecretVaultRef::Root, &account, &password, derivation)?.address }
-			else { self.sstore.generate_derived(&account, &password, derivation)? }
-		)
-	}
-
-	/// Import a new presale wallet.
-	pub fn import_presale(&self, presale_json: &[u8], password: &Password) -> Result<Address, Error> {
-		let account = self.sstore.import_presale(SecretVaultRef::Root, presale_json, password)?;
-		Ok(Address::from(account.address).into())
-	}
-
-	/// Import a new wallet.
-	pub fn import_wallet(&self, json: &[u8], password: &Password, gen_id: bool) -> Result<Address, Error> {
-		let account = self.sstore.import_wallet(SecretVaultRef::Root, json, password, gen_id)?;
-		if self.blacklisted_accounts.contains(&account.address) {
-			self.sstore.remove_account(&account, password)?;
-			return Err(Error::InvalidAccount.into());
-		}
-		Ok(Address::from(account.address).into())
-	}
-
-	/// Checks whether an account with a given address is present.
-	pub fn has_account(&self, address: Address) -> bool {
-		self.sstore.account_ref(&address).is_ok() && !self.blacklisted_accounts.contains(&address)
-	}
-
-	/// Returns addresses of all accounts.
-	pub fn accounts(&self) -> Result<Vec<Address>, Error> {
-		let accounts = self.sstore.accounts()?;
-		Ok(accounts
-			.into_iter()
-			.map(|a| a.address)
-			.filter(|address| !self.blacklisted_accounts.contains(address))
-			.collect()
-		)
-	}
-
-	/// Returns the address of default account.
-	pub fn default_account(&self) -> Result<Address, Error> {
-		Ok(self.accounts()?.first().cloned().unwrap_or_default())
-	}
-
-	/// Returns each address along with metadata.
-	pub fn addresses_info(&self) -> HashMap<Address, AccountMeta> {
-		self.address_book.read().get()
-	}
-
-	/// Returns each address along with metadata.
-	pub fn set_address_name(&self, account: Address, name: String) {
-		self.address_book.write().set_name(account, name)
-	}
-
-	/// Returns each address along with metadata.
-	pub fn set_address_meta(&self, account: Address, meta: String) {
-		self.address_book.write().set_meta(account, meta)
-	}
-
-	/// Removes and address from the address book
-	pub fn remove_address(&self, addr: Address) {
-		self.address_book.write().remove(addr)
-	}
-
-	/// Returns each account along with name and meta.
-	pub fn accounts_info(&self) -> Result<HashMap<Address, AccountMeta>, Error> {
-		let r = self.sstore.accounts()?
-			.into_iter()
-			.filter(|a| !self.blacklisted_accounts.contains(&a.address))
-			.map(|a| (a.address.clone(), self.account_meta(a.address).ok().unwrap_or_default()))
-			.collect();
-		Ok(r)
-	}
-
-	/// Returns each account along with name and meta.
-	pub fn account_meta(&self, address: Address) -> Result<AccountMeta, Error> {
-		let account = self.sstore.account_ref(&address)?;
-		Ok(AccountMeta {
-			name: self.sstore.name(&account)?,
-			meta: self.sstore.meta(&account)?,
-			uuid: self.sstore.uuid(&account).ok().map(Into::into),	// allowed to not have a Uuid
-		})
-	}
-
-	/// Returns account public key.
-	pub fn account_public(&self, address: Address, password: &Password) -> Result<Public, Error> {
-		self.sstore.public(&self.sstore.account_ref(&address)?, password)
-	}
-
-	/// Returns each account along with name and meta.
-	pub fn set_account_name(&self, address: Address, name: String) -> Result<(), Error> {
-		self.sstore.set_name(&self.sstore.account_ref(&address)?, name)?;
-		Ok(())
-	}
-
-	/// Returns each account along with name and meta.
-	pub fn set_account_meta(&self, address: Address, meta: String) -> Result<(), Error> {
-		self.sstore.set_meta(&self.sstore.account_ref(&address)?, meta)?;
-		Ok(())
-	}
-
-	/// Returns `true` if the password for `account` is `password`. `false` if not.
-	pub fn test_password(&self, address: &Address, password: &Password) -> Result<bool, Error> {
-		self.sstore.test_password(&self.sstore.account_ref(&address)?, password)
-			.map_err(Into::into)
-	}
-
-	/// Permanently removes an account.
-	pub fn kill_account(&self, address: &Address, password: &Password) -> Result<(), Error> {
-		self.sstore.remove_account(&self.sstore.account_ref(&address)?, &password)?;
-		Ok(())
-	}
-
-	/// Changes the password of `account` from `password` to `new_password`. Fails if incorrect `password` given.
-	pub fn change_password(&self, address: &Address, password: Password, new_password: Password) -> Result<(), Error> {
-		self.sstore.change_password(&self.sstore.account_ref(address)?, &password, &new_password)
-	}
-
-	/// Exports an account for given address.
-	pub fn export_account(&self, address: &Address, password: Password) -> Result<KeyFile, Error> {
-		self.sstore.export_account(&self.sstore.account_ref(address)?, &password)
-	}
-
-	/// Helper method used for unlocking accounts.
-	fn unlock_account(&self, address: Address, password: Password, unlock: Unlock) -> Result<(), Error> {
-		let account = self.sstore.account_ref(&address)?;
-
-		// check if account is already unlocked permanently, if it is, do nothing
-		let mut unlocked = self.unlocked.write();
-		if let Some(data) = unlocked.get(&account) {
-			if let Unlock::Perm = data.unlock {
-				return Ok(())
-			}
-		}
-
-		if self.unlock_keep_secret && unlock == Unlock::Perm {
-			// verify password and get the secret
-			let secret = self.sstore.raw_secret(&account, &password)?;
-			self.unlocked_secrets.write().insert(account.clone(), secret);
-		} else {
-			// verify password by signing dump message
-			// result may be discarded
-			let _ = self.sstore.sign(&account, &password, &Default::default())?;
-		}
-
-		let data = AccountData { unlock, password };
-
-		unlocked.insert(account, data);
-		Ok(())
-	}
-
-	fn password(&self, account: &StoreAccountRef) -> Result<Password, SignError> {
-		let mut unlocked = self.unlocked.write();
-		let data = unlocked.get(account).ok_or(SignError::NotUnlocked)?.clone();
-		if let Unlock::OneTime = data.unlock {
-			unlocked.remove(account).expect("data exists: so key must exist: qed");
-		}
-		if let Unlock::Timed(ref end) = data.unlock {
-			if Instant::now() > *end {
-				unlocked.remove(account).expect("data exists: so key must exist: qed");
-				return Err(SignError::NotUnlocked);
-			}
-		}
-		Ok(data.password)
-	}
-
-	/// Unlocks account permanently.
-	pub fn unlock_account_permanently(&self, account: Address, password: Password) -> Result<(), Error> {
-		self.unlock_account(account, password, Unlock::Perm)
-	}
-
-	/// Unlocks account temporarily (for one signing).
-	pub fn unlock_account_temporarily(&self, account: Address, password: Password) -> Result<(), Error> {
-		self.unlock_account(account, password, Unlock::OneTime)
-	}
-
-	/// Unlocks account temporarily with a timeout.
-	pub fn unlock_account_timed(&self, account: Address, password: Password, duration: Duration) -> Result<(), Error> {
-		self.unlock_account(account, password, Unlock::Timed(Instant::now() + duration))
-	}
-
-	/// Checks if given account is unlocked
-	pub fn is_unlocked(&self, address: &Address) -> bool {
-		let unlocked = self.unlocked.read();
-		let unlocked_secrets = self.unlocked_secrets.read();
-		self.sstore.account_ref(address)
-			.map(|r| unlocked.get(&r).is_some() || unlocked_secrets.get(&r).is_some())
-			.unwrap_or(false)
-	}
-
-	/// Checks if given account is unlocked permanently
-	pub fn is_unlocked_permanently(&self, address: &Address) -> bool {
-		let unlocked = self.unlocked.read();
-		self.sstore.account_ref(address)
-			.map(|r| unlocked.get(&r).map_or(false, |account| account.unlock == Unlock::Perm))
-			.unwrap_or(false)
-	}
-
-	/// Signs the message. If password is not provided the account must be unlocked.
-	pub fn sign(&self, address: Address, password: Option<Password>, message: Message) -> Result<Signature, SignError> {
-		let account = self.sstore.account_ref(&address)?;
-		match self.unlocked_secrets.read().get(&account) {
-			Some(secret) => {
-				Ok(self.sstore.sign_with_secret(&secret, &message)?)
-			},
-			None => {
-				let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
-				Ok(self.sstore.sign(&account, &password, &message)?)
-			}
-		}
-	}
-
-	/// Signs message using the derived secret. If password is not provided the account must be unlocked.
-	pub fn sign_derived(&self, address: &Address, password: Option<Password>, derivation: Derivation, message: Message)
-		-> Result<Signature, SignError>
-	{
-		let account = self.sstore.account_ref(address)?;
-		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
-		Ok(self.sstore.sign_derived(&account, &password, derivation, &message)?)
-	}
-
-	/// Signs given message with supplied token. Returns a token to use in next signing within this session.
-	pub fn sign_with_token(&self, address: Address, token: AccountToken, message: Message) -> Result<(Signature, AccountToken), SignError> {
-		let account = self.sstore.account_ref(&address)?;
-		let is_std_password = self.sstore.test_password(&account, &token)?;
-
-		let new_token = Password::from(random_string(16));
-		let signature = if is_std_password {
-			// Insert to transient store
-			self.sstore.copy_account(&self.transient_sstore, SecretVaultRef::Root, &account, &token, &new_token)?;
-			// sign
-			self.sstore.sign(&account, &token, &message)?
-		} else {
-			// check transient store
-			self.transient_sstore.change_password(&account, &token, &new_token)?;
-			// and sign
-			self.transient_sstore.sign(&account, &new_token, &message)?
-		};
-
-		Ok((signature, new_token))
-	}
-
-	/// Decrypts a message with given token. Returns a token to use in next operation for this account.
-	pub fn decrypt_with_token(&self, address: Address, token: AccountToken, shared_mac: &[u8], message: &[u8])
-		-> Result<(Vec<u8>, AccountToken), SignError>
-	{
-		let account = self.sstore.account_ref(&address)?;
-		let is_std_password = self.sstore.test_password(&account, &token)?;
-
-		let new_token = Password::from(random_string(16));
-		let message = if is_std_password {
-			// Insert to transient store
-			self.sstore.copy_account(&self.transient_sstore, SecretVaultRef::Root, &account, &token, &new_token)?;
-			// decrypt
-			self.sstore.decrypt(&account, &token, shared_mac, message)?
-		} else {
-			// check transient store
-			self.transient_sstore.change_password(&account, &token, &new_token)?;
-			// and decrypt
-			self.transient_sstore.decrypt(&account, &token, shared_mac, message)?
-		};
-
-		Ok((message, new_token))
-	}
-
-	/// Decrypts a message. If password is not provided the account must be unlocked.
-	pub fn decrypt(&self, address: Address, password: Option<Password>, shared_mac: &[u8], message: &[u8]) -> Result<Vec<u8>, SignError> {
-		let account = self.sstore.account_ref(&address)?;
-		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
-		Ok(self.sstore.decrypt(&account, &password, shared_mac, message)?)
-	}
-
-	/// Agree on shared key.
-	pub fn agree(&self, address: Address, password: Option<Password>, other_public: &Public) -> Result<Secret, SignError> {
-		let account = self.sstore.account_ref(&address)?;
-		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
-		Ok(self.sstore.agree(&account, &password, other_public)?)
-	}
-
-	/// Returns the underlying `SecretStore` reference if one exists.
-	pub fn list_geth_accounts(&self, testnet: bool) -> Vec<Address> {
-		self.sstore.list_geth_accounts(testnet).into_iter().map(|a| Address::from(a).into()).collect()
-	}
-
-	/// Returns the underlying `SecretStore` reference if one exists.
-	pub fn import_geth_accounts(&self, desired: Vec<Address>, testnet: bool) -> Result<Vec<Address>, Error> {
-		self.sstore.import_geth_accounts(SecretVaultRef::Root, desired, testnet)
-			.map(|a| a.into_iter().map(|a| a.address).collect())
-			.map_err(Into::into)
-	}
-
-	/// Create new vault.
-	pub fn create_vault(&self, name: &str, password: &Password) -> Result<(), Error> {
-		self.sstore.create_vault(name, password)
-			.map_err(Into::into)
-	}
-
-	/// Open existing vault.
-	pub fn open_vault(&self, name: &str, password: &Password) -> Result<(), Error> {
-		self.sstore.open_vault(name, password)
-			.map_err(Into::into)
-	}
-
-	/// Close previously opened vault.
-	pub fn close_vault(&self, name: &str) -> Result<(), Error> {
-		self.sstore.close_vault(name)
-			.map_err(Into::into)
-	}
-
-	/// List all vaults
-	pub fn list_vaults(&self) -> Result<Vec<String>, Error> {
-		self.sstore.list_vaults()
-			.map_err(Into::into)
-	}
-
-	/// List all currently opened vaults
-	pub fn list_opened_vaults(&self) -> Result<Vec<String>, Error> {
-		self.sstore.list_opened_vaults()
-			.map_err(Into::into)
-	}
-
-	/// Change vault password.
-	pub fn change_vault_password(&self, name: &str, new_password: &Password) -> Result<(), Error> {
-		self.sstore.change_vault_password(name, new_password)
-			.map_err(Into::into)
-	}
-
-	/// Change vault of the given address.
-	pub fn change_vault(&self, address: Address, new_vault: &str) -> Result<(), Error> {
-		let new_vault_ref = if new_vault.is_empty() { SecretVaultRef::Root } else { SecretVaultRef::Vault(new_vault.to_owned()) };
-		let old_account_ref = self.sstore.account_ref(&address)?;
-		self.sstore.change_account_vault(new_vault_ref, old_account_ref)
-			.map_err(Into::into)
-			.map(|_| ())
-	}
-
-	/// Get vault metadata string.
-	pub fn get_vault_meta(&self, name: &str) -> Result<String, Error> {
-		self.sstore.get_vault_meta(name)
-			.map_err(Into::into)
-	}
-
-	/// Set vault metadata string.
-	pub fn set_vault_meta(&self, name: &str, meta: &str) -> Result<(), Error> {
-		self.sstore.set_vault_meta(name, meta)
-			.map_err(Into::into)
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::{AccountProvider, Unlock};
-	use std::time::{Duration, Instant};
-	use ethkey::{Generator, Random, Address};
-	use ethstore::{StoreAccountRef, Derivation};
-	use ethereum_types::H256;
-
-	#[test]
-	fn unlock_account_temp() {
-		let kp = Random.generate().unwrap();
-		let ap = AccountProvider::transient_provider();
-		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).is_ok());
-		assert!(ap.unlock_account_temporarily(kp.address(), "test1".into()).is_err());
-		assert!(ap.unlock_account_temporarily(kp.address(), "test".into()).is_ok());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_err());
-	}
-
-	#[test]
-	fn derived_account_nosave() {
-		let kp = Random.generate().unwrap();
-		let ap = AccountProvider::transient_provider();
-		assert!(ap.insert_account(kp.secret().clone(), &"base".into()).is_ok());
-		assert!(ap.unlock_account_permanently(kp.address(), "base".into()).is_ok());
-
-		let derived_addr = ap.derive_account(
-			&kp.address(),
-			None,
-			Derivation::SoftHash(H256::from_low_u64_be(999)),
-			false,
-		).expect("Derivation should not fail");
-
-		assert!(ap.unlock_account_permanently(derived_addr, "base".into()).is_err(),
-			"There should be an error because account is not supposed to be saved");
-	}
-
-	#[test]
-	fn derived_account_save() {
-		let kp = Random.generate().unwrap();
-		let ap = AccountProvider::transient_provider();
-		assert!(ap.insert_account(kp.secret().clone(), &"base".into()).is_ok());
-		assert!(ap.unlock_account_permanently(kp.address(), "base".into()).is_ok());
-
-		let derived_addr = ap.derive_account(
-			&kp.address(),
-			None,
-			Derivation::SoftHash(H256::from_low_u64_be(999)),
-			true,
-		).expect("Derivation should not fail");
-
-		assert!(ap.unlock_account_permanently(derived_addr, "base_wrong".into()).is_err(),
-			"There should be an error because password is invalid");
-
-		assert!(ap.unlock_account_permanently(derived_addr, "base".into()).is_ok(),
-			"Should be ok because account is saved and password is valid");
-	}
-
-	#[test]
-	fn derived_account_sign() {
-		let kp = Random.generate().unwrap();
-		let ap = AccountProvider::transient_provider();
-		assert!(ap.insert_account(kp.secret().clone(), &"base".into()).is_ok());
-		assert!(ap.unlock_account_permanently(kp.address(), "base".into()).is_ok());
-
-		let derived_addr = ap.derive_account(
-			&kp.address(),
-			None,
-			Derivation::SoftHash(H256::from_low_u64_be(1999)),
-			true,
-		).expect("Derivation should not fail");
-		ap.unlock_account_permanently(derived_addr, "base".into())
-			.expect("Should be ok because account is saved and password is valid");
-
-		let msg = Default::default();
-		let signed_msg1 = ap.sign(derived_addr, None, msg)
-			.expect("Signing with existing unlocked account should not fail");
-		let signed_msg2 = ap.sign_derived(
-			&kp.address(),
-			None,
-			Derivation::SoftHash(H256::from_low_u64_be(1999)),
-			msg,
-		).expect("Derived signing with existing unlocked account should not fail");
-
-		assert_eq!(signed_msg1, signed_msg2,
-			"Signed messages should match");
-	}
-
-	#[test]
-	fn unlock_account_perm() {
-		let kp = Random.generate().unwrap();
-		let ap = AccountProvider::transient_provider();
-		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).is_ok());
-		assert!(ap.unlock_account_permanently(kp.address(), "test1".into()).is_err());
-		assert!(ap.unlock_account_permanently(kp.address(), "test".into()).is_ok());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
-		assert!(ap.unlock_account_temporarily(kp.address(), "test".into()).is_ok());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
-	}
-
-	#[test]
-	fn unlock_account_timer() {
-		let kp = Random.generate().unwrap();
-		let ap = AccountProvider::transient_provider();
-		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).is_ok());
-		assert!(ap.unlock_account_timed(kp.address(), "test1".into(), Duration::from_secs(60)).is_err());
-		assert!(ap.unlock_account_timed(kp.address(), "test".into(), Duration::from_secs(60)).is_ok());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_ok());
-		ap.unlocked.write().get_mut(&StoreAccountRef::root(kp.address())).unwrap().unlock = Unlock::Timed(Instant::now());
-		assert!(ap.sign(kp.address(), None, Default::default()).is_err());
-	}
-
-	#[test]
-	fn should_sign_and_return_token() {
-		// given
-		let kp = Random.generate().unwrap();
-		let ap = AccountProvider::transient_provider();
-		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).is_ok());
-
-		// when
-		let (_signature, token) = ap.sign_with_token(kp.address(), "test".into(), Default::default()).unwrap();
-
-		// then
-		ap.sign_with_token(kp.address(), token.clone(), Default::default())
-			.expect("First usage of token should be correct.");
-		assert!(ap.sign_with_token(kp.address(), token, Default::default()).is_err(), "Second usage of the same token should fail.");
-	}
-
-	#[test]
-	fn should_not_return_blacklisted_account() {
-		// given
-		let mut ap = AccountProvider::transient_provider();
-		let acc = ap.new_account(&"test".into()).unwrap();
-		ap.blacklisted_accounts = vec![acc];
-
-		// then
-		assert_eq!(ap.accounts_info().unwrap().keys().cloned().collect::<Vec<Address>>(), vec![]);
-		assert_eq!(ap.accounts().unwrap(), vec![]);
-	}
-}
--- a/accounts/src/stores.rs
+++ b/accounts/src/stores.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/>.
-
-//! Address Book Store
-
-use std::{fs, fmt, hash, ops};
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-
-use ethkey::Address;
-use log::{trace, warn};
-
-use crate::AccountMeta;
-
-/// Disk-backed map from Address to String. Uses JSON.
-pub struct AddressBook {
-	cache: DiskMap<Address, AccountMeta>,
-}
-
-impl AddressBook {
-	/// Creates new address book at given directory.
-	pub fn new(path: &Path) -> Self {
-		let mut r = AddressBook {
-			cache: DiskMap::new(path, "address_book.json")
-		};
-		r.cache.revert(AccountMeta::read);
-		r
-	}
-
-	/// Creates transient address book (no changes are saved to disk).
-	pub fn transient() -> Self {
-		AddressBook {
-			cache: DiskMap::transient()
-		}
-	}
-
-	/// Get the address book.
-	pub fn get(&self) -> HashMap<Address, AccountMeta> {
-		self.cache.clone()
-	}
-
-	fn save(&self) {
-		self.cache.save(AccountMeta::write)
-	}
-
-	/// Sets new name for given address.
-	pub fn set_name(&mut self, a: Address, name: String) {
-		{
-			let x = self.cache.entry(a)
-				.or_insert_with(|| AccountMeta {name: Default::default(), meta: "{}".to_owned(), uuid: None});
-			x.name = name;
-		}
-		self.save();
-	}
-
-	/// Sets new meta for given address.
-	pub fn set_meta(&mut self, a: Address, meta: String) {
-		{
-			let x = self.cache.entry(a)
-				.or_insert_with(|| AccountMeta {name: "Anonymous".to_owned(), meta: Default::default(), uuid: None});
-			x.meta = meta;
-		}
-		self.save();
-	}
-
-	/// Removes an entry
-	pub fn remove(&mut self, a: Address) {
-		self.cache.remove(&a);
-		self.save();
-	}
-}
-
-/// Disk-serializable HashMap
-#[derive(Debug)]
-struct DiskMap<K: hash::Hash + Eq, V> {
-	path: PathBuf,
-	cache: HashMap<K, V>,
-	transient: bool,
-}
-
-impl<K: hash::Hash + Eq, V> ops::Deref for DiskMap<K, V> {
-	type Target = HashMap<K, V>;
-	fn deref(&self) -> &Self::Target {
-		&self.cache
-	}
-}
-
-impl<K: hash::Hash + Eq, V> ops::DerefMut for DiskMap<K, V> {
-	fn deref_mut(&mut self) -> &mut Self::Target {
-		&mut self.cache
-	}
-}
-
-impl<K: hash::Hash + Eq, V> DiskMap<K, V> {
-	pub fn new(path: &Path, file_name: &str) -> Self {
-		let mut path = path.to_owned();
-		path.push(file_name);
-		trace!(target: "diskmap", "path={:?}", path);
-		DiskMap {
-			path: path,
-			cache: HashMap::new(),
-			transient: false,
-		}
-	}
-
-	pub fn transient() -> Self {
-		let mut map = DiskMap::new(&PathBuf::new(), "diskmap.json".into());
-		map.transient = true;
-		map
-	}
-
-	fn revert<F, E>(&mut self, read: F) where
-		F: Fn(fs::File) -> Result<HashMap<K, V>, E>,
-		E: fmt::Display,
-	{
-		if self.transient { return; }
-		trace!(target: "diskmap", "revert {:?}", self.path);
-		let _ = fs::File::open(self.path.clone())
-			.map_err(|e| trace!(target: "diskmap", "Couldn't open disk map: {}", e))
-			.and_then(|f| read(f).map_err(|e| warn!(target: "diskmap", "Couldn't read disk map: {}", e)))
-			.and_then(|m| {
-				self.cache = m;
-				Ok(())
-			});
-	}
-
-	fn save<F, E>(&self, write: F) where
-		F: Fn(&HashMap<K, V>, &mut fs::File) -> Result<(), E>,
-		E: fmt::Display,
-	{
-		if self.transient { return; }
-		trace!(target: "diskmap", "save {:?}", self.path);
-		let _ = fs::File::create(self.path.clone())
-			.map_err(|e| warn!(target: "diskmap", "Couldn't open disk map for writing: {}", e))
-			.and_then(|mut f| {
-				write(&self.cache, &mut f).map_err(|e| warn!(target: "diskmap", "Couldn't write to disk map: {}", e))
-			});
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::{AddressBook, Address};
-	use std::collections::HashMap;
-	use tempdir::TempDir;
-	use crate::account_data::AccountMeta;
-
-	#[test]
-	fn should_save_and_reload_address_book() {
-		let tempdir = TempDir::new("").unwrap();
-		let mut b = AddressBook::new(tempdir.path());
-		b.set_name(Address::from_low_u64_be(1), "One".to_owned());
-		b.set_meta(Address::from_low_u64_be(1), "{1:1}".to_owned());
-		let b = AddressBook::new(tempdir.path());
-		assert_eq!(b.get(), vec![
-		   (Address::from_low_u64_be(1), AccountMeta {name: "One".to_owned(), meta: "{1:1}".to_owned(), uuid: None})
-		].into_iter().collect::<HashMap<_, _>>());
-	}
-
-	#[test]
-	fn should_remove_address() {
-		let tempdir = TempDir::new("").unwrap();
-		let mut b = AddressBook::new(tempdir.path());
-
-		b.set_name(Address::from_low_u64_be(1), "One".to_owned());
-		b.set_name(Address::from_low_u64_be(2), "Two".to_owned());
-		b.set_name(Address::from_low_u64_be(3), "Three".to_owned());
-		b.remove(Address::from_low_u64_be(2).into());
-
-		let b = AddressBook::new(tempdir.path());
-		assert_eq!(b.get(), vec![
-			(Address::from_low_u64_be(1), AccountMeta{name: "One".to_owned(), meta: "{}".to_owned(), uuid: None}),
-			(Address::from_low_u64_be(3), AccountMeta{name: "Three".to_owned(), meta: "{}".to_owned(), uuid: None}),
-		].into_iter().collect::<HashMap<_, _>>());
-	}
-}
--- a/build.rs
+++ b/build.rs
@@ -0,0 +1,35 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+extern crate rustc_version;
+
+const MIN_RUSTC_VERSION: &'static str = "1.15.1";
+
+fn main() {
+	let is = rustc_version::version().unwrap();
+	let required = MIN_RUSTC_VERSION.parse().unwrap();
+	assert!(is >= required, format!("
+
+It looks like you are compiling Parity with an old rustc compiler {}.
+Parity requires version {}. Please update your compiler.
+If you use rustup, try this:
+
+    rustup update stable
+
+and try building Parity again.
+
+", is, required));
+}
--- a/chainspec/Cargo.toml
+++ b/chainspec/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-description = "Parity Ethereum Chain Specification"
 name = "chainspec"
 version = "0.1.0"
-authors = ["Marek Kotewicz <marek@parity.io>"]
+authors = ["debris <marek.kotewicz@gmail.com>"]

 [dependencies]
 ethjson = { path = "../json" }
 serde_json = "1.0"
+serde_ignored = "0.0.4"
--- a/chainspec/src/main.rs
+++ b/chainspec/src/main.rs
@@ -1,22 +1,8 @@
-// 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 serde_ignored;
 extern crate ethjson;

+use std::collections::BTreeSet;
 use std::{fs, env, process};
 use ethjson::spec::Spec;

@@ -39,11 +25,24 @@ fn main() {
 		Err(_) => quit(&format!("{} could not be opened", path)),
 	};

-	let spec: Result<Spec, _> = serde_json::from_reader(file);
+	let mut unused = BTreeSet::new();
+	let mut deserializer = serde_json::Deserializer::from_reader(file);
+
+	let spec: Result<Spec, _> = serde_ignored::deserialize(&mut deserializer, |field| {
+		unused.insert(field.to_string());
+	});

 	if let Err(err) = spec {
 		quit(&format!("{} {}", path, err.to_string()));
 	}

+	if !unused.is_empty() {
+		let err = unused.into_iter()
+			.map(|field| format!("{} unexpected field `{}`", path, field))
+			.collect::<Vec<_>>()
+			.join("\n");
+		quit(&err);
+	}
+
 	println!("{} is valid", path);
 }
--- a/cli-signer/Cargo.toml
+++ b/cli-signer/Cargo.toml
@@ -1,14 +0,0 @@
-[package]
-description = "Parity Ethereum CLI Signer Tool"
-homepage = "http://parity.io"
-license = "GPL-3.0"
-name = "cli-signer"
-version = "1.4.0"
-authors = ["Parity <admin@parity.io>"]
-
-[dependencies]
-ethereum-types = "0.6.0"
-futures = "0.1"
-rpassword = "1.0"
-parity-rpc = { path = "../rpc" }
-parity-rpc-client = { path = "rpc-client" }
--- a/cli-signer/rpc-client/Cargo.toml
+++ b/cli-signer/rpc-client/Cargo.toml
@@ -1,21 +0,0 @@
-[package]
-description = "Parity Ethereum RPC Client"
-homepage = "http://parity.io"
-license = "GPL-3.0"
-name = "parity-rpc-client"
-version = "1.4.0"
-authors = ["Parity <admin@parity.io>"]
-
-[dependencies]
-ethereum-types = "0.6.0"
-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 = "12.0.0"
-jsonrpc-ws-server = "12.0.0"
-parity-rpc = { path = "../../rpc" }
-keccak-hash = "0.2.0"
--- a/cli-signer/rpc-client/src/client.rs
+++ b/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)
-	}
-}
--- a/cli-signer/rpc-client/src/lib.rs
+++ b/cli-signer/rpc-client/src/lib.rs
@@ -1,91 +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 ethereum_types;
-extern crate futures;
-extern crate jsonrpc_core;
-extern crate jsonrpc_ws_server as ws;
-extern crate parity_rpc as rpc;
-extern crate parking_lot;
-extern crate serde;
-extern crate serde_json;
-extern crate url;
-extern crate keccak_hash as hash;
-
-#[macro_use]
-extern crate log;
-
-#[cfg(test)]
-#[macro_use]
-extern crate matches;
-
-/// Boxed future response.
-pub type BoxFuture<T, E> = Box<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();
-	}
-
-}
--- a/cli-signer/rpc-client/src/signer_client.rs
+++ b/cli-signer/rpc-client/src/signer_client.rs
@@ -1,63 +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 ethereum_types::U256;
-use rpc::signer::{ConfirmationRequest, TransactionModification, TransactionCondition};
-use serde;
-use serde_json::{Value as JsonValue, to_value};
-use std::path::PathBuf;
-use futures::{Canceled};
-use {BoxFuture};
-
-pub struct SignerRpc {
-	rpc: Rpc,
-}
-
-impl SignerRpc {
-	pub fn new(url: &str, authfile: &PathBuf) -> Result<Self, RpcError> {
-		Ok(SignerRpc { rpc: Rpc::new(&url, authfile)? })
-	}
-
-	pub fn requests_to_confirm(&mut self) -> BoxFuture<Result<Vec<ConfirmationRequest>, RpcError>, Canceled> {
-		self.rpc.request("signer_requestsToConfirm", vec![])
-	}
-
-	pub fn confirm_request(
-		&mut self,
-		id: U256,
-		new_gas: Option<U256>,
-		new_gas_price: Option<U256>,
-		new_condition: Option<Option<TransactionCondition>>,
-		pwd: &str
-	) -> BoxFuture<Result<U256, RpcError>, Canceled> {
-		self.rpc.request("signer_confirmRequest", vec![
-			Self::to_value(&format!("{:#x}", id)),
-			Self::to_value(&TransactionModification { sender: None, gas_price: new_gas_price, gas: new_gas, condition: new_condition }),
-			Self::to_value(&pwd),
-		])
-	}
-
-	pub fn reject_request(&mut self, id: U256) -> BoxFuture<Result<bool, RpcError>, Canceled> {
-		self.rpc.request("signer_rejectRequest", vec![
-			JsonValue::String(format!("{:#x}", id))
-		])
-	}
-
-	fn to_value<T: serde::Serialize>(v: &T) -> JsonValue {
-		to_value(v).expect("Our types are always serializable; qed")
-	}
-}
--- a/cli-signer/src/lib.rs
+++ b/cli-signer/src/lib.rs
@@ -1,197 +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 ethereum_types;
-extern crate futures;
-extern crate rpassword;
-
-extern crate parity_rpc as rpc;
-extern crate parity_rpc_client as client;
-
-use ethereum_types::U256;
-use rpc::signer::ConfirmationRequest;
-use client::signer_client::SignerRpc;
-use std::io::{Write, BufRead, BufReader, stdout, stdin};
-use std::path::PathBuf;
-use std::fs::File;
-
-use futures::Future;
-
-fn sign_interactive(
-	signer: &mut SignerRpc,
-	password: &str,
-	request: ConfirmationRequest
-) {
-	print!("\n{}\nSign this transaction? (y)es/(N)o/(r)eject: ", request);
-	let _ = stdout().flush();
-	match BufReader::new(stdin()).lines().next() {
-		Some(Ok(line)) => {
-			match line.to_lowercase().chars().nth(0) {
-				Some('y') => {
-					match sign_transaction(signer, request.id, password) {
-						Ok(s) | Err(s) => println!("{}", s),
-					}
-				}
-				Some('r') => {
-					match reject_transaction(signer, request.id) {
-						Ok(s) | Err(s) => println!("{}", s),
-					}
-				}
-				_ => ()
-			}
-		}
-		_ => println!("Could not read from stdin")
-	}
-}
-
-fn sign_transactions(
-	signer: &mut SignerRpc,
-	password: String
-) -> Result<String, String> {
-	signer.requests_to_confirm().map(|reqs| {
-		match reqs {
-			Ok(ref reqs) if reqs.is_empty() => {
-				Ok("No transactions in signing queue".to_owned())
-			}
-			Ok(reqs) => {
-				for r in reqs {
-					sign_interactive(signer, &password, r)
-				}
-				Ok("".to_owned())
-			}
-			Err(err) => {
-				Err(format!("error: {:?}", err))
-			}
-		}
-	}).map_err(|err| {
-		format!("{:?}", err)
-	}).wait()?
-}
-
-fn list_transactions(signer: &mut SignerRpc) -> Result<String, String> {
-	signer.requests_to_confirm().map(|reqs| {
-		match reqs {
-			Ok(ref reqs) if reqs.is_empty() => {
-				Ok("No transactions in signing queue".to_owned())
-			}
-			Ok(ref reqs) => {
-				Ok(format!("Transaction queue:\n{}", reqs
-						   .iter()
-						   .map(|r| format!("{}", r))
-						   .collect::<Vec<String>>()
-						   .join("\n")))
-			}
-			Err(err) => {
-				Err(format!("error: {:?}", err))
-			}
-		}
-	}).map_err(|err| {
-		format!("{:?}", err)
-	}).wait()?
-}
-
-fn sign_transaction(
-	signer: &mut SignerRpc, id: U256, password: &str
-) -> Result<String, String> {
-	signer.confirm_request(id, None, None, None, password).map(|res| {
-		match res {
-			Ok(u) => Ok(format!("Signed transaction id: {:#x}", u)),
-			Err(e) => Err(format!("{:?}", e)),
-		}
-	}).map_err(|err| {
-		format!("{:?}", err)
-	}).wait()?
-}
-
-fn reject_transaction(
-	signer: &mut SignerRpc, id: U256) -> Result<String, String>
-{
-	signer.reject_request(id).map(|res| {
-		match res {
-			Ok(true) => Ok(format!("Rejected transaction id {:#x}", id)),
-			Ok(false) => Err(format!("No such request")),
-			Err(e) => Err(format!("{:?}", e)),
-		}
-	}).map_err(|err| {
-		format!("{:?}", err)
-	}).wait()?
-}
-
-// cmds
-
-pub fn signer_list(
-	signerport: u16, authfile: PathBuf
-) -> Result<String, String> {
-	let addr = &format!("ws://127.0.0.1:{}", signerport);
-	let mut signer = SignerRpc::new(addr, &authfile).map_err(|err| {
-		format!("{:?}", err)
-	})?;
-	list_transactions(&mut signer)
-}
-
-pub fn signer_reject(
-	id: Option<usize>, signerport: u16, authfile: PathBuf
-) -> Result<String, String> {
-	let id = id.ok_or(format!("id required for signer reject"))?;
-	let addr = &format!("ws://127.0.0.1:{}", signerport);
-	let mut signer = SignerRpc::new(addr, &authfile).map_err(|err| {
-		format!("{:?}", err)
-	})?;
-	reject_transaction(&mut signer, U256::from(id))
-}
-
-pub fn signer_sign(
-	id: Option<usize>,
-	pwfile: Option<PathBuf>,
-	signerport: u16,
-	authfile: PathBuf
-) -> Result<String, String> {
-	let password;
-	match pwfile {
-		Some(pwfile) => {
-			match File::open(pwfile) {
-				Ok(fd) => {
-					match BufReader::new(fd).lines().next() {
-						Some(Ok(line)) => password = line,
-						_ => return Err(format!("No password in file"))
-					}
-				},
-				Err(e) =>
-					return Err(format!("Could not open password file: {}", e))
-			}
-		}
-		None => {
-			password = match rpassword::prompt_password_stdout("Password: ") {
-				Ok(p) => p,
-				Err(e) => return Err(format!("{}", e)),
-			}
-		}
-	}
-
-	let addr = &format!("ws://127.0.0.1:{}", signerport);
-	let mut signer = SignerRpc::new(addr, &authfile).map_err(|err| {
-		format!("{:?}", err)
-	})?;
-
-	match id {
-		Some(id) => {
-			sign_transaction(&mut signer, U256::from(id), &password)
-		},
-		None => {
-			sign_transactions(&mut signer, password)
-		}
-	}
-}
--- a/dapps/Cargo.toml
+++ b/dapps/Cargo.toml
@@ -0,0 +1,51 @@
+[package]
+description = "Parity Dapps crate"
+name = "parity-dapps"
+version = "1.8.0"
+license = "GPL-3.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[lib]
+
+[dependencies]
+base32 = "0.3"
+futures = "0.1"
+futures-cpupool = "0.1"
+linked-hash-map = "0.5"
+log = "0.3"
+parity-dapps-glue = "1.8"
+parking_lot = "0.4"
+mime_guess = "2.0.0-alpha.2"
+rand = "0.3"
+rustc-hex = "1.0"
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = "1.0"
+unicase = "1.4"
+zip = { version = "0.1", default-features = false }
+itertools = "0.5"
+
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.8" }
+jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.8" }
+
+ethcore-util = { path = "../util" }
+ethcore-bigint = { path = "../util/bigint" }
+ethcore-bytes = { path = "../util/bytes" }
+fetch = { path = "../util/fetch" }
+node-health = { path = "./node-health" }
+parity-hash-fetch = { path = "../hash-fetch" }
+parity-reactor = { path = "../util/reactor" }
+parity-ui = { path = "./ui" }
+hash = { path = "../util/hash" }
+
+clippy = { version = "0.0.103", optional = true}
+
+[dev-dependencies]
+env_logger = "0.4"
+ethcore-devtools = { path = "../devtools" }
+
+[features]
+dev = ["clippy", "ethcore-util/dev"]
+
+ui = ["parity-ui/no-precompiled-js"]
+ui-precompiled = ["parity-ui/use-precompiled-js"]
--- a/dapps/js-glue/Cargo.toml
+++ b/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.8.0"
+license = "GPL-3.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+build = "build.rs"
+
+[build-dependencies]
+quasi_codegen = { version = "0.32", optional = true }
+syntex = { version = "0.58", optional = true }
+
+[dependencies]
+glob = { version = "0.2.11" }
+mime_guess = { version = "2.0.0-alpha.2" }
+aster = { version = "0.41", default-features = false }
+quasi = { version = "0.32", default-features = false }
+quasi_macros = { version = "0.32", optional = true }
+syntex = { version = "0.58", optional = true }
+syntex_syntax = { version = "0.58", optional = true }
+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 = []
+
+
--- a/dapps/js-glue/README.md
+++ b/dapps/js-glue/README.md
@@ -0,0 +1,65 @@
+# Parity Dapps (JS-glue)
+
+Code generator to simplify creating a built-in Parity Dapp
+
+# How to create new builtin Dapp.
+1. Clone this repository.
+
+   ```bash
+   $ git clone https://github.com/paritytech/parity.git
+   ```
+
+1. Create a new directory for your Dapp. (`./myapp`)
+
+   ```bash
+   $ mkdir -p ./parity/dapps/myapp/src/web
+   ```
+
+1. Copy your frontend files to `./dapps/myapp/src/web` (bundled ones)
+
+   ```bash
+   $ cp -r ./myapp-src/* ./parity/dapps/myapp/src/web
+   ```
+
+1. Instead of creating `web3` in your app. Load (as the first script tag in `head`):
+
+   ```html
+   <script src="/parity-utils/inject.js"></script>
+   ```
+
+   The `inject.js` script will create global `web3` instance with proper provider that should be used by your dapp.
+
+1. Create `./parity/dapps/myapp/Cargo.toml` with you apps details. See example here: [parity-status Cargo.toml](https://github.com/paritytech/parity-ui/blob/master/status/Cargo.toml).
+
+   ```bash
+   $ git clone https://github.com/paritytech/parity-ui.git
+   $ cd ./parity-ui/
+   $ cp ./home/Cargo.toml ../parity/dapps/myapp/Cargo.toml
+   $ cp ./home/build.rs ../parity/dapps/myapp/build.rs
+   $ cp ./home/src/lib.rs ../parity/dapps/myapp/src/lib.rs
+   $ cp ./home/src/lib.rs.in ../parity/dapps/myapp/src/lib.rs.in
+   # And edit the details of your app
+   $ vim ../parity/dapps/myapp/Cargo.toml # Edit the details
+   $ vim ./parity/dapps/myapp/src/lib.rs.in # Edit the details
+   ```
+# How to include your Dapp into `Parity`?
+1. Edit `dapps/Cargo.toml` and add dependency to your application (it can be optional)
+
+   ```toml
+   # Use git repo and version
+   parity-dapps-myapp = { path="./myapp" }
+   ```
+
+1. Edit `dapps/src/apps.rs` and add your application to `all_pages` (if it's optional you need to specify two functions - see `parity-dapps-wallet` example)
+
+1. Compile parity.
+
+   ```bash
+   $ cargo build --release # While inside `parity`
+   ```
+
+1. Commit the results.
+
+   ```bash
+   $ git add myapp && git commit -am "My first Parity Dapp".
+   ```
--- a/dapps/js-glue/build.rs
+++ b/dapps/js-glue/build.rs
@@ -0,0 +1,43 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+
+#[cfg(feature = "with-syntex")]
+mod inner {
+	extern crate syntex;
+	extern crate quasi_codegen;
+
+	use std::env;
+	use std::path::Path;
+
+	pub fn main() {
+		let out_dir = env::var_os("OUT_DIR").unwrap();
+
+		let src = Path::new("src/lib.rs.in");
+		let dst = Path::new(&out_dir).join("lib.rs");
+
+		quasi_codegen::expand(&src, &dst).unwrap();
+	}
+}
+
+#[cfg(not(feature = "with-syntex"))]
+mod inner {
+	pub fn main() {}
+}
+
+fn main() {
+	inner::main();
+}
--- a/dapps/js-glue/src/build.rs
+++ b/dapps/js-glue/src/build.rs
@@ -0,0 +1,65 @@
+
+#[cfg(feature = "with-syntex")]
+pub mod inner {
+	use syntex;
+	use codegen;
+	use syntax::{ast, fold};
+	use std::env;
+	use std::path::Path;
+
+	fn strip_attributes(krate: ast::Crate) -> ast::Crate {
+		/// Helper folder that strips the serde attributes after the extensions have been expanded.
+		struct StripAttributeFolder;
+
+		impl fold::Folder for StripAttributeFolder {
+			fn fold_attribute(&mut self, attr: ast::Attribute) -> Option<ast::Attribute> {
+				if &*attr.value.name.as_str() == "webapp" {
+					return None;
+				}
+
+				Some(attr)
+			}
+
+			fn fold_mac(&mut self, mac: ast::Mac) -> ast::Mac {
+				fold::noop_fold_mac(mac, self)
+			}
+		}
+
+		fold::Folder::fold_crate(&mut StripAttributeFolder, krate)
+	}
+
+	pub fn register(reg: &mut syntex::Registry) {
+		reg.add_attr("feature(custom_derive)");
+		reg.add_attr("feature(custom_attribute)");
+
+		reg.add_decorator("derive_WebAppFiles", codegen::expand_webapp_implementation);
+		reg.add_post_expansion_pass(strip_attributes);
+	}
+
+	pub fn generate() {
+		let out_dir = env::var_os("OUT_DIR").unwrap();
+		let mut registry = syntex::Registry::new();
+		register(&mut registry);
+
+		let src = Path::new("src/lib.rs.in");
+		let dst = Path::new(&out_dir).join("lib.rs");
+
+		registry.expand("", &src, &dst).unwrap();
+	}
+}
+
+#[cfg(not(feature = "with-syntex"))]
+pub mod inner {
+	use codegen;
+
+	pub fn register(reg: &mut rustc_plugin::Registry) {
+		reg.register_syntax_extension(
+			syntax::parse::token::intern("derive_WebAppFiles"),
+			syntax::ext::base::MultiDecorator(
+				Box::new(codegen::expand_webapp_implementation)));
+
+		reg.register_attribute("webapp".to_owned(), AttributeType::Normal);
+	}
+
+	pub fn generate() {}
+}
--- a/dapps/js-glue/src/codegen.rs
+++ b/dapps/js-glue/src/codegen.rs
@@ -0,0 +1,194 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+extern crate aster;
+extern crate glob;
+extern crate mime_guess;
+
+use self::mime_guess::guess_mime_type;
+use std::path::{self, Path, PathBuf};
+use std::ops::Deref;
+
+use syntax::attr;
+use syntax::ast::{self, MetaItem, Item};
+use syntax::codemap::Span;
+use syntax::ext::base::{Annotatable, ExtCtxt};
+use syntax::print::pprust::lit_to_string;
+use syntax::symbol::InternedString;
+
+pub fn expand_webapp_implementation(
+	cx: &mut ExtCtxt,
+	span: Span,
+	meta_item: &MetaItem,
+	annotatable: &Annotatable,
+	push: &mut FnMut(Annotatable)
+) {
+	let item = match *annotatable {
+		Annotatable::Item(ref item) => item,
+		_ => {
+			cx.span_err(meta_item.span, "`#[derive(WebAppFiles)]` may only be applied to struct implementations");
+			return;
+		},
+	};
+	let builder = aster::AstBuilder::new().span(span);
+	implement_webapp(cx, &builder, item, push);
+}
+
+fn implement_webapp(cx: &ExtCtxt, builder: &aster::AstBuilder, item: &Item, push: &mut FnMut(Annotatable)) {
+	let static_files_dir = extract_path(cx, item);
+
+	let src = Path::new("src");
+	let static_files = {
+		let mut buf = src.to_path_buf();
+		buf.push(static_files_dir.deref());
+		buf
+	};
+
+	let search_location = {
+		let mut buf = static_files.to_path_buf();
+		buf.push("**");
+		buf.push("*");
+		buf
+	};
+
+	let files = glob::glob(search_location.to_str().expect("Valid UTF8 path"))
+		.expect("The sources directory is missing.")
+		.collect::<Result<Vec<PathBuf>, glob::GlobError>>()
+		.expect("There should be no error when reading a list of files.");
+
+	let statements = files
+		.iter()
+		.filter(|path_buf| path_buf.is_file())
+		.map(|path_buf| {
+			let path = path_buf.as_path();
+			let filename = path.file_name().and_then(|s| s.to_str()).expect("Only UTF8 paths.");
+			let mime_type = guess_mime_type(filename).to_string();
+			let file_path = as_uri(path.strip_prefix(&static_files).ok().expect("Prefix is always there, cause it's absolute path;qed"));
+			let file_path_in_source = path.to_str().expect("Only UTF8 paths.");
+
+			let path_lit = builder.expr().str(file_path.as_str());
+			let mime_lit = builder.expr().str(mime_type.as_str());
+			let web_path_lit = builder.expr().str(file_path_in_source);
+			let separator_lit = builder.expr().str(path::MAIN_SEPARATOR.to_string().as_str());
+			let concat_id = builder.id("concat!");
+			let env_id = builder.id("env!");
+			let macro_id = builder.id("include_bytes!");
+
+			let content = quote_expr!(
+				cx,
+				$macro_id($concat_id($env_id("CARGO_MANIFEST_DIR"), $separator_lit, $web_path_lit))
+			);
+			quote_stmt!(
+				cx,
+				files.insert($path_lit, File { path: $path_lit, content_type: $mime_lit, content: $content });
+			).expect("The statement is always ok, because it just uses literals.")
+		}).collect::<Vec<ast::Stmt>>();
+
+	let type_name = item.ident;
+
+	let files_impl = quote_item!(cx,
+		impl $type_name {
+			#[allow(unused_mut)]
+			fn files() -> ::std::collections::HashMap<&'static str, File> {
+				let mut files = ::std::collections::HashMap::new();
+				$statements
+				files
+			}
+		}
+	).unwrap();
+
+	push(Annotatable::Item(files_impl));
+}
+
+fn extract_path(cx: &ExtCtxt, item: &Item) -> String {
+	for meta_items in item.attrs.iter().filter_map(webapp_meta_items) {
+		for meta_item in meta_items {
+			let is_path = &*meta_item.name.as_str() == "path";
+			match meta_item.node {
+				ast::MetaItemKind::NameValue(ref lit) if is_path => {
+					if let Some(s) = get_str_from_lit(cx, lit) {
+						return s.deref().to_owned();
+					}
+				},
+				_ => {},
+			}
+		}
+	}
+
+	// default
+	"web".to_owned()
+}
+
+fn webapp_meta_items(attr: &ast::Attribute) -> Option<Vec<ast::MetaItem>> {
+	let is_webapp = &*attr.value.name.as_str() == "webapp";
+	match attr.value.node {
+		ast::MetaItemKind::List(ref items) if is_webapp => {
+			attr::mark_used(&attr);
+			Some(
+				items.iter()
+				.map(|item| item.node.clone())
+				.filter_map(|item| match item {
+					ast::NestedMetaItemKind::MetaItem(item) => Some(item),
+					_ => None,
+				})
+				.collect()
+			)
+		}
+		_ => None
+	}
+}
+
+fn get_str_from_lit(cx: &ExtCtxt, lit: &ast::Lit) -> Option<InternedString> {
+	match lit.node {
+		ast::LitKind::Str(ref s, _) => Some(s.clone().as_str()),
+		_ => {
+			cx.span_err(
+				lit.span,
+				&format!("webapp annotation path must be a string, not `{}`",
+					lit_to_string(lit)
+				)
+			);
+			return None;
+		}
+	}
+}
+
+fn as_uri(path: &Path) -> String {
+	let mut s = String::new();
+	for component in path.iter() {
+		s.push_str(component.to_str().expect("Only UTF-8 filenames are supported."));
+		s.push('/');
+	}
+	s[0..s.len()-1].into()
+}
+
+#[test]
+fn should_convert_path_separators_on_all_platforms() {
+	// given
+	let p = {
+		let mut p = PathBuf::new();
+		p.push("web");
+		p.push("src");
+		p.push("index.html");
+		p
+	};
+
+	// when
+	let path = as_uri(&p);
+
+	// then
+	assert_eq!(path, "web/src/index.html".to_owned());
+}
--- a/dapps/js-glue/src/js.rs
+++ b/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.");
+}
--- a/dapps/js-glue/src/lib.rs
+++ b/dapps/js-glue/src/lib.rs
@@ -0,0 +1,38 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+
+#![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))]
+#![cfg_attr(not(feature = "with-syntex"), plugin(quasi_macros))]
+
+#[cfg(feature = "with-syntex")]
+extern crate syntex;
+
+#[cfg(feature = "with-syntex")]
+extern crate syntex_syntax as syntax;
+
+#[cfg(feature = "with-syntex")]
+include!(concat!(env!("OUT_DIR"), "/lib.rs"));
+
+#[cfg(not(feature = "with-syntex"))]
+#[macro_use]
+extern crate syntax;
+
+#[cfg(not(feature = "with-syntex"))]
+extern crate rustc_plugin;
+
+#[cfg(not(feature = "with-syntex"))]
+include!("lib.rs.in");
--- a/dapps/js-glue/src/lib.rs.in
+++ b/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;
+}
--- a/dapps/node-health/Cargo.toml
+++ b/dapps/node-health/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "node-health"
+description = "Node's health status"
+version = "0.1.0"
+license = "GPL-3.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+futures = "0.1"
+futures-cpupool = "0.1"
+log = "0.3"
+ntp = "0.2.0"
+parking_lot = "0.4"
+serde = "1.0"
+serde_derive = "1.0"
+time = "0.1.35"
+
+parity-reactor = { path = "../../util/reactor" }
--- a/dapps/node-health/src/health.rs
+++ b/dapps/node-health/src/health.rs
@@ -0,0 +1,122 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Reporting node's health.
+
+use std::sync::Arc;
+use std::time;
+use futures::Future;
+use futures::sync::oneshot;
+use types::{HealthInfo, HealthStatus, Health};
+use time::{TimeChecker, MAX_DRIFT};
+use parity_reactor::Remote;
+use parking_lot::Mutex;
+use {SyncStatus};
+
+const TIMEOUT_SECS: u64 = 5;
+const PROOF: &str = "Only one closure is invoked.";
+
+/// A struct enabling you to query for node's health.
+#[derive(Debug, Clone)]
+pub struct NodeHealth {
+	sync_status: Arc<SyncStatus>,
+	time: TimeChecker,
+	remote: Remote,
+}
+
+impl NodeHealth {
+	/// Creates new `NodeHealth`.
+	pub fn new(sync_status: Arc<SyncStatus>, time: TimeChecker, remote: Remote) -> Self {
+		NodeHealth { sync_status, time, remote, }
+	}
+
+	/// Query latest health report.
+	pub fn health(&self) -> Box<Future<Item = Health, Error = ()> + Send> {
+		trace!(target: "dapps", "Checking node health.");
+		// Check timediff
+		let sync_status = self.sync_status.clone();
+		let time = self.time.time_drift();
+		let (tx, rx) = oneshot::channel();
+		let tx = Arc::new(Mutex::new(Some(tx)));
+		let tx2 = tx.clone();
+		self.remote.spawn_with_timeout(
+			move || time.then(move |result| {
+				let _ = tx.lock().take().expect(PROOF).send(Ok(result));
+				Ok(())
+			}),
+			time::Duration::from_secs(TIMEOUT_SECS),
+			move || {
+				let _ = tx2.lock().take().expect(PROOF).send(Err(()));
+			},
+		);
+
+		Box::new(rx.map_err(|err| {
+			warn!(target: "dapps", "Health request cancelled: {:?}", err);
+		}).and_then(move |time| {
+			// Check peers
+			let peers = {
+				let (connected, max) = sync_status.peers();
+				let (status, message) = match connected {
+					0 => {
+						(HealthStatus::Bad, "You are not connected to any peers. There is most likely some network issue. Fix connectivity.".into())
+					},
+					1 => (HealthStatus::NeedsAttention, "You are connected to only one peer. Your node might not be reliable. Check your network connection.".into()),
+					_ => (HealthStatus::Ok, "".into()),
+				};
+				HealthInfo { status, message, details: (connected, max) }
+			};
+
+			// Check sync
+			let sync = {
+				let is_syncing = sync_status.is_major_importing();
+				let (status, message) = if is_syncing {
+					(HealthStatus::NeedsAttention, "Your node is still syncing, the values you see might be outdated. Wait until it's fully synced.".into())
+				} else {
+					(HealthStatus::Ok, "".into())
+				};
+				HealthInfo { status, message, details: is_syncing }
+			};
+
+			// Check time
+			let time = {
+				let (status, message, details) = match time {
+					Ok(Ok(diff)) if diff < MAX_DRIFT && diff > -MAX_DRIFT => {
+						(HealthStatus::Ok, "".into(), diff)
+					},
+					Ok(Ok(diff)) => {
+						(HealthStatus::Bad, format!(
+							"Your clock is not in sync. Detected difference is too big for the protocol to work: {}ms. Synchronize your clock.",
+							diff,
+						), diff)
+					},
+					Ok(Err(err)) => {
+						(HealthStatus::NeedsAttention, format!(
+							"Unable to reach time API: {}. Make sure that your clock is synchronized.",
+							err,
+						), 0)
+					},
+					Err(_) => {
+						(HealthStatus::NeedsAttention, "Time API request timed out. Make sure that the clock is synchronized.".into(), 0)
+					},
+				};
+
+				HealthInfo { status, message, details, }
+			};
+
+			Ok(Health { peers, sync, time})
+		}))
+	}
+}
--- a/dapps/node-health/src/lib.rs
+++ b/dapps/node-health/src/lib.rs
@@ -0,0 +1,49 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Node Health status reporting.
+
+#![warn(missing_docs)]
+
+extern crate futures;
+extern crate futures_cpupool;
+extern crate ntp;
+extern crate time as time_crate;
+extern crate parity_reactor;
+extern crate parking_lot;
+
+#[macro_use]
+extern crate log;
+#[macro_use]
+extern crate serde_derive;
+
+mod health;
+mod time;
+mod types;
+
+pub use futures_cpupool::CpuPool;
+pub use health::NodeHealth;
+pub use types::{Health, HealthInfo, HealthStatus};
+pub use time::{TimeChecker, Error};
+
+/// Indicates sync status
+pub trait SyncStatus: ::std::fmt::Debug + Send + Sync {
+	/// Returns true if there is a major sync happening.
+	fn is_major_importing(&self) -> bool;
+
+	/// Returns number of connected and ideal peers.
+	fn peers(&self) -> (usize, usize);
+}
--- a/dapps/node-health/src/time.rs
+++ b/dapps/node-health/src/time.rs
@@ -0,0 +1,357 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Periodically checks node's time drift using [SNTP](https://tools.ietf.org/html/rfc1769).
+//!
+//! An NTP packet is sent to the server with a local timestamp, the server then completes the packet, yielding the
+//! following timestamps:
+//!
+//!    Timestamp Name          ID   When Generated
+//!   ------------------------------------------------------------
+//!    Originate Timestamp     T1   time request sent by client
+//!    Receive Timestamp       T2   time request received at server
+//!    Transmit Timestamp      T3   time reply sent by server
+//!    Destination Timestamp   T4   time reply received at client
+//!
+//! The drift is defined as:
+//!
+//! drift = ((T2 - T1) + (T3 - T4)) / 2.
+//!
+
+use std::io;
+use std::{fmt, mem, time};
+use std::collections::VecDeque;
+use std::sync::atomic::{self, AtomicUsize};
+use std::sync::Arc;
+
+use futures::{self, Future};
+use futures::future::{self, IntoFuture};
+use futures_cpupool::{CpuPool, CpuFuture};
+use ntp;
+use parking_lot::RwLock;
+use time_crate::{Duration, Timespec};
+
+/// Time checker error.
+#[derive(Debug, Clone, PartialEq)]
+pub enum Error {
+	/// No servers are currently available for a query.
+	NoServersAvailable,
+	/// There was an error when trying to reach the NTP server.
+	Ntp(String),
+	/// IO error when reading NTP response.
+	Io(String),
+}
+
+impl fmt::Display for Error {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		use self::Error::*;
+
+		match *self {
+			NoServersAvailable => write!(fmt, "No NTP servers available"),
+			Ntp(ref err) => write!(fmt, "NTP error: {}", err),
+			Io(ref err) => write!(fmt, "Connection Error: {}", err),
+		}
+	}
+}
+
+impl From<io::Error> for Error {
+	fn from(err: io::Error) -> Self { Error::Io(format!("{}", err)) }
+}
+
+impl From<ntp::errors::Error> for Error {
+	fn from(err: ntp::errors::Error) -> Self { Error::Ntp(format!("{}", err)) }
+}
+
+/// NTP time drift checker.
+pub trait Ntp {
+	/// Returned Future.
+	type Future: IntoFuture<Item=Duration, Error=Error>;
+
+	/// Returns the current time drift.
+	fn drift(&self) -> Self::Future;
+}
+
+const SERVER_MAX_POLL_INTERVAL_SECS: u64 = 60;
+#[derive(Debug)]
+struct Server {
+	pub address: String,
+	next_call: RwLock<time::Instant>,
+	failures: AtomicUsize,
+}
+
+impl Server {
+	pub fn is_available(&self) -> bool {
+		*self.next_call.read() < time::Instant::now()
+	}
+
+	pub fn report_success(&self) {
+		self.failures.store(0, atomic::Ordering::SeqCst);
+		self.update_next_call(1)
+	}
+
+	pub fn report_failure(&self) {
+		let errors = self.failures.fetch_add(1, atomic::Ordering::SeqCst);
+		self.update_next_call(1 << errors)
+	}
+
+	fn update_next_call(&self, delay: usize) {
+		*self.next_call.write() = time::Instant::now() + time::Duration::from_secs(delay as u64 * SERVER_MAX_POLL_INTERVAL_SECS);
+	}
+}
+
+impl<T: AsRef<str>> From<T> for Server {
+	fn from(t: T) -> Self {
+		Server {
+			address: t.as_ref().to_owned(),
+			next_call: RwLock::new(time::Instant::now()),
+			failures: Default::default(),
+		}
+	}
+}
+
+/// NTP client using the SNTP algorithm for calculating drift.
+#[derive(Clone)]
+pub struct SimpleNtp {
+	addresses: Vec<Arc<Server>>,
+	pool: CpuPool,
+}
+
+impl fmt::Debug for SimpleNtp {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		f
+			.debug_struct("SimpleNtp")
+			.field("addresses", &self.addresses)
+			.finish()
+	}
+}
+
+impl SimpleNtp {
+	fn new<T: AsRef<str>>(addresses: &[T], pool: CpuPool) -> SimpleNtp {
+		SimpleNtp {
+			addresses: addresses.iter().map(Server::from).map(Arc::new).collect(),
+			pool: pool,
+		}
+	}
+}
+
+impl Ntp for SimpleNtp {
+	type Future = future::Either<
+		CpuFuture<Duration, Error>,
+		future::FutureResult<Duration, Error>,
+	>;
+
+	fn drift(&self) -> Self::Future {
+		use self::future::Either::{A, B};
+
+		let server = self.addresses.iter().find(|server| server.is_available());
+		server.map(|server| {
+			let server = server.clone();
+			A(self.pool.spawn_fn(move || {
+				debug!(target: "dapps", "Fetching time from {}.", server.address);
+
+				match ntp::request(&server.address) {
+					Ok(packet) => {
+						let dest_time = ::time_crate::now_utc().to_timespec();
+						let orig_time = Timespec::from(packet.orig_time);
+						let recv_time = Timespec::from(packet.recv_time);
+						let transmit_time = Timespec::from(packet.transmit_time);
+
+						let drift = ((recv_time - orig_time) + (transmit_time - dest_time)) / 2;
+
+						server.report_success();
+						Ok(drift)
+					},
+					Err(err) => {
+						server.report_failure();
+						Err(err.into())
+					},
+				}
+			}))
+		}).unwrap_or_else(|| B(future::err(Error::NoServersAvailable)))
+	}
+}
+
+// NOTE In a positive scenario first results will be seen after:
+// MAX_RESULTS * UPDATE_TIMEOUT_INCOMPLETE_SECS seconds.
+const MAX_RESULTS: usize = 4;
+const UPDATE_TIMEOUT_OK_SECS: u64 = 6 * 60 * 60;
+const UPDATE_TIMEOUT_WARN_SECS: u64 = 15 * 60;
+const UPDATE_TIMEOUT_ERR_SECS: u64 = 60;
+const UPDATE_TIMEOUT_INCOMPLETE_SECS: u64 = 10;
+
+/// Maximal valid time drift.
+pub const MAX_DRIFT: i64 = 10_000;
+
+type BoxFuture<A, B> = Box<Future<Item = A, Error = B> + Send>;
+
+#[derive(Debug, Clone)]
+/// A time checker.
+pub struct TimeChecker<N: Ntp = SimpleNtp> {
+	ntp: N,
+	last_result: Arc<RwLock<(time::Instant, VecDeque<Result<i64, Error>>)>>,
+}
+
+impl TimeChecker<SimpleNtp> {
+	/// Creates new time checker given the NTP server address.
+	pub fn new<T: AsRef<str>>(ntp_addresses: &[T], pool: CpuPool) -> Self {
+		let last_result = Arc::new(RwLock::new(
+			// Assume everything is ok at the very beginning.
+			(time::Instant::now(), vec![Ok(0)].into())
+		));
+
+		let ntp = SimpleNtp::new(ntp_addresses, pool);
+
+		TimeChecker {
+			ntp,
+			last_result,
+		}
+	}
+}
+
+impl<N: Ntp> TimeChecker<N> where <N::Future as IntoFuture>::Future: Send + 'static {
+	/// Updates the time
+	pub fn update(&self) -> BoxFuture<i64, Error> {
+		trace!(target: "dapps", "Updating time from NTP.");
+		let last_result = self.last_result.clone();
+		Box::new(self.ntp.drift().into_future().then(move |res| {
+			let res = res.map(|d| d.num_milliseconds());
+
+			if let Err(Error::NoServersAvailable) = res {
+				debug!(target: "dapps", "No NTP servers available. Selecting an older result.");
+				return select_result(last_result.read().1.iter());
+			}
+
+			// Update the results.
+			let mut results = mem::replace(&mut last_result.write().1, VecDeque::new());
+			let has_all_results = results.len() >= MAX_RESULTS;
+			let valid_till = time::Instant::now() + time::Duration::from_secs(
+				match res {
+					Ok(time) if has_all_results && time < MAX_DRIFT => UPDATE_TIMEOUT_OK_SECS,
+					Ok(_) if has_all_results => UPDATE_TIMEOUT_WARN_SECS,
+					Err(_) if has_all_results => UPDATE_TIMEOUT_ERR_SECS,
+					_ => UPDATE_TIMEOUT_INCOMPLETE_SECS,
+				}
+			);
+
+			trace!(target: "dapps", "New time drift received: {:?}", res);
+			// Push the result.
+			results.push_back(res);
+			while results.len() > MAX_RESULTS {
+				results.pop_front();
+			}
+
+			// Select a response and update last result.
+			let res = select_result(results.iter());
+			*last_result.write() = (valid_till, results);
+			res
+		}))
+	}
+
+	/// Returns a current time drift or error if last request to NTP server failed.
+	pub fn time_drift(&self) -> BoxFuture<i64, Error> {
+		// return cached result
+		{
+			let res = self.last_result.read();
+			if res.0 > time::Instant::now() {
+				return Box::new(futures::done(select_result(res.1.iter())));
+			}
+		}
+		// or update and return result
+		self.update()
+	}
+}
+
+fn select_result<'a, T: Iterator<Item=&'a Result<i64, Error>>>(results: T) -> Result<i64, Error> {
+	let mut min = None;
+	for res in results {
+		min = Some(match (min.take(), res) {
+			(Some(Ok(min)), &Ok(ref new)) => Ok(::std::cmp::min(min, *new)),
+			(Some(Ok(old)), &Err(_)) => Ok(old),
+			(_, ref new) => (*new).clone(),
+		})
+	}
+
+	min.unwrap_or_else(|| Err(Error::Ntp("NTP server unavailable.".into())))
+}
+
+#[cfg(test)]
+mod tests {
+	use std::sync::Arc;
+	use std::cell::{Cell, RefCell};
+	use std::time::Instant;
+	use time::Duration;
+	use futures::{future, Future};
+	use super::{Ntp, TimeChecker, Error};
+	use parking_lot::RwLock;
+
+	#[derive(Clone)]
+	struct FakeNtp(RefCell<Vec<Duration>>, Cell<u64>);
+	impl FakeNtp {
+		fn new() -> FakeNtp {
+			FakeNtp(
+				RefCell::new(vec![Duration::milliseconds(150)]),
+				Cell::new(0))
+		}
+	}
+
+	impl Ntp for FakeNtp {
+		type Future = future::FutureResult<Duration, Error>;
+
+		fn drift(&self) -> Self::Future {
+			self.1.set(self.1.get() + 1);
+			future::ok(self.0.borrow_mut().pop().expect("Unexpected call to drift()."))
+		}
+	}
+
+	fn time_checker() -> TimeChecker<FakeNtp> {
+		let last_result = Arc::new(RwLock::new(
+			(Instant::now(), vec![Err(Error::Ntp("NTP server unavailable".into()))].into())
+		));
+
+		TimeChecker {
+			ntp: FakeNtp::new(),
+			last_result: last_result,
+		}
+	}
+
+	#[test]
+	fn should_fetch_time_on_start() {
+		// given
+		let time = time_checker();
+
+		// when
+		let diff = time.time_drift().wait().unwrap();
+
+		// then
+		assert_eq!(diff, 150);
+		assert_eq!(time.ntp.1.get(), 1);
+	}
+
+	#[test]
+	fn should_not_fetch_twice_if_timeout_has_not_passed() {
+		// given
+		let time = time_checker();
+
+		// when
+		let diff1 = time.time_drift().wait().unwrap();
+		let diff2 = time.time_drift().wait().unwrap();
+
+		// then
+		assert_eq!(diff1, 150);
+		assert_eq!(diff2, 150);
+		assert_eq!(time.ntp.1.get(), 1);
+	}
+}
--- a/dapps/node-health/src/types.rs
+++ b/dapps/node-health/src/types.rs
@@ -0,0 +1,57 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Base health types.
+
+/// Health API endpoint status.
+#[derive(Debug, PartialEq, Serialize)]
+pub enum HealthStatus {
+	/// Everything's OK.
+	#[serde(rename = "ok")]
+	Ok,
+	/// Node health need attention
+	/// (the issue is not critical, but may need investigation)
+	#[serde(rename = "needsAttention")]
+	NeedsAttention,
+	/// There is something bad detected with the node.
+	#[serde(rename = "bad")]
+	Bad,
+}
+
+/// Represents a single check in node health.
+/// Cointains the status of that check and apropriate message and details.
+#[derive(Debug, PartialEq, Serialize)]
+#[serde(deny_unknown_fields)]
+pub struct HealthInfo<T> {
+	/// Check status.
+	pub status: HealthStatus,
+	/// Human-readable message.
+	pub message: String,
+	/// Technical details of the check.
+	pub details: T,
+}
+
+/// Node Health status.
+#[derive(Debug, PartialEq, Serialize)]
+#[serde(deny_unknown_fields)]
+pub struct Health {
+	/// Status of peers.
+	pub peers: HealthInfo<(usize, usize)>,
+	/// Sync status.
+	pub sync: HealthInfo<bool>,
+	/// Time diff info.
+	pub time: HealthInfo<i64>,
+}
--- a/dapps/res/gavcoin.zip
+++ b/dapps/res/gavcoin.zip
--- a/dapps/src/api/api.rs
+++ b/dapps/src/api/api.rs
@@ -0,0 +1,97 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+
+use hyper::{Method, StatusCode};
+
+use api::response;
+use apps::fetcher::Fetcher;
+use endpoint::{Endpoint, Request, Response, EndpointPath};
+use futures::{future, Future};
+use node_health::{NodeHealth, HealthStatus};
+
+#[derive(Clone)]
+pub struct RestApi {
+	fetcher: Arc<Fetcher>,
+	health: NodeHealth,
+}
+
+impl Endpoint for RestApi {
+	fn respond(&self, mut path: EndpointPath, req: Request) -> Response {
+		if let Method::Options = *req.method() {
+			return Box::new(future::ok(response::empty()));
+		}
+
+		let endpoint = path.app_params.get(0).map(String::to_owned);
+		let hash = path.app_params.get(1).map(String::to_owned);
+
+		// at this point path.app_id contains 'api', adjust it to the hash properly, otherwise
+		// we will try and retrieve 'api' as the hash when doing the /api/content route
+		if let Some(ref hash) = hash {
+			path.app_id = hash.to_owned();
+		}
+
+		trace!(target: "dapps", "Handling /api request: {:?}/{:?}", endpoint, hash);
+		match endpoint.as_ref().map(String::as_str) {
+			Some("ping") => Box::new(future::ok(response::ping(req))),
+			Some("health") => self.health(),
+			Some("content") => self.resolve_content(hash.as_ref().map(String::as_str), path, req),
+			_ => Box::new(future::ok(response::not_found())),
+		}
+	}
+}
+
+impl RestApi {
+	pub fn new(
+		fetcher: Arc<Fetcher>,
+		health: NodeHealth,
+	) -> Box<Endpoint> {
+		Box::new(RestApi {
+			fetcher,
+			health,
+		})
+	}
+
+	fn resolve_content(&self, hash: Option<&str>, path: EndpointPath, req: Request) -> Response {
+		trace!(target: "dapps", "Resolving content: {:?} from path: {:?}", hash, path);
+		match hash {
+			Some(hash) if self.fetcher.contains(hash) => {
+				self.fetcher.respond(path, req)
+			},
+			_ => Box::new(future::ok(response::not_found())),
+		}
+	}
+
+	fn health(&self) -> Response {
+		Box::new(self.health.health()
+			.then(|health| {
+				let status = match health {
+					Ok(ref health) => {
+						if [&health.peers.status, &health.sync.status].iter().any(|x| *x != &HealthStatus::Ok) {
+							StatusCode::PreconditionFailed // HTTP 412
+						} else {
+							StatusCode::Ok // HTTP 200
+						}
+					},
+					_ => StatusCode::ServiceUnavailable, // HTTP 503
+				};
+
+				Ok(response::as_json(status, &health).into())
+			})
+		)
+	}
+}
--- a/dapps/src/api/mod.rs
+++ b/dapps/src/api/mod.rs
@@ -0,0 +1,23 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! REST API
+
+mod api;
+mod response;
+mod types;
+
+pub use self::api::RestApi;
--- a/dapps/src/api/response.rs
+++ b/dapps/src/api/response.rs
@@ -0,0 +1,43 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use serde::Serialize;
+use serde_json;
+use hyper::{self, mime, StatusCode};
+
+use handlers::{ContentHandler, EchoHandler};
+
+pub fn empty() -> hyper::Response {
+	ContentHandler::ok("".into(), mime::TEXT_PLAIN).into()
+}
+
+pub fn as_json<T: Serialize>(status: StatusCode, val: &T) -> hyper::Response {
+	let json = serde_json::to_string(val)
+		.expect("serialization to string is infallible; qed");
+	ContentHandler::new(status, json, mime::APPLICATION_JSON).into()
+}
+
+pub fn ping(req: hyper::Request) -> hyper::Response {
+	EchoHandler::new(req).into()
+}
+
+pub fn not_found() -> hyper::Response {
+	as_json(StatusCode::NotFound, &::api::types::ApiError {
+		code: "404".into(),
+		title: "Not Found".into(),
+		detail: "Resource you requested has not been found.".into(),
+	})
+}
--- a/dapps/src/api/types.rs
+++ b/dapps/src/api/types.rs
@@ -0,0 +1,27 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+/// A structure representing any error in REST API.
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct ApiError {
+	/// Error code.
+	pub code: String,
+	/// Human-readable error summary.
+	pub title: String,
+	/// More technical error details.
+	pub detail: String,
+}
--- a/dapps/src/apps/app.rs
+++ b/dapps/src/apps/app.rs
@@ -0,0 +1,55 @@
+// 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,
+		}
+	}
+}
--- a/dapps/src/apps/cache.rs
+++ b/dapps/src/apps/cache.rs
@@ -0,0 +1,128 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Fetchable Dapps support.
+
+use std::fs;
+
+use linked_hash_map::LinkedHashMap;
+use page::local;
+use handlers::FetchControl;
+
+pub enum ContentStatus {
+	Fetching(FetchControl),
+	Ready(local::Dapp),
+}
+
+#[derive(Default)]
+pub struct ContentCache {
+	cache: LinkedHashMap<String, ContentStatus>,
+}
+
+impl ContentCache {
+	pub fn insert(&mut self, content_id: String, status: ContentStatus) -> Option<ContentStatus> {
+		self.cache.insert(content_id, status)
+	}
+
+	pub fn remove(&mut self, content_id: &str) -> Option<ContentStatus> {
+		self.cache.remove(content_id)
+	}
+
+	pub fn get(&mut self, content_id: &str) -> Option<&mut ContentStatus> {
+		self.cache.get_refresh(content_id)
+	}
+
+	pub fn clear_garbage(&mut self, expected_size: usize) -> Vec<(String, ContentStatus)> {
+		let len = self.cache.len();
+
+		if len <= expected_size {
+			return Vec::new();
+		}
+
+		let mut removed = Vec::with_capacity(len - expected_size);
+
+		while self.cache.len() > expected_size {
+			let entry = self.cache.pop_front().expect("expected_size bounded at 0, len is greater; qed");
+
+			match entry.1 {
+				ContentStatus::Fetching(ref fetch) => {
+					trace!(target: "dapps", "Aborting {} because of limit.", entry.0);
+					// Mark as aborted
+					fetch.abort()
+				},
+				ContentStatus::Ready(ref endpoint) => {
+					trace!(target: "dapps", "Removing {} because of limit.", entry.0);
+					// Remove path (dir or file)
+					let res = fs::remove_dir_all(&endpoint.path()).or_else(|_| fs::remove_file(&endpoint.path()));
+					if let Err(e) = res {
+						warn!(target: "dapps", "Unable to remove dapp/content from cache: {:?}", e);
+					}
+				}
+			}
+
+			removed.push(entry);
+		}
+		removed
+	}
+
+	#[cfg(test)]
+	pub fn len(&self) -> usize {
+		self.cache.len()
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	fn only_keys(data: Vec<(String, ContentStatus)>) -> Vec<String> {
+		data.into_iter().map(|x| x.0).collect()
+	}
+
+	#[test]
+	fn should_remove_least_recently_used() {
+		// given
+		let mut cache = ContentCache::default();
+		cache.insert("a".into(), ContentStatus::Fetching(Default::default()));
+		cache.insert("b".into(), ContentStatus::Fetching(Default::default()));
+		cache.insert("c".into(), ContentStatus::Fetching(Default::default()));
+
+		// when
+		let res = cache.clear_garbage(2);
+
+		// then
+		assert_eq!(cache.len(), 2);
+		assert_eq!(only_keys(res), vec!["a"]);
+	}
+
+	#[test]
+	fn should_update_lru_if_accessed() {
+		// given
+		let mut cache = ContentCache::default();
+		cache.insert("a".into(), ContentStatus::Fetching(Default::default()));
+		cache.insert("b".into(), ContentStatus::Fetching(Default::default()));
+		cache.insert("c".into(), ContentStatus::Fetching(Default::default()));
+
+		// when
+		cache.get("a");
+		let res = cache.clear_garbage(2);
+
+		// then
+		assert_eq!(cache.len(), 2);
+		assert_eq!(only_keys(res), vec!["b"]);
+	}
+
+}
--- a/dapps/src/apps/fetcher/installers.rs
+++ b/dapps/src/apps/fetcher/installers.rs
@@ -0,0 +1,267 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use zip;
+use std::{fs, fmt};
+use std::io::{self, Read, Write};
+use std::path::PathBuf;
+use bigint::hash::H256;
+use fetch::{self, Mime};
+use futures_cpupool::CpuPool;
+use hash::keccak_buffer;
+
+use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest, serialize_manifest, Manifest};
+use handlers::{ContentValidator, ValidatorResponse};
+use page::{local, PageCache};
+use Embeddable;
+
+type OnDone = Box<Fn(Option<local::Dapp>) + Send>;
+
+fn write_response_and_check_hash(
+	id: &str,
+	mut content_path: PathBuf,
+	filename: &str,
+	response: fetch::Response
+) -> Result<(fs::File, PathBuf), ValidationError> {
+	// try to parse id
+	let id = id.parse().map_err(|_| ValidationError::InvalidContentId)?;
+
+	// check if content exists
+	if content_path.exists() {
+		warn!(target: "dapps", "Overwriting existing content at 0x{:?}", id);
+		fs::remove_dir_all(&content_path)?
+	}
+
+	// create directory
+	fs::create_dir_all(&content_path)?;
+
+	// append filename
+	content_path.push(filename);
+
+	// Now write the response
+	let mut file = io::BufWriter::new(fs::File::create(&content_path)?);
+	let mut reader = io::BufReader::new(response);
+	io::copy(&mut reader, &mut file)?;
+	file.flush()?;
+
+	// Validate hash
+	// TODO [ToDr] calculate keccak in-flight while reading the response
+	let mut file = io::BufReader::new(fs::File::open(&content_path)?);
+	let hash = keccak_buffer(&mut file)?;
+	if id == hash {
+		Ok((file.into_inner(), content_path))
+	} else {
+		Err(ValidationError::HashMismatch {
+			expected: id,
+			got: hash,
+		})
+	}
+}
+
+pub struct Content {
+	id: String,
+	mime: Mime,
+	content_path: PathBuf,
+	on_done: OnDone,
+	pool: CpuPool,
+}
+
+impl Content {
+	pub fn new(id: String, mime: Mime, content_path: PathBuf, on_done: OnDone, pool: CpuPool) -> Self {
+		Content {
+			id,
+			mime,
+			content_path,
+			on_done,
+			pool,
+		}
+	}
+}
+
+impl ContentValidator for Content {
+	type Error = ValidationError;
+
+	fn validate_and_install(self, response: fetch::Response) -> Result<ValidatorResponse, ValidationError> {
+		let pool = self.pool;
+		let id = self.id.clone();
+		let mime = self.mime;
+		let validate = move |content_path: PathBuf| {
+			// Create dir
+			let (_, content_path) = write_response_and_check_hash(&id, content_path, &id, response)?;
+
+			Ok(local::Dapp::single_file(pool, content_path, mime, PageCache::Enabled))
+		};
+
+		// Prepare path for a file
+		let content_path = self.content_path.join(&self.id);
+		// Make sure to always call on_done (even in case of errors)!
+		let result = validate(content_path.clone());
+		// remove the file if there was an error
+		if result.is_err() {
+			// Ignore errors since the file might not exist
+			let _ = fs::remove_dir_all(&content_path);
+		}
+		(self.on_done)(result.as_ref().ok().cloned());
+		result.map(ValidatorResponse::Local)
+	}
+}
+
+pub struct Dapp {
+	id: String,
+	dapps_path: PathBuf,
+	on_done: OnDone,
+	embeddable_on: Embeddable,
+	pool: CpuPool,
+}
+
+impl Dapp {
+	pub fn new(id: String, dapps_path: PathBuf, on_done: OnDone, embeddable_on: Embeddable, pool: CpuPool) -> Self {
+		Dapp {
+			id,
+			dapps_path,
+			on_done,
+			embeddable_on,
+			pool,
+		}
+	}
+
+	fn find_manifest(zip: &mut zip::ZipArchive<fs::File>) -> Result<(Manifest, PathBuf), ValidationError> {
+		for i in 0..zip.len() {
+			let mut file = zip.by_index(i)?;
+
+			if !file.name().ends_with(MANIFEST_FILENAME) {
+				continue;
+			}
+
+			// try to read manifest
+			let mut manifest = String::new();
+			let manifest = file
+				.read_to_string(&mut manifest).ok()
+				.and_then(|_| deserialize_manifest(manifest).ok());
+
+			if let Some(manifest) = manifest {
+				let mut manifest_location = PathBuf::from(file.name());
+				manifest_location.pop(); // get rid of filename
+				return Ok((manifest, manifest_location));
+			}
+		}
+
+		Err(ValidationError::ManifestNotFound)
+	}
+}
+
+impl ContentValidator for Dapp {
+	type Error = ValidationError;
+
+	fn validate_and_install(self, response: fetch::Response) -> Result<ValidatorResponse, ValidationError> {
+		let id = self.id.clone();
+		let pool = self.pool;
+		let embeddable_on = self.embeddable_on;
+		let validate = move |dapp_path: PathBuf| {
+			let (file, zip_path) = write_response_and_check_hash(&id, dapp_path.clone(), &format!("{}.zip", id), response)?;
+			trace!(target: "dapps", "Opening dapp bundle at {:?}", zip_path);
+			// Unpack archive
+			let mut zip = zip::ZipArchive::new(file)?;
+			// First find manifest file
+			let (mut manifest, manifest_dir) = Self::find_manifest(&mut zip)?;
+			// Overwrite id to match hash
+			manifest.id = id;
+
+			// Unpack zip
+			for i in 0..zip.len() {
+				let mut file = zip.by_index(i)?;
+				let is_dir = file.name().chars().rev().next() == Some('/');
+
+				let file_path = PathBuf::from(file.name());
+				let location_in_manifest_base = file_path.strip_prefix(&manifest_dir);
+				// Create files that are inside manifest directory
+				if let Ok(location_in_manifest_base) = location_in_manifest_base {
+					let p = dapp_path.join(location_in_manifest_base);
+					// Check if it's a directory
+					if is_dir {
+						fs::create_dir_all(p)?;
+					} else {
+						let mut target = fs::File::create(p)?;
+						io::copy(&mut file, &mut target)?;
+					}
+				}
+			}
+
+			// Remove zip
+			fs::remove_file(&zip_path)?;
+
+			// Write manifest
+			let manifest_str = serialize_manifest(&manifest).map_err(ValidationError::ManifestSerialization)?;
+			let manifest_path = dapp_path.join(MANIFEST_FILENAME);
+			let mut manifest_file = fs::File::create(manifest_path)?;
+			manifest_file.write_all(manifest_str.as_bytes())?;
+			// Create endpoint
+			let endpoint = local::Dapp::new(pool, dapp_path, manifest.into(), PageCache::Enabled, embeddable_on);
+			Ok(endpoint)
+		};
+
+		// Prepare directory for dapp
+		let target = self.dapps_path.join(&self.id);
+		// Validate the dapp
+		let result = validate(target.clone());
+		// remove the file if there was an error
+		if result.is_err() {
+			// Ignore errors since the file might not exist
+			let _ = fs::remove_dir_all(&target);
+		}
+		(self.on_done)(result.as_ref().ok().cloned());
+		result.map(ValidatorResponse::Local)
+	}
+}
+
+#[derive(Debug)]
+pub enum ValidationError {
+	Io(io::Error),
+	Zip(zip::result::ZipError),
+	InvalidContentId,
+	ManifestNotFound,
+	ManifestSerialization(String),
+	HashMismatch { expected: H256, got: H256, },
+}
+
+impl fmt::Display for ValidationError {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		match *self {
+			ValidationError::Io(ref io) => write!(f, "Unexpected IO error occured: {:?}", io),
+			ValidationError::Zip(ref zip) => write!(f, "Unable to read ZIP archive: {:?}", zip),
+			ValidationError::InvalidContentId => write!(f, "ID is invalid. It should be 256 bits keccak hash of content."),
+			ValidationError::ManifestNotFound => write!(f, "Downloaded Dapp bundle did not contain valid manifest.json file."),
+			ValidationError::ManifestSerialization(ref err) => {
+				write!(f, "There was an error during Dapp Manifest serialization: {:?}", err)
+			},
+			ValidationError::HashMismatch { ref expected, ref got } => {
+				write!(f, "Hash of downloaded content did not match. Expected:{:?}, Got:{:?}.", expected, got)
+			},
+		}
+	}
+}
+
+impl From<io::Error> for ValidationError {
+	fn from(err: io::Error) -> Self {
+		ValidationError::Io(err)
+	}
+}
+
+impl From<zip::result::ZipError> for ValidationError {
+	fn from(err: zip::result::ZipError) -> Self {
+		ValidationError::Zip(err)
+	}
+}
--- a/dapps/src/apps/fetcher/mod.rs
+++ b/dapps/src/apps/fetcher/mod.rs
@@ -0,0 +1,320 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Fetchable Dapps support.
+//! Manages downloaded (cached) Dapps and downloads them when necessary.
+//! Uses `URLHint` to resolve addresses into Dapps bundle file location.
+
+mod installers;
+
+use std::{fs, env};
+use std::path::PathBuf;
+use std::sync::Arc;
+use rustc_hex::FromHex;
+use futures::{future, Future};
+use futures_cpupool::CpuPool;
+use fetch::{Client as FetchClient, Fetch};
+use hash_fetch::urlhint::{URLHintContract, URLHint, URLHintResult};
+
+use hyper::StatusCode;
+
+use {Embeddable, SyncStatus, random_filename};
+use parking_lot::Mutex;
+use page::local;
+use handlers::{ContentHandler, ContentFetcherHandler};
+use endpoint::{self, Endpoint, EndpointPath};
+use apps::cache::{ContentCache, ContentStatus};
+
+/// Limit of cached dapps/content
+const MAX_CACHED_DAPPS: usize = 20;
+
+pub trait Fetcher: Endpoint + 'static {
+	fn contains(&self, content_id: &str) -> bool;
+}
+
+pub struct ContentFetcher<F: Fetch = FetchClient, R: URLHint + 'static = URLHintContract> {
+	cache_path: PathBuf,
+	resolver: R,
+	cache: Arc<Mutex<ContentCache>>,
+	sync: Arc<SyncStatus>,
+	embeddable_on: Embeddable,
+	fetch: F,
+	pool: CpuPool,
+	only_content: bool,
+}
+
+impl<R: URLHint + 'static, F: Fetch> Drop for ContentFetcher<F, R> {
+	fn drop(&mut self) {
+		// Clear cache path
+		let _ = fs::remove_dir_all(&self.cache_path);
+	}
+}
+
+impl<R: URLHint + 'static, F: Fetch> ContentFetcher<F, R> {
+	pub fn new(
+		resolver: R,
+		sync: Arc<SyncStatus>,
+		fetch: F,
+		pool: CpuPool,
+	) -> Self {
+		let mut cache_path = env::temp_dir();
+		cache_path.push(random_filename());
+
+		ContentFetcher {
+			cache_path,
+			resolver,
+			sync,
+			cache: Arc::new(Mutex::new(ContentCache::default())),
+			embeddable_on: None,
+			fetch,
+			pool,
+			only_content: true,
+		}
+	}
+
+	pub fn allow_dapps(mut self, dapps: bool) -> Self {
+		self.only_content = !dapps;
+		self
+	}
+
+	pub fn embeddable_on(mut self, embeddable_on: Embeddable) -> Self {
+		self.embeddable_on = embeddable_on;
+		self
+	}
+
+	fn not_found(embeddable: Embeddable) -> endpoint::Response {
+		Box::new(future::ok(ContentHandler::error(
+			StatusCode::NotFound,
+			"Resource Not Found",
+			"Requested resource was not found.",
+			None,
+			embeddable,
+		).into()))
+	}
+
+	fn still_syncing(embeddable: Embeddable) -> endpoint::Response {
+		Box::new(future::ok(ContentHandler::error(
+			StatusCode::ServiceUnavailable,
+			"Sync In Progress",
+			"Your node is still syncing. We cannot resolve any content before it's fully synced.",
+			Some("<a href=\"javascript:window.location.reload()\">Refresh</a>"),
+			embeddable,
+		).into()))
+	}
+
+	fn dapps_disabled(address: Embeddable) -> endpoint::Response {
+		Box::new(future::ok(ContentHandler::error(
+			StatusCode::ServiceUnavailable,
+			"Network Dapps Not Available",
+			"This interface doesn't support network dapps for security reasons.",
+			None,
+			address,
+		).into()))
+	}
+
+	#[cfg(test)]
+	fn set_status(&self, content_id: &str, status: ContentStatus) {
+		self.cache.lock().insert(content_id.to_owned(), status);
+	}
+
+	// resolve contract call synchronously.
+	// TODO: port to futures-based hyper and make it all async.
+	fn resolve(&self, content_id: Vec<u8>) -> Option<URLHintResult> {
+		self.resolver.resolve(content_id)
+			.wait()
+			.unwrap_or_else(|e| { warn!("Error resolving content-id: {}", e); None })
+	}
+}
+
+impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
+	fn contains(&self, content_id: &str) -> bool {
+		{
+			let mut cache = self.cache.lock();
+			// Check if we already have the app
+			if cache.get(content_id).is_some() {
+				return true;
+			}
+		}
+		// fallback to resolver
+		if let Ok(content_id) = content_id.from_hex() {
+			// if there is content or we are syncing return true
+			self.sync.is_major_importing() || self.resolve(content_id).is_some()
+		} else {
+			false
+		}
+	}
+}
+
+impl<R: URLHint + 'static, F: Fetch> Endpoint for ContentFetcher<F, R> {
+	fn respond(&self, path: EndpointPath, req: endpoint::Request) -> endpoint::Response {
+		let mut cache = self.cache.lock();
+		let content_id = path.app_id.clone();
+
+		let (new_status, handler) = {
+			let status = cache.get(&content_id);
+			match status {
+				// Just serve the content
+				Some(&mut ContentStatus::Ready(ref endpoint)) => {
+					(None, endpoint.to_response(&path))
+				},
+				// Content is already being fetched
+				Some(&mut ContentStatus::Fetching(ref fetch_control)) if !fetch_control.is_deadline_reached() => {
+					trace!(target: "dapps", "Content fetching in progress. Waiting...");
+					(None, fetch_control.to_response(path))
+				},
+				// We need to start fetching the content
+				_ => {
+					trace!(target: "dapps", "Content unavailable. Fetching... {:?}", content_id);
+					let content_hex = content_id.from_hex().expect("to_handler is called only when `contains` returns true.");
+					let content = self.resolve(content_hex);
+
+					let cache = self.cache.clone();
+					let id = content_id.clone();
+					let on_done = move |result: Option<local::Dapp>| {
+						let mut cache = cache.lock();
+						match result {
+							Some(endpoint) => cache.insert(id.clone(), ContentStatus::Ready(endpoint)),
+							// In case of error
+							None => cache.remove(&id),
+						};
+					};
+
+					match content {
+						// Don't serve dapps if we are still syncing (but serve content)
+						Some(URLHintResult::Dapp(_)) if self.sync.is_major_importing() => {
+							(None, Self::still_syncing(self.embeddable_on.clone()))
+						},
+						Some(URLHintResult::Dapp(_)) if self.only_content => {
+							(None, Self::dapps_disabled(self.embeddable_on.clone()))
+						},
+						Some(URLHintResult::Dapp(dapp)) => {
+							let handler = ContentFetcherHandler::new(
+								req.method(),
+								&dapp.url(),
+								path,
+								installers::Dapp::new(
+									content_id.clone(),
+									self.cache_path.clone(),
+									Box::new(on_done),
+									self.embeddable_on.clone(),
+									self.pool.clone(),
+								),
+								self.embeddable_on.clone(),
+								self.fetch.clone(),
+							);
+
+							(Some(ContentStatus::Fetching(handler.fetch_control())), Box::new(handler) as endpoint::Response)
+						},
+						Some(URLHintResult::Content(content)) => {
+							let handler = ContentFetcherHandler::new(
+								req.method(),
+								&content.url,
+								path,
+								installers::Content::new(
+									content_id.clone(),
+									content.mime,
+									self.cache_path.clone(),
+									Box::new(on_done),
+									self.pool.clone(),
+								),
+								self.embeddable_on.clone(),
+								self.fetch.clone(),
+							);
+
+							(Some(ContentStatus::Fetching(handler.fetch_control())), Box::new(handler) as endpoint::Response)
+						},
+						None if self.sync.is_major_importing() => {
+							(None, Self::still_syncing(self.embeddable_on.clone()))
+						},
+						None => {
+							// This may happen when sync status changes in between
+							// `contains` and `to_handler`
+							(None, Self::not_found(self.embeddable_on.clone()))
+						},
+					}
+				},
+			}
+		};
+
+		if let Some(status) = new_status {
+			cache.clear_garbage(MAX_CACHED_DAPPS);
+			cache.insert(content_id, status);
+		}
+
+		handler
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use std::env;
+	use std::sync::Arc;
+	use bytes::Bytes;
+	use fetch::{Fetch, Client};
+	use futures::future;
+	use hash_fetch::urlhint::{URLHint, URLHintResult, BoxFuture};
+
+	use apps::cache::ContentStatus;
+	use endpoint::EndpointInfo;
+	use page::local;
+	use super::{ContentFetcher, Fetcher};
+	use {SyncStatus};
+
+	#[derive(Clone)]
+	struct FakeResolver;
+	impl URLHint for FakeResolver {
+		fn resolve(&self, _id: Bytes) -> BoxFuture<Option<URLHintResult>, String> {
+			Box::new(future::ok(None))
+		}
+	}
+
+	#[derive(Debug)]
+	struct FakeSync(bool);
+	impl SyncStatus for FakeSync {
+		fn is_major_importing(&self) -> bool { self.0 }
+		fn peers(&self) -> (usize, usize) { (0, 5) }
+	}
+
+	#[test]
+	fn should_true_if_contains_the_app() {
+		// given
+		let pool = ::futures_cpupool::CpuPool::new(1);
+		let path = env::temp_dir();
+		let fetcher = ContentFetcher::new(
+			FakeResolver,
+			Arc::new(FakeSync(false)),
+			Client::new().unwrap(),
+			pool.clone(),
+		).allow_dapps(true);
+
+		let handler = local::Dapp::new(pool, path, EndpointInfo {
+			name: "fake".into(),
+			description: "".into(),
+			version: "".into(),
+			author: "".into(),
+			icon_url: "".into(),
+		}, 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);
+	}
+}
--- a/dapps/src/apps/fs.rs
+++ b/dapps/src/apps/fs.rs
@@ -0,0 +1,137 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::collections::BTreeMap;
+use std::io;
+use std::io::Read;
+use std::fs;
+use std::path::{Path, PathBuf};
+use futures_cpupool::CpuPool;
+
+use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest};
+use endpoint::{Endpoint, EndpointInfo};
+use page::{local, PageCache};
+use Embeddable;
+
+struct LocalDapp {
+	id: String,
+	path: PathBuf,
+	info: EndpointInfo,
+}
+
+/// Tries to find and read manifest file in given `path` to extract `EndpointInfo`
+/// If manifest is not found sensible default `EndpointInfo` is returned based on given `name`.
+fn read_manifest(name: &str, mut path: PathBuf) -> EndpointInfo {
+	path.push(MANIFEST_FILENAME);
+
+	fs::File::open(path.clone())
+		.map_err(|e| format!("{:?}", e))
+		.and_then(|mut f| {
+			// Reat file
+			let mut s = String::new();
+			f.read_to_string(&mut s).map_err(|e| format!("{:?}", e))?;
+			// Try to deserialize manifest
+			deserialize_manifest(s)
+		})
+		.map(Into::into)
+		.unwrap_or_else(|e| {
+			warn!(target: "dapps", "Cannot read manifest file at: {:?}. Error: {:?}", path, e);
+
+			EndpointInfo {
+				name: name.into(),
+				description: name.into(),
+				version: "0.0.0".into(),
+				author: "?".into(),
+				icon_url: "icon.png".into(),
+			}
+		})
+}
+
+/// Returns Dapp Id and Local Dapp Endpoint for given filesystem path.
+/// Parses the path to extract last component (for name).
+/// `None` is returned when path is invalid or non-existent.
+pub fn local_endpoint<P: AsRef<Path>>(path: P, embeddable: Embeddable, pool: CpuPool) -> Option<(String, Box<local::Dapp>)> {
+	let path = path.as_ref().to_owned();
+	path.canonicalize().ok().and_then(|path| {
+		let name = path.file_name().and_then(|name| name.to_str());
+		name.map(|name| {
+			let dapp = local_dapp(name.into(), path.clone());
+			(dapp.id, Box::new(local::Dapp::new(
+				pool.clone(), dapp.path, dapp.info, PageCache::Disabled, embeddable.clone())
+			))
+		})
+	})
+}
+
+
+fn local_dapp(name: String, path: PathBuf) -> LocalDapp {
+	// try to get manifest file
+	let info = read_manifest(&name, path.clone());
+	LocalDapp {
+		id: name,
+		path: path,
+		info: info,
+	}
+}
+
+/// Returns endpoints for Local Dapps found for given filesystem path.
+/// Scans the directory and collects `local::Dapp`.
+pub fn local_endpoints<P: AsRef<Path>>(dapps_path: P, embeddable: Embeddable, pool: CpuPool) -> BTreeMap<String, Box<Endpoint>> {
+	let mut pages = BTreeMap::<String, Box<Endpoint>>::new();
+	for dapp in local_dapps(dapps_path.as_ref()) {
+		pages.insert(
+			dapp.id,
+			Box::new(local::Dapp::new(pool.clone(), dapp.path, dapp.info, PageCache::Disabled, embeddable.clone()))
+		);
+	}
+	pages
+}
+
+
+fn local_dapps(dapps_path: &Path) -> Vec<LocalDapp> {
+	let files = fs::read_dir(dapps_path);
+	if let Err(e) = files {
+		warn!(target: "dapps", "Unable to load local dapps from: {}. Reason: {:?}", dapps_path.display(), e);
+		return vec![];
+	}
+
+	let files = files.expect("Check is done earlier");
+	files.map(|dir| {
+			let entry = dir?;
+			let file_type = entry.file_type()?;
+
+			// skip files
+			if file_type.is_file() {
+				return Err(io::Error::new(io::ErrorKind::NotFound, "Not a file"));
+			}
+
+			// take directory name and path
+			entry.file_name().into_string()
+				.map(|name| (name, entry.path()))
+				.map_err(|e| {
+					info!(target: "dapps", "Unable to load dapp: {:?}. Reason: {:?}", entry.path(), e);
+					io::Error::new(io::ErrorKind::NotFound, "Invalid name")
+				})
+		})
+		.filter_map(|m| {
+			if let Err(ref e) = m {
+				debug!(target: "dapps", "Ignoring local dapp: {:?}", e);
+			}
+			m.ok()
+		})
+		.map(|(name, path)| local_dapp(name, path))
+		.collect()
+}
--- a/dapps/src/apps/manifest.rs
+++ b/dapps/src/apps/manifest.rs
@@ -0,0 +1,29 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use serde_json;
+pub use apps::App as Manifest;
+
+pub const MANIFEST_FILENAME: &'static str = "manifest.json";
+
+pub fn deserialize_manifest(manifest: String) -> Result<Manifest, String> {
+	serde_json::from_str::<Manifest>(&manifest).map_err(|e| format!("{:?}", e))
+	// TODO [todr] Manifest validation (especialy: id (used as path))
+}
+
+pub fn serialize_manifest(manifest: &Manifest) -> Result<String, String> {
+	serde_json::to_string_pretty(manifest).map_err(|e| format!("{:?}", e))
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tomasz Drwięga	c74c8c1ac1	[beta] Backports + HF block update (#7244 ) * Reduce max block timestamp drift to 15 seconds (#7240) * reduce max block timestamp drift to 15 seconds * add test for block timestamp validation within allowed drift * Update kovan HF block number.	2017-12-11 14:11:41 +01:00
Tomasz Drwięga	4e39c318aa	[beta] Kovan HF (#7234 ) * Kovan HF. * Bump version. * Fix aura difficulty race (#7198) * Fix Aura difficulty race * fix test key * extract out score calculation * fix build * Update kovan HF block number. * Add missing byzantium builtins. * Bump installers versions. * Increase allowed time drift to 10s. (#7238)	2017-12-08 13:08:15 +01:00
Robert Habermeier	03b1e9d8ba	Merge pull request #7197 from paritytech/td-beta-backports Beta backports	2017-12-06 15:18:45 +01:00
Tomasz Drwięga	fdaedc8c00	Maximum uncle count transition (#7196 ) * Enable delayed maximum_uncle_count activation. * Fix tests. * Defer kovan HF.	2017-12-05 16:01:52 +01:00
Marek Kotewicz	d60fe51553	Merge pull request #7006 from paritytech/no-uncles Disable uncles by default	2017-12-05 16:01:44 +01:00
Robert Habermeier	c7621b9bbf	Merge pull request #7075 from miyao-gmo/feature/estimate_gas_limit escape inifinite loop in estimte_gas	2017-12-04 16:18:22 +01:00
Marek Kotewicz	0ec35d9ac5	Merge pull request #7067 from sorpaas/patch-1 ECIP-1039: Monetary policy rounding specification	2017-12-04 16:15:06 +01:00
Sergey Pepyakin	ef702b77dc	WASM Remove blockhash error (#7121 ) * Remove blockhash error * Update tests.	2017-12-04 16:14:46 +01:00
Marek Kotewicz	a8cf4efc91	Merge pull request #7110 from paritytech/remove-storage-error WASM storage_read and storage_write don't return anything	2017-12-04 16:14:23 +01:00
Marek Kotewicz	aeb43b6af0	Merge pull request #7097 from paritytech/panic-payload-with-msg WASM parse payload from panics	2017-12-04 16:13:29 +01:00
Tomasz Drwięga	dcdde49d91	Fix no-default-features.	2017-12-04 15:32:24 +01:00
Marek Kotewicz	b49c44a198	Merge pull request #7043 from paritytech/beta-backport backports to beta	2017-11-14 15:51:13 +01:00
Sergey Pepyakin	561e843207	pwasm-std update (#7018 )	2017-11-13 16:42:23 +01:00
debris	6ad5d559ca	version 1.8.3	2017-11-13 15:31:35 +01:00
Kirill Pimenov	91db3535f8	Merge pull request #7004 from paritytech/cli-arguments-backwards-compatible Make CLI arguments parsing more backwards compatible	2017-11-13 15:19:36 +01:00
Arkadiy Paronyan	baa1223736	Skip nonce check for gas estimation (#6997 )	2017-11-13 14:54:23 +01:00
Alexey	a2d5edb8f5	Merge pull request #6967 from paritytech/wasm-elog Events in WASM runtime	2017-11-13 14:53:05 +01:00
Tomasz Drwięga	454b4518f2	Return decoded seal fields. (#6932 )	2017-11-13 14:52:00 +01:00
Tomasz Drwięga	303036cab0	Fix serialization of status in transaction receipts. (#6926 )	2017-11-13 14:50:55 +01:00
Kirill Pimenov	b7e9152cc2	Merge pull request #6921 from paritytech/windows-fixes Windows fixes	2017-11-13 14:49:01 +01:00
GitLab Build Bot	b1b5ffff95	[ci skip] js-precompiled 20171110-144625	2017-11-10 14:56:35 +00:00
Marek Kotewicz	067cbe78d2	Merge pull request #7014 from paritytech/jg-wallet-deploy [beta] Disallow builtin multisig deploy (only watch)	2017-11-10 15:34:23 +01:00
jacogr	1211c1f10c	Disallow builtin multisig deploy (only watch)	2017-11-10 09:31:32 +01:00
Nikolay Volf	148ec3731c	[beta] Add hint in ActionParams for splitting code/data (#6968 ) * Action params and embedded params handling * fix namespaces	2017-11-03 12:20:54 +01:00
Arkadiy Paronyan	1b6588cb27	[beta] Backports (#6891 ) * v1.8.2 * Refactor static context check in CREATE. (#6886) * Refactor static context check in CREATE. * Fix wasm. * Fix serialization of non-localized transactions (#6868) * Fix serialization of non-localized transactions. * Return proper SignedTransactions representation. * Allow force sealing and reseal=0 for non-dev chains. (#6878)	2017-10-25 13:13:11 +02:00
Afri Schoedon	0e4a06d078	Add ECIP1017 to Morden config (#6810 ) (#6845 ) * Add ECIP1017 setting to Morden config * Convert spaces to tabs * Update Morden bootnodes to match Geth	2017-10-20 20:42:51 +02:00
Arkadiy Paronyan	d470773fec	Ethstore optimizations (#6827 ) (#6844 )	2017-10-20 20:22:01 +02:00
Arkadiy Paronyan	8f0eb3e192	v1.8.1 (#6843 )	2017-10-20 16:40:59 +02:00
Arkadiy Paronyan	48c7e4ab8c	Backport #6815 and #6829 (#6837 ) * Tweaked snapshot sync threshold * Change keypath derivation logic (#6815) While the standard defined by Trezor as the default derivation path here https://blog.trezor.io/trezor-integration-with-myetherwallet-3e217a652e08 says that it should be `m/44'/60'/0`, in practice they don't have an implementation of a wallet for Ethereum themselves and refer customers to MEW. MEW has a custom implementation of the path derivation logic that allows them to generate multiple addresses by essentially adding `/0`, `/1` etc to the path. In my initial implementation of Trezor I didn't take this into consideration unfortunately and just used the keypath that Trezor themselves recommended. However, given that it's seemingly standard practice to append `/0` for a "sub-address" (and this is what we've done for Ledger as well) it seems like a mistake on my part to not take that into consideration. Unfortunately, anyone who has used their Trezor device with Parity previously would now see a different address when they connect the Trezor device the next time. The only way they would have to access the old address is to use an old version, or by going through MEW and selecting the Ledger keypath. Also see #6811	2017-10-20 12:51:02 +02:00
GitLab Build Bot	8362bc7f2d	[ci skip] js-precompiled 20171019-155727	2017-10-19 16:02:16 +00:00
Jaco Greeff	284fc65c70	Refresh cached tokens based on registry info & random balances (#6818 ) (#6824 ) * Refresh cached tokens based on registry info & random balances * Don't display errored token images	2017-10-19 17:49:25 +02:00
Arkadiy Paronyan	9882902f31	Updated ethabi to fix auto-update (#6771 )	2017-10-15 13:59:43 +02:00
Arkadiy Paronyan	789c85561e	Fixed kovan chain validation (#6758 ) (#6760 ) * Fixed kovan chain validation * Fork detection * Fixed typo	2017-10-14 22:14:59 +02:00
Arkadiy Paronyan	18dff68278	Bumped fork block number for auto-update (#6755 )	2017-10-14 15:10:38 +02:00
Arkadiy Paronyan	d9a92c2bea	CLI: Reject invalid argument values rather than ignore them (#6723 ) (#6747 ) * CLI: Reject invalid argument values rather than ignore them * Fix grumbles	2017-10-13 16:34:21 +02:00
Arkadiy Paronyan	2145388103	Fixed modexp gas calculation overflow (#6741 ) (#6745 )	2017-10-13 16:12:26 +02:00
GitLab Build Bot	77d00e3dab	[ci skip] js-precompiled 20171012-203645	2017-10-12 20:48:36 +00:00
Nicolas Gotchac	aa6909ff99	Backport beta #6730 - Fixes Badges (#6732 ) * Fix badges not showing up * Always fetch meta data first [badges]	2017-10-12 22:26:57 +02:00
arkpar	0085d6a47b	v1.8.0 in beta	2017-10-12 20:28:59 +02:00