Update shell32-sys to fix windows build (#8793 )

[stable] Backports (#8782 )
* Fix light sync with initial validator-set contract (#8528) * Fix #8468 * Use U256::max_value() instead * Fix again * Also change initial transaction gas * Don't open Browser post-install on Mac (#8641) Since we start parity with the UI disabled per default now, opening the browser post installation will show an annoying error message, confusing the user. This patch removes opening the browser to prevent that annoyance. fixes #8194 * Prefix uint fmt with `0x` with alternate flag * Set the request index to that of the current request (#8683) * Set the request index to that of the current request When setting up the chain of (two) requests to look up a block by hash, the second need to refer to the first. This fixes an issue where the back ref was set to the subsequent request, not the current one. When the requests are executed we loop through them in order and ensure the requests that should produce headers all match up. We do this by index so they better be right. In other words: off by one. * Node table sorting according to last contact data (#8541) * network-devp2p: sort nodes in node table using last contact data * network-devp2p: rename node contact types in node table json output * network-devp2p: fix node table tests * network-devp2p: note node failure when failed to establish connection * network-devp2p: handle UselessPeer error * network-devp2p: note failure when marking node as useless * network-devp2p: handle UselessPeer disconnect (#8686)
2018-06-05 10:24:11 +02:00 · 2018-06-04 22:28:15 +02:00 · 2018-06-04 13:57:24 +02:00 · 2018-05-14 15:52:51 +02:00 · 2018-05-14 15:52:18 +02:00 · 2018-05-14 04:21:48 -05:00
1405 changed files with 144068 additions and 205825 deletions
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,30 +1,3 @@
-# NOTE: if you make changes here, remember to also update:
-#	scripts/test-linux.sh
-#	scripts/build-linux.sh
-#	scripts/build-windows.sh
-
-# Using 'cfg` is broken, see https://github.com/rust-lang/cargo/issues/6858
-#[target.'cfg(target_arch = "x86_64")']
-#rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
-# …so instead we list all target triples (Tier 1 64-bit platforms)
-[target.x86_64-unknown-linux-gnu]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
-[target.x86_64-pc-windows-gnu]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
 [target.x86_64-pc-windows-msvc]
-# Enables the aes-ni instructions for RustCrypto dependency.
-# Link the C runtime statically ; https://github.com/openethereum/openethereum/issues/6643
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3", "-Ctarget-feature=+crt-static"]
-
-[target.x86_64-apple-darwin]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
-[target.x86_64-unknown-linux-musl]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
+# Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643
+rustflags = ["-Ctarget-feature=+crt-static"]
--- a/.dockerignore
+++ b/.dockerignore
@@ -16,7 +16,7 @@ target
 # idea ide
 .idea

-# git folder is not ignored so vergen library can get the commit hash and date for the build
-#.git
+# git stuff
+.git

 ethcore/res/ethereum/tests
--- a/.github/CODE_OF_CONDUCT.md
+++ b/.github/CODE_OF_CONDUCT.md
@@ -2,11 +2,11 @@

 ## 1. Purpose

-A primary goal of OpenEthereum project is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
+A primary goal of Parity is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).

 This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.

-We invite all those who participate in OpenEthereum to help us create safe and positive experiences for everyone.
+We invite all those who participate in Parity to help us create safe and positive experiences for everyone.

 ## 2. Open Source Citizenship

--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -2,7 +2,7 @@

 ## Do you have a question?

-Check out our [Basic Usage](https://wiki.parity.io/Basic-Usage), [Configuration](https://wiki.parity.io/Configuring-Parity-Ethereum), and [FAQ](https://wiki.parity.io/FAQ) articles on our [wiki](https://wiki.parity.io/)!
+Check out our [Basic Usage](https://github.com/paritytech/parity/wiki/Basic-Usage), [Configuration](https://github.com/paritytech/parity/wiki/Configuring-Parity), and [FAQ](https://github.com/paritytech/parity/wiki/FAQ) articles on our [wiki](https://github.com/paritytech/parity/wiki)!

 See also frequently asked questions [tagged with `parity`](https://ethereum.stackexchange.com/questions/tagged/parity?sort=votes&pageSize=50) on Stack Exchange.

@@ -10,11 +10,11 @@ See also frequently asked questions [tagged with `parity`](https://ethereum.stac

 Do **not** open an issue on Github if you think your discovered bug could be a **security-relevant vulnerability**. Please, read our [security policy](../SECURITY.md) instead.

-Otherwise, just create a [new issue](https://github.com/openethereum/openethereum/issues/new) in our repository and state:
+Otherwise, just create a [new issue](https://github.com/paritytech/parity/issues/new) in our repository and state:

- What's your OpenEthereum version?
+- What's your Parity version?
 - What's your operating system and version?
- How did you install OpenEthereum?
+- How did you install parity?
 - Is your node fully synchronized?
 - Did you try turning it off and on again?

@@ -22,45 +22,12 @@ Also, try to include **steps to reproduce** the issue and expand on the **actual

 ## Contribute!

-If you would like to contribute to OpenEthereum, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/openethereum/openethereum/compare).
+If you would like to contribute to Parity, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/paritytech/parity/compare).

-### Labels & Milestones
-
-We use [labels](https://github.com/openethereum/openethereum/labels) to manage PRs and issues and communicate the state of a PR. Please familiarize yourself with them. Furthermore we are organizing issues in [milestones](https://github.com/openethereum/openethereum/milestones). Best way to get started is to a pick a ticket from the current milestone tagged [`easy`](https://github.com/openethereum/openethereum/labels/Q2-easy%20%F0%9F%92%83) and get going, or [`mentor`](https://github.com/openethereum/openethereum/labels/Q1-mentor%20%F0%9F%95%BA) and get in contact with the mentor offering their support on that larger task.
-
-### Rules
-
-There are a few basic ground-rules for contributors (including the maintainer(s) of the project):
-
-* **No pushing directly to the master branch**.
-* **All modifications** must be made in a **pull-request** to solicit feedback from other contributors.
-* Pull-requests cannot be merged before CI runs green and two reviewers have given their approval.
-* Contributors should adhere to the [Parity Ethereum Style Guide](https://wiki.parity.io/Parity-Ethereum-Style-Guide).
-
-### Recommendations
-
-* **Non-master branch names** *should* be prefixed with a short name moniker, followed by the associated Github Issue ID (if any), and a brief description of the task using the format `<GITHUB_USERNAME>-<ISSUE_ID>-<BRIEF_DESCRIPTION>` (e.g. `gavin-123-readme`). The name moniker helps people to inquiry about their unfinished work, and the GitHub Issue ID helps your future self and other developers (particularly those who are onboarding) find out about and understand the original scope of the task, and where it fits into OpenEthereum [Projects](https://github.com/openethereum/openethereum/projects).
-* **Remove stale branches periodically**
-
-### Preparing Pull Requests
-
-* If your PR does not alter any logic (e.g. comments, dependencies, docs), then it may be tagged [`insubstantial`](https://github.com/openethereum/openethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22).
-
-* Once a PR is ready for review please add the [`pleasereview`](https://github.com/openethereum/openethereum/pulls?utf8=%E2%9C%93&q=is%3Aopen+is%3Apr+label%3A%22A0-pleasereview+%F0%9F%A4%93%22+) label.
-
-### Reviewing Pull Requests*:
-
-* At least two reviewers are required to review PRs (even for PRs tagged [`insubstantial`](https://github.com/openethereum/openethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22)).
-
-When doing a review, make sure to look for any:
-
-* Buggy behavior.
-* Undue maintenance burden.
-* Breaking with house coding style.
-* Pessimization (i.e. reduction of speed as measured in the projects benchmarks).
-* Breaking changes should be carefuly reviewed and tagged as such so they end up in the [changelog](../CHANGELOG.md).
-* Uselessness (i.e. it does not strictly add a feature or fix a known issue).
+Please, refer to the [Coding Guide](https://github.com/paritytech/parity/wiki/Coding-guide) in our wiki for more details about hacking on Parity.

 ## License.

-By contributing to OpenEthereum, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).
+By contributing to Parity, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).
+
+Each contributor has to sign our Contributor License Agreement. The purpose of the CLA is to ensure that the guardian of a project's outputs has the necessary ownership or grants of rights over all contributions to allow them to distribute under the chosen license. You can read and sign our full Contributor License Agreement at [cla.parity.io](https://cla.parity.io) before submitting a pull request.
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,14 +1,13 @@
 _Before filing a new issue, please **provide the following information**._

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

 _Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._
+
--- 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/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -1,18 +0,0 @@
-name: Security audit
-on:
-  pull_request:
-    paths: Cargo.lock
-  schedule:
-    - cron: '0 0 * * *'
-jobs:
-  security_audit:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v1
-        with:
-          fetch-depth: 50
-      - name: Run cargo audit
-        uses: actions-rs/audit-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -1,103 +0,0 @@
-name:                           Build and Test Suite
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable
-jobs:
-  build-tests:
-    name:                       Test and Build
-    env:
-      SCCACHE_CACHE_SIZE:       "1G"
-      SCCACHE_IDLE_TIMEOUT:     0
-    strategy:
-      matrix:
-        platform:
-          - ubuntu-16.04
-          - macos-latest
-          - windows-latest
-        toolchain:
-          - stable
-    runs-on:                    ${{ matrix.platform }}
-    steps:
-      - name:                   Checkout sources
-        uses:                   actions/checkout@master
-        with:
-          submodules:           true
-      # https://github.com/actions/cache/issues/133 
-      - name:                   Fixup the owner of ~/.cargo/
-        if:                     matrix.platform == 'ubuntu-16.04'
-        run:                    sudo chown -R $(whoami):$(id -ng) ~/.cargo/
-      - name:                   Install toolchain
-        uses:                   actions-rs/toolchain@v1
-        with:
-          toolchain:            ${{ matrix.toolchain }}
-          profile:              minimal
-          override:             true
-      - name:                   Cache cargo registry
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/registry
-          key:                  ${{ runner.os }}-cargo-registry-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo index
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/git
-          key:                  ${{ runner.os }}-cargo-git-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo build
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 target
-          key:                  ${{ runner.os }}-cargo-build-target-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache linux
-        if:                     matrix.platform == 'ubuntu-16.04'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "/home/runner/.cache/sccache"
-          key:                  ${{ runner.os }}-sccache-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache MacOS
-        if:                     matrix.platform == 'macos-latest'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "/Users/runner/Library/Caches/Mozilla.sccache"
-          key:                  ${{ runner.os }}-sccache-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache Windows
-        if:                     matrix.platform == 'windows-latest'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "C:\\Users\\runneradmin\\AppData\\Local\\Mozilla\\sccache\\cache"
-          key:                  ${{ runner.os }}-sccache-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Install sccache for ${{ matrix.platform }}
-        shell:                  pwsh
-        run:                    pwsh scripts/actions/install-sccache.ps1 ${{ runner.os}}
-      - name:                   Install LLVM for Windows
-        if:                     matrix.platform == 'windows-latest'
-        run:                    choco install llvm
-      - name:                   Sccache statistics
-        run:                    sccache --show-stats
-      - name:                   Build tests
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              test
-          args:                 --locked --all --release --features "json-tests" --verbose --no-run
-      - name:                   Run tests for ${{ matrix.platform }}
-        if:                     matrix.platform == 'windows-latest'
-        continue-on-error: true #Skip step if Windows tests failure
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              test
-          args:                 --locked --all --release --features "json-tests" --verbose
-      - name:                   Run tests for ${{ matrix.platform }}
-        if:                     matrix.platform != 'windows-latest'
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              test
-          args:                 --locked --all --release --features "json-tests" --verbose
-      - name:                   Stop sccache
-        if:                     always()
-        run:                    sccache --stop-server
-      - name:                   Prepare build directory for cache
-        shell: bash
-        run:                    bash scripts/actions/clean-target.sh
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,95 +0,0 @@
-name:                           Build Release Suite
-
-on:
-  push:
-    branches:
-      - stable
-    tags:
-      - v*
-
-jobs:
-  build:
-    name:                       Build Release
-    env:
-      SCCACHE_CACHE_SIZE:       "1G"
-      SCCACHE_IDLE_TIMEOUT:     0
-    strategy:
-      matrix:
-        platform:
-          - ubuntu-16.04
-          - macos-latest
-          - windows-latest
-        toolchain:
-          - stable
-    runs-on:                    ${{ matrix.platform }}
-    steps:
-      - name:                   Checkout sources
-        uses:                   actions/checkout@master
-      # https://github.com/actions/cache/issues/133
-      - name:                   Fixup the owner of ~/.cargo/
-        if:                     matrix.platform == 'ubuntu-16.04'
-        run:                    sudo chown -R $(whoami):$(id -ng) ~/.cargo/
-      - name:                   Install toolchain
-        uses:                   actions-rs/toolchain@v1
-        with:
-          toolchain:            ${{ matrix.toolchain }}
-          profile:              minimal
-          override:             true
-      - name:                   Cache cargo registry
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/registry
-          key:                  ${{ runner.os }}-cargo-registry-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo index
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/git
-          key:                  ${{ runner.os }}-cargo-git-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo build
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 target
-          key:                  ${{ runner.os }}-cargo-build-target-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache linux
-        if:                     matrix.platform == 'ubuntu-16.04'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "/home/runner/.cache/sccache"
-          key:                  ${{ runner.os }}-sccache-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache MacOS
-        if:                     matrix.platform == 'macos-latest'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "/Users/runner/Library/Caches/Mozilla.sccache"
-          key:                  ${{ runner.os }}-sccache-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache Windows
-        if:                     matrix.platform == 'windows-latest'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "C:\\Users\\runneradmin\\AppData\\Local\\Mozilla\\sccache\\cache"
-          key:                  ${{ runner.os }}-sccache-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Install sccache for ${{ matrix.platform }}
-        shell:                  pwsh
-        run:                    pwsh scripts/actions/install-sccache.ps1 ${{ runner.os}}
-      - name:                   Install LLVM for Windows
-        if:                     matrix.platform == 'windows-latest'
-        run:                    choco install llvm
-      - name:                   Sccache statistics
-        run:                    sccache --show-stats
-      - name:                   Build OpenEthereum for windows
-        if:                     matrix.platform == 'windows-latest'
-        run:                    sh scripts/actions/build-windows.sh ${{matrix.platform}}
-      - name:                   Build OpenEthereum for ${{matrix.platform}}
-        if:                     matrix.platform != 'windows-latest'
-        run:                    sh scripts/actions/build-linux.sh ${{matrix.platform}}
-      - name:                   Stop sccache
-        if:                     always()
-        run:                    sccache --stop-server
-      - name:                   Download artifact
-        uses:                   actions/upload-artifact@v1
-        with:
-          name:                 ${{matrix.platform}}.artifacts.zip
-          path:                 artifacts/
-      - name:                   Prepare build directory for cache
-        shell: bash
-        run:                    bash scripts/actions/clean-target.sh
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -1,88 +0,0 @@
-name:                           Check
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable
-jobs:
-  check:
-    name:                       Check
-    runs-on:                    ubuntu-16.04
-    env:
-      SCCACHE_CACHE_SIZE:       "1G"
-      SCCACHE_IDLE_TIMEOUT:     0    
-    steps:
-      - name:                   Checkout sources
-        uses:                   actions/checkout@master
-        with:
-          submodules:           true
-      # https://github.com/actions/cache/issues/133
-      - name:                   Fixup the owner of ~/.cargo/
-        run:                    sudo chown -R $(whoami):$(id -ng) ~/.cargo/
-      - name:                   Install stable toolchain
-        uses:                   actions-rs/toolchain@v1
-        with:
-          toolchain:            stable
-          profile:              minimal
-          override:             true
-      - name:                   Cache cargo registry
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/registry
-          key:                  ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo index
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/git
-          key:                  ${{ runner.os }}-cargo-git-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo build
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 target
-          key:                  ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
-      # Install sccache based on https://github.com/denoland/rusty_v8/blob/master/.github/workflows/ci.yml#L69
-      - name:                   Cache sccache
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "/home/runner/.cache/sccache"
-          key:                  ${{ runner.os }}-sccache-check-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Install sccache for Linux
-        shell:                  pwsh
-        run:                    pwsh scripts/actions/install-sccache.ps1 ${{ runner.os}}
-      - name:                   Sccache statistics
-        run:                    sccache --show-stats
-      - name:                   Run cargo check 1/3
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              check
-          args:                 --locked --no-default-features --verbose
-      - name:                   Run cargo check 2/3
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              check
-          args:                 --locked --manifest-path util/io/Cargo.toml --no-default-features --verbose
-      - name:                   Run cargo check 3/3
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              check
-          args:                 --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose
-      - name:                   Run cargo check evmbin
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              check
-          args:                 --locked -p evmbin --verbose
-      - name:                   Run cargo check benches
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              check
-          args:                 --locked --all --benches --verbose
-      - name:                   Run validate chainspecs
-        run:                    ./scripts/actions/validate-chainspecs.sh
-      - name:                   Stop sccache
-        if:                     always()
-        run:                    sccache --stop-server
-      - name:                   Prepare build directory for cache
-        shell: bash
-        run:                    bash scripts/actions/clean-target.sh
--- a/.github/workflows/deploy-docker.yml
+++ b/.github/workflows/deploy-docker.yml
@@ -1,30 +0,0 @@
-name:                           Docker Image Release
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - v*
-
-jobs:
-  deploy-docker:
-    name:                       Build Release
-    runs-on:                    ubuntu-latest
-    steps:
-      - name:                   Checkout sources
-        uses:                   actions/checkout@master
-      - name:                   Install toolchain
-        uses:                   actions-rs/toolchain@v1
-        with:
-          toolchain:            stable
-          profile:              minimal
-          override:             true
-      - name:                   Deploy to docker hub
-        uses: elgohr/Publish-Docker-Github-Action@master
-        with:
-          name: openethereum/openethereum
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          dockerfile: scripts/docker/alpine/Dockerfile
-          tag_names: true
--- a/.gitignore
+++ b/.gitignore
@@ -38,8 +38,7 @@ node_modules

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

 .vscode
-rls/
-/openethereum.*
+
+/parity.*
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,246 @@
+stages:
+  - test
+  - push-release
+  - build
+variables:
+  RUST_BACKTRACE: "1"
+  RUSTFLAGS: ""
+  CARGOFLAGS: ""
+  CI_SERVER_NAME: "GitLab CI"
+  LIBSSL: "libssl1.0.0 (>=1.0.0)"
+cache:
+  key: "$CI_BUILD_STAGE-$CI_BUILD_REF_NAME"
+  paths:
+    - target/
+  untracked: true
+linux-ubuntu:
+  stage: build
+  image: parity/rust:gitlab-ci
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - rustup default stable
+    # ARGUMENTS: 1. BUILD_PLATFORM (target for binaries) 2. PLATFORM (target for cargo) 3. ARC (architecture) 4. & 5. CC & CXX flags 6. binary identifier
+    - scripts/gitlab-build.sh x86_64-unknown-linux-gnu x86_64-unknown-linux-gnu amd64 gcc g++ ubuntu
+  tags:
+    - rust-stable
+  artifacts:
+    paths:
+    - parity.zip
+    name: "stable-x86_64-unknown-linux-gnu_parity"
+linux-debian:
+  stage: build
+  image: parity/rust-debian:gitlab-ci
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - export LIBSSL="libssl1.1 (>=1.1.0)"
+    - scripts/gitlab-build.sh x86_64-unknown-debian-gnu x86_64-unknown-linux-gnu amd64 gcc g++ debian
+  tags:
+    - rust-debian
+  artifacts:
+    paths:
+    - parity.zip
+    name: "stable-x86_64-unknown-debian-gnu_parity"
+linux-centos:
+  stage: build
+  image: parity/rust-centos:gitlab-ci
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - scripts/gitlab-build.sh x86_64-unknown-centos-gnu x86_64-unknown-linux-gnu x86_64 gcc g++ centos
+  tags:
+    - rust-centos
+  artifacts:
+    paths:
+    - parity.zip
+    name: "x86_64-unknown-centos-gnu_parity"
+linux-i686:
+  stage: build
+  image: parity/rust-i686:gitlab-ci
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - scripts/gitlab-build.sh i686-unknown-linux-gnu i686-unknown-linux-gnu i386 gcc g++ ubuntu
+  tags:
+    - rust-i686
+  artifacts:
+    paths:
+      - parity.zip
+    name: "i686-unknown-linux-gnu"
+  allow_failure: true
+linux-armv7:
+  stage: build
+  image: parity/rust-armv7:gitlab-ci
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - scripts/gitlab-build.sh armv7-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ ubuntu
+  tags:
+    - rust-arm
+  artifacts:
+    paths:
+    - parity.zip
+    name: "armv7_unknown_linux_gnueabihf_parity"
+  allow_failure: true
+linux-arm:
+  stage: build
+  image: parity/rust-arm:gitlab-ci
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - scripts/gitlab-build.sh arm-unknown-linux-gnueabihf arm-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ ubuntu
+  tags:
+    - rust-arm
+  artifacts:
+    paths:
+    - parity.zip
+    name: "arm-unknown-linux-gnueabihf_parity"
+  allow_failure: true
+linux-aarch64:
+  stage: build
+  image: parity/rust-arm64:gitlab-ci
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - scripts/gitlab-build.sh aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu arm64 aarch64-linux-gnu-gcc aarch64-linux-gnu-g++ ubuntu
+  tags:
+    - rust-arm
+  artifacts:
+    paths:
+    - parity.zip
+    name: "aarch64-unknown-linux-gnu_parity"
+linux-snap:
+  stage: build
+  image: parity/snapcraft:gitlab-ci
+  only:
+    - stable
+    - beta
+    - tags
+    - triggers
+  script:
+    - scripts/gitlab-build.sh x86_64-unknown-snap-gnu x86_64-unknown-linux-gnu amd64 gcc g++ snap
+  tags:
+    - rust-stable
+  artifacts:
+    paths:
+    - parity.zip
+    name: "stable-x86_64-unknown-snap-gnu_parity"
+darwin:
+  stage: build
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - scripts/gitlab-build.sh x86_64-apple-darwin x86_64-apple-darwin macos gcc g++ macos
+  tags:
+    - osx
+  artifacts:
+    paths:
+    - parity.zip
+    name: "x86_64-apple-darwin_parity"
+windows:
+  cache:
+    key: "%CI_BUILD_STAGE%-%CI_BUILD_REF_NAME%"
+    untracked: true
+  stage: build
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc installer "" "" windows
+  tags:
+   - rust-windows
+  artifacts:
+    paths:
+    - parity.zip
+    name: "x86_64-pc-windows-msvc_parity"
+docker-build:
+  stage: build
+  only:
+    - tags
+    - triggers
+  before_script:
+    - docker info
+  script:
+    - if [ "$CI_BUILD_REF_NAME" == "master" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
+    - echo "Tag:" $DOCKER_TAG
+    - docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
+    - scripts/docker-build.sh $DOCKER_TAG
+    - docker logout
+  tags:
+    - docker
+test-coverage:
+  stage: test
+  only:
+    - master
+  script:
+    - scripts/gitlab-test.sh test-coverage
+  tags:
+    - kcov
+  allow_failure: true
+test-rust-stable:
+  stage: test
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-test.sh stable
+  tags:
+    - rust-stable
+test-rust-beta:
+  stage: test
+  only:
+    - triggers
+    - master
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-test.sh beta
+  tags:
+    - rust-beta
+  allow_failure: true
+test-rust-nightly:
+  stage: test
+  only:
+    - triggers
+    - master
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-test.sh nightly
+  tags:
+    - rust
+    - rust-nightly
+  allow_failure: true
+push-release:
+  stage: push-release
+  only:
+    - tags
+    - triggers
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-push-release.sh
+  tags:
+    - curl
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,4 +4,4 @@
 	branch = develop
 [submodule "ethcore/res/wasm-tests"]
 	path = ethcore/res/wasm-tests
-	url = https://github.com/openethereum/wasm-tests
+	url = https://github.com/paritytech/wasm-tests
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,119 +1,392 @@
-## OpenEthereum [v3.0.0](https://github.com/openethereum/openethereum/releases/tag/v3.0.0)
+## Parity [v1.9.3](https://github.com/paritytech/parity/releases/tag/v1.9.3) (2018-02-20)

-OpenEthereum v3.0.0 is the first release of OpenEthereum client as part of OpenEthereum project, divested from Parity Technologies.
-
-This release marks the transition from Parity Technologies infrastructure and bootnodes to the one managed by OpenEthereum project.
-
-Parity-Ethereum v2.7 users can continue using their existing data folders. Command-line interface has also stayed identical.
-Unless specified otherwise, OpenEthereum v3.0.0 will detect if the user's database in the old Parity-Ethereum default path,
-and only if it's not found will write to the new default location.
-
-This release includes several major improvements to network and database stack:
- Support for `eth/64` protocol and Node Discovery v4 `Ethereum Node Records` extension.
- Accounts bloom is removed which should decrease the database size.
-
-**Due to database changes this is a one-way upgrade. Please back up your database if you plan to continue using Parity-Ethereum v2.7.2.**
-
-Note that this release drops support for IPFS and `eth/62` protocol. Additionally, it marks light client, private transactions and updater as deprecated features which may be removed in a future release.
+Parity 1.9.3 is a bug-fix release to improve performance and stability.

 The full list of included changes:
- Add deprecation warnings (#11682)
- Add Curl to Docker image (#11687)
- v3 release version strings and track stable (#11680)
- Fix sccache server errors (#11675)
- Don't delete old db after migration (#11662)
- rename inject to drain_transaction_overlay (#11657)
- Drain the transaction overlay (#11654)
- vergen library seems to depend not only on the .git folder content but also on the git binary (#11651)
- New default paths (#11641)
- Update EWF's chains with Istanbul transition block numbers (#11482)
- add openethereum supplementary bootnodes, those are not active right now, but will be in case the network needs more power (#11650)
- Remove Parity bootnodes (#11644)
- Remove accounts bloom (#11589)
- Deploy docker images on master (#11640)
- Fix some compiler warnings (#11632)
- Add support for non-fork side of Phoenix (#11627)
- validate mainnet specs against all forks (#11625)
- Fix ecrecover builtin (#11623)
- Update .gitmodules (#11628)
- ethcore/res: activate ecip-1088 phoenix on classic (#11598)
- Upgrade parity-common deps to latest (#11620)
- Fix Goerli syncing (#11604)
- deps: switch to upstream ctrlc (#11617)
- Deduplicating crate dependencies (part 3 of n) (#11614)
- Deduplicating crate dependencies (part 2 of n, `slab`) (#11613)
- Actually save ENR on creation and modification (#11602)
- Activate POSDAO on xDai chain and update bootnodes (#11610)
- Activate on-chain randomness in POA Core (#11609)
- Deduplicating crate dependencies (part 1 of n) (#11606)
- Update enodes for POA Sokol (#11611)
- Remove .git folder from dogerignore file so vergen library can get build date and commit hash in the binary generatio vergen library can get build date and commit hash in the binary generation (#11608)
- Reduced gas cost for static calls made to precompiles EIP2046/1352 (#11583)
- `ethcore-bloom-journal` was renamed to `accounts-bloom` (#11605)
- Use serde_json to export hardcoded sync (#11601)
- Node Discovery v4 ENR Extension (EIP-868) (#11540)
- Fix compile warnings (#11595)
- Update version to 3.0.0-alpha.1 (#11592)
- ethcore/res: bump canon fork hash for mordor and kotti testnets (#11584)
- Update on push tags (#11590)
- Replace deprecated tempdir dependency with tempfile (#11588)
- Fix project name, links, rename the binaries (#11580)
- Update Cargo.lock (#11573)
- ci: workaround for the cache bug on Linux (#11568)
- Increase the default pruning parameters (#11558)
- Add Docker build and push to github actions (#11555)
- Update README (#11578)
- informant: display I/O stats (#11523)
- [devp2p discovery]: remove `deprecated_echo_hash` (#11564)
- [secretstore] create db_version file when database doesn't exist (#11570)
- Remove Parity's Security Policy (#11565)
- ethcore/res: enable ecip-1088 phoenix upgrade for kotti and mordor testnets (#11529)
- Misc docs and renames …and one less clone (#11556)
- [secretstore]: don't sign message with only zeroes (#11561)
- [devp2p discovery]: cleanup (#11547)
- Code cleanup in the sync module (#11552)
- initial cleanup (#11542)
- Warn if genesis constructor revert (#11550)
- ethcore: cleanup after #11531 (#11546)
- license update (#11543)
- Less cloning when importing blocks (#11531)
- Github Actions (#11528)
- Fix Alpine Dockerfile (#11538)
- Remove AuxiliaryData/AuxiliaryRequest (#11533)
- [journaldb]: cleanup (#11534)
- Remove references to parity-ethereum (#11525)
- Drop IPFS support (#11532)
- chain-supplier: fix warning reporting for GetNodeData request (#11530)
- Faster kill_garbage (#11514)
- [EngineSigner]: don't sign message with only zeroes (#11524)
- fix compilation warnings (#11522)
- [ethcore cleanup]: various unrelated fixes from `#11493` (#11507)
- Add benchmark for transaction execution (#11509)
- Add Smart Contract License v1.0
- Misc fixes (#11510)
- [dependencies]: unify `rustc-hex` (#11506)
- Activate on-chain randomness in POA Sokol (#11505)
- Grab bag of cleanup (#11504)
- Implement eth/64 (EIP-2364) and drop support for eth/62 (#11472)
- [dependencies]: remove `util/macros` (#11501)
- OpenEthereum bootnodes are added (#11499)
- [ci benches]: use `all-features` (#11496)
- [verification]: make test-build compile standalone (#11495)
- complete null-signatures removal (#11491)
- Include the seal when populating the header for a new block (#11475)
- fix compilation warnings (#11492)
- cargo update -p cmake (#11490)
- update to published rlp-derive (#11489)
- Switch usage of Secret Store to the external lib (#11487)
- Switch from the internal runtime lib to external one from crates.io (#11480)
- Update params.rs (#11474)
- weak_counts has been stabilized (#11476)
- sync: remove broken eth_protocol_version method (#11473)
- Use parity-crypto updated to use upstream rust-secp256k1 (#11406)
- Cleanup some code in Aura (#11466)
- upgrade some of the dependencies (#11467)
- Some more release track changes to README.md (#11465)
- Update simple one-line installer due to switching to a single stable release track (#11463)
- update Dockerfile (#11461)
- Implement EIP-2124 (#11456)
- [eth classic chainspec]: remove `balance = 1` (#11459)
+
+- Backports ([#7945](https://github.com/paritytech/parity/pull/7945))
+  - ECIP 1041 - Remove Difficulty Bomb ([#7905](https://github.com/paritytech/parity/pull/7905))
+  - spec: Validate required divisor fields are not 0 ([#7933](https://github.com/paritytech/parity/pull/7933))
+  - Kovan WASM fork code ([#7849](https://github.com/paritytech/parity/pull/7849))
+- Gitlab Cargo Cache ([#7944](https://github.com/paritytech/parity/pull/7944))
+- Bump react-qr-reader ([#7943](https://github.com/paritytech/parity/pull/7943))
+  - Update react-qr-reader
+  - Explicit webrtc-adapter dependency (package-lock workaround)
+  - Iframe with allow (QR, new Chrome policy)
+- Backport of [#7844](https://github.com/paritytech/parity/pull/7844) and [#7917](https://github.com/paritytech/parity/pull/7917) to beta ([#7940](https://github.com/paritytech/parity/pull/7940))
+  - Randomize the peer we dispatch to
+  - Fix a division by zero in light client RPC handler
+- Wallet allowJsEval: true ([#7913](https://github.com/paritytech/parity/pull/7913))
+  - Wallet allowJsEval: true
+  - Fix unsafe wallet.
+  - Enable unsafe-eval for all dapps.
+- Fix CSP for dapps that require eval. ([#7867](https://github.com/paritytech/parity/pull/7867)) ([#7903](https://github.com/paritytech/parity/pull/7903))
+  - Add allowJsEval to manifest.
+  - Enable 'unsafe-eval' if requested in manifest.
+- Fix snap build beta ([#7895](https://github.com/paritytech/parity/pull/7895))
+- Fix snapcraft grade to stable ([#7894](https://github.com/paritytech/parity/pull/7894))
+- Backport Master CI PRs to Beta ([#7890](https://github.com/paritytech/parity/pull/7890))
+  - Add binary identifiers and sha256sum to builds ([#7830](https://github.com/paritytech/parity/pull/7830))
+  - Fix checksums and auto-update push ([#7846](https://github.com/paritytech/parity/pull/7846))
+  - Update gitlab-build.sh ([#7855](https://github.com/paritytech/parity/pull/7855))
+  - Fix installer binary names for macos and windows ([#7881](https://github.com/paritytech/parity/pull/7881))
+  - Update gitlab-test.sh ([#7883](https://github.com/paritytech/parity/pull/7883))
+  - Fix snapcraft nightly ([#7884](https://github.com/paritytech/parity/pull/7884))
+- Backport Core PRs to beta ([#7891](https://github.com/paritytech/parity/pull/7891))
+  - Update back-references more aggressively after answering from cache ([#7578](https://github.com/paritytech/parity/pull/7578))
+  - Updated WASM Runtime & new interpreter (wasmi) ([#7796](https://github.com/paritytech/parity/pull/7796))
+  - Adjust storage update evm-style ([#7812](https://github.com/paritytech/parity/pull/7812))
+  - Add new EF ropstens nodes ([#7824](https://github.com/paritytech/parity/pull/7824))
+  - Store updater metadata in a single place ([#7832](https://github.com/paritytech/parity/pull/7832))
+  - WASM: Disable internal memory ([#7842](https://github.com/paritytech/parity/pull/7842))
+  - Add a timeout for light client sync requests ([#7848](https://github.com/paritytech/parity/pull/7848))
+  - Flush keyfiles. Resolves [#7632](https://github.com/paritytech/parity/issues/7632) ([#7868](https://github.com/paritytech/parity/pull/7868))
+  - Fix wallet import ([#7873](https://github.com/paritytech/parity/pull/7873))
+
+## Parity [v1.9.2](https://github.com/paritytech/parity/releases/tag/v1.9.2) (2018-02-02)
+
+Parity 1.9.2 is a bug-fix release to improve performance and stability. It adds additional bootnodes for the Ropsten test network.
+
+The full list of included changes:
+
+- Backports beta ([#7780](https://github.com/paritytech/parity/pull/7780))
+  - Bump beta to 1.9.2
+  - Update ropsten.json ([#7776](https://github.com/paritytech/parity/pull/7776))
+- Snapcraft push beta
+
+## Parity [v1.9.1](https://github.com/paritytech/parity/releases/tag/v1.9.1) (2018-02-01)
+
+Parity 1.9.1 is a bug-fix release to improve performance and stability. It restores ERC-20 token balances, improves networking, fixes database corruptions on client shutdown, and fixes issues with the `--password` command-line flag. Happy syncing, fellow Ethereans!
+
+In addition, this stabilizes Kovan and other Proof-of-Authority networks. If you run a network with AuRa engine, updating is highly encouraged!
+
+The full list of included changes:
+
+- Beta Backports ([#7756](https://github.com/paritytech/parity/pull/7756))
+  - Filter-out nodes.json ([#7716](https://github.com/paritytech/parity/pull/7716))
+    - Filter-out nodes.json
+    - network: sort node table nodes by failure ratio
+    - network: fix node table tests
+    - network: fit node failure percentage into buckets of 5%
+    - network: consider number of attempts in sorting of node table
+    - network: fix node table grumbles
+  - Fix client not being dropped on shutdown ([#7695](https://github.com/paritytech/parity/pull/7695))
+    - parity: wait for client to drop on shutdown
+    - parity: fix grumbles in shutdown wait
+    - parity: increase shutdown timeouts
+  - Wrap --help output to 120 characters ([#7626](https://github.com/paritytech/parity/pull/7626))
+    - Update Clap dependency and remove workarounds
+    - WIP
+    - Remove line breaks in help messages for now
+    - Multiple values can only be separated by commas (closes [#7428](https://github.com/paritytech/parity/issues/7428))
+    - Grumbles; refactor repeating code; add constant
+    - Use a single Wrapper rather than allocate a new one for each call
+    - Wrap --help to 120 characters rather than 100 characte
+- Token filter balances (throttle) ([#7742](https://github.com/paritytech/parity/pull/7742))
+  - Token filter balances (throttle)
+  - Cleanups
+  - Remove unused uniq
+  - Update @parity/shared to 2.2.23
+  - Remove unused code paths
+- Bump beta to 1.9.1 ([#7751](https://github.com/paritytech/parity/pull/7751))
+- Explicitly add branch name ([#7754](https://github.com/paritytech/parity/pull/7754))
+  - Explicitly add branch name
+  - Fix cargo update branch to beta
+- Revert revert revert ([#7715](https://github.com/paritytech/parity/pull/7715))
+ - This reverts commit 568dc33.
+
+## Parity [v1.9.0](https://github.com/paritytech/parity/releases/tag/v1.9.0) "Velocity" (2018-01-25)
+
+We are happy to announce our newest Parity 1.9 release. Among others, it enables the following features:
+
+- It integrates the fully reworked Parity Wallet and DApps browser (a.k.a. "UI 2.0", [#6819](https://github.com/paritytech/parity/pull/6819)).
+- It enables devp2p snappy compression ([#6683](https://github.com/paritytech/parity/pull/6683)).
+- AuRa Proof-of-Authority chains now disable uncles by default ([#7006](https://github.com/paritytech/parity/pull/7006)). Existing PoA chains can go through a "maximum uncle count transition" to achieve more stability ([#7196](https://github.com/paritytech/parity/pull/7196)).
+- Added Expanse's Byzantium hard-fork ([#7463](https://github.com/paritytech/parity/pull/7463)).
+- Added support for Ellaism chain ([#7222](https://github.com/paritytech/parity/pull/7222)).
+
+Further, users upgrading from 1.8 should acknowledge the following changes:
+
+- Fixed DELEGATECALL's from/to field ([#7568](https://github.com/paritytech/parity/pull/7568)).
+- Set zero nonce and gas price for calls by default ([#6954](https://github.com/paritytech/parity/pull/6954)).
+- Create pending blocks with all transactions from the queue ([#6942](https://github.com/paritytech/parity/pull/6942)).
+- Remove RPC parameter leniency now that Mist formats correctly ([#6651](https://github.com/paritytech/parity/pull/6651)). Parity stops accepting decimal-formatted block numbers and stops parsing the empty string as empty bytes.
+- Public nodes do not support the user interface anymore. If you are running a public node, please stay on the 1.8 branch of the stable releases.
+
+Additional noteworthy changes:
+
+- `ethstore` and `ethkey` have been significantly improved ([#6961](https://github.com/paritytech/parity/pull/6961)):
+  - `ethstore` now supports brute forcing pre-sale wallets given a password list for recovery.
+  - `ethkey` now supports multi-threaded generation of prefix-matching addresses.
+  - `ethkey` now supports prefix-matching brain wallets.
+  - `ethkey` now supports brain-wallets recovery-phrases lookup. This helps to find a correct phrase if you know the address you want to get yet you made a typo backing the phrase up, or forgot a word.
+
+Read more about Parity 1.9 in our [blog post](http://paritytech.io/velocity-the-fastest-parity-released/).
+
+The full list of included changes:
+
+- Add scroll when when too many accounts ([#7677](https://github.com/paritytech/parity/pull/7677)) ([#7679](https://github.com/paritytech/parity/pull/7679))
+- Update installer.nsi
+- Fix conditions in gitlab-test ([#7676](https://github.com/paritytech/parity/pull/7676))
+  - Fix conditions in gitlab-test
+  - Update gitlab-test.sh
+- Remove cargo cache
+- Backports to beta ([#7660](https://github.com/paritytech/parity/pull/7660))
+  - Improve handling of RocksDB corruption ([#7630](https://github.com/paritytech/parity/pull/7630))
+    - Kvdb-rocksdb: update rust-rocksdb version
+    - Kvdb-rocksdb: mark corruptions and attempt repair on db open
+    - Kvdb-rocksdb: better corruption detection on open
+    - Kvdb-rocksdb: add corruption_file_name const
+    - Kvdb-rocksdb: rename mark_corruption to check_for_corruption
+  - Hardening of CSP ([#7621](https://github.com/paritytech/parity/pull/7621))
+  - Fixed delegatecall's from/to ([#7568](https://github.com/paritytech/parity/pull/7568))
+    - Fixed delegatecall's from/to, closes [#7166](https://github.com/paritytech/parity/issues/7166)
+    - Added tests for delegatecall traces, [#7167](https://github.com/paritytech/parity/issues/7167)
+  - Light client RPCs ([#7603](https://github.com/paritytech/parity/pull/7603))
+    - Implement registrar.
+    - Implement eth_getCode
+    - Don't wait for providers.
+    - Don't wait for providers.
+    - Fix linting and wasm tests.
+  - Problem: AttachedProtocols don't get registered ([#7610](https://github.com/paritytech/parity/pull/7610))
+  - Fix Temporarily Invalid blocks handling ([#7613](https://github.com/paritytech/parity/pull/7613))
+    - Handle temporarily invalid blocks in sync.
+    - Fix tests.
+- Add docker build for beta ([#7671](https://github.com/paritytech/parity/pull/7671))
+  - Add docker build for beta
+  - Add cargo cache
+- Fix snapcraft build for beta ([#7670](https://github.com/paritytech/parity/pull/7670))
+- Update Parity.pkgproj
+- update gitlab build from master
+- Update references to dapp sources ([#7634](https://github.com/paritytech/parity/pull/7634)) ([#7636](https://github.com/paritytech/parity/pull/7636))
+- Update tokenreg ([#7618](https://github.com/paritytech/parity/pull/7618)) ([#7619](https://github.com/paritytech/parity/pull/7619))
+- Fix cache:key ([#7598](https://github.com/paritytech/parity/pull/7598))
+- Make 1.9 beta ([#7533](https://github.com/paritytech/parity/pull/7533))
+- Trigger js-precompiled ([#7535](https://github.com/paritytech/parity/pull/7535))
+- RocksDB fix ([#7512](https://github.com/paritytech/parity/pull/7512))
+- Update js-api ([#7510](https://github.com/paritytech/parity/pull/7510))
+- Expose default gas price percentile configuration in CLI ([#7497](https://github.com/paritytech/parity/pull/7497))
+- Use https connection ([#7503](https://github.com/paritytech/parity/pull/7503))
+- More thorough changes detection ([#7472](https://github.com/paritytech/parity/pull/7472))
+- Fix small layout issues ([#7500](https://github.com/paritytech/parity/pull/7500))
+- Show all accounts on Topbar ([#7498](https://github.com/paritytech/parity/pull/7498))
+- Update Parity Mainnet Bootnodes ([#7476](https://github.com/paritytech/parity/pull/7476))
+- Fixed panic when io is not available for export block ([#7495](https://github.com/paritytech/parity/pull/7495))
+- Advance AuRa step as far as we can and prevent invalid blocks. ([#7451](https://github.com/paritytech/parity/pull/7451))
+- Update package-lock in js-old ([#7494](https://github.com/paritytech/parity/pull/7494))
+- Update issue template and readme ([#7450](https://github.com/paritytech/parity/pull/7450))
+- Update package-lock.json pinned versions  ([#7492](https://github.com/paritytech/parity/pull/7492))
+- Explicit pre-precompiled push checkout ([#7474](https://github.com/paritytech/parity/pull/7474))
+- Trigger js-precompiled ([#7473](https://github.com/paritytech/parity/pull/7473))
+- Expanse Byzantium update w/ correct metropolis difficulty increment divisor ([#7463](https://github.com/paritytech/parity/pull/7463))
+- Updated icons ([#7469](https://github.com/paritytech/parity/pull/7469))
+- Cleanup certifications ([#7454](https://github.com/paritytech/parity/pull/7454))
+- Fix css lint (updated stylelint) ([#7471](https://github.com/paritytech/parity/pull/7471))
+- Upgrade markdown-loader & marked ([#7467](https://github.com/paritytech/parity/pull/7467))
+- Remove JS test for removed code ([#7461](https://github.com/paritytech/parity/pull/7461))
+- Pull in dapp-status ([#7457](https://github.com/paritytech/parity/pull/7457))
+- Bump openssl crate ([#7455](https://github.com/paritytech/parity/pull/7455))
+- Signer updates from global Redux state ([#7452](https://github.com/paritytech/parity/pull/7452))
+- Remove expanse chain ([#7437](https://github.com/paritytech/parity/pull/7437))
+- Store tokens with repeatable id ([#7435](https://github.com/paritytech/parity/pull/7435))
+- Strict config parsing ([#7433](https://github.com/paritytech/parity/pull/7433))
+- Upgrade to RocksDB 5.8.8 and tune settings to reduce space amplification ([#7348](https://github.com/paritytech/parity/pull/7348))
+- Fix status layout ([#7432](https://github.com/paritytech/parity/pull/7432))
+- Fix tracing failed calls. ([#7412](https://github.com/paritytech/parity/pull/7412))
+- Problem: sending any Whisper message fails ([#7421](https://github.com/paritytech/parity/pull/7421))
+- Wait for future blocks in AuRa ([#7368](https://github.com/paritytech/parity/pull/7368))
+- Fix final feature. ([#7426](https://github.com/paritytech/parity/pull/7426))
+- Use RwLock for state DB ([#7425](https://github.com/paritytech/parity/pull/7425))
+- Update branding on UI ([#7370](https://github.com/paritytech/parity/pull/7370))
+- Changelog for 1.8.5 and 1.7.11 ([#7401](https://github.com/paritytech/parity/pull/7401))
+- Added checking tx-type using transactions permission contract for miners ([#7359](https://github.com/paritytech/parity/pull/7359))
+- Standalone dir crate, replaces [#7383](https://github.com/paritytech/parity/issues/7383) ([#7409](https://github.com/paritytech/parity/pull/7409))
+- SecretStore: secretstore_signRawHash method ([#7336](https://github.com/paritytech/parity/pull/7336))
+- SecretStore: return error 404 when there's no key shares for given key on all nodes ([#7331](https://github.com/paritytech/parity/pull/7331))
+- SecretStore: PoA integration initial version ([#7101](https://github.com/paritytech/parity/pull/7101))
+- Update bootnodes ([#7363](https://github.com/paritytech/parity/pull/7363))
+- Fix default CORS settings. ([#7387](https://github.com/paritytech/parity/pull/7387))
+- Fix version ([#7390](https://github.com/paritytech/parity/pull/7390))
+- Wasm runtime update ([#7356](https://github.com/paritytech/parity/pull/7356))
+- Parity-version pr reopen ([#7136](https://github.com/paritytech/parity/pull/7136))
+- Get rid of clippy remainings. ([#7355](https://github.com/paritytech/parity/pull/7355))
+- Avoid using ok_or with allocated argument ([#7357](https://github.com/paritytech/parity/pull/7357))
+- Make accounts refresh time configurable. ([#7345](https://github.com/paritytech/parity/pull/7345))
+- Enable traces for DEV chain ([#7327](https://github.com/paritytech/parity/pull/7327))
+- Problem: AuRa's unsafeties around step duration ([#7282](https://github.com/paritytech/parity/pull/7282))
+- Problem: Cargo.toml file contains [project] key ([#7346](https://github.com/paritytech/parity/pull/7346))
+- Fix broken flex modal layouts ([#7343](https://github.com/paritytech/parity/pull/7343))
+- Fix dappIcon & Fix Signer Pending ([#7338](https://github.com/paritytech/parity/pull/7338))
+- Fix wallet token/badge icons not showing up ([#7333](https://github.com/paritytech/parity/pull/7333))
+- Add Ellaism coin in chain config ([#7222](https://github.com/paritytech/parity/pull/7222))
+- Update bootnodes ([#7296](https://github.com/paritytech/parity/pull/7296))
+- Adds `personal_signTransaction` RPC method ([#6991](https://github.com/paritytech/parity/pull/6991))
+- Fix double initialization of embeded providers. ([#7326](https://github.com/paritytech/parity/pull/7326))
+- Transaction Pool re-implementation ([#6994](https://github.com/paritytech/parity/pull/6994))
+- UI package bump ([#7318](https://github.com/paritytech/parity/pull/7318))
+- Test framework and basic test for whisper ([#7011](https://github.com/paritytech/parity/pull/7011))
+- CI js-precompiled trigger ([#7316](https://github.com/paritytech/parity/pull/7316))
+- Fix inject.js & Signer store duplication ([#7299](https://github.com/paritytech/parity/pull/7299))
+- Detect different node, same-key signing in aura ([#7245](https://github.com/paritytech/parity/pull/7245))
+- New warp enodes ([#7287](https://github.com/paritytech/parity/pull/7287))
+- CSS fixes for v1 ([#7285](https://github.com/paritytech/parity/pull/7285))
+- Wallet subscriptions & refresh ([#7283](https://github.com/paritytech/parity/pull/7283))
+- Update inject web3 dependencies ([#7286](https://github.com/paritytech/parity/pull/7286))
+- Some padding around dapp image ([#7276](https://github.com/paritytech/parity/pull/7276))
+- Expand available middleware methods ([#7275](https://github.com/paritytech/parity/pull/7275))
+- Inject parity script to all dapps // Expand dapps to any ZIP file ([#7260](https://github.com/paritytech/parity/pull/7260))
+- New Homepage ([#7266](https://github.com/paritytech/parity/pull/7266))
+- Update kovan HF block number. ([#7259](https://github.com/paritytech/parity/pull/7259))
+- CHANGELOG for 1.7.10 and 1.8.4 ([#7265](https://github.com/paritytech/parity/pull/7265))
+- Remove extraneous id hashing ([#7269](https://github.com/paritytech/parity/pull/7269))
+- Simplify status + content display overlaps/page fixing ([#7264](https://github.com/paritytech/parity/pull/7264))
+- UI redirect to 127.0.0.1 when localhost requested ([#7236](https://github.com/paritytech/parity/pull/7236))
+- Usability improvements to security token Dialog [#7112](https://github.com/paritytech/parity/issues/7112) ([#7134](https://github.com/paritytech/parity/pull/7134))
+- Don't display unneeded notifications ([#7237](https://github.com/paritytech/parity/pull/7237))
+- Reduce max block timestamp drift to 15 seconds ([#7240](https://github.com/paritytech/parity/pull/7240))
+- Increase allowed time drift to 10s. ([#7238](https://github.com/paritytech/parity/pull/7238))
+- Improve building from source ([#7239](https://github.com/paritytech/parity/pull/7239))
+- Fix/Update method permissions ([#7233](https://github.com/paritytech/parity/pull/7233))
+- Fix aura difficulty race ([#7198](https://github.com/paritytech/parity/pull/7198))
+- Dependency updates ([#7226](https://github.com/paritytech/parity/pull/7226))
+- Display all dapps (shell) & wallet tabs (v1) by default ([#7213](https://github.com/paritytech/parity/pull/7213))
+- Rework dapps list ([#7206](https://github.com/paritytech/parity/pull/7206))
+- Add contributing guidelines and code of conduct. ([#7157](https://github.com/paritytech/parity/pull/7157))
+- Make Signing Requests more visible ([#7204](https://github.com/paritytech/parity/pull/7204))
+- Send each log as a separate notification ([#7175](https://github.com/paritytech/parity/pull/7175))
+- Deleting a mistake comment in calc difficulty ([#7154](https://github.com/paritytech/parity/pull/7154))
+- Maximum uncle count transition ([#7196](https://github.com/paritytech/parity/pull/7196))
+- Update FirstRun for UI-2 ([#7195](https://github.com/paritytech/parity/pull/7195))
+- Update mocha import stubs ([#7191](https://github.com/paritytech/parity/pull/7191))
+- Escape inifinite loop in estimte_gas ([#7075](https://github.com/paritytech/parity/pull/7075))
+- New account selector UI in top bar ([#7179](https://github.com/paritytech/parity/pull/7179))
+- Removed ethcore-util dependency from ethcore-network ([#7180](https://github.com/paritytech/parity/pull/7180))
+- WASM test runner utility upgrade ([#7147](https://github.com/paritytech/parity/pull/7147))
+- React 16 ([#7174](https://github.com/paritytech/parity/pull/7174))
+- Assorted improvements for ethstore and ethkey ([#6961](https://github.com/paritytech/parity/pull/6961))
+- Delete unused package.json (dist bundles) ([#7173](https://github.com/paritytech/parity/pull/7173))
+- Remove *.css.map & *.js.map ([#7168](https://github.com/paritytech/parity/pull/7168))
+- Use git flag to remove old js artifacts ([#7165](https://github.com/paritytech/parity/pull/7165))
+- Cleanup JS build artifacts ([#7164](https://github.com/paritytech/parity/pull/7164))
+- Fixes typo in user config path ([#7159](https://github.com/paritytech/parity/pull/7159))
+- Pull in new dapp-{methods,visible} dapps ([#7150](https://github.com/paritytech/parity/pull/7150))
+- WASM test runner utility ([#7142](https://github.com/paritytech/parity/pull/7142))
+- WASM Remove blockhash error ([#7121](https://github.com/paritytech/parity/pull/7121))
+- ECIP-1039: Monetary policy rounding specification ([#7067](https://github.com/paritytech/parity/pull/7067))
+- Fixed `RotatingLogger` after migrating to new arrayvec ([#7129](https://github.com/paritytech/parity/pull/7129))
+- Push to correct shell branch ([#7135](https://github.com/paritytech/parity/pull/7135))
+- Update js-precompiled ref, trigger JS build ([#7132](https://github.com/paritytech/parity/pull/7132))
+- Fixed build && test ([#7128](https://github.com/paritytech/parity/pull/7128))
+- Update packages, pull in compiled-only repos ([#7125](https://github.com/paritytech/parity/pull/7125))
+- Cleanup top bar, add Home icon for navigation ([#7118](https://github.com/paritytech/parity/pull/7118))
+- WASM storage_read and storage_write don't return anything ([#7110](https://github.com/paritytech/parity/pull/7110))
+- Local dapp development URL ([#7100](https://github.com/paritytech/parity/pull/7100))
+- Remove unused and duplicated files in js-old ([#7082](https://github.com/paritytech/parity/pull/7082))
+- Optimize & group dapp requests ([#7083](https://github.com/paritytech/parity/pull/7083))
+- WASM parse payload from panics ([#7097](https://github.com/paritytech/parity/pull/7097))
+- Fix no-default-features. ([#7096](https://github.com/paritytech/parity/pull/7096))
+- Updated eth-secp256k1 ([#7090](https://github.com/paritytech/parity/pull/7090))
+- Improve Github Issue Template ([#7099](https://github.com/paritytech/parity/pull/7099))
+- Changes necessary to upload crates to crates.io ([#7020](https://github.com/paritytech/parity/pull/7020))
+- Reopened 6860 - iterate over both buffered and unbuffered database entries ([#7048](https://github.com/paritytech/parity/pull/7048))
+- SecretStore: servers set change session api ([#6925](https://github.com/paritytech/parity/pull/6925))
+- Disable uncles by default ([#7006](https://github.com/paritytech/parity/pull/7006))
+- Squashed ethcore-network changes which introduce error-chain ([#7040](https://github.com/paritytech/parity/pull/7040))
+- Removed redundant imports ([#7057](https://github.com/paritytech/parity/pull/7057))
+- CHANGELOG for 1.7.8, 1.7.9, 1.8.2, and 1.8.3 ([#7055](https://github.com/paritytech/parity/pull/7055))
+- Properly display Signer errors (Snackbar display popup) ([#7053](https://github.com/paritytech/parity/pull/7053))
+- Add the desktop file for the snap ([#7059](https://github.com/paritytech/parity/pull/7059))
+- Small performance gain in allocations ([#7054](https://github.com/paritytech/parity/pull/7054))
+- Bump JSON-RPC version ([#7051](https://github.com/paritytech/parity/pull/7051))
+- Fix nonce reservation ([#7025](https://github.com/paritytech/parity/pull/7025))
+- Fixed ethstore-cli output ([#7052](https://github.com/paritytech/parity/pull/7052))
+- Add mui for embed compilation ([#7049](https://github.com/paritytech/parity/pull/7049))
+- Update the snap metadata to keep working strictly confined ([#6993](https://github.com/paritytech/parity/pull/6993))
+- Remove unused js packages (dapp cleanups) ([#7046](https://github.com/paritytech/parity/pull/7046))
+- Gitlog location update  ([#7042](https://github.com/paritytech/parity/pull/7042))
+- Move git logging to .git-release.log ([#7041](https://github.com/paritytech/parity/pull/7041))
+- Start from rust root in release update step ([#7039](https://github.com/paritytech/parity/pull/7039))
+- Complete token merge, remove unused files ([#7037](https://github.com/paritytech/parity/pull/7037))
+- Add missing cargo-push.sh shell variable ([#7036](https://github.com/paritytech/parity/pull/7036))
+- Fix npm start script ([#7034](https://github.com/paritytech/parity/pull/7034))
+-  Update executable flags on release scripts ([#7035](https://github.com/paritytech/parity/pull/7035))
+- Fix v1 precompiled ([#7033](https://github.com/paritytech/parity/pull/7033))
+- Push precompiled to correct branch (v1) ([#7031](https://github.com/paritytech/parity/pull/7031))
+- Update v1 Wallet Dapp ([#6935](https://github.com/paritytech/parity/pull/6935))
+- WASM tests update ([#7018](https://github.com/paritytech/parity/pull/7018))
+- Events in WASM runtime ([#6967](https://github.com/paritytech/parity/pull/6967))
+- Adds validate_node_url() and refactors boot node check ([#6907](https://github.com/paritytech/parity/pull/6907)) ([#6970](https://github.com/paritytech/parity/pull/6970))
+- Fix windows build (with ui rebuild) ([#7016](https://github.com/paritytech/parity/pull/7016))
+- Make CLI arguments parsing more backwards compatible ([#7004](https://github.com/paritytech/parity/pull/7004))
+- Fixes for parity-extension ([#6990](https://github.com/paritytech/parity/pull/6990))
+- Update ethcore-bigint ([#6992](https://github.com/paritytech/parity/pull/6992))
+- Get local transactions by hash in the light client ([#6874](https://github.com/paritytech/parity/pull/6874))
+- Warn when blacklisted account present in store ([#6875](https://github.com/paritytech/parity/pull/6875))
+- Skip nonce check for gas estimation ([#6997](https://github.com/paritytech/parity/pull/6997))
+- Creating pending block with all transactions from the queue ([#6942](https://github.com/paritytech/parity/pull/6942))
+- Removes `MAX_TX_TO_IMPORT` from `ChainSync` ([#6976](https://github.com/paritytech/parity/pull/6976))
+- SecretStore: versioned keys ([#6910](https://github.com/paritytech/parity/pull/6910))
+- Removes `FUTURE_QUEUE_LIMITS_SHIFT` ([#6962](https://github.com/paritytech/parity/pull/6962))
+- Set zero nonce and gas price for calls by default ([#6954](https://github.com/paritytech/parity/pull/6954))
+- Add hint in ActionParams for splitting code/data ([#6957](https://github.com/paritytech/parity/pull/6957))
+- Return decoded seal fields. ([#6932](https://github.com/paritytech/parity/pull/6932))
+- Fix serialization of status in transaction receipts. ([#6926](https://github.com/paritytech/parity/pull/6926))
+- Reserve nonces for signing ([#6834](https://github.com/paritytech/parity/pull/6834))
+- Windows fixes ([#6921](https://github.com/paritytech/parity/pull/6921))
+- Don't add {css,js}.map from dapps ([#6931](https://github.com/paritytech/parity/pull/6931))
+- Fix JSON tracing for sub-calls. ([#6842](https://github.com/paritytech/parity/pull/6842))
+- Shell updates (bonds, updated Dapps) ([#6897](https://github.com/paritytech/parity/pull/6897))
+- Fix [#6228](https://github.com/paritytech/parity/issues/6228): do not display eth price in cli for etc ([#6877](https://github.com/paritytech/parity/pull/6877))
+- Fix mining help ([#6885](https://github.com/paritytech/parity/pull/6885))
+- Refactor static context check in CREATE. ([#6886](https://github.com/paritytech/parity/pull/6886))
+- Cleanup some configuration options ([#6878](https://github.com/paritytech/parity/pull/6878))
+- Fix serialization of non-localized transactions ([#6868](https://github.com/paritytech/parity/pull/6868))
+- Updated ntp to version 0.3 ([#6854](https://github.com/paritytech/parity/pull/6854))
+- Align README with 1.8 and prepare CHANGELOG with 1.8.1 ([#6833](https://github.com/paritytech/parity/pull/6833))
+- Return error on timed unlock ([#6777](https://github.com/paritytech/parity/pull/6777))
+- Fix dapps tests in master ([#6866](https://github.com/paritytech/parity/pull/6866))
+- Ethstore optimizations ([#6827](https://github.com/paritytech/parity/pull/6827))
+- Add ECIP1017 to Morden config ([#6810](https://github.com/paritytech/parity/pull/6810))
+- Remove all package publishing to npm ([#6838](https://github.com/paritytech/parity/pull/6838))
+- Util crates use tempdir crate instead of devtools to create temp path ([#6807](https://github.com/paritytech/parity/pull/6807))
+- Trigger js build ([#6836](https://github.com/paritytech/parity/pull/6836))
+- Clean-up scripts. ([#6832](https://github.com/paritytech/parity/pull/6832))
+- Tweaked snapshot sync threshold ([#6829](https://github.com/paritytech/parity/pull/6829))
+- Integrate UI 2 ([#6819](https://github.com/paritytech/parity/pull/6819))
+- Refresh cached tokens based on registry info & random balances ([#6818](https://github.com/paritytech/parity/pull/6818))
+- Change keypath derivation logic ([#6815](https://github.com/paritytech/parity/pull/6815))
+- Refactors journaldb as a separate crate ([#6801](https://github.com/paritytech/parity/pull/6801))
+- Trigger UI build. ([#6817](https://github.com/paritytech/parity/pull/6817))
+- Bumped more crate versions ([#6809](https://github.com/paritytech/parity/pull/6809))
+- Fix RPC compilation warnings. ([#6808](https://github.com/paritytech/parity/pull/6808))
+- Remove internal ipc ([#6795](https://github.com/paritytech/parity/pull/6795))
+- Consistent KeyValueDB errors ([#6792](https://github.com/paritytech/parity/pull/6792))
+- Squash remaining warnings ([#6789](https://github.com/paritytech/parity/pull/6789))
+- Forward-port [#6754](https://github.com/paritytech/parity/issues/6754) [#6755](https://github.com/paritytech/parity/issues/6755) ([#6785](https://github.com/paritytech/parity/pull/6785))
+- Removed duplicated versions of clippy ([#6776](https://github.com/paritytech/parity/pull/6776))
+- Updated ethabi to version 4.0 ([#6742](https://github.com/paritytech/parity/pull/6742))
+- Updated rpc_cli and parity to rpassword 1.0 ([#6774](https://github.com/paritytech/parity/pull/6774))
+- Fix sign data typo ([#6750](https://github.com/paritytech/parity/pull/6750))
+- Refactoring/cache 6693 ([#6772](https://github.com/paritytech/parity/pull/6772))
+- Fix CHANGLOG for 1.8.0 ([#6751](https://github.com/paritytech/parity/pull/6751))
+- Removes redundant `mut` in service.rs.in ([#6775](https://github.com/paritytech/parity/pull/6775))
+- Remove redundant `mut` ([#6773](https://github.com/paritytech/parity/pull/6773))
+- Fixed kovan chain validation ([#6758](https://github.com/paritytech/parity/pull/6758))
+- Removed redundant evm deps ([#6757](https://github.com/paritytech/parity/pull/6757))
+- Fixed modexp gas calculation overflow ([#6741](https://github.com/paritytech/parity/pull/6741))
+- Use cc 1.0 instead of gcc ([#6733](https://github.com/paritytech/parity/pull/6733))
+- Version bump to 1.9.0 ([#6727](https://github.com/paritytech/parity/pull/6727))
+- Fix badges not showing up ([#6730](https://github.com/paritytech/parity/pull/6730))
+
+### Previous releases
+
+- [CHANGELOG-1.8](docs/CHANGELOG-1.8.md) (_stable_)
+- [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)
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,84 +1,75 @@
 [package]
-description = "OpenEthereum"
-name = "openethereum"
+description = "Parity Ethereum client"
+name = "parity"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "3.0.0"
+version = "1.10.5"
 license = "GPL-3.0"
-authors = [
-	"OpenEthereum developers",
-	"Parity Technologies <admin@parity.io>"
-]
+authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
-ansi_term = "0.11"
-atty = "0.2.8"
-blooms-db = { path = "util/blooms-db" }
+log = "0.3"
+env_logger = "0.4"
+rustc-hex = "1.0"
+docopt = "0.8"
 clap = "2"
-cli-signer= { path = "cli-signer" }
-client-traits = { path = "ethcore/client-traits" }
-common-types = { path = "ethcore/types" }
-ctrlc = { version = "3.1.4", features = ["termination"] }
-dir = { path = "util/dir" }
-docopt = "1.0"
-engine = { path = "ethcore/engine" }
-ethabi = { version = "12.0", optional = true }
-ethcore = { path = "ethcore", features = ["parity"] }
-ethcore-accounts = { path = "accounts", optional = true }
-ethcore-blockchain = { path = "ethcore/blockchain" }
-ethcore-call-contract = { path = "ethcore/call-contract", optional = true }
-ethcore-db = { path = "ethcore/db" }
-ethcore-io = { path = "util/io" }
-ethcore-light = { path = "ethcore/light" }
-ethcore-logger = { path = "parity/logger" }
-ethcore-miner = { path = "miner" }
-ethcore-network = { path = "util/network" }
-ethcore-private-tx = { path = "ethcore/private-tx" }
-ethcore-service = { path = "ethcore/service" }
-ethcore-sync = { path = "ethcore/sync" }
-ethereum-types = "0.9.0"
-ethkey = { path = "accounts/ethkey" }
-ethstore = { path = "accounts/ethstore" }
-fdlimit = "0.1"
-futures = "0.1"
-journaldb = { path = "util/journaldb" }
-jsonrpc-core = "14.0.3"
-keccak-hash = "0.5.0"
-kvdb = "0.5.0"
-kvdb-rocksdb = "0.7.0"
-log = "0.4"
-migration-rocksdb = { path = "util/migration-rocksdb" }
-node-filter = { path = "ethcore/node-filter" }
+term_size = "0.3"
+textwrap = "0.9"
+time = "0.1"
 num_cpus = "1.2"
 number_prefix = "0.2"
-panic_hook = { path = "util/panic-hook" }
-parity-bytes = "0.1"
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-parity-daemonize = "0.3"
-parity-hash-fetch = { path = "updater/hash-fetch" }
-parity-local-store = { path = "miner/local-store" }
-parity-path = "0.1"
-parity-rpc = { path = "rpc" }
-parity-runtime = "0.1.1"
-parity-secretstore = { git = "https://github.com/paritytech/secret-store", branch = "v1.x", optional = true }
-parity-updater = { path = "updater" }
-parity-util-mem = { version = "0.6.0", features = ["jemalloc-global"] }
-parity-version = { path = "util/version" }
-parking_lot = "0.10.0"
-regex = "1.0"
-registrar = { path = "util/registrar" }
-rlp = "0.4.5"
 rpassword = "1.0"
-rustc-hex = "2.1.0"
-semver = "0.9"
+semver = "0.6"
+ansi_term = "0.10"
+parking_lot = "0.5"
+regex = "0.2"
+isatty = "0.1"
+toml = "0.4"
 serde = "1.0"
-serde_derive = "1.0"
 serde_json = "1.0"
-snapshot = { path = "ethcore/snapshot" }
-spec = { path = "ethcore/spec" }
-term_size = "0.3"
-textwrap = "0.11.0"
-toml = "0.5.6"
-verification = { path = "ethcore/verification" }
+serde_derive = "1.0"
+futures = "0.1"
+futures-cpupool = "0.1"
+fdlimit = "0.1"
+ws2_32-sys = "0.2"
+ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.10" }
+ethsync = { path = "sync" }
+ethcore = { path = "ethcore" }
+ethcore-bytes = { path = "util/bytes" }
+ethcore-io = { path = "util/io" }
+ethcore-light = { path = "ethcore/light" }
+ethcore-logger = { path = "logger" }
+ethcore-migrations = { path = "ethcore/migrations" }
+ethcore-miner = { path = "miner" }
+ethcore-network = { path = "util/network" }
+ethcore-stratum = { path = "stratum" }
+ethcore-transaction = { path = "ethcore/transaction" }
+ethereum-types = "0.2"
+node-filter = { path = "ethcore/node_filter" }
+ethkey = { path = "ethkey" }
+node-health = { path = "dapps/node-health" }
+rlp = { path = "util/rlp" }
+rpc-cli = { path = "rpc_cli" }
+parity-hash-fetch = { path = "hash-fetch" }
+parity-ipfs-api = { path = "ipfs" }
+parity-local-store = { path = "local-store" }
+parity-reactor = { path = "util/reactor" }
+parity-rpc = { path = "rpc" }
+parity-rpc-client = { path = "rpc_client" }
+parity-updater = { path = "updater" }
+parity-version = { path = "util/version" }
+parity-whisper = { path = "whisper" }
+path = { path = "util/path" }
+dir = { path = "util/dir" }
+panic_hook = { path = "util/panic_hook" }
+keccak-hash = { path = "util/hash" }
+migration = { path = "util/migration" }
+kvdb = { path = "util/kvdb" }
+kvdb-rocksdb = { path = "util/kvdb-rocksdb" }
+journaldb = { path = "util/journaldb" }
+
+parity-dapps = { path = "dapps", optional = true }
+ethcore-secretstore = { path = "secret_store", optional = true }

 [build-dependencies]
 rustc_version = "0.2"
@@ -86,48 +77,58 @@ rustc_version = "0.2"
 [dev-dependencies]
 pretty_assertions = "0.1"
 ipnetwork = "0.12.6"
-tempfile = "3.1"
-fake-fetch = { path = "util/fake-fetch" }
+tempdir = "0.3"

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

 [features]
-default = ["accounts"]
-accounts = ["ethcore-accounts", "parity-rpc/accounts"]
-miner-debug = ["ethcore/miner-debug"]
+default = ["ui-precompiled"]
+ui = [
+	"ui-enabled",
+	"parity-dapps/ui",
+]
+ui-precompiled = [
+	"ui-enabled",
+	"parity-dapps/ui-precompiled",
+]
+ui-enabled = ["dapps"]
+dapps = ["parity-dapps"]
+jit = ["ethcore/jit"]
 json-tests = ["ethcore/json-tests"]
 test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
-secretstore = ["parity-secretstore", "accounts", "ethabi", "ethcore-call-contract"]
+secretstore = ["ethcore-secretstore"]
 final = ["parity-version/final"]
-deadlock_detection = ["parking_lot/deadlock_detection"]
-# hardcode version number 1.3.7 of parity to force an update
-# in order to manually test that parity fall-over to the local version
-# in case of invalid or deprecated command line arguments are entered
-test-updater = ["parity-updater/test-updater"]
-
-[lib]
-path = "parity/lib.rs"

 [[bin]]
 path = "parity/main.rs"
-name = "openethereum"
+name = "parity"
+
+[profile.dev]
+panic = "abort"

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

 [workspace]
-# This should only list projects that are not
-# in the dependency tree in any other way
-# (i.e. pretty much only standalone CLI tools)
 members = [
-	"accounts/ethkey/cli",
-	"accounts/ethstore/cli",
 	"chainspec",
+	"dapps/js-glue",
 	"ethcore/wasm/run",
+	"ethcore/types",
+	"ethkey/cli",
+	"ethstore/cli",
 	"evmbin",
+	"miner",
+	"transaction-pool",
+	"whisper",
+	"util/rlp_compress"
 ]
--- a/README.md
+++ b/README.md
@@ -1,102 +1,116 @@
-# OpenEthereum
+# Parity - fast, light, and robust Ethereum client

-Fast and feature-rich multi-network Ethereum client.
+## [» Download the latest release «](https://github.com/paritytech/parity/releases/latest)

-[» Download the latest release «](https://github.com/openethereum/openethereum/releases/latest)
-
-[![GPL licensed][license-badge]][license-url]
-[![Build Status][ci-badge]][ci-url]
-[![Discord chat][chat-badge]][chat-url]
-
-[license-badge]: https://img.shields.io/badge/license-GPL_v3-green.svg
-[license-url]: LICENSE
-[ci-badge]: https://github.com/openethereum/openethereum/workflows/Build%20and%20Test%20Suite/badge.svg
-[ci-url]: https://github.com/openethereum/openethereum/actions
-[chat-badge]: https://img.shields.io/discord/669192218728202270.svg?logo=discord
-[chat-url]: https://discord.io/openethereum
-
-## Table of Contents
-
-1. [Description](#chapter-001)
-2. [Technical Overview](#chapter-002)
-3. [Building](#chapter-003)<br>
-  3.1 [Building Dependencies](#chapter-0031)<br>
-  3.2 [Building from Source Code](#chapter-0032)<br>
-  3.3 [Starting OpenEthereum](#chapter-0034)
-4. [Testing](#chapter-004)
-5. [Documentation](#chapter-005)
-6. [Toolchain](#chapter-006)
-7. [Contributing](#chapter-008)
-8. [License](#chapter-009)
+[![build status](https://gitlab.parity.io/parity/parity/badges/master/build.svg)](https://gitlab.parity.io/parity/parity/commits/master)
+[![codecov](https://codecov.io/gh/paritytech/parity/branch/master/graph/badge.svg)](https://codecov.io/gh/paritytech/parity)
+[![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)


-## 1. Description <a id="chapter-001"></a>
+### Join the chat!

-**Built for mission-critical use**: Miners, service providers, and exchanges need fast synchronisation and maximum uptime. OpenEthereum provides the core infrastructure essential for speedy and reliable services.
+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)

- 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
+Or join our community on Matrix:
+[![Riot: +Parity](https://img.shields.io/badge/riot-%2Bparity%3Amatrix.parity.io-orange.svg)](https://riot.im/app/#/group/+parity:matrix.parity.io)

-## 2. Technical Overview <a id="chapter-002"></a>
+Official website: https://parity.io

-OpenEthereum's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing OpenEthereum using the **Rust programming language**. OpenEthereum is licensed under the GPLv3 and can be used for all your Ethereum needs.
+Be sure to check out [our wiki](https://paritytech.github.io/wiki/) and the [internal documentation](https://paritytech.github.io/parity/ethcore/index.html) for more information.

-By default, OpenEthereum runs a JSON-RPC HTTP server on port `:8545` and a Web-Sockets server on port `:8546`. This is fully configurable and supports a number of APIs.
+----

-If you run into problems while using OpenEthereum, check out the [old wiki for documentation](https://wiki.parity.io/), feel free to [file an issue in this repository](https://github.com/openethereum/openethereum/issues/new), or hop on our [Discord](https://discord.io/openethereum) chat room to ask a question. We are glad to help!
+## About Parity

-You can download OpenEthereum's latest release at [the releases page](https://github.com/openethereum/openethereum/releases) or follow the instructions below to build from source. Read the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions.
+Parity's 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.

-## 3. Building <a id="chapter-003"></a>
+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:

-### 3.1 Build Dependencies <a id="chapter-0031"></a>
+- create and manage your Ethereum accounts;
+- manage your Ether and any Ethereum tokens;
+- create and register your own tokens;
+- and much more.

-OpenEthereum requires **latest stable Rust version** to build.
+By default, Parity will also run a JSONRPC server on `127.0.0.1:8545` and a websockets server on `127.0.0.1:8546`. This is fully configurable and supports a number of APIs.

-We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have `rustup`, you can install it like this:
+If you run into an issue while using Parity, feel free to file one in this repository or hop on our [Gitter](https://gitter.im/paritytech/parity) or [Riot](https://riot.im/app/#/group/+parity:matrix.parity.io) chat room to ask a question. We are glad to help!
+
+**For security-critical issues**, please refer to the security policy outlined in [SECURITY.MD](SECURITY.md).
+
+Parity's current release is 1.9. 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.23.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
-  ```
+	```bash
+	$ curl https://sh.rustup.rs -sSf | sh
+	```

-  OpenEthereum also requires `clang` (>= 9.0), `clang++`, `pkg-config`, `file`, `make`, and `cmake` packages to be installed.
+	Parity also requires `gcc`, `g++`, `libssl-dev`/`openssl`, `libudev-dev` and `pkg-config` packages to be installed.

 - OSX:
+	```bash
+	$ curl https://sh.rustup.rs -sSf | sh
+	```
+
+	`clang` is required. It comes with Xcode command line tools or can be installed with homebrew.
+
+- Windows
+  Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the rustup installer from
+	https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe, start "VS2015 x64 Native Tools Command Prompt", and use the following command to install and set up the msvc toolchain:
  ```bash
-  $ curl https://sh.rustup.rs -sSf | sh
+	$ rustup default stable-x86_64-pc-windows-msvc
  ```

-  `clang` is required. It comes with Xcode command line tools or can be installed with homebrew.
+Once you have rustup, install Parity or download and build from source

- Windows:
-  Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the `rustup` installer from
-  https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe, start "VS2015 x64 Native Tools Command Prompt", and use the following command to install and set up the `msvc` toolchain:
-  ```bash
-  $ rustup default stable-x86_64-pc-windows-msvc
-  ```
+----

-Once you have `rustup` installed, then you need to install:
-* [Perl](https://www.perl.org)
-* [Yasm](https://yasm.tortall.net)
+## Install from the snap store

-Make sure that these binaries are in your `PATH`. After that, you should be able to build OpenEthereum from source.
-
-### 3.2 Build from Source Code <a id="chapter-0032"></a>
+In any of the [supported Linux distros](https://snapcraft.io/docs/core/install):

 ```bash
-# download OpenEthereum code
-$ git clone https://github.com/openethereum/openethereum
-$ cd openethereum
-
-# build in release mode
-$ cargo build --release --features final
+sudo snap install parity
 ```

-This produces an executable in the `./target/release` subdirectory.
+Or, if you want to contribute testing the upcoming release:
+
+```bash
+sudo snap install parity --beta
+```
+
+And to test the latest code landed into the master branch:
+
+```bash
+sudo snap install parity --edge
+```
+
+----
+
+## Build from source
+
+```bash
+# download Parity code
+$ git clone https://github.com/paritytech/parity
+$ cd parity
+
+# build in release mode
+$ cargo build --release
+```
+
+This will produce an executable in the `./target/release` subdirectory.

 Note: if cargo fails to parse manifest try:

@@ -104,219 +118,62 @@ Note: if cargo fails to parse manifest try:
 $ ~/.cargo/bin/cargo build --release
 ```

-Note, when compiling a crate and you receive errors, it's in most cases your outdated version of Rust, or some of your crates have to be recompiled. Cleaning the repository will most likely solve the issue if you are on the latest stable version of Rust, try:
+Note: When compiling a crate and you receive the following error:
+
+```
+error: the crate is compiled with the panic strategy `abort` which is incompatible with this crate's strategy of `unwind`
+```
+
+Cleaning the repository will most likely solve the issue, try:

 ```bash
 $ cargo clean
 ```

-This always compiles the latest nightly builds. If you want to build stable, do a
+This will always compile the latest nightly builds. If you want to build stable or beta, do a

 ```bash
 $ git checkout stable
 ```

-### 3.3 Starting OpenEthereum <a id="chapter-0034"></a>
-
-#### Manually
-
-To start OpenEthereum manually, just run
+or

 ```bash
-$ ./target/release/openethereum
+$ git checkout beta
 ```

-so OpenEthereum begins syncing the Ethereum blockchain.
+first.

-#### Using `systemd` service file
+----

-To start OpenEthereum as a regular user using `systemd` init:
+## Simple one-line installer for Mac and Ubuntu

-1. Copy `./scripts/openethereum.service` to your
-`systemd` user directory (usually `~/.config/systemd/user`).
-2. Copy release to bin folder, write `sudo install ./target/release/openethereum /usr/bin/openethereum`
-3. To configure OpenEthereum, see [our old wiki](https://paritytech.github.io/wiki/Configuring-Parity) for details.
+```bash
+bash <(curl https://get.parity.io -Lk)
+```

-## 4. Testing <a id="chapter-004"></a>
+The one-line installer always defaults to the latest beta release. To install a stable release, run:

-Download the required test files: `git submodule update --init --recursive`. You can run tests with the following commands:
+```bash
+bash <(curl https://get.parity.io -Lk) -r stable
+```

-* **All** packages
-  ```
-  cargo test --all
-  ```
+## Start Parity

-* Specific package
-  ```
-  cargo test --package <spec>
-  ```
+### Manually

-Replace `<spec>` with one of the packages from the [package list](#package-list) (e.g. `cargo test --package evmbin`).
+To start Parity manually, just run

-You can show your logs in the test output by passing `--nocapture` (i.e. `cargo test --package evmbin -- --nocapture`)
+```bash
+$ ./target/release/parity
+```

-## 5. Documentation <a id="chapter-005"></a>
+and Parity will begin syncing the Ethereum blockchain.

-Be sure to [check out our old wiki](https://wiki.parity.io) for more information.
+### Using systemd service file

-### Viewing documentation for OpenEthereum packages
+To start Parity as a regular user using systemd init:

-You can generate documentation for OpenEthereum Rust packages that automatically opens in your web browser using [rustdoc with Cargo](https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html#using-rustdoc-with-cargo) (of the The Rustdoc Book), by running the the following commands:
-
-* **All** packages
-  ```
-  cargo doc --document-private-items --open
-  ```
-
-* Specific package
-  ```
-  cargo doc --package <spec> -- --document-private-items --open
-  ```
-
-Use`--document-private-items` to also view private documentation and `--no-deps` to exclude building documentation for dependencies.
-
-Replacing `<spec>` with one of the following from the details section below (i.e. `cargo doc --package openethereum --open`):
-
-<a id="package-list"></a>
-**Package List**
-<details><p>
-
-* OpenEthereum Client Application
-  ```bash
-  openethereum
-  ```
-* OpenEthereum Account Management, Key Management Tool, and Keys Generator
-  ```bash
-  ethcore-accounts, ethkey-cli, ethstore, ethstore-cli
-  ```
-* OpenEthereum Chain Specification
-  ```bash
-  chainspec
-  ```
-* OpenEthereum CLI Signer Tool & RPC Client
-  ```bash
-  cli-signer parity-rpc-client
-  ```
-* OpenEthereum Ethash & ProgPoW Implementations
-  ```bash
-  ethash
-  ```
-* EthCore Library
-  ```bash
-  ethcore
-  ```
-  * OpenEthereum Blockchain Database, Test Generator, Configuration,
-Caching, Importing Blocks, and Block Information
-    ```bash
-    ethcore-blockchain
-    ```
-  * OpenEthereum Contract Calls and Blockchain Service & Registry Information
-    ```bash
-    ethcore-call-contract
-    ```
-  * OpenEthereum Database Access & Utilities, Database Cache Manager
-    ```bash
-    ethcore-db
-    ```
-  * OpenEthereum Virtual Machine (EVM) Rust Implementation
-    ```bash
-    evm
-    ```
-  * OpenEthereum Light Client Implementation
-    ```bash
-    ethcore-light
-    ```
-  * Smart Contract based Node Filter, Manage Permissions of Network Connections
-    ```bash
-    node-filter
-    ```
-  * Private Transactions
-    ```bash
-    ethcore-private-tx
-    ```
-  * OpenEthereum Client & Network Service Creation & Registration with the I/O Subsystem
-    ```bash
-    ethcore-service
-    ```
-  * OpenEthereum Blockchain Synchronization
-    ```bash
-    ethcore-sync
-    ```
-  * OpenEthereum Common Types
-    ```bash
-    common-types
-    ```
-  * OpenEthereum Virtual Machines (VM) Support Library
-    ```bash
-    vm
-    ```
-  * OpenEthereum WASM Interpreter
-    ```bash
-    wasm
-    ```
-  * OpenEthereum WASM Test Runner
-    ```bash
-    pwasm-run-test
-    ```
-  * OpenEthereum EVM Implementation
-    ```bash
-    evmbin
-    ```
-  * OpenEthereum JSON Deserialization
-    ```bash
-    ethjson
-    ```
-  * OpenEthereum State Machine Generalization for Consensus Engines
-    ```bash
-    parity-machine
-    ```
-* OpenEthereum Miner Interface
-  ```bash
-  ethcore-miner parity-local-store price-info ethcore-stratum using_queue
-  ```
-* OpenEthereum Logger Implementation
-  ```bash
-  ethcore-logger
-  ```
-* OpenEthereum JSON-RPC Servers
-  ```bash
-  parity-rpc
-  ```
-* OpenEthereum Updater Service
-  ```bash
-  parity-updater parity-hash-fetch
-  ```
-* OpenEthereum Core Libraries (`util`)
-  ```bash
-  accounts-bloom blooms-db dir eip-712 fake-fetch fastmap fetch ethcore-io
-  journaldb keccak-hasher len-caching-lock memory-cache memzero
-  migration-rocksdb ethcore-network ethcore-network-devp2p panic_hook
-  patricia-trie-ethereum registrar rlp_compress stats
-  time-utils triehash-ethereum unexpected parity-version
-  ```
-
-</p></details>
-
-## 6. Toolchain <a id="chapter-006"></a>
-
-In addition to the OpenEthereum client, there are additional tools in this repository available:
-
- [evmbin](./evmbin) - OpenEthereum EVM Implementation.
- [ethstore](./accounts/ethstore) - OpenEthereum Key Management.
- [ethkey](./accounts/ethkey) - OpenEthereum Keys Generator.
-
-The following tools are available in a separate repository:
- [ethabi](https://github.com/openethereum/ethabi) - OpenEthereum Encoding of Function Calls. [Docs here](https://crates.io/crates/ethabi)
- [whisper](https://github.com/openethereum/whisper) - OpenEthereum Whisper-v2 PoC Implementation.
-
-## 7. Contributing <a id="chapter-007"></a>
-
-An introduction has been provided in the ["So You Want to be a Core Developer" presentation slides by Hernando Castano](http://tiny.cc/contrib-to-parity-eth). Additional guidelines are provided in [CONTRIBUTING](./.github/CONTRIBUTING.md).
-
-### Contributor Code of Conduct
-
-[CODE_OF_CONDUCT](./.github/CODE_OF_CONDUCT.md)
-
-## 8. License <a id="chapter-008"></a>
-
-[LICENSE](./LICENSE)
+1. Copy `./scripts/parity.service` to your
+systemd user directory (usually `~/.config/systemd/user`).
+2. To configure Parity, write a `/etc/parity/config.toml` config file, see [Configuring Parity](https://paritytech.github.io/wiki/Configuring-Parity) for details.
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,80 @@
+# Security Policy
+
+Parity Technologies is committed to resolving security vulnerabilities in our software quickly and carefully. We take the necessary steps to minimize risk, provide timely information, and deliver vulnerability fixes and mitigations required to address security issues.
+
+## Reporting a Vulnerability
+
+Security vulnerabilities in Parity software should be reported by email to security@parity.io. If you think your report might be eligible for the Parity Bug Bounty Program, your email should be send to bugbounty@parity.io. 
+
+Your report should include the following:
+
+- your name
+- description of the vulnerability
+- attack scenario (if any)
+- components
+- reproduction
+- other details
+
+Try to include as much information in your report as you can, including a description of the vulnerability, its potential impact, and steps for reproducing it. Be sure to use a descriptive subject line.
+
+You'll receive a response to your email within two business days indicating the next steps in handling your report. We encourage finders to use encrypted communication channels to protect the confidentiality of vulnerability reports. You can encrypt your report using our public key. This key is [on MIT's key server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73) server and reproduced below.
+
+After the initial reply to your report, our team will endeavor to keep you informed of the progress being made towards a fix. These updates will be sent at least every five business days. 
+
+Thank you for taking the time to responsibly disclose any vulnerabilities you find.
+
+## Responsible Investigation and Reporting
+
+Responsible investigation and reporting includes, but isn't limited to, the following:
+
+- Don't violate the privacy of other users, destroy data, etc.
+- Don’t defraud or harm Parity Technologies Ltd or its users during your research; you should make a good faith effort to not interrupt or degrade our services.
+- Don't target our physical security measures, or attempt to use social engineering, spam, distributed denial of service (DDOS) attacks, etc.
+- Initially report the bug only to us and not to anyone else.
+- Give us a reasonable amount of time to fix the bug before disclosing it to anyone else, and give us adequate written warning before disclosing it to anyone else.
+- In general, please investigate and report bugs in a way that makes a reasonable, good faith effort not to be disruptive or harmful to us or our users. Otherwise your actions might be interpreted as an attack rather than an effort to be helpful.
+
+## Bug Bounty Program
+
+Our Bug Bounty Program allows us to recognise and reward members of the Parity community for helping us find and address significant bugs, in accordance with the terms of the Parity Bug Bounty Program. A detailed description on eligibility, rewards, legal information and terms & conditions for contributors can be found on [our website](https://paritytech.io/bug-bounty.html). 
+
+
+
+
+
+
+## Plaintext PGP Key
+
+```
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFlyIAwBCACe0keNPjgYzZ1Oy/8t3zj/Qw9bHHqrzx7FWy8NbXnYBM19NqOZ
+DIP7Oe0DvCaf/uruBskCS0iVstHlEFQ2AYe0Ei0REt9lQdy61GylU/DEB3879IG+
+6FO0SnFeYeerv1/hFI2K6uv8v7PyyVDiiJSW0I1KIs2OBwJicTKmWxLAeQsRgx9G
+yRGalrVk4KP+6pWTA7k3DxmDZKZyfYV/Ej10NtuzmsemwDbv98HKeomp/kgFOfSy
+3AZjeCpctlsNqpjUuXa0/HudmH2WLxZ0fz8XeoRh8XM9UudNIecjrDqmAFrt/btQ
+/3guvlzhFCdhYPVGsUusKMECk/JG+Xx1/1ZjABEBAAG0LFBhcml0eSBTZWN1cml0
+eSBDb250YWN0IDxzZWN1cml0eUBwYXJpdHkuaW8+iQFUBBMBCAA+FiEE2uUVYCjP
+N6B8aTiDXQ8DAY0H3nMFAllyIAwCGwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwEC
+HgECF4AACgkQXQ8DAY0H3nM60wgAkS3A36Zc+upiaxU7tumcGv+an17j7gin0sif
+0ELSjVfrXInM6ovai+NhUdcLkJ7tCrKS90fvlaELK5Sg9CXBWCTFccKN4A/B7ey
+rOg2NPXUecnyBB/XqQgKYH7ujYlOlqBDXMfz6z8Hj6WToxg9PPMGGomyMGh8AWxM
+3yRPFs5RKt0VKgN++5N00oly5Y8ri5pgCidDvCLYMGTVDHFKwkuc9w6BlWlu1R1e
+/hXFWUFAP1ffTAul3QwyKhjPn2iotCdxXjvt48KaU8DN4iL7aMBN/ZBKqGS7yRdF
+D/JbJyaaJ0ZRvFSTSXy/sWY3z1B5mtCPBxco8hqqNfRkCwuZ6LkBDQRZciAMAQgA
+8BP8xrwe12TOUTqL/Vrbxv/FLdhKh53J6TrPKvC2TEEKOrTNo5ahRq+XOS5E7G2N
+x3b+fq8gR9BzFcldAx0XWUtGs/Wv++ulaSNqTBxj13J3G3WGsUfMKxRgj//piCUD
+bCFLQfGZdKk0M1o9QkPVARwwmvCNiNB/l++xGqPtfc44H5jWj3GoGvL2MkShPzrN
+yN/bJ+m+R5gtFGdInqa5KXBuxxuW25eDKJ+LzjbgUgeC76wNcfOiQHTdMkcupjdO
+bbGFwo10hcbRAOcZEv6//Zrlmk/6nPxEd2hN20St2bSN0+FqfZ267mWEu3ejsgF8
+ArdCpv5h4fBvJyNwiTZwIQARAQABiQE8BBgBCAAmFiEE2uUVYCjPN6B8aTiDXQ8D
+AY0H3nMFAllyIAwCGwwFCQPCZwAACgkQXQ8DAY0H3nNisggAl4fqhRlA34wIb190
+sqXHVxiCuzPaqS6krE9xAa1+gncX485OtcJNqnjugHm2rFE48lv7oasviuPXuInE
+/OgVFnXYv9d/Xx2JUeDs+bFTLouCDRY2Unh7KJZasfqnMcCHWcxHx5FvRNZRssaB
+WTZVo6sizPurGUtbpYe4/OLFhadBqAE0EUmVRFEUMc1YTnu4eLaRBzoWN4d2UWwi
+LN25RSrVSke7LTSFbgn9ntQrQ2smXSR+cdNkkfRCjFcpUaecvFl9HwIqoyVbT4Ym
+0hbpbbX/cJdc91tKa+psa29uMeGL/cgL9fAu19yNFRyOTMxjZnvql1X/WE1pLmoP
+ETBD1Q==
+=K9Qw
+-----END PGP PUBLIC KEY BLOCK-----
+```
--- a/49
+++ b/49
@@ -1,49 +0,0 @@
-SMART CONTRACT LICENSE v1.0
-
-
-Anyone may run, modify, publicly perform, distribute and redistribute this
-software, and create derivative works based on it in each case in compliance
-with the permissions granted by the document (“Permissions Document”) whose
-**KECCAK256 HASH** equals the value found in the PUBLICLY READABLE VARIABLE
-named permissionsDocumentHash  on the **ETHEREUM MAINNET** **SMART CONTRACT
-ACCOUNT** with the following ADDRESS 0x5a88CA36Fd58Efde3b955758285E8e3347D1eAe3
-which is deemed incorporated into this license by reference. In case of any
-conflicts between this license and the Permissions Document, this license shall
-prevail.
-
-
-Where:
- KECCAK256 HASH is the cryptographic hash algorithm that may take any document,
-expressed as a series of bytes, and convert it to a single value which may be
-expressed as a number from 0 to `2**256`;
- ETHEREUM MAINNET is the peer-to-peer blockchain network and shared account
-ledger initiated and recognised by the Ethereum Foundation as "Ethereum";
- SMART CONTRACT ACCOUNT is a single account to be found on the ETHEREUM MAINNET
-identified by an ADDRESS and which represents the combination of a computer
-programme and some associated values;
- ADDRESS is a number between 0 and `2**160`, which is the primary means of
-identifying a single account on the ETHEREUM MAINNET;
- PUBLICLY READABLE VARIABLE is an item in a smart contract storage, publicly
-accessible via the smart contract’s ABI using a getter function matching its
-name.
-
-This license supplements and does not replace any other license pertaining to
-this software.
-
-No permissions are granted if no **KECCAK256 HASH** appears in the *ETHEREUM
-MAINNET** **SMART CONTRACT ACCOUNT**.
-
-This license takes effect as a bare licence, and has the effect of granting
-rights to each licensee (which may be subject to conditions), BUT IMPOSES NO
-OBLIGATIONS OR LIABILITY ON ANY LICENSOR, ANY OWNER OF RIGHTS IN THE SOFTWARE,
-OR ANY PERSON INVOLVED IN THE DESIGN, DEVELOPMENT AND CODING OF THE SOFTWARE
-(“GRANTOR”).
-
-Each Grantor shall, to the maximum extent permitted by law, have no liability
-for direct, indirect, special, incidental, consequential, exemplary, punitive or
-other damages of any character including, without limitation, procurement of
-substitute software or services, loss of use, data or profits, or business
-interruption, however caused and on any theory of contract, warranty, tort
-(including negligence), product liability or otherwise, arising in any way in
-relation to the supply, licensing or operation of the software, even if advised
-of the possibility of such damages.
--- a/accounts/Cargo.toml
+++ b/accounts/Cargo.toml
@@ -1,21 +0,0 @@
-[package]
-description = "OpenEthereum Account Management"
-license = "GPL-3.0"
-name = "ethcore-accounts"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-ethkey = { path = "ethkey" }
-ethstore = { path = "ethstore" }
-log = "0.4"
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-parking_lot = "0.10.0"
-serde = "1.0"
-serde_derive = "1.0"
-serde_json = "1.0"
-
-[dev-dependencies]
-ethereum-types = "0.9.0"
-tempfile = "3.1"
--- a/accounts/ethkey/Cargo.toml
+++ b/accounts/ethkey/Cargo.toml
@@ -1,13 +0,0 @@
-[package]
-description = "OpenEthereum Keys Generator"
-name = "ethkey"
-version = "0.4.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-edit-distance = "2.0"
-log = "0.4"
-serde = "1.0"
-serde_derive = "1.0"
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-parity-wordlist = "1.3.1"
--- a/accounts/ethkey/src/lib.rs
+++ b/accounts/ethkey/src/lib.rs
@@ -1,40 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-// #![warn(missing_docs)]
-
-extern crate edit_distance;
-extern crate parity_crypto;
-extern crate parity_wordlist;
-extern crate serde;
-
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate serde_derive;
-
-mod brain;
-mod brain_prefix;
-mod password;
-mod prefix;
-
-pub mod brain_recover;
-
-pub use self::parity_wordlist::Error as WordlistError;
-pub use self::brain::Brain;
-pub use self::brain_prefix::BrainPrefix;
-pub use self::password::Password;
-pub use self::prefix::Prefix;
--- a/accounts/ethkey/src/password.rs
+++ b/accounts/ethkey/src/password.rs
@@ -1,59 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{fmt, ptr};
-
-#[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Password(String);
-
-impl fmt::Debug for Password {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Password(******)")
-    }
-}
-
-impl Password {
-	pub fn as_bytes(&self) -> &[u8] {
-		self.0.as_bytes()
-	}
-
-	pub fn as_str(&self) -> &str {
-		self.0.as_str()
-	}
-}
-
-// Custom drop impl to zero out memory.
-impl Drop for Password {
-	fn drop(&mut self) {
-		unsafe {
-			for byte_ref in self.0.as_mut_vec() {
-				ptr::write_volatile(byte_ref, 0)
-			}
-		}
-	}
-}
-
-impl From<String> for Password {
-	fn from(s: String) -> Password {
-		Password(s)
-	}
-}
-
-impl<'a> From<&'a str> for Password {
-	fn from(s: &'a str) -> Password {
-		Password::from(String::from(s))
-	}
-}
--- a/accounts/ethstore/Cargo.toml
+++ b/accounts/ethstore/Cargo.toml
@@ -1,30 +0,0 @@
-[package]
-description = "OpenEthereum Key Management"
-name = "ethstore"
-version = "0.2.1"
-authors = ["Parity Technologies <admin@parity.io>"]
-repository = "https://github.com/openethereum/openethereum"
-
-[dependencies]
-log = "0.4"
-libc = "0.2"
-rand = "0.7.3"
-ethkey = { path = "../ethkey" }
-serde = "1.0"
-serde_json = "1.0"
-serde_derive = "1.0"
-rustc-hex = "2.1.0"
-tiny-keccak = "2.0.2"
-time = "0.1.34"
-parking_lot = "0.10.0"
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-ethereum-types = "0.9.0"
-dir = { path = "../../util/dir" }
-smallvec = "1.2.0"
-parity-wordlist = "1.3.1"
-tempfile = "3.1"
-
-[dev-dependencies]
-matches = "0.1"
-
-[lib]
--- a/accounts/ethstore/cli/Cargo.toml
+++ b/accounts/ethstore/cli/Cargo.toml
@@ -1,27 +0,0 @@
-[package]
-description = "OpenEthereum Key Management CLI"
-name = "ethstore-cli"
-version = "0.1.1"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-docopt = "1.0"
-env_logger = "0.5"
-num_cpus = "1.6"
-rustc-hex = "2.1.0"
-serde = "1.0"
-serde_derive = "1.0"
-parking_lot = "0.10.0"
-ethstore = { path = "../" }
-ethkey = { path = "../../ethkey" }
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-dir = { path = '../../../util/dir' }
-panic_hook = { path = "../../../util/panic-hook" }
-
-[[bin]]
-name = "ethstore"
-path = "src/main.rs"
-doc = false
-
-[dev-dependencies]
-tempfile = "3.1"
--- a/accounts/ethstore/cli/tests/cli.rs
+++ b/accounts/ethstore/cli/tests/cli.rs
@@ -1,82 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate tempfile;
-use std::process::Command;
-use tempfile::Builder;
-use std::fs::File;
-use std::io::Write;
-
-fn run(args: &[&str]) -> String {
-	let output = Command::new("cargo")
-		.args(&["run", "--"])
-		.args(args)
-		.output()
-		.unwrap();
-	assert!(output.status.success());
-	String::from_utf8(output.stdout).unwrap()
-}
-
-#[test]
-fn cli_cmd() {
-	Command::new("cargo")
-		.arg("build")
-		.output()
-		.unwrap();
-
-	let dir = Builder::new().prefix("test-vault").tempdir().unwrap();
-
-	let mut passwd = File::create(dir.path().join("test-password")).unwrap();
-	writeln!(passwd, "password").unwrap();
-
-	let mut passwd2 = File::create(dir.path().join("test-vault-addr")).unwrap();
-	writeln!(passwd2, "password2").unwrap();
-
-	let test_password_buf = dir.path().join("test-password");
-	let test_password: &str = test_password_buf.to_str().unwrap();
-	let dir_str: &str = dir.path().to_str().unwrap();
-	let test_vault_addr_buf = dir.path().join("test-vault-addr");
-	let test_vault_addr = test_vault_addr_buf.to_str().unwrap();
-
-	run(&["create-vault", "test-vault", test_password, "--dir", dir_str]);
-
-	let output = run(&["insert", "7d29fab185a33e2cd955812397354c472d2b84615b645aa135ff539f6b0d70d5",
-			    test_vault_addr,
-			    "--dir", dir_str,
-			    "--vault", "test-vault",
-			   "--vault-pwd", test_password]);
-	let address = output.trim();
-
-	let output = run(&["list",
-			   "--dir", dir_str,
-			   "--vault", "test-vault",
-			   "--vault-pwd", test_password]);
-	assert_eq!(output, " 0: 0xa8fa5dd30a87bb9e3288d604eb74949c515ab66e\n");
-
-	let output = run(&["sign", &address[2..],
-			   test_vault_addr,
-			   "7d29fab185a33e2cd955812397354c472d2b84615b645aa135ff539f6b0d70d5",
-			   "--dir", dir_str,
-			   "--vault", "test-vault",
-			   "--vault-pwd", test_password]);
-	assert_eq!(output, "0x54ab6e5cf0c5cb40043fdca5d15d611a3a94285414a076dafecc8dc9c04183f413296a3defff61092c0bb478dc9887ec01070e1275234211208fb8f4be4a9b0101\n");
-
-	let output = run(&["public", &address[2..], test_vault_addr,
-			   "--dir", dir_str,
-			   "--vault", "test-vault",
-			   "--vault-pwd", test_password]);
-	assert_eq!(output, "0x35f222d88b80151857a2877826d940104887376a94c1cbd2c8c7c192eb701df88a18a4ecb8b05b1466c5b3706042027b5e079fe3a3683e66d822b0e047aa3418\n");
-}
--- a/accounts/src/account_data.rs
+++ b/accounts/src/account_data.rs
@@ -1,73 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Account Metadata
-
-use std::{
-	collections::HashMap,
-	time::Instant,
-};
-
-use parity_crypto::publickey::Address;
-use ethkey::Password;
-use serde_derive::{Serialize, Deserialize};
-use serde_json;
-
-/// Type of unlock.
-#[derive(Clone, PartialEq)]
-pub enum Unlock {
-	/// If account is unlocked temporarily, it should be locked after first usage.
-	OneTime,
-	/// Account unlocked permanently can always sign message.
-	/// Use with caution.
-	Perm,
-	/// Account unlocked with a timeout
-	Timed(Instant),
-}
-
-/// Data associated with account.
-#[derive(Clone)]
-pub struct AccountData {
-	pub unlock: Unlock,
-	pub password: Password,
-}
-
-/// Collected account metadata
-#[derive(Default, Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct AccountMeta {
-	/// The name of the account.
-	pub name: String,
-	/// The rest of the metadata of the account.
-	pub meta: String,
-	/// The 128-bit Uuid of the account, if it has one (brain-wallets don't).
-	pub uuid: Option<String>,
-}
-
-impl AccountMeta {
-	/// Read a hash map of Address -> AccountMeta
-	pub fn read<R>(reader: R) -> Result<HashMap<Address, Self>, serde_json::Error> where
-		R: ::std::io::Read,
-	{
-		serde_json::from_reader(reader)
-	}
-
-	/// Write a hash map of Address -> AccountMeta
-	pub fn write<W>(m: &HashMap<Address, Self>, writer: &mut W) -> Result<(), serde_json::Error> where
-		W: ::std::io::Write,
-	{
-		serde_json::to_writer(writer, m)
-	}
-}
--- a/accounts/src/error.rs
+++ b/accounts/src/error.rs
@@ -1,46 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-
-use ethstore::{Error as SSError};
-
-/// Signing error
-#[derive(Debug)]
-pub enum SignError {
-	/// Account is not unlocked
-	NotUnlocked,
-	/// Account does not exist.
-	NotFound,
-	/// Low-level error from store
-	SStore(SSError),
-}
-
-impl fmt::Display for SignError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		match *self {
-			SignError::NotUnlocked => write!(f, "Account is locked"),
-			SignError::NotFound => write!(f, "Account does not exist"),
-			SignError::SStore(ref e) => write!(f, "{}", e),
-		}
-	}
-}
-
-impl From<SSError> for SignError {
-	fn from(e: SSError) -> Self {
-		SignError::SStore(e)
-	}
-}
--- a/accounts/src/lib.rs
+++ b/accounts/src/lib.rs
@@ -1,649 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-#![warn(missing_docs)]
-
-//! Account management.
-
-mod account_data;
-mod error;
-mod stores;
-
-use self::account_data::{Unlock, AccountData};
-use self::stores::AddressBook;
-
-use std::collections::HashMap;
-use std::time::{Instant, Duration};
-
-use ethkey::Password;
-use parity_crypto::publickey::{Address, Message, Public, Secret, Random, Generator, Signature};
-use ethstore::accounts_dir::MemoryDirectory;
-use ethstore::{
-	SimpleSecretStore, SecretStore, EthStore, EthMultiStore,
-	random_string, SecretVaultRef, StoreAccountRef, OpaqueSecret,
-};
-use log::warn;
-use parking_lot::RwLock;
-
-pub use ethstore::{Derivation, IndexDerivation, KeyFile, Error};
-
-pub use self::account_data::AccountMeta;
-pub use self::error::SignError;
-
-type AccountToken = Password;
-
-/// Account management settings.
-#[derive(Debug, Default)]
-pub struct AccountProviderSettings {
-	/// Store raw account secret when unlocking the account permanently.
-	pub unlock_keep_secret: bool,
-	/// Disallowed accounts.
-	pub blacklisted_accounts: Vec<Address>,
-}
-
-/// Account management.
-/// Responsible for unlocking accounts.
-pub struct AccountProvider {
-	/// For performance reasons some methods can re-use unlocked secrets.
-	unlocked_secrets: RwLock<HashMap<StoreAccountRef, OpaqueSecret>>,
-	/// Unlocked account data.
-	unlocked: RwLock<HashMap<StoreAccountRef, AccountData>>,
-	/// Address book.
-	address_book: RwLock<AddressBook>,
-	/// Accounts on disk
-	sstore: Box<dyn SecretStore>,
-	/// Accounts unlocked with rolling tokens
-	transient_sstore: EthMultiStore,
-	/// When unlocking account permanently we additionally keep a raw secret in memory
-	/// to increase the performance of transaction signing.
-	unlock_keep_secret: bool,
-	/// Disallowed accounts.
-	blacklisted_accounts: Vec<Address>,
-}
-
-fn transient_sstore() -> EthMultiStore {
-	EthMultiStore::open(Box::new(MemoryDirectory::default())).expect("MemoryDirectory load always succeeds; qed")
-}
-
-impl AccountProvider {
-	/// Creates new account provider.
-	pub fn new(sstore: Box<dyn SecretStore>, settings: AccountProviderSettings) -> Self {
-		if let Ok(accounts) = sstore.accounts() {
-			for account in accounts.into_iter().filter(|a| settings.blacklisted_accounts.contains(&a.address)) {
-				warn!("Local Account {} has a blacklisted (known to be weak) address and will be ignored",
-					account.address);
-			}
-		}
-
-		// Remove blacklisted accounts from address book.
-		let mut address_book = AddressBook::new(&sstore.local_path());
-		for addr in &settings.blacklisted_accounts {
-			address_book.remove(*addr);
-		}
-
-		AccountProvider {
-			unlocked_secrets: RwLock::new(HashMap::new()),
-			unlocked: RwLock::new(HashMap::new()),
-			address_book: RwLock::new(address_book),
-			sstore,
-			transient_sstore: transient_sstore(),
-			unlock_keep_secret: settings.unlock_keep_secret,
-			blacklisted_accounts: settings.blacklisted_accounts,
-		}
-	}
-
-	/// Creates not disk backed provider.
-	pub fn transient_provider() -> Self {
-		AccountProvider {
-			unlocked_secrets: RwLock::new(HashMap::new()),
-			unlocked: RwLock::new(HashMap::new()),
-			address_book: RwLock::new(AddressBook::transient()),
-			sstore: Box::new(EthStore::open(Box::new(MemoryDirectory::default())).expect("MemoryDirectory load always succeeds; qed")),
-			transient_sstore: transient_sstore(),
-			unlock_keep_secret: false,
-			blacklisted_accounts: vec![],
-		}
-	}
-
-	/// Creates new random account.
-	pub fn new_account(&self, password: &Password) -> Result<Address, Error> {
-		self.new_account_and_public(password).map(|d| d.0)
-	}
-
-	/// Creates new random account and returns address and public key
-	pub fn new_account_and_public(&self, password: &Password) -> Result<(Address, Public), Error> {
-		let acc = Random.generate();
-		let public = acc.public().clone();
-		let secret = acc.secret().clone();
-		let account = self.sstore.insert_account(SecretVaultRef::Root, secret, password)?;
-		Ok((account.address, public))
-	}
-
-	/// Inserts new account into underlying store.
-	/// Does not unlock account!
-	pub fn insert_account(&self, secret: Secret, password: &Password) -> Result<Address, Error> {
-		let account = self.sstore.insert_account(SecretVaultRef::Root, secret, password)?;
-		if self.blacklisted_accounts.contains(&account.address) {
-			self.sstore.remove_account(&account, password)?;
-			return Err(Error::InvalidAccount.into());
-		}
-		Ok(account.address)
-	}
-
-	/// Generates new derived account based on the existing one
-	/// If password is not provided, account must be unlocked
-	/// New account will be created with the same password (if save: true)
-	pub fn derive_account(&self, address: &Address, password: Option<Password>, derivation: Derivation, save: bool)
-		-> Result<Address, SignError>
-	{
-		let account = self.sstore.account_ref(&address)?;
-		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
-		Ok(
-			if save { self.sstore.insert_derived(SecretVaultRef::Root, &account, &password, derivation)?.address }
-			else { self.sstore.generate_derived(&account, &password, derivation)? }
-		)
-	}
-
-	/// Import a new presale wallet.
-	pub fn import_presale(&self, presale_json: &[u8], password: &Password) -> Result<Address, Error> {
-		let account = self.sstore.import_presale(SecretVaultRef::Root, presale_json, password)?;
-		Ok(Address::from(account.address).into())
-	}
-
-	/// Import a new wallet.
-	pub fn import_wallet(&self, json: &[u8], password: &Password, gen_id: bool) -> Result<Address, Error> {
-		let account = self.sstore.import_wallet(SecretVaultRef::Root, json, password, gen_id)?;
-		if self.blacklisted_accounts.contains(&account.address) {
-			self.sstore.remove_account(&account, password)?;
-			return Err(Error::InvalidAccount.into());
-		}
-		Ok(Address::from(account.address).into())
-	}
-
-	/// Checks whether an account with a given address is present.
-	pub fn has_account(&self, address: Address) -> bool {
-		self.sstore.account_ref(&address).is_ok() && !self.blacklisted_accounts.contains(&address)
-	}
-
-	/// Returns addresses of all accounts.
-	pub fn accounts(&self) -> Result<Vec<Address>, Error> {
-		let accounts = self.sstore.accounts()?;
-		Ok(accounts
-			.into_iter()
-			.map(|a| a.address)
-			.filter(|address| !self.blacklisted_accounts.contains(address))
-			.collect()
-		)
-	}
-
-	/// Returns the address of default account.
-	pub fn default_account(&self) -> Result<Address, Error> {
-		Ok(self.accounts()?.first().cloned().unwrap_or_default())
-	}
-
-	/// Returns each address along with metadata.
-	pub fn addresses_info(&self) -> HashMap<Address, AccountMeta> {
-		self.address_book.read().get()
-	}
-
-	/// Returns each address along with metadata.
-	pub fn set_address_name(&self, account: Address, name: String) {
-		self.address_book.write().set_name(account, name)
-	}
-
-	/// Returns each address along with metadata.
-	pub fn set_address_meta(&self, account: Address, meta: String) {
-		self.address_book.write().set_meta(account, meta)
-	}
-
-	/// Removes and address from the address book
-	pub fn remove_address(&self, addr: Address) {
-		self.address_book.write().remove(addr)
-	}
-
-	/// Returns each account along with name and meta.
-	pub fn accounts_info(&self) -> Result<HashMap<Address, AccountMeta>, Error> {
-		let r = self.sstore.accounts()?
-			.into_iter()
-			.filter(|a| !self.blacklisted_accounts.contains(&a.address))
-			.map(|a| (a.address.clone(), self.account_meta(a.address).ok().unwrap_or_default()))
-			.collect();
-		Ok(r)
-	}
-
-	/// Returns each account along with name and meta.
-	pub fn account_meta(&self, address: Address) -> Result<AccountMeta, Error> {
-		let account = self.sstore.account_ref(&address)?;
-		Ok(AccountMeta {
-			name: self.sstore.name(&account)?,
-			meta: self.sstore.meta(&account)?,
-			uuid: self.sstore.uuid(&account).ok().map(Into::into),	// allowed to not have a Uuid
-		})
-	}
-
-	/// Returns account public key.
-	pub fn account_public(&self, address: Address, password: &Password) -> Result<Public, Error> {
-		self.sstore.public(&self.sstore.account_ref(&address)?, password)
-	}
-
-	/// Returns each account along with name and meta.
-	pub fn set_account_name(&self, address: Address, name: String) -> Result<(), Error> {
-		self.sstore.set_name(&self.sstore.account_ref(&address)?, name)?;
-		Ok(())
-	}
-
-	/// Returns each account along with name and meta.
-	pub fn set_account_meta(&self, address: Address, meta: String) -> Result<(), Error> {
-		self.sstore.set_meta(&self.sstore.account_ref(&address)?, meta)?;
-		Ok(())
-	}
-
-	/// Returns `true` if the password for `account` is `password`. `false` if not.
-	pub fn test_password(&self, address: &Address, password: &Password) -> Result<bool, Error> {
-		self.sstore.test_password(&self.sstore.account_ref(&address)?, password)
-			.map_err(Into::into)
-	}
-
-	/// Permanently removes an account.
-	pub fn kill_account(&self, address: &Address, password: &Password) -> Result<(), Error> {
-		self.sstore.remove_account(&self.sstore.account_ref(&address)?, &password)?;
-		Ok(())
-	}
-
-	/// Changes the password of `account` from `password` to `new_password`. Fails if incorrect `password` given.
-	pub fn change_password(&self, address: &Address, password: Password, new_password: Password) -> Result<(), Error> {
-		self.sstore.change_password(&self.sstore.account_ref(address)?, &password, &new_password)
-	}
-
-	/// Exports an account for given address.
-	pub fn export_account(&self, address: &Address, password: Password) -> Result<KeyFile, Error> {
-		self.sstore.export_account(&self.sstore.account_ref(address)?, &password)
-	}
-
-	/// Helper method used for unlocking accounts.
-	fn unlock_account(&self, address: Address, password: Password, unlock: Unlock) -> Result<(), Error> {
-		let account = self.sstore.account_ref(&address)?;
-
-		// check if account is already unlocked permanently, if it is, do nothing
-		let mut unlocked = self.unlocked.write();
-		if let Some(data) = unlocked.get(&account) {
-			if let Unlock::Perm = data.unlock {
-				return Ok(())
-			}
-		}
-
-		if self.unlock_keep_secret && unlock == Unlock::Perm {
-			// verify password and get the secret
-			let secret = self.sstore.raw_secret(&account, &password)?;
-			self.unlocked_secrets.write().insert(account.clone(), secret);
-		} else {
-			// verify password by signing a dummy message
-			// result may be discarded
-			let dummy_msg = [1u8;32].into();
-			let _ = self.sstore.sign(&account, &password, &dummy_msg)?;
-		}
-
-		let data = AccountData { unlock, password };
-
-		unlocked.insert(account, data);
-		Ok(())
-	}
-
-	fn password(&self, account: &StoreAccountRef) -> Result<Password, SignError> {
-		let mut unlocked = self.unlocked.write();
-		let data = unlocked.get(account).ok_or(SignError::NotUnlocked)?.clone();
-		if let Unlock::OneTime = data.unlock {
-			unlocked.remove(account).expect("data exists: so key must exist: qed");
-		}
-		if let Unlock::Timed(ref end) = data.unlock {
-			if Instant::now() > *end {
-				unlocked.remove(account).expect("data exists: so key must exist: qed");
-				return Err(SignError::NotUnlocked);
-			}
-		}
-		Ok(data.password)
-	}
-
-	/// Unlocks account permanently.
-	pub fn unlock_account_permanently(&self, account: Address, password: Password) -> Result<(), Error> {
-		self.unlock_account(account, password, Unlock::Perm)
-	}
-
-	/// Unlocks account temporarily (for one signing).
-	pub fn unlock_account_temporarily(&self, account: Address, password: Password) -> Result<(), Error> {
-		self.unlock_account(account, password, Unlock::OneTime)
-	}
-
-	/// Unlocks account temporarily with a timeout.
-	pub fn unlock_account_timed(&self, account: Address, password: Password, duration: Duration) -> Result<(), Error> {
-		self.unlock_account(account, password, Unlock::Timed(Instant::now() + duration))
-	}
-
-	/// Checks if given account is unlocked
-	pub fn is_unlocked(&self, address: &Address) -> bool {
-		let unlocked = self.unlocked.read();
-		let unlocked_secrets = self.unlocked_secrets.read();
-		self.sstore.account_ref(address)
-			.map(|r| unlocked.get(&r).is_some() || unlocked_secrets.get(&r).is_some())
-			.unwrap_or(false)
-	}
-
-	/// Checks if given account is unlocked permanently
-	pub fn is_unlocked_permanently(&self, address: &Address) -> bool {
-		let unlocked = self.unlocked.read();
-		self.sstore.account_ref(address)
-			.map(|r| unlocked.get(&r).map_or(false, |account| account.unlock == Unlock::Perm))
-			.unwrap_or(false)
-	}
-
-	/// Signs the message. If password is not provided the account must be unlocked.
-	pub fn sign(&self, address: Address, password: Option<Password>, message: Message) -> Result<Signature, SignError> {
-		let account = self.sstore.account_ref(&address)?;
-		match self.unlocked_secrets.read().get(&account) {
-			Some(secret) => {
-				Ok(self.sstore.sign_with_secret(&secret, &message)?)
-			},
-			None => {
-				let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
-				Ok(self.sstore.sign(&account, &password, &message)?)
-			}
-		}
-	}
-
-	/// Signs message using the derived secret. If password is not provided the account must be unlocked.
-	pub fn sign_derived(&self, address: &Address, password: Option<Password>, derivation: Derivation, message: Message)
-		-> Result<Signature, SignError>
-	{
-		let account = self.sstore.account_ref(address)?;
-		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
-		Ok(self.sstore.sign_derived(&account, &password, derivation, &message)?)
-	}
-
-	/// Signs given message with supplied token. Returns a token to use in next signing within this session.
-	pub fn sign_with_token(&self, address: Address, token: AccountToken, message: Message) -> Result<(Signature, AccountToken), SignError> {
-		let account = self.sstore.account_ref(&address)?;
-		let is_std_password = self.sstore.test_password(&account, &token)?;
-
-		let new_token = Password::from(random_string(16));
-		let signature = if is_std_password {
-			// Insert to transient store
-			self.sstore.copy_account(&self.transient_sstore, SecretVaultRef::Root, &account, &token, &new_token)?;
-			// sign
-			self.sstore.sign(&account, &token, &message)?
-		} else {
-			// check transient store
-			self.transient_sstore.change_password(&account, &token, &new_token)?;
-			// and sign
-			self.transient_sstore.sign(&account, &new_token, &message)?
-		};
-
-		Ok((signature, new_token))
-	}
-
-	/// Decrypts a message with given token. Returns a token to use in next operation for this account.
-	pub fn decrypt_with_token(&self, address: Address, token: AccountToken, shared_mac: &[u8], message: &[u8])
-		-> Result<(Vec<u8>, AccountToken), SignError>
-	{
-		let account = self.sstore.account_ref(&address)?;
-		let is_std_password = self.sstore.test_password(&account, &token)?;
-
-		let new_token = Password::from(random_string(16));
-		let message = if is_std_password {
-			// Insert to transient store
-			self.sstore.copy_account(&self.transient_sstore, SecretVaultRef::Root, &account, &token, &new_token)?;
-			// decrypt
-			self.sstore.decrypt(&account, &token, shared_mac, message)?
-		} else {
-			// check transient store
-			self.transient_sstore.change_password(&account, &token, &new_token)?;
-			// and decrypt
-			self.transient_sstore.decrypt(&account, &token, shared_mac, message)?
-		};
-
-		Ok((message, new_token))
-	}
-
-	/// Decrypts a message. If password is not provided the account must be unlocked.
-	pub fn decrypt(&self, address: Address, password: Option<Password>, shared_mac: &[u8], message: &[u8]) -> Result<Vec<u8>, SignError> {
-		let account = self.sstore.account_ref(&address)?;
-		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
-		Ok(self.sstore.decrypt(&account, &password, shared_mac, message)?)
-	}
-
-	/// Agree on shared key.
-	pub fn agree(&self, address: Address, password: Option<Password>, other_public: &Public) -> Result<Secret, SignError> {
-		let account = self.sstore.account_ref(&address)?;
-		let password = password.map(Ok).unwrap_or_else(|| self.password(&account))?;
-		Ok(self.sstore.agree(&account, &password, other_public)?)
-	}
-
-	/// Returns the underlying `SecretStore` reference if one exists.
-	pub fn list_geth_accounts(&self, testnet: bool) -> Vec<Address> {
-		self.sstore.list_geth_accounts(testnet).into_iter().map(|a| Address::from(a).into()).collect()
-	}
-
-	/// Returns the underlying `SecretStore` reference if one exists.
-	pub fn import_geth_accounts(&self, desired: Vec<Address>, testnet: bool) -> Result<Vec<Address>, Error> {
-		self.sstore.import_geth_accounts(SecretVaultRef::Root, desired, testnet)
-			.map(|a| a.into_iter().map(|a| a.address).collect())
-			.map_err(Into::into)
-	}
-
-	/// Create new vault.
-	pub fn create_vault(&self, name: &str, password: &Password) -> Result<(), Error> {
-		self.sstore.create_vault(name, password)
-			.map_err(Into::into)
-	}
-
-	/// Open existing vault.
-	pub fn open_vault(&self, name: &str, password: &Password) -> Result<(), Error> {
-		self.sstore.open_vault(name, password)
-			.map_err(Into::into)
-	}
-
-	/// Close previously opened vault.
-	pub fn close_vault(&self, name: &str) -> Result<(), Error> {
-		self.sstore.close_vault(name)
-			.map_err(Into::into)
-	}
-
-	/// List all vaults
-	pub fn list_vaults(&self) -> Result<Vec<String>, Error> {
-		self.sstore.list_vaults()
-			.map_err(Into::into)
-	}
-
-	/// List all currently opened vaults
-	pub fn list_opened_vaults(&self) -> Result<Vec<String>, Error> {
-		self.sstore.list_opened_vaults()
-			.map_err(Into::into)
-	}
-
-	/// Change vault password.
-	pub fn change_vault_password(&self, name: &str, new_password: &Password) -> Result<(), Error> {
-		self.sstore.change_vault_password(name, new_password)
-			.map_err(Into::into)
-	}
-
-	/// Change vault of the given address.
-	pub fn change_vault(&self, address: Address, new_vault: &str) -> Result<(), Error> {
-		let new_vault_ref = if new_vault.is_empty() { SecretVaultRef::Root } else { SecretVaultRef::Vault(new_vault.to_owned()) };
-		let old_account_ref = self.sstore.account_ref(&address)?;
-		self.sstore.change_account_vault(new_vault_ref, old_account_ref)
-			.map_err(Into::into)
-			.map(|_| ())
-	}
-
-	/// Get vault metadata string.
-	pub fn get_vault_meta(&self, name: &str) -> Result<String, Error> {
-		self.sstore.get_vault_meta(name)
-			.map_err(Into::into)
-	}
-
-	/// Set vault metadata string.
-	pub fn set_vault_meta(&self, name: &str, meta: &str) -> Result<(), Error> {
-		self.sstore.set_vault_meta(name, meta)
-			.map_err(Into::into)
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::{AccountProvider, Unlock};
-	use std::time::{Duration, Instant};
-	use parity_crypto::publickey::{Generator, Random, Address};
-	use ethstore::{StoreAccountRef, Derivation};
-	use ethereum_types::H256;
-
-	#[test]
-	fn unlock_account_temp() {
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		let dummy_msg = [1u8; 32].into();
-		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).is_ok());
-		assert!(ap.unlock_account_temporarily(kp.address(), "test1".into()).is_err());
-		assert!(ap.unlock_account_temporarily(kp.address(), "test".into()).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_err());
-	}
-
-	#[test]
-	fn derived_account_nosave() {
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		assert!(ap.insert_account(kp.secret().clone(), &"base".into()).is_ok());
-		assert!(ap.unlock_account_permanently(kp.address(), "base".into()).is_ok());
-
-		let derived_addr = ap.derive_account(
-			&kp.address(),
-			None,
-			Derivation::SoftHash(H256::from_low_u64_be(999)),
-			false,
-		).expect("Derivation should not fail");
-
-		assert!(ap.unlock_account_permanently(derived_addr, "base".into()).is_err(),
-			"There should be an error because account is not supposed to be saved");
-	}
-
-	#[test]
-	fn derived_account_save() {
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		assert!(ap.insert_account(kp.secret().clone(), &"base".into()).is_ok());
-		assert!(ap.unlock_account_permanently(kp.address(), "base".into()).is_ok());
-
-		let derived_addr = ap.derive_account(
-			&kp.address(),
-			None,
-			Derivation::SoftHash(H256::from_low_u64_be(999)),
-			true,
-		).expect("Derivation should not fail");
-
-		assert!(ap.unlock_account_permanently(derived_addr, "base_wrong".into()).is_err(),
-			"There should be an error because password is invalid");
-
-		assert!(ap.unlock_account_permanently(derived_addr, "base".into()).is_ok(),
-			"Should be ok because account is saved and password is valid");
-	}
-
-	#[test]
-	fn derived_account_sign() {
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		assert!(ap.insert_account(kp.secret().clone(), &"base".into()).is_ok());
-		assert!(ap.unlock_account_permanently(kp.address(), "base".into()).is_ok());
-
-		let derived_addr = ap.derive_account(
-			&kp.address(),
-			None,
-			Derivation::SoftHash(H256::from_low_u64_be(1999)),
-			true,
-		).expect("Derivation should not fail");
-		ap.unlock_account_permanently(derived_addr, "base".into())
-			.expect("Should be ok because account is saved and password is valid");
-
-		let msg = [2u8; 32].into();
-		let signed_msg1 = ap.sign(derived_addr, None, msg)
-			.expect("Signing with existing unlocked account should not fail");
-		let signed_msg2 = ap.sign_derived(
-			&kp.address(),
-			None,
-			Derivation::SoftHash(H256::from_low_u64_be(1999)),
-			msg,
-		).expect("Derived signing with existing unlocked account should not fail");
-
-		assert_eq!(signed_msg1, signed_msg2,
-			"Signed messages should match");
-	}
-
-	#[test]
-	fn unlock_account_perm() {
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		let dummy_msg = [1u8; 32].into();
-		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).is_ok());
-		assert!(ap.unlock_account_permanently(kp.address(), "test1".into()).is_err());
-		assert!(ap.unlock_account_permanently(kp.address(), "test".into()).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_ok());
-		assert!(ap.unlock_account_temporarily(kp.address(), "test".into()).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_ok());
-	}
-
-	#[test]
-	fn unlock_account_timer() {
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		let dummy_msg = [1u8; 32].into();
-
-		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).is_ok());
-		assert!(ap.unlock_account_timed(kp.address(), "test1".into(), Duration::from_secs(60)).is_err());
-		assert!(ap.unlock_account_timed(kp.address(), "test".into(), Duration::from_secs(60)).is_ok());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_ok());
-		ap.unlocked.write().get_mut(&StoreAccountRef::root(kp.address())).unwrap().unlock = Unlock::Timed(Instant::now());
-		assert!(ap.sign(kp.address(), None, dummy_msg).is_err());
-	}
-
-	#[test]
-	fn should_sign_and_return_token() {
-		// given
-		let kp = Random.generate();
-		let ap = AccountProvider::transient_provider();
-		let dummy_msg = [1u8; 32].into();
-		assert!(ap.insert_account(kp.secret().clone(), &"test".into()).is_ok());
-
-		// when
-		let (_signature, token) = ap.sign_with_token(kp.address(), "test".into(), dummy_msg).unwrap();
-
-		// then
-		ap.sign_with_token(kp.address(), token.clone(), dummy_msg)
-			.expect("First usage of token should be correct.");
-		assert!(ap.sign_with_token(kp.address(), token, dummy_msg).is_err(), "Second usage of the same token should fail.");
-	}
-
-	#[test]
-	fn should_not_return_blacklisted_account() {
-		// given
-		let mut ap = AccountProvider::transient_provider();
-		let acc = ap.new_account(&"test".into()).unwrap();
-		ap.blacklisted_accounts = vec![acc];
-
-		// then
-		assert_eq!(ap.accounts_info().unwrap().keys().cloned().collect::<Vec<Address>>(), vec![]);
-		assert_eq!(ap.accounts().unwrap(), vec![]);
-	}
-}
--- a/accounts/src/stores.rs
+++ b/accounts/src/stores.rs
@@ -1,189 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Address Book Store
-
-use std::{fs, fmt, hash, ops};
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-
-use parity_crypto::publickey::Address;
-use log::{trace, warn};
-
-use crate::AccountMeta;
-
-/// Disk-backed map from Address to String. Uses JSON.
-pub struct AddressBook {
-	cache: DiskMap<Address, AccountMeta>,
-}
-
-impl AddressBook {
-	/// Creates new address book at given directory.
-	pub fn new(path: &Path) -> Self {
-		let mut r = AddressBook {
-			cache: DiskMap::new(path, "address_book.json")
-		};
-		r.cache.revert(AccountMeta::read);
-		r
-	}
-
-	/// Creates transient address book (no changes are saved to disk).
-	pub fn transient() -> Self {
-		AddressBook {
-			cache: DiskMap::transient()
-		}
-	}
-
-	/// Get the address book.
-	pub fn get(&self) -> HashMap<Address, AccountMeta> {
-		self.cache.clone()
-	}
-
-	fn save(&self) {
-		self.cache.save(AccountMeta::write)
-	}
-
-	/// Sets new name for given address.
-	pub fn set_name(&mut self, a: Address, name: String) {
-		{
-			let x = self.cache.entry(a)
-				.or_insert_with(|| AccountMeta {name: Default::default(), meta: "{}".to_owned(), uuid: None});
-			x.name = name;
-		}
-		self.save();
-	}
-
-	/// Sets new meta for given address.
-	pub fn set_meta(&mut self, a: Address, meta: String) {
-		{
-			let x = self.cache.entry(a)
-				.or_insert_with(|| AccountMeta {name: "Anonymous".to_owned(), meta: Default::default(), uuid: None});
-			x.meta = meta;
-		}
-		self.save();
-	}
-
-	/// Removes an entry
-	pub fn remove(&mut self, a: Address) {
-		self.cache.remove(&a);
-		self.save();
-	}
-}
-
-/// Disk-serializable HashMap
-#[derive(Debug)]
-struct DiskMap<K: hash::Hash + Eq, V> {
-	path: PathBuf,
-	cache: HashMap<K, V>,
-	transient: bool,
-}
-
-impl<K: hash::Hash + Eq, V> ops::Deref for DiskMap<K, V> {
-	type Target = HashMap<K, V>;
-	fn deref(&self) -> &Self::Target {
-		&self.cache
-	}
-}
-
-impl<K: hash::Hash + Eq, V> ops::DerefMut for DiskMap<K, V> {
-	fn deref_mut(&mut self) -> &mut Self::Target {
-		&mut self.cache
-	}
-}
-
-impl<K: hash::Hash + Eq, V> DiskMap<K, V> {
-	pub fn new(path: &Path, file_name: &str) -> Self {
-		let mut path = path.to_owned();
-		path.push(file_name);
-		trace!(target: "diskmap", "path={:?}", path);
-		DiskMap {
-			path: path,
-			cache: HashMap::new(),
-			transient: false,
-		}
-	}
-
-	pub fn transient() -> Self {
-		let mut map = DiskMap::new(&PathBuf::new(), "diskmap.json".into());
-		map.transient = true;
-		map
-	}
-
-	fn revert<F, E>(&mut self, read: F) where
-		F: Fn(fs::File) -> Result<HashMap<K, V>, E>,
-		E: fmt::Display,
-	{
-		if self.transient { return; }
-		trace!(target: "diskmap", "revert {:?}", self.path);
-		let _ = fs::File::open(self.path.clone())
-			.map_err(|e| trace!(target: "diskmap", "Couldn't open disk map: {}", e))
-			.and_then(|f| read(f).map_err(|e| warn!(target: "diskmap", "Couldn't read disk map at: {:?} {}", self.path, e)))
-			.and_then(|m| {
-				self.cache = m;
-				Ok(())
-			});
-	}
-
-	fn save<F, E>(&self, write: F) where
-		F: Fn(&HashMap<K, V>, &mut fs::File) -> Result<(), E>,
-		E: fmt::Display,
-	{
-		if self.transient { return; }
-		trace!(target: "diskmap", "save {:?}", self.path);
-		let _ = fs::File::create(self.path.clone())
-			.map_err(|e| warn!(target: "diskmap", "Couldn't open disk map for writing at: {:?} {}", self.path, e))
-			.and_then(|mut f| {
-				write(&self.cache, &mut f).map_err(|e| warn!(target: "diskmap", "Couldn't write to disk map at: {:?} {}", self.path, e))
-			});
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::{AddressBook, Address};
-	use std::collections::HashMap;
-	use tempfile::TempDir;
-	use crate::account_data::AccountMeta;
-
-	#[test]
-	fn should_save_and_reload_address_book() {
-		let tempdir = TempDir::new().unwrap();
-		let mut b = AddressBook::new(tempdir.path());
-		b.set_name(Address::from_low_u64_be(1), "One".to_owned());
-		b.set_meta(Address::from_low_u64_be(1), "{1:1}".to_owned());
-		let b = AddressBook::new(tempdir.path());
-		assert_eq!(b.get(), vec![
-		   (Address::from_low_u64_be(1), AccountMeta {name: "One".to_owned(), meta: "{1:1}".to_owned(), uuid: None})
-		].into_iter().collect::<HashMap<_, _>>());
-	}
-
-	#[test]
-	fn should_remove_address() {
-		let tempdir = TempDir::new().unwrap();
-		let mut b = AddressBook::new(tempdir.path());
-
-		b.set_name(Address::from_low_u64_be(1), "One".to_owned());
-		b.set_name(Address::from_low_u64_be(2), "Two".to_owned());
-		b.set_name(Address::from_low_u64_be(3), "Three".to_owned());
-		b.remove(Address::from_low_u64_be(2).into());
-
-		let b = AddressBook::new(tempdir.path());
-		assert_eq!(b.get(), vec![
-			(Address::from_low_u64_be(1), AccountMeta{name: "One".to_owned(), meta: "{}".to_owned(), uuid: None}),
-			(Address::from_low_u64_be(3), AccountMeta{name: "Three".to_owned(), meta: "{}".to_owned(), uuid: None}),
-		].into_iter().collect::<HashMap<_, _>>());
-	}
-}
--- a/chainspec/Cargo.toml
+++ b/chainspec/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-description = "OpenEthereum Chain Specification"
 name = "chainspec"
 version = "0.1.0"
-authors = ["Marek Kotewicz <marek@parity.io>"]
+authors = ["debris <marek.kotewicz@gmail.com>"]

 [dependencies]
 ethjson = { path = "../json" }
 serde_json = "1.0"
+serde_ignored = "0.0.4"
--- a/chainspec/src/main.rs
+++ b/chainspec/src/main.rs
@@ -1,22 +1,8 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Open Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
 extern crate serde_json;
+extern crate serde_ignored;
 extern crate ethjson;

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

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

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

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

+	if !unused.is_empty() {
+		let err = unused.into_iter()
+			.map(|field| format!("{} unexpected field `{}`", path, field))
+			.collect::<Vec<_>>()
+			.join("\n");
+		quit(&err);
+	}
+
 	println!("{} is valid", path);
 }
--- a/cli-signer/Cargo.toml
+++ b/cli-signer/Cargo.toml
@@ -1,14 +0,0 @@
-[package]
-description = "OpenEthereum CLI Signer Tool"
-repository = "https://github.com/openethereum/openethereum"
-license = "GPL-3.0"
-name = "cli-signer"
-version = "1.4.0"
-authors = ["Parity <admin@parity.io>"]
-
-[dependencies]
-ethereum-types = "0.9.0"
-futures = "0.1"
-rpassword = "1.0"
-parity-rpc = { path = "../rpc" }
-parity-rpc-client = { path = "rpc-client" }
--- a/cli-signer/rpc-client/Cargo.toml
+++ b/cli-signer/rpc-client/Cargo.toml
@@ -1,21 +0,0 @@
-[package]
-description = "OpenEthereum RPC Client"
-repository = "https://github.com/openethereum/openethereum"
-license = "GPL-3.0"
-name = "parity-rpc-client"
-version = "1.4.0"
-authors = ["Parity <admin@parity.io>"]
-
-[dependencies]
-ethereum-types = "0.9.0"
-futures = "0.1"
-log = "0.4"
-serde = "1.0"
-serde_json = "1.0"
-url = "2.1.1"
-matches = "0.1"
-parking_lot = "0.10.0"
-jsonrpc-core = "14.0.3"
-jsonrpc-ws-server = "14.0.3"
-parity-rpc = { path = "../../rpc" }
-keccak-hash = "0.5.0"
--- a/dapps/Cargo.toml
+++ b/dapps/Cargo.toml
@@ -0,0 +1,48 @@
+[package]
+description = "Parity Dapps crate"
+name = "parity-dapps"
+version = "1.9.0"
+license = "GPL-3.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[lib]
+
+[dependencies]
+base32 = "0.3"
+futures = "0.1"
+futures-cpupool = "0.1"
+linked-hash-map = "0.5"
+log = "0.3"
+parity-dapps-glue = "1.9"
+parking_lot = "0.5"
+mime_guess = "2.0.0-alpha.2"
+rand = "0.4"
+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.10" }
+jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.10" }
+
+ethcore-bytes = { path = "../util/bytes" }
+ethereum-types = "0.2"
+fetch = { path = "../util/fetch" }
+node-health = { path = "./node-health" }
+parity-hash-fetch = { path = "../hash-fetch" }
+parity-reactor = { path = "../util/reactor" }
+parity-ui = { path = "./ui" }
+parity-ui-deprecation = { path = "./ui-deprecation" }
+keccak-hash = { path = "../util/hash" }
+parity-version = { path = "../util/version" }
+
+[dev-dependencies]
+env_logger = "0.4"
+ethcore-devtools = { path = "../devtools" }
+
+[features]
+ui = ["parity-ui/no-precompiled-js"]
+ui-precompiled = ["parity-ui/use-precompiled-js"]
--- a/dapps/js-glue/Cargo.toml
+++ b/dapps/js-glue/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+description = "Base Package for all Parity built-in dapps"
+name = "parity-dapps-glue"
+version = "1.9.1"
+license = "GPL-3.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+build = "build.rs"
+
+[build-dependencies]
+quasi_codegen = { version = "0.32", optional = true }
+syntex = { version = "0.58", optional = true }
+
+[dependencies]
+glob = { version = "0.2.11" }
+mime_guess = { version = "2.0.0-alpha.2" }
+aster = { version = "0.41", default-features = false }
+quasi = { version = "0.32", default-features = false }
+quasi_macros = { version = "0.32", optional = true }
+syntex = { version = "0.58", optional = true }
+syntex_syntax = { version = "0.58", optional = true }
+
+[features]
+default = ["with-syntex"]
+nightly = ["quasi_macros"]
+with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
+use-precompiled-js = []
+
+
--- 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_cmd(cmd: &mut Command) -> &mut Command {
+		cmd
+	}
+}
+
+#[cfg(windows)]
+mod platform {
+	use std::process::{Command, Stdio};
+
+	pub static NPM_CMD: &'static str = "cmd.exe";
+	// NOTE [ToDr] For some reason on windows
+	// The command doesn't have %~dp0 set properly
+	// and it cannot load globally installed node.exe
+	pub fn handle_cmd(cmd: &mut Command) -> &mut Command {
+		cmd.stdin(Stdio::null())
+			.arg("/c")
+			.arg("npm.cmd")
+	}
+}
+
+fn die<T : fmt::Debug>(s: &'static str, e: T) -> ! {
+	panic!("Error: {}: {:?}", s, e);
+}
+
+#[cfg(feature = "use-precompiled-js")]
+pub fn test(_path: &str) {
+}
+#[cfg(feature = "use-precompiled-js")]
+pub fn build(_path: &str, _dest: &str) {
+}
+
+#[cfg(not(feature = "use-precompiled-js"))]
+pub fn build(path: &str, dest: &str) {
+	let child = platform::handle_cmd(&mut Command::new(platform::NPM_CMD))
+		.arg("install")
+		.arg("--no-progress")
+		.current_dir(path)
+		.status()
+		.unwrap_or_else(|e| die("Installing node.js dependencies with npm", e));
+	assert!(child.success(), "There was an error installing dependencies.");
+
+	let child = platform::handle_cmd(&mut Command::new(platform::NPM_CMD))
+		.arg("run")
+		.arg("build")
+		.env("NODE_ENV", "production")
+		.env("BUILD_DEST", dest)
+		.current_dir(path)
+		.status()
+		.unwrap_or_else(|e| die("Building JS code", e));
+	assert!(child.success(), "There was an error build JS code.");
+}
+
+#[cfg(not(feature = "use-precompiled-js"))]
+pub fn test(path: &str) {
+	let child = Command::new(platform::NPM_CMD)
+		.arg("run")
+		.arg("test")
+		.current_dir(path)
+		.status()
+		.unwrap_or_else(|e| die("Running test command", e));
+	assert!(child.success(), "There was an error while running JS tests.");
+}
--- 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.3.0"
+parking_lot = "0.5"
+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,39 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct App {
+	pub id: Option<String>,
+	pub name: String,
+	pub description: String,
+	pub version: String,
+	pub author: String,
+	#[serde(rename="iconUrl")]
+	pub icon_url: String,
+	#[serde(rename="localUrl")]
+	pub local_url: Option<String>,
+	#[serde(rename="allowJsEval")]
+	pub allow_js_eval: Option<bool>,
+}
+
+impl App {
+	pub fn with_id(&self, id: &str) -> Self {
+		let mut app = self.clone();
+		app.id = Some(id.into());
+		app
+	}
+}
--- 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,268 @@
+// 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 ethereum_types::H256;
+use fetch;
+use futures_cpupool::CpuPool;
+use hash::keccak_buffer;
+use mime_guess::Mime;
+
+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(fetch::BodyReader::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 = Some(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,344 @@
+// 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 futures::{future, Future};
+use futures_cpupool::CpuPool;
+use fetch::{Client as FetchClient, Fetch};
+use hash_fetch::urlhint::{URLHintContract, URLHint, URLHintResult};
+
+use hyper::StatusCode;
+
+use ethereum_types::H256;
+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: H256) -> 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.parse() {
+			// 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.parse().expect("to_handler is called only when `contains` returns true.");
+					let content = self.resolve(content_hex);
+
+					let cache = self.cache.clone();
+					let id = content_id.clone();
+					let on_done = move |result: Option<local::Dapp>| {
+						let mut cache = cache.lock();
+						match result {
+							Some(endpoint) => cache.insert(id.clone(), ContentStatus::Ready(endpoint)),
+							// In case of error
+							None => cache.remove(&id),
+						};
+					};
+
+					match content {
+						// Don't serve dapps if we are still syncing (but serve content)
+						Some(URLHintResult::Dapp(_)) if self.sync.is_major_importing() => {
+							(None, Self::still_syncing(self.embeddable_on.clone()))
+						},
+						Some(URLHintResult::Dapp(_)) if self.only_content => {
+							(None, Self::dapps_disabled(self.embeddable_on.clone()))
+						},
+						Some(content) => {
+							let handler = match content {
+								URLHintResult::Dapp(dapp) => {
+									ContentFetcherHandler::new(
+										req.method(),
+										&dapp.url(),
+										path,
+										installers::Dapp::new(
+											content_id.clone(),
+											self.cache_path.clone(),
+											Box::new(on_done),
+											self.embeddable_on.clone(),
+											self.pool.clone(),
+										),
+										self.embeddable_on.clone(),
+										self.fetch.clone(),
+										self.pool.clone(),
+									)
+								},
+							    URLHintResult::GithubDapp(content) => {
+									ContentFetcherHandler::new(
+										req.method(),
+										&content.url,
+										path,
+										installers::Dapp::new(
+											content_id.clone(),
+											self.cache_path.clone(),
+											Box::new(on_done),
+											self.embeddable_on.clone(),
+											self.pool.clone(),
+										),
+										self.embeddable_on.clone(),
+										self.fetch.clone(),
+										self.pool.clone(),
+									)
+							    },
+								URLHintResult::Content(content) => {
+									ContentFetcherHandler::new(
+										req.method(),
+										&content.url,
+										path,
+										installers::Content::new(
+											content_id.clone(),
+											content.mime,
+											self.cache_path.clone(),
+											Box::new(on_done),
+											self.pool.clone(),
+										),
+										self.embeddable_on.clone(),
+										self.fetch.clone(),
+										self.pool.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 fetch::Client;
+	use futures::{future, Future};
+	use hash_fetch::urlhint::{URLHint, URLHintResult};
+	use ethereum_types::H256;
+
+	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: H256) -> Box<Future<Item = Option<URLHintResult>, Error = String> + Send> {
+			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 {
+			id: None,
+			name: "fake".into(),
+			description: "".into(),
+			version: "".into(),
+			author: "".into(),
+			icon_url: "".into(),
+			local_url: Some("".into()),
+			allow_js_eval: None,
+		}, 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,139 @@
+// 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)
+		})
+		.unwrap_or_else(|e| {
+			warn!(target: "dapps", "Cannot read manifest file at: {:?}. Error: {:?}", path, e);
+
+			EndpointInfo {
+				id: None,
+				name: name.into(),
+				description: name.into(),
+				version: "0.0.0".into(),
+				author: "?".into(),
+				icon_url: "icon.png".into(),
+				local_url: None,
+				allow_js_eval: Some(false),
+			}
+		})
+}
+
+/// 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,34 @@
+// 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> {
+	let mut manifest = serde_json::from_str::<Manifest>(&manifest).map_err(|e| format!("{:?}", e))?;
+	if manifest.id.is_none() {
+		return Err("App 'id' is missing.".into());
+	}
+	manifest.allow_js_eval = Some(manifest.allow_js_eval.unwrap_or(false));
+
+	Ok(manifest)
+}
+
+pub fn serialize_manifest(manifest: &Manifest) -> Result<String, String> {
+	serde_json::to_string_pretty(manifest).map_err(|e| format!("{:?}", e))
+}
--- a/dapps/src/apps/mod.rs
+++ b/dapps/src/apps/mod.rs
@@ -0,0 +1,105 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use endpoint::{Endpoints, Endpoint};
+use futures_cpupool::CpuPool;
+use page;
+use proxypac::ProxyPac;
+use web::Web;
+use fetch::Fetch;
+use {WebProxyTokens, ParentFrameSettings};
+
+mod app;
+mod cache;
+mod ui;
+pub mod fs;
+pub mod fetcher;
+pub mod manifest;
+
+pub use self::app::App;
+
+pub const HOME_PAGE: &'static str = "home";
+pub const RPC_PATH: &'static str =  "rpc";
+pub const API_PATH: &'static str =  "api";
+pub const UTILS_PATH: &'static str =  "parity-utils";
+pub const WEB_PATH: &'static str = "web";
+pub const URL_REFERER: &'static str = "__referer=";
+
+pub fn utils(pool: CpuPool) -> Box<Endpoint> {
+	Box::new(page::builtin::Dapp::new(pool, ::parity_ui::App::default()))
+}
+
+pub fn ui(pool: CpuPool) -> Box<Endpoint> {
+	Box::new(page::builtin::Dapp::with_fallback_to_index(pool, ::parity_ui::App::default()))
+}
+
+pub fn ui_deprecation(pool: CpuPool) -> Box<Endpoint> {
+	Box::new(page::builtin::Dapp::with_fallback_to_index(pool, ::parity_ui_deprecation::App::default()))
+}
+
+pub fn ui_redirection(embeddable: Option<ParentFrameSettings>) -> Box<Endpoint> {
+	Box::new(ui::Redirection::new(embeddable))
+}
+
+pub fn all_endpoints<F: Fetch>(
+	dapps_path: PathBuf,
+	extra_dapps: Vec<PathBuf>,
+	dapps_domain: &str,
+	embeddable: Option<ParentFrameSettings>,
+	web_proxy_tokens: Arc<WebProxyTokens>,
+	fetch: F,
+	pool: CpuPool,
+) -> (Vec<String>, Endpoints) {
+	// fetch fs dapps at first to avoid overwriting builtins
+	let mut pages = fs::local_endpoints(dapps_path.clone(), embeddable.clone(), pool.clone());
+	let local_endpoints: Vec<String> = pages.keys().cloned().collect();
+	for path in extra_dapps {
+		if let Some((id, endpoint)) = fs::local_endpoint(path.clone(), embeddable.clone(), pool.clone()) {
+			pages.insert(id, endpoint);
+		} else {
+			warn!(target: "dapps", "Ignoring invalid dapp at {}", path.display());
+		}
+	}
+
+	// NOTE [ToDr] Dapps will be currently embeded on 8180
+	pages.insert(
+		"ui".into(),
+		Box::new(page::builtin::Dapp::new_safe_to_embed(pool.clone(), ::parity_ui::App::default(), embeddable.clone()))
+	);
+	// old version
+	pages.insert(
+		"v1".into(),
+		Box::new({
+			let mut page = page::builtin::Dapp::new_safe_to_embed(pool.clone(), ::parity_ui::old::App::default(), embeddable.clone());
+			// allow JS eval on old Wallet
+			page.allow_js_eval();
+			page
+		})
+	);
+	pages.insert(
+		"proxy".into(),
+		ProxyPac::boxed(embeddable.clone(), dapps_domain.to_owned())
+	);
+	pages.insert(
+		WEB_PATH.into(),
+		Web::boxed(embeddable.clone(), web_proxy_tokens.clone(), fetch.clone(), pool.clone())
+	);
+
+	(local_endpoints, pages)
+}
--- a/dapps/src/apps/ui.rs
+++ b/dapps/src/apps/ui.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/>.
+
+//! UI redirections
+
+use hyper::StatusCode;
+use futures::future;
+
+use endpoint::{Endpoint, Request, Response, EndpointPath};
+use {handlers, Embeddable};
+
+/// Redirection to UI server.
+pub struct Redirection {
+	embeddable_on: Embeddable,
+}
+
+impl Redirection {
+	pub fn new(
+		embeddable_on: Embeddable,
+	) -> Self {
+		Redirection {
+			embeddable_on,
+		}
+	}
+}
+
+impl Endpoint for Redirection {
+	fn respond(&self, _path: EndpointPath, req: Request) -> Response {
+		Box::new(future::ok(if let Some(ref frame) = self.embeddable_on {
+			trace!(target: "dapps", "Redirecting to signer interface.");
+			let protocol = req.uri().scheme().unwrap_or("http");
+			handlers::Redirection::new(format!("{}://{}:{}", protocol, &frame.host, frame.port)).into()
+		} else {
+			trace!(target: "dapps", "Signer disabled, returning 404.");
+			handlers::ContentHandler::error(
+				StatusCode::NotFound,
+				"404 Not Found",
+				"Your homepage is not available when Trusted Signer is disabled.",
+				Some("You can still access dapps by writing a correct address, though. Re-enable Signer to get your homepage back."),
+				None,
+			).into()
+		}))
+	}
+}
--- a/dapps/src/endpoint.rs
+++ b/dapps/src/endpoint.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/>.
+
+//! URL Endpoint traits
+
+use std::collections::BTreeMap;
+
+use futures::Future;
+use hyper;
+
+#[derive(Debug, PartialEq, Default, Clone)]
+pub struct EndpointPath {
+	pub app_id: String,
+	pub app_params: Vec<String>,
+	pub query: Option<String>,
+	pub host: String,
+	pub port: u16,
+	pub using_dapps_domains: bool,
+}
+
+impl EndpointPath {
+	pub fn has_no_params(&self) -> bool {
+		self.app_params.is_empty() || self.app_params.iter().all(|x| x.is_empty())
+	}
+}
+
+pub type EndpointInfo = ::apps::App;
+pub type Endpoints = BTreeMap<String, Box<Endpoint>>;
+pub type Response = Box<Future<Item=hyper::Response, Error=hyper::Error> + Send>;
+pub type Request = hyper::Request;
+
+pub trait Endpoint : Send + Sync {
+	fn info(&self) -> Option<&EndpointInfo> { None }
+
+	fn respond(&self, path: EndpointPath, req: Request) -> Response;
+}
--- a/dapps/src/error_tpl.html
+++ b/dapps/src/error_tpl.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width">
+		<title>{title}</title>
+		<link rel="stylesheet" href="/parity-utils/styles.css">
+	</head>
+	<body>
+		<div class="parity-navbar">
+		</div>
+		<div class="parity-box">
+			<h1>{title}</h1>
+			<h3>{message}</h3>
+			<p><code>{details}</code></p>
+		</div>
+		<div class="parity-status">
+			<small>{version}</small>
+		</div>
+	</body>
+</html>
--- a/dapps/src/handlers/content.rs
+++ b/dapps/src/handlers/content.rs
@@ -0,0 +1,88 @@
+// 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/>.
+
+//! Simple Content Handler
+
+use hyper::{self, mime, header};
+use hyper::StatusCode;
+
+use parity_version::version;
+
+use handlers::add_security_headers;
+use Embeddable;
+
+#[derive(Debug, Clone)]
+pub struct ContentHandler {
+	code: StatusCode,
+	content: String,
+	mimetype: mime::Mime,
+	safe_to_embed_on: Embeddable,
+}
+
+impl ContentHandler {
+	pub fn ok(content: String, mimetype: mime::Mime) -> Self {
+		Self::new(StatusCode::Ok, content, mimetype)
+	}
+
+	pub fn html(code: StatusCode, content: String, embeddable_on: Embeddable) -> Self {
+		Self::new_embeddable(code, content, mime::TEXT_HTML, embeddable_on)
+	}
+
+	pub fn error(
+		code: StatusCode,
+		title: &str,
+		message: &str,
+		details: Option<&str>,
+		embeddable_on: Embeddable,
+	) -> Self {
+		Self::html(code, format!(
+			include_str!("../error_tpl.html"),
+			title=title,
+			message=message,
+			details=details.unwrap_or_else(|| ""),
+			version=version(),
+		), embeddable_on)
+	}
+
+	pub fn new(code: StatusCode, content: String, mimetype: mime::Mime) -> Self {
+		Self::new_embeddable(code, content, mimetype, None)
+	}
+
+	pub fn new_embeddable(
+		code: StatusCode,
+		content: String,
+		mimetype: mime::Mime,
+		safe_to_embed_on: Embeddable,
+	) -> Self {
+		ContentHandler {
+			code,
+			content,
+			mimetype,
+			safe_to_embed_on,
+		}
+	}
+}
+
+impl Into<hyper::Response> for ContentHandler {
+	fn into(self) -> hyper::Response {
+		let mut res = hyper::Response::new()
+			.with_status(self.code)
+			.with_header(header::ContentType(self.mimetype))
+			.with_body(self.content);
+		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on, false);
+		res
+	}
+}
--- a/dapps/src/handlers/echo.rs
+++ b/dapps/src/handlers/echo.rs
@@ -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/>.
+
+//! Echo Handler
+
+use hyper::{self, header};
+
+use handlers::add_security_headers;
+
+#[derive(Debug)]
+pub struct EchoHandler {
+	request: hyper::Request,
+}
+
+impl EchoHandler {
+	pub fn new(request: hyper::Request) -> Self {
+		EchoHandler {
+			request,
+		}
+	}
+}
+
+impl Into<hyper::Response> for EchoHandler {
+	fn into(self) -> hyper::Response {
+		let content_type = self.request.headers().get().cloned();
+		let mut res = hyper::Response::new()
+			.with_header(content_type.unwrap_or(header::ContentType::json()))
+			.with_body(self.request.body());
+
+		add_security_headers(res.headers_mut(), None, false);
+		res
+	}
+}
--- a/dapps/src/handlers/fetch.rs
+++ b/dapps/src/handlers/fetch.rs
@@ -0,0 +1,373 @@
+// 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/>.
+
+//! Hyper Server Handler that fetches a file during a request (proxy).
+
+use std::{fmt, mem};
+use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::time::{Instant, Duration};
+use fetch::{self, Fetch};
+use futures::sync::oneshot;
+use futures::{self, Future};
+use futures_cpupool::CpuPool;
+use hyper::{self, Method, StatusCode};
+use parking_lot::Mutex;
+
+use endpoint::{self, EndpointPath};
+use handlers::{ContentHandler, StreamingHandler};
+use page::local;
+use {Embeddable};
+
+const FETCH_TIMEOUT: u64 = 300;
+
+pub enum ValidatorResponse {
+	Local(local::Dapp),
+	Streaming(StreamingHandler<fetch::BodyReader>),
+}
+
+pub trait ContentValidator: Sized + Send + 'static {
+	type Error: fmt::Debug + fmt::Display;
+
+	fn validate_and_install(self, fetch::Response) -> Result<ValidatorResponse, Self::Error>;
+}
+
+#[derive(Debug, Clone)]
+pub struct FetchControl {
+	abort: Arc<AtomicBool>,
+	listeners: Arc<Mutex<Vec<oneshot::Sender<WaitResult>>>>,
+	deadline: Instant,
+}
+
+impl Default for FetchControl {
+	fn default() -> Self {
+		FetchControl {
+			abort: Arc::new(AtomicBool::new(false)),
+			listeners: Arc::new(Mutex::new(Vec::new())),
+			deadline: Instant::now() + Duration::from_secs(FETCH_TIMEOUT),
+		}
+	}
+}
+
+impl FetchControl {
+	pub fn is_deadline_reached(&self) -> bool {
+		self.deadline < Instant::now()
+	}
+
+	pub fn abort(&self) {
+		self.abort.store(true, Ordering::SeqCst);
+	}
+
+	pub fn to_response(&self, path: EndpointPath) -> endpoint::Response {
+		let (tx, receiver) = oneshot::channel();
+		self.listeners.lock().push(tx);
+
+		Box::new(WaitingHandler {
+			path,
+			state: WaitState::Waiting(receiver),
+		})
+	}
+
+	fn notify<F: Fn() -> WaitResult>(&self, status: F) {
+		let mut listeners = self.listeners.lock();
+		for sender in listeners.drain(..) {
+			trace!(target: "dapps", "Resuming request waiting for content...");
+			if let Err(_) = sender.send(status()) {
+				trace!(target: "dapps", "Waiting listener notification failed.");
+			}
+		}
+	}
+
+	fn set_status(&self, status: &FetchState) {
+		match *status {
+			FetchState::Error(ref handler) => self.notify(|| WaitResult::Error(handler.clone())),
+			FetchState::Done(ref endpoint, _) => self.notify(|| WaitResult::Done(endpoint.clone())),
+			FetchState::Streaming(_) => self.notify(|| WaitResult::NonAwaitable),
+			FetchState::InProgress(_) => {},
+			FetchState::Empty => {},
+		}
+	}
+}
+
+
+enum WaitState {
+	Waiting(oneshot::Receiver<WaitResult>),
+	Done(endpoint::Response),
+}
+
+#[derive(Debug)]
+enum WaitResult {
+	Error(ContentHandler),
+	Done(local::Dapp),
+	NonAwaitable,
+}
+
+pub struct WaitingHandler {
+	path: EndpointPath,
+	state: WaitState,
+}
+
+impl Future for WaitingHandler {
+	type Item = hyper::Response;
+	type Error = hyper::Error;
+
+	fn poll(&mut self) -> futures::Poll<Self::Item, Self::Error> {
+		loop {
+			let new_state = match self.state {
+				WaitState::Waiting(ref mut receiver) => {
+					let result = try_ready!(receiver.poll().map_err(|_| hyper::Error::Timeout));
+
+					match result {
+						WaitResult::Error(handler) => {
+							return Ok(futures::Async::Ready(handler.into()));
+						},
+						WaitResult::NonAwaitable => {
+							let errors = Errors { embeddable_on: None };
+							return Ok(futures::Async::Ready(errors.streaming().into()));
+						},
+						WaitResult::Done(endpoint) => {
+							WaitState::Done(endpoint.to_response(&self.path).into())
+						},
+					}
+				},
+				WaitState::Done(ref mut response) => {
+					return response.poll()
+				},
+			};
+
+			self.state = new_state;
+		}
+	}
+}
+
+#[derive(Debug, Clone)]
+struct Errors {
+	embeddable_on: Embeddable,
+}
+
+impl Errors {
+	fn streaming(&self) -> ContentHandler {
+		ContentHandler::error(
+			StatusCode::BadGateway,
+			"Streaming Error",
+			"This content is being streamed in other place.",
+			None,
+			self.embeddable_on.clone(),
+		)
+	}
+
+	fn download_error<E: fmt::Debug>(&self, e: E) -> ContentHandler {
+		ContentHandler::error(
+			StatusCode::BadGateway,
+			"Download Error",
+			"There was an error when fetching the content.",
+			Some(&format!("{:?}", e)),
+			self.embeddable_on.clone(),
+		)
+	}
+
+	fn invalid_content<E: fmt::Debug>(&self, e: E) -> ContentHandler {
+		ContentHandler::error(
+			StatusCode::BadGateway,
+			"Invalid Dapp",
+			"Downloaded bundle does not contain a valid content.",
+			Some(&format!("{:?}", e)),
+			self.embeddable_on.clone(),
+		)
+	}
+
+	fn timeout_error(&self) -> ContentHandler {
+		ContentHandler::error(
+			StatusCode::GatewayTimeout,
+			"Download Timeout",
+			&format!("Could not fetch content within {} seconds.", FETCH_TIMEOUT),
+			None,
+			self.embeddable_on.clone(),
+		)
+	}
+
+	fn method_not_allowed(&self) -> ContentHandler {
+		ContentHandler::error(
+			StatusCode::MethodNotAllowed,
+			"Method Not Allowed",
+			"Only <code>GET</code> requests are allowed.",
+			None,
+			self.embeddable_on.clone(),
+		)
+	}
+}
+
+enum FetchState {
+	Error(ContentHandler),
+	InProgress(Box<Future<Item=FetchState, Error=()> + Send>),
+	Streaming(hyper::Response),
+	Done(local::Dapp, endpoint::Response),
+	Empty,
+}
+
+impl fmt::Debug for FetchState {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		use self::FetchState::*;
+
+		write!(fmt, "FetchState(")?;
+		match *self {
+			Error(ref error) => write!(fmt, "error: {:?}", error),
+			InProgress(_) => write!(fmt, "in progress"),
+			Streaming(ref res) => write!(fmt, "streaming: {:?}", res),
+			Done(ref endpoint, _) => write!(fmt, "done: {:?}", endpoint),
+			Empty => write!(fmt, "?"),
+		}?;
+		write!(fmt, ")")
+	}
+}
+
+#[derive(Debug)]
+pub struct ContentFetcherHandler {
+	fetch_control: FetchControl,
+	status: FetchState,
+	errors: Errors,
+}
+
+impl ContentFetcherHandler {
+	pub fn fetch_control(&self) -> FetchControl {
+		self.fetch_control.clone()
+	}
+
+	pub fn new<H: ContentValidator, F: Fetch>(
+		method: &hyper::Method,
+		url: &str,
+		path: EndpointPath,
+		installer: H,
+		embeddable_on: Embeddable,
+		fetch: F,
+		pool: CpuPool,
+	) -> Self {
+		let fetch_control = FetchControl::default();
+		let errors = Errors { embeddable_on };
+
+		// Validation of method
+		let status = match *method {
+			// Start fetching content
+			Method::Get => {
+				trace!(target: "dapps", "Fetching content from: {:?}", url);
+				FetchState::InProgress(Self::fetch_content(
+						pool,
+						fetch,
+						url,
+						fetch_control.abort.clone(),
+						path,
+						errors.clone(),
+						installer,
+				))
+			},
+			// or return error
+			_ => FetchState::Error(errors.method_not_allowed()),
+		};
+
+		ContentFetcherHandler {
+			fetch_control,
+			status,
+			errors,
+		}
+	}
+
+	fn fetch_content<H: ContentValidator, F: Fetch>(
+		pool: CpuPool,
+		fetch: F,
+		url: &str,
+		abort: Arc<AtomicBool>,
+		path: EndpointPath,
+		errors: Errors,
+		installer: H,
+	) -> Box<Future<Item=FetchState, Error=()> + Send> {
+		// Start fetching the content
+		let pool2 = pool.clone();
+		let future = fetch.fetch(url, abort.into()).then(move |result| {
+			trace!(target: "dapps", "Fetching content finished. Starting validation: {:?}", result);
+			Ok(match result {
+				Ok(response) => match installer.validate_and_install(response) {
+					Ok(ValidatorResponse::Local(endpoint)) => {
+						trace!(target: "dapps", "Validation OK. Returning response.");
+						let response = endpoint.to_response(&path);
+						FetchState::Done(endpoint, response)
+					},
+					Ok(ValidatorResponse::Streaming(stream)) => {
+						trace!(target: "dapps", "Validation OK. Streaming response.");
+						let (reading, response) = stream.into_response();
+						pool.spawn(reading).forget();
+						FetchState::Streaming(response)
+					},
+					Err(e) => {
+						trace!(target: "dapps", "Error while validating content: {:?}", e);
+						FetchState::Error(errors.invalid_content(e))
+					},
+				},
+				Err(e) => {
+					warn!(target: "dapps", "Unable to fetch content: {:?}", e);
+					FetchState::Error(errors.download_error(e))
+				},
+			})
+		});
+
+		// make sure to run within fetch thread pool.
+		Box::new(pool2.spawn(future))
+	}
+}
+
+impl Future for ContentFetcherHandler {
+	type Item = hyper::Response;
+	type Error = hyper::Error;
+
+	fn poll(&mut self) -> futures::Poll<Self::Item, Self::Error> {
+		loop {
+			trace!(target: "dapps", "Polling status: {:?}", self.status);
+			self.status = match mem::replace(&mut self.status, FetchState::Empty) {
+				FetchState::Error(error) => {
+					return Ok(futures::Async::Ready(error.into()));
+				},
+				FetchState::Streaming(response) => {
+					return Ok(futures::Async::Ready(response));
+				},
+				any => any,
+			};
+
+			let status = match self.status {
+				// Request may time out
+				FetchState::InProgress(_) if self.fetch_control.is_deadline_reached() => {
+					trace!(target: "dapps", "Fetching dapp failed because of timeout.");
+					FetchState::Error(self.errors.timeout_error())
+				},
+				FetchState::InProgress(ref mut receiver) => {
+					// Check if there is a response
+					trace!(target: "dapps", "Polling streaming response.");
+					try_ready!(receiver.poll().map_err(|err| {
+						warn!(target: "dapps", "Error while fetching response: {:?}", err);
+						hyper::Error::Timeout
+					}))
+				},
+				FetchState::Done(_, ref mut response) => {
+					return response.poll()
+				},
+				FetchState::Empty => panic!("Future polled twice."),
+				_ => unreachable!(),
+			};
+
+			trace!(target: "dapps", "New status: {:?}", status);
+			self.fetch_control.set_status(&status);
+			self.status = status;
+		}
+	}
+}
--- a/dapps/src/handlers/mod.rs
+++ b/dapps/src/handlers/mod.rs
@@ -0,0 +1,121 @@
+// 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/>.
+
+//! Hyper handlers implementations.
+
+mod content;
+mod echo;
+mod fetch;
+mod reader;
+mod redirect;
+mod streaming;
+
+pub use self::content::ContentHandler;
+pub use self::echo::EchoHandler;
+pub use self::fetch::{ContentFetcherHandler, ContentValidator, FetchControl, ValidatorResponse};
+pub use self::reader::Reader;
+pub use self::redirect::Redirection;
+pub use self::streaming::StreamingHandler;
+
+use std::iter;
+use itertools::Itertools;
+use hyper::header;
+use {apps, address, Embeddable};
+
+/// Adds security-related headers to the Response.
+pub fn add_security_headers(headers: &mut header::Headers, embeddable_on: Embeddable, allow_js_eval: bool) {
+	headers.set_raw("X-XSS-Protection", "1; mode=block");
+	headers.set_raw("X-Content-Type-Options", "nosniff");
+
+	// Embedding header:
+	if let None = embeddable_on {
+		headers.set_raw("X-Frame-Options",  "SAMEORIGIN");
+	}
+
+	// Content Security Policy headers
+	headers.set_raw("Content-Security-Policy", String::new()
+		// Restrict everything to the same origin by default.
+		+ "default-src 'self';"
+		// Allow connecting to WS servers and HTTP(S) servers.
+		// We could be more restrictive and allow only RPC server URL.
+		+ "connect-src http: https: ws: wss:;"
+		// Allow framing any content from HTTP(S).
+		// Again we could only allow embedding from RPC server URL.
+		// (deprecated)
+		+ "frame-src 'self' http: https:;"
+		// Allow framing and web workers from HTTP(S).
+		+ "child-src 'self' http: https:;"
+		// We allow data: blob: and HTTP(s) images.
+		// We could get rid of wildcarding HTTP and only allow RPC server URL.
+		// (http required for local dapps icons)
+		+ "img-src 'self' 'unsafe-inline' data: blob: http: https:;"
+		// Allow style from data: blob: and HTTPS.
+		+ "style-src 'self' 'unsafe-inline' data: blob: https:;"
+		// Allow fonts from data: and HTTPS.
+		+ "font-src 'self' data: https:;"
+		// Disallow objects
+		+ "object-src 'none';"
+		// Allow scripts
+		+ {
+			let script_src = embeddable_on.as_ref()
+				.map(|e| e.extra_script_src.iter()
+					 .map(|&(ref host, port)| address(host, port))
+					 .join(" ")
+				).unwrap_or_default();
+			let eval = if allow_js_eval { " 'unsafe-eval'" } else { "" };
+
+			&format!(
+				"script-src 'self' {}{};",
+				script_src,
+				eval
+			)
+		}
+		// Same restrictions as script-src with additional
+		// blob: that is required for camera access (worker)
+		+ "worker-src 'self' https: blob:;"
+		// Run in sandbox mode (although it's not fully safe since we allow same-origin and script)
+		+ "sandbox allow-same-origin allow-forms allow-modals allow-popups allow-presentation allow-scripts;"
+		// Disallow submitting forms from any dapps
+		+ "form-action 'none';"
+		// Never allow mixed content
+		+ "block-all-mixed-content;"
+		// Specify if the site can be embedded.
+		+ &match embeddable_on {
+			Some(ref embed) => {
+				let std = address(&embed.host, embed.port);
+				let proxy = format!("{}.{}", apps::HOME_PAGE, embed.dapps_domain);
+				let domain = format!("*.{}:{}", embed.dapps_domain, embed.port);
+
+				let mut ancestors = vec![std, domain, proxy]
+					.into_iter()
+					.chain(embed.extra_embed_on
+						.iter()
+						.map(|&(ref host, port)| address(host, port))
+					);
+
+				let ancestors = if embed.host == "127.0.0.1" {
+					let localhost = address("localhost", embed.port);
+					ancestors.chain(iter::once(localhost)).join(" ")
+				} else {
+					ancestors.join(" ")
+				};
+
+				format!("frame-ancestors {};", ancestors)
+			},
+			None => format!("frame-ancestors 'self';"),
+		}
+	);
+}
--- a/dapps/src/handlers/reader.rs
+++ b/dapps/src/handlers/reader.rs
@@ -0,0 +1,73 @@
+// 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 chunk-producing io::Read wrapper.
+
+use std::io::{self, Read};
+
+use futures::{self, sink, Sink, Future};
+use futures::sync::mpsc;
+use hyper;
+
+type Sender = mpsc::Sender<Result<hyper::Chunk, hyper::Error>>;
+
+const MAX_CHUNK_SIZE: usize = 32 * 1024;
+
+/// A Reader is essentially a stream of `hyper::Chunks`.
+/// The chunks are read from given `io::Read` instance.
+///
+/// Unfortunately `hyper` doesn't allow you to pass `Stream`
+/// directly to the response, so you need to create
+/// a `Body::pair()` and send over chunks using `sink::Send`.
+/// Also `Chunks` need to take `Vec` by value, so we need
+/// to allocate it for each chunk being sent.
+pub struct Reader<R: io::Read> {
+	buffer: [u8; MAX_CHUNK_SIZE],
+	content: io::BufReader<R>,
+	sending: sink::Send<Sender>,
+}
+
+impl<R: io::Read> Reader<R> {
+	pub fn pair(content: R, initial: Vec<u8>) -> (Self, hyper::Body) {
+		let (tx, rx) = hyper::Body::pair();
+		let reader = Reader {
+			buffer: [0; MAX_CHUNK_SIZE],
+			content: io::BufReader::new(content),
+			sending: tx.send(Ok(initial.into())),
+		};
+
+		(reader, rx)
+	}
+}
+
+impl<R: io::Read> Future for Reader<R> {
+	type Item = ();
+	type Error = ();
+
+	fn poll(&mut self) -> futures::Poll<Self::Item, Self::Error> {
+		loop {
+			let next = try_ready!(self.sending.poll().map_err(|err| {
+				warn!(target: "dapps", "Unable to send next chunk: {:?}", err);
+			}));
+
+			self.sending = match self.content.read(&mut self.buffer) {
+				Ok(0) => return Ok(futures::Async::Ready(())),
+				Ok(read) => next.send(Ok(self.buffer[..read].to_vec().into())),
+				Err(err) => next.send(Err(hyper::Error::Io(err))),
+			}
+		}
+	}
+}
--- a/dapps/src/handlers/redirect.rs
+++ b/dapps/src/handlers/redirect.rs
@@ -0,0 +1,41 @@
+// 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/>.
+
+//! HTTP Redirection hyper handler
+
+use hyper::{self, header, StatusCode};
+
+#[derive(Clone)]
+pub struct Redirection {
+	to_url: String
+}
+
+impl Redirection {
+	pub fn new<T: Into<String>>(url: T) -> Self {
+		Redirection {
+			to_url: url.into()
+		}
+	}
+}
+
+impl Into<hyper::Response> for Redirection {
+	fn into(self) -> hyper::Response {
+		// Don't use `MovedPermanently` here to prevent browser from caching the redirections.
+		hyper::Response::new()
+			.with_status(StatusCode::Found)
+			.with_header(header::Location::new(self.to_url))
+	}
+}
--- a/dapps/src/handlers/streaming.rs
+++ b/dapps/src/handlers/streaming.rs
@@ -0,0 +1,58 @@
+// 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/>.
+
+//! Content Stream Response
+
+use std::io;
+use hyper::{self, header, mime, StatusCode};
+
+use handlers::{add_security_headers, Reader};
+use Embeddable;
+
+pub struct StreamingHandler<R> {
+	initial: Vec<u8>,
+	content: R,
+	status: StatusCode,
+	mimetype: mime::Mime,
+	safe_to_embed_on: Embeddable,
+}
+
+impl<R: io::Read> StreamingHandler<R> {
+	pub fn new(content: R, status: StatusCode, mimetype: mime::Mime, safe_to_embed_on: Embeddable) -> Self {
+		StreamingHandler {
+			initial: Vec::new(),
+			content,
+			status,
+			mimetype,
+			safe_to_embed_on,
+		}
+	}
+
+	pub fn set_initial_content(&mut self, content: &str) {
+		self.initial = content.as_bytes().to_vec();
+	}
+
+	pub fn into_response(self) -> (Reader<R>, hyper::Response) {
+		let (reader, body) = Reader::pair(self.content, self.initial);
+		let mut res = hyper::Response::new()
+			.with_status(self.status)
+			.with_header(header::ContentType(self.mimetype))
+			.with_body(body);
+		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on, false);
+
+		(reader, res)
+	}
+}
--- a/dapps/src/lib.rs
+++ b/dapps/src/lib.rs
@@ -0,0 +1,339 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Ethcore Webapplications for Parity
+#![warn(missing_docs)]
+
+extern crate base32;
+extern crate futures_cpupool;
+extern crate itertools;
+extern crate linked_hash_map;
+extern crate mime_guess;
+extern crate parking_lot;
+extern crate rand;
+extern crate rustc_hex;
+extern crate serde;
+extern crate serde_json;
+extern crate unicase;
+extern crate zip;
+
+extern crate jsonrpc_http_server;
+
+extern crate ethcore_bytes as bytes;
+extern crate ethereum_types;
+extern crate fetch;
+extern crate node_health;
+extern crate parity_dapps_glue as parity_dapps;
+extern crate parity_hash_fetch as hash_fetch;
+extern crate parity_ui;
+extern crate parity_ui_deprecation;
+extern crate keccak_hash as hash;
+extern crate parity_version;
+
+#[macro_use]
+extern crate futures;
+#[macro_use]
+extern crate log;
+#[macro_use]
+extern crate serde_derive;
+
+#[cfg(test)]
+extern crate env_logger;
+#[cfg(test)]
+extern crate ethcore_devtools as devtools;
+#[cfg(test)]
+extern crate jsonrpc_core;
+#[cfg(test)]
+extern crate parity_reactor;
+
+mod endpoint;
+mod apps;
+mod page;
+mod router;
+mod handlers;
+mod api;
+mod proxypac;
+mod web;
+#[cfg(test)]
+mod tests;
+
+use std::collections::HashMap;
+use std::mem;
+use std::path::PathBuf;
+use std::sync::Arc;
+use futures_cpupool::CpuPool;
+use jsonrpc_http_server::{self as http, hyper, Origin};
+use parking_lot::RwLock;
+
+use fetch::Fetch;
+use node_health::NodeHealth;
+
+pub use hash_fetch::urlhint::ContractClient;
+pub use node_health::SyncStatus;
+
+
+/// Validates Web Proxy tokens
+pub trait WebProxyTokens: Send + Sync {
+	/// Should return a domain allowed to be accessed by this token or `None` if the token is not valid
+	fn domain(&self, token: &str) -> Option<Origin>;
+}
+
+impl<F> WebProxyTokens for F where F: Fn(String) -> Option<Origin> + Send + Sync {
+	fn domain(&self, token: &str) -> Option<Origin> { self(token.to_owned()) }
+}
+
+/// Current supported endpoints.
+#[derive(Default, Clone)]
+pub struct Endpoints {
+	local_endpoints: Arc<RwLock<Vec<String>>>,
+	endpoints: Arc<RwLock<endpoint::Endpoints>>,
+	dapps_path: PathBuf,
+	embeddable: Option<ParentFrameSettings>,
+	pool: Option<CpuPool>,
+}
+
+impl Endpoints {
+	/// Returns a current list of app endpoints.
+	pub fn list(&self) -> Vec<apps::App> {
+		self.endpoints.read().iter().filter_map(|(ref k, ref e)| {
+			e.info().map(|ref info| info.with_id(k))
+		}).collect()
+	}
+
+	/// Check for any changes in the local dapps folder and update.
+	pub fn refresh_local_dapps(&self) {
+		let pool = match self.pool.as_ref() {
+			None => return,
+			Some(pool) => pool,
+		};
+		let new_local = apps::fs::local_endpoints(&self.dapps_path, self.embeddable.clone(), pool.clone());
+		let old_local = mem::replace(&mut *self.local_endpoints.write(), new_local.keys().cloned().collect());
+		let (_, to_remove): (_, Vec<_>) = old_local
+			.into_iter()
+			.partition(|k| new_local.contains_key(&k.clone()));
+
+		let mut endpoints = self.endpoints.write();
+		// remove the dead dapps
+		for k in to_remove {
+			endpoints.remove(&k);
+		}
+		// new dapps to be added
+		for (k, v) in new_local {
+			if !endpoints.contains_key(&k) {
+				endpoints.insert(k, v);
+			}
+		}
+	}
+}
+
+/// Dapps server as `jsonrpc-http-server` request middleware.
+pub struct Middleware {
+	endpoints: Endpoints,
+	router: router::Router,
+}
+
+impl Middleware {
+	/// Get local endpoints handle.
+	pub fn endpoints(&self) -> &Endpoints {
+		&self.endpoints
+	}
+
+	/// Creates new middleware for UI server.
+	pub fn ui<F: Fetch>(
+		pool: CpuPool,
+		health: NodeHealth,
+		dapps_domain: &str,
+		registrar: Arc<ContractClient>,
+		sync_status: Arc<SyncStatus>,
+		fetch: F,
+		info_page_only: bool,
+	) -> Self {
+		let content_fetcher = Arc::new(apps::fetcher::ContentFetcher::new(
+			hash_fetch::urlhint::URLHintContract::new(registrar),
+			sync_status.clone(),
+			fetch.clone(),
+			pool.clone(),
+		).embeddable_on(None).allow_dapps(false));
+
+		if info_page_only {
+			let mut special = HashMap::default();
+			special.insert(router::SpecialEndpoint::Home, Some(apps::ui_deprecation(pool.clone())));
+
+			return Middleware {
+				endpoints: Default::default(),
+				router: router::Router::new(
+					content_fetcher,
+					None,
+					special,
+					None,
+					dapps_domain.to_owned(),
+				),
+			}
+		}
+
+		let special = {
+			let mut special = special_endpoints(
+				pool.clone(),
+				health,
+				content_fetcher.clone(),
+			);
+			special.insert(router::SpecialEndpoint::Home, Some(apps::ui(pool.clone())));
+			special
+		};
+		let router = router::Router::new(
+			content_fetcher,
+			None,
+			special,
+			None,
+			dapps_domain.to_owned(),
+		);
+
+		Middleware {
+			endpoints: Default::default(),
+			router: router,
+		}
+	}
+
+	/// Creates new Dapps server middleware.
+	pub fn dapps<F: Fetch>(
+		pool: CpuPool,
+		health: NodeHealth,
+		ui_address: Option<(String, u16)>,
+		extra_embed_on: Vec<(String, u16)>,
+		extra_script_src: Vec<(String, u16)>,
+		dapps_path: PathBuf,
+		extra_dapps: Vec<PathBuf>,
+		dapps_domain: &str,
+		registrar: Arc<ContractClient>,
+		sync_status: Arc<SyncStatus>,
+		web_proxy_tokens: Arc<WebProxyTokens>,
+		fetch: F,
+	) -> Self {
+		let embeddable = as_embeddable(ui_address, extra_embed_on, extra_script_src, dapps_domain);
+		let content_fetcher = Arc::new(apps::fetcher::ContentFetcher::new(
+			hash_fetch::urlhint::URLHintContract::new(registrar),
+			sync_status.clone(),
+			fetch.clone(),
+			pool.clone(),
+		).embeddable_on(embeddable.clone()).allow_dapps(true));
+		let (local_endpoints, endpoints) = apps::all_endpoints(
+			dapps_path.clone(),
+			extra_dapps,
+			dapps_domain,
+			embeddable.clone(),
+			web_proxy_tokens,
+			fetch.clone(),
+			pool.clone(),
+		);
+		let endpoints = Endpoints {
+			endpoints: Arc::new(RwLock::new(endpoints)),
+			dapps_path,
+			local_endpoints: Arc::new(RwLock::new(local_endpoints)),
+			embeddable: embeddable.clone(),
+			pool: Some(pool.clone()),
+		};
+
+		let special = {
+			let mut special = special_endpoints(
+				pool.clone(),
+				health,
+				content_fetcher.clone(),
+			);
+			special.insert(
+				router::SpecialEndpoint::Home,
+				Some(apps::ui_redirection(embeddable.clone())),
+			);
+			special
+		};
+
+		let router = router::Router::new(
+			content_fetcher,
+			Some(endpoints.clone()),
+			special,
+			embeddable,
+			dapps_domain.to_owned(),
+		);
+
+		Middleware {
+			endpoints,
+			router,
+		}
+	}
+}
+
+impl http::RequestMiddleware for Middleware {
+	fn on_request(&self, req: hyper::Request) -> http::RequestMiddlewareAction {
+		self.router.on_request(req)
+	}
+}
+
+fn special_endpoints(
+	pool: CpuPool,
+	health: NodeHealth,
+	content_fetcher: Arc<apps::fetcher::Fetcher>,
+) -> HashMap<router::SpecialEndpoint, Option<Box<endpoint::Endpoint>>> {
+	let mut special = HashMap::new();
+	special.insert(router::SpecialEndpoint::Rpc, None);
+	special.insert(router::SpecialEndpoint::Utils, Some(apps::utils(pool)));
+	special.insert(router::SpecialEndpoint::Api, Some(api::RestApi::new(
+		content_fetcher,
+		health,
+	)));
+	special
+}
+
+fn address(host: &str, port: u16) -> String {
+	format!("{}:{}", host, port)
+}
+
+fn as_embeddable(
+	ui_address: Option<(String, u16)>,
+	extra_embed_on: Vec<(String, u16)>,
+	extra_script_src: Vec<(String, u16)>,
+	dapps_domain: &str,
+) -> Option<ParentFrameSettings> {
+	ui_address.map(|(host, port)| ParentFrameSettings {
+		host,
+		port,
+		extra_embed_on,
+		extra_script_src,
+		dapps_domain: dapps_domain.to_owned(),
+	})
+}
+
+/// Random filename
+fn random_filename() -> String {
+	use ::rand::Rng;
+	let mut rng = ::rand::OsRng::new().unwrap();
+	rng.gen_ascii_chars().take(12).collect()
+}
+
+type Embeddable = Option<ParentFrameSettings>;
+
+/// Parent frame host and port allowed to embed the content.
+#[derive(Debug, Clone)]
+pub struct ParentFrameSettings {
+	/// Hostname
+	pub host: String,
+	/// Port
+	pub port: u16,
+	/// Additional URLs the dapps can be embedded on.
+	pub extra_embed_on: Vec<(String, u16)>,
+	/// Additional URLs the dapp scripts can be loaded from.
+	pub extra_script_src: Vec<(String, u16)>,
+	/// Dapps Domain (web3.site)
+	pub dapps_domain: String,
+}
--- a/dapps/src/page/builtin.rs
+++ b/dapps/src/page/builtin.rs
@@ -0,0 +1,165 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::io;
+use futures::future;
+use futures_cpupool::CpuPool;
+use hyper::mime::{self, Mime};
+use itertools::Itertools;
+use parity_dapps::{WebApp, Info};
+
+use endpoint::{Endpoint, EndpointInfo, EndpointPath, Request, Response};
+use page::{handler, PageCache};
+use Embeddable;
+
+pub struct Dapp<T: WebApp + 'static> {
+	/// futures cpu pool
+	pool: CpuPool,
+	/// Content of the files
+	app: T,
+	/// Safe to be loaded in frame by other origin. (use wisely!)
+	safe_to_embed_on: Embeddable,
+	info: EndpointInfo,
+	fallback_to_index_html: bool,
+}
+
+impl<T: WebApp + 'static> Dapp<T> {
+	/// Creates new `Dapp` for builtin (compile time) Dapp.
+	pub fn new(pool: CpuPool, app: T) -> Self {
+		let info = app.info();
+		Dapp {
+			pool,
+			app,
+			safe_to_embed_on: None,
+			info: EndpointInfo::from(info),
+			fallback_to_index_html: false,
+		}
+	}
+
+	/// Creates a new `Dapp` for builtin (compile time) Dapp.
+	/// Instead of returning 404 this endpoint will always server index.html.
+	pub fn with_fallback_to_index(pool: CpuPool, app: T) -> Self {
+		let info = app.info();
+		Dapp {
+			pool,
+			app,
+			safe_to_embed_on: None,
+			info: EndpointInfo::from(info),
+			fallback_to_index_html: true,
+		}
+	}
+
+	/// Creates new `Dapp` which can be safely used in iframe
+	/// even from different origin. It might be dangerous (clickjacking).
+	/// Use wisely!
+	pub fn new_safe_to_embed(pool: CpuPool, app: T, address: Embeddable) -> Self {
+		let info = app.info();
+		Dapp {
+			pool,
+			app,
+			safe_to_embed_on: address,
+			info: EndpointInfo::from(info),
+			fallback_to_index_html: false,
+		}
+	}
+
+	/// Allow the dapp to use `unsafe-eval` to run JS.
+	pub fn allow_js_eval(&mut self) {
+		self.info.allow_js_eval = Some(true);
+	}
+}
+
+impl<T: WebApp> Endpoint for Dapp<T> {
+	fn info(&self) -> Option<&EndpointInfo> {
+		Some(&self.info)
+	}
+
+	fn respond(&self, path: EndpointPath, _req: Request) -> Response {
+		trace!(target: "dapps", "Builtin file path: {:?}", path);
+		let file_path = if path.has_no_params() {
+			"index.html".to_owned()
+		} else {
+			path.app_params.into_iter().filter(|x| !x.is_empty()).join("/")
+		};
+		trace!(target: "dapps", "Builtin file: {:?}", file_path);
+
+		let file = {
+			let file = |path| self.app.file(path).map(|file| {
+				let content_type = match file.content_type.parse() {
+					Ok(mime) => mime,
+					Err(_) => {
+						warn!(target: "dapps", "invalid MIME type: {}", file.content_type);
+						mime::TEXT_HTML
+					},
+				};
+				BuiltinFile {
+					content_type,
+					content: io::Cursor::new(file.content),
+				}
+			});
+			let res = file(&file_path);
+			if self.fallback_to_index_html {
+				res.or_else(|| file("index.html"))
+			} else {
+				res
+			}
+		};
+
+		let (reader, response) = handler::PageHandler {
+			file,
+			cache: PageCache::Disabled,
+			safe_to_embed_on: self.safe_to_embed_on.clone(),
+			allow_js_eval: self.info.allow_js_eval.clone().unwrap_or(false),
+		}.into_response();
+
+		self.pool.spawn(reader).forget();
+
+		Box::new(future::ok(response))
+	}
+}
+
+impl From<Info> for EndpointInfo {
+	fn from(info: Info) -> Self {
+		EndpointInfo {
+			id: None,
+			name: info.name.into(),
+			description: info.description.into(),
+			author: info.author.into(),
+			icon_url: info.icon_url.into(),
+			local_url: None,
+			version: info.version.into(),
+			allow_js_eval: None,
+		}
+	}
+}
+
+
+struct BuiltinFile {
+	content_type: Mime,
+	content: io::Cursor<&'static [u8]>,
+}
+
+impl handler::DappFile for BuiltinFile {
+	type Reader = io::Cursor<&'static [u8]>;
+
+	fn content_type(&self) -> &Mime {
+		&self.content_type
+	}
+
+	fn into_reader(self) -> Self::Reader {
+		self.content
+	}
+}
--- a/dapps/src/page/handler.rs
+++ b/dapps/src/page/handler.rs
@@ -0,0 +1,116 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::io;
+use std::time::{Duration, SystemTime};
+use hyper::{self, header, StatusCode};
+use hyper::mime::{self, Mime};
+
+use apps;
+use handlers::{Reader, ContentHandler, add_security_headers};
+use {Embeddable};
+
+/// Represents a file that can be sent to client.
+/// Implementation should keep track of bytes already sent internally.
+pub trait DappFile {
+	/// A reader type returned by this file.
+	type Reader: io::Read;
+
+	/// Returns a content-type of this file.
+	fn content_type(&self) -> &Mime;
+
+	/// Convert this file into io::Read instance.
+	fn into_reader(self) -> Self::Reader where Self: Sized;
+}
+
+/// Defines what cache headers should be appended to returned resources.
+#[derive(Debug, Copy, Clone, PartialEq)]
+pub enum PageCache {
+	Enabled,
+	Disabled,
+}
+
+impl Default for PageCache {
+	fn default() -> Self {
+		PageCache::Disabled
+	}
+}
+
+/// A handler for a single webapp.
+/// Resolves correct paths and serves as a plumbing code between
+/// hyper server and dapp.
+pub struct PageHandler<T: DappFile> {
+	/// File currently being served
+	pub file: Option<T>,
+	/// Flag indicating if the file can be safely embeded (put in iframe).
+	pub safe_to_embed_on: Embeddable,
+	/// Cache settings for this page.
+	pub cache: PageCache,
+	/// Allow JS unsafe-eval.
+	pub allow_js_eval: bool,
+}
+
+impl<T: DappFile> PageHandler<T> {
+	pub fn into_response(self) -> (Option<Reader<T::Reader>>, hyper::Response) {
+		let file = match self.file {
+			None => return (None, ContentHandler::error(
+				StatusCode::NotFound,
+				"File not found",
+				"Requested file has not been found.",
+				None,
+				self.safe_to_embed_on,
+			).into()),
+			Some(file) => file,
+		};
+
+		let mut res = hyper::Response::new()
+			.with_status(StatusCode::Ok);
+
+		// headers
+		{
+			let mut headers = res.headers_mut();
+
+			if let PageCache::Enabled = self.cache {
+				let validity_secs = 365u32 * 24 * 3600;
+				let validity = Duration::from_secs(validity_secs as u64);
+				headers.set(header::CacheControl(vec![
+					header::CacheDirective::Public,
+					header::CacheDirective::MaxAge(validity_secs),
+				]));
+				headers.set(header::Expires(header::HttpDate::from(SystemTime::now() + validity)));
+			}
+
+			headers.set(header::ContentType(file.content_type().to_owned()));
+
+			add_security_headers(&mut headers, self.safe_to_embed_on, self.allow_js_eval);
+		}
+
+		let initial_content = if file.content_type().to_owned() == mime::TEXT_HTML {
+			let content = &format!(
+				r#"<script src="/{}/inject.js"></script>"#,
+				apps::UTILS_PATH,
+			);
+
+			content.as_bytes().to_vec()
+		} else {
+			Vec::new()
+		};
+
+		let (reader, body) = Reader::pair(file.into_reader(), initial_content);
+		res.set_body(body);
+		(Some(reader), res)
+	}
+}
--- a/dapps/src/page/local.rs
+++ b/dapps/src/page/local.rs
@@ -0,0 +1,148 @@
+// 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 mime_guess;
+use std::{fs, fmt};
+use std::path::{Path, PathBuf};
+use futures::{future};
+use futures_cpupool::CpuPool;
+use page::handler::{self, PageCache};
+use endpoint::{Endpoint, EndpointInfo, EndpointPath, Request, Response};
+use hyper::mime::Mime;
+use Embeddable;
+
+#[derive(Clone)]
+pub struct Dapp {
+	pool: CpuPool,
+	path: PathBuf,
+	mime: Option<Mime>,
+	info: Option<EndpointInfo>,
+	cache: PageCache,
+	embeddable_on: Embeddable,
+}
+
+impl fmt::Debug for Dapp {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		fmt.debug_struct("Dapp")
+			.field("path", &self.path)
+			.field("mime", &self.mime)
+			.field("info", &self.info)
+			.field("cache", &self.cache)
+			.field("embeddable_on", &self.embeddable_on)
+			.finish()
+	}
+}
+
+impl Dapp {
+	pub fn new(pool: CpuPool, path: PathBuf, info: EndpointInfo, cache: PageCache, embeddable_on: Embeddable) -> Self {
+		Dapp {
+			pool,
+			path,
+			mime: None,
+			info: Some(info),
+			cache,
+			embeddable_on,
+		}
+	}
+
+	pub fn single_file(pool: CpuPool, path: PathBuf, mime: Mime, cache: PageCache) -> Self {
+		Dapp {
+			pool,
+			path,
+			mime: Some(mime),
+			info: None,
+			cache,
+			embeddable_on: None,
+		}
+	}
+
+	pub fn path(&self) -> PathBuf {
+		self.path.clone()
+	}
+
+	fn get_file(&self, path: &EndpointPath) -> Option<LocalFile> {
+		if let Some(ref mime) = self.mime {
+			return LocalFile::from_path(&self.path, mime.to_owned());
+		}
+
+		let mut file_path = self.path.to_owned();
+
+		if path.has_no_params() {
+			file_path.push("index.html");
+		} else {
+			for part in &path.app_params {
+				file_path.push(part);
+			}
+		}
+
+		let mime = mime_guess::guess_mime_type(&file_path);
+		LocalFile::from_path(&file_path, mime)
+	}
+
+
+	pub fn to_response(&self, path: &EndpointPath) -> Response {
+		let (reader, response) = handler::PageHandler {
+			file: self.get_file(path),
+			cache: self.cache,
+			safe_to_embed_on: self.embeddable_on.clone(),
+			allow_js_eval: self.info.as_ref().and_then(|x| x.allow_js_eval).unwrap_or(false),
+		}.into_response();
+
+		self.pool.spawn(reader).forget();
+
+		Box::new(future::ok(response))
+	}
+}
+
+impl Endpoint for Dapp {
+	fn info(&self) -> Option<&EndpointInfo> {
+		self.info.as_ref()
+	}
+
+	fn respond(&self, path: EndpointPath, _req: Request) -> Response {
+		self.to_response(&path)
+	}
+}
+
+struct LocalFile {
+	content_type: Mime,
+	file: fs::File,
+}
+
+impl LocalFile {
+	fn from_path<P: AsRef<Path>>(path: P, content_type: Mime) -> Option<Self> {
+		trace!(target: "dapps", "Local file: {:?}", path.as_ref());
+		// Check if file exists
+		fs::File::open(&path).ok().map(|file| {
+			LocalFile {
+				content_type,
+				file,
+			}
+		})
+	}
+}
+
+impl handler::DappFile for LocalFile {
+	type Reader = fs::File;
+
+	fn content_type(&self) -> &Mime {
+		&self.content_type
+	}
+
+	fn into_reader(self) -> Self::Reader {
+		self.file
+	}
+}
--- a/dapps/src/page/mod.rs
+++ b/dapps/src/page/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/>.
+
+
+pub mod builtin;
+pub mod local;
+mod handler;
+
+pub use self::handler::PageCache;
+
--- a/dapps/src/proxypac.rs
+++ b/dapps/src/proxypac.rs
@@ -0,0 +1,68 @@
+// 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/>.
+
+//! Serving ProxyPac file
+
+use apps::HOME_PAGE;
+use endpoint::{Endpoint, Request, Response, EndpointPath};
+use futures::future;
+use handlers::ContentHandler;
+use hyper::mime;
+use {address, Embeddable};
+
+pub struct ProxyPac {
+	embeddable: Embeddable,
+	dapps_domain: String,
+}
+
+impl ProxyPac {
+	pub fn boxed(embeddable: Embeddable, dapps_domain: String) -> Box<Endpoint> {
+		Box::new(ProxyPac { embeddable, dapps_domain })
+	}
+}
+
+impl Endpoint for ProxyPac {
+	fn respond(&self, path: EndpointPath, _req: Request) -> Response {
+		let ui = self.embeddable
+			.as_ref()
+			.map(|ref parent| address(&parent.host, parent.port))
+			.unwrap_or_else(|| format!("{}:{}", path.host, path.port));
+
+		let content = format!(
+r#"
+function FindProxyForURL(url, host) {{
+	if (shExpMatch(host, "{0}.{1}"))
+	{{
+		return "PROXY {4}";
+	}}
+
+	if (shExpMatch(host, "*.{1}"))
+	{{
+		return "PROXY {2}:{3}";
+	}}
+
+	return "DIRECT";
+}}
+"#,
+		HOME_PAGE, self.dapps_domain, path.host, path.port, ui);
+
+		Box::new(future::ok(
+			ContentHandler::ok(content, mime::TEXT_JAVASCRIPT).into()
+		))
+	}
+}
+
+
--- a/dapps/src/router.rs
+++ b/dapps/src/router.rs
@@ -0,0 +1,417 @@
+// 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/>.
+
+//! Router implementation
+//! Dispatch requests to proper application.
+
+use std::sync::Arc;
+use std::collections::HashMap;
+
+use futures::future;
+use hyper::{self, header, Uri};
+use jsonrpc_http_server as http;
+
+use apps;
+use apps::fetcher::Fetcher;
+use endpoint::{self, Endpoint, EndpointPath};
+use Endpoints;
+use handlers;
+use Embeddable;
+
+/// Special endpoints are accessible on every domain (every dapp)
+#[derive(Debug, PartialEq, Hash, Eq)]
+pub enum SpecialEndpoint {
+	Rpc,
+	Api,
+	Utils,
+	Home,
+	None,
+}
+
+enum Response {
+	Some(endpoint::Response),
+	None(hyper::Request),
+}
+
+/// An endpoint router.
+/// Dispatches the request to particular Endpoint by requested uri/path.
+pub struct Router {
+	endpoints: Option<Endpoints>,
+	fetch: Arc<Fetcher>,
+	special: HashMap<SpecialEndpoint, Option<Box<Endpoint>>>,
+	embeddable_on: Embeddable,
+	dapps_domain: String,
+}
+
+impl Router {
+	fn resolve_request(&self, req: hyper::Request, refresh_dapps: bool) -> (bool, Response) {
+		// Choose proper handler depending on path / domain
+		let endpoint = extract_endpoint(req.uri(), req.headers().get(), &self.dapps_domain);
+		let referer = extract_referer_endpoint(&req, &self.dapps_domain);
+		let is_utils = endpoint.1 == SpecialEndpoint::Utils;
+		let is_get_request = *req.method() == hyper::Method::Get;
+		let is_head_request = *req.method() == hyper::Method::Head;
+		let has_dapp = |dapp: &str| self.endpoints
+			.as_ref()
+			.map_or(false, |endpoints| endpoints.endpoints.read().contains_key(dapp));
+
+		trace!(target: "dapps", "Routing request to {:?}. Details: {:?}", req.uri(), req);
+		debug!(target: "dapps", "Handling endpoint request: {:?}, referer: {:?}", endpoint, referer);
+
+		(is_utils, match (endpoint.0, endpoint.1, referer) {
+			// Handle invalid web requests that we can recover from
+			(ref path, SpecialEndpoint::None, Some(ref referer))
+				if referer.app_id == apps::WEB_PATH
+					&& has_dapp(apps::WEB_PATH)
+					&& !is_web_endpoint(path)
+				=>
+			{
+				let token = referer.app_params.get(0).map(String::as_str).unwrap_or("");
+				let requested = req.uri().path();
+				let query = req.uri().query().map_or_else(String::new, |query| format!("?{}", query));
+				let redirect_url = format!("/{}/{}{}{}", apps::WEB_PATH, token, requested, query);
+				trace!(target: "dapps", "Redirecting to correct web request: {:?}", redirect_url);
+				Response::Some(Box::new(future::ok(
+					handlers::Redirection::new(redirect_url).into()
+				)))
+			},
+			// First check special endpoints
+			(ref path, ref endpoint, _) if self.special.contains_key(endpoint) => {
+				trace!(target: "dapps", "Resolving to special endpoint.");
+				let special = self.special.get(endpoint).expect("special known to contain key; qed");
+				match *special {
+					Some(ref special) => Response::Some(special.respond(path.clone().unwrap_or_default(), req)),
+					None => Response::None(req),
+				}
+			},
+			// Then delegate to dapp
+			(Some(ref path), _, _) if has_dapp(&path.app_id) => {
+				trace!(target: "dapps", "Resolving to local/builtin dapp.");
+				Response::Some(self.endpoints
+					.as_ref()
+					.expect("endpoints known to be set; qed")
+					.endpoints
+					.read()
+					.get(&path.app_id)
+					.expect("endpoints known to contain key; qed")
+					.respond(path.clone(), req))
+			},
+			// Try to resolve and fetch the dapp
+			(Some(ref path), _, _) if self.fetch.contains(&path.app_id) => {
+				trace!(target: "dapps", "Resolving to fetchable content.");
+				Response::Some(self.fetch.respond(path.clone(), req))
+			},
+			// 404 for non-existent content (only if serving endpoints and not homepage)
+			(Some(ref path), _, _)
+				if (is_get_request || is_head_request)
+					&& self.endpoints.is_some()
+					&& path.app_id != apps::HOME_PAGE
+				=>
+			{
+				trace!(target: "dapps", "Resolving to 404.");
+				if refresh_dapps {
+					debug!(target: "dapps", "Refreshing dapps and re-trying.");
+					self.endpoints.as_ref().map(|endpoints| endpoints.refresh_local_dapps());
+					return self.resolve_request(req, false);
+				} else {
+					Response::Some(Box::new(future::ok(handlers::ContentHandler::error(
+						hyper::StatusCode::NotFound,
+						"404 Not Found",
+						"Requested content was not found.",
+						None,
+						self.embeddable_on.clone(),
+					).into())))
+				}
+			},
+			// Any other GET|HEAD requests to home page.
+			_ if (is_get_request || is_head_request) && self.special.contains_key(&SpecialEndpoint::Home) => {
+				trace!(target: "dapps", "Resolving to home page.");
+				let special = self.special.get(&SpecialEndpoint::Home).expect("special known to contain key; qed");
+				match *special {
+					Some(ref special) => {
+						let mut endpoint = EndpointPath::default();
+						endpoint.app_params = req.uri().path().split('/').map(str::to_owned).collect();
+						Response::Some(special.respond(endpoint, req))
+					},
+					None => Response::None(req),
+				}
+			},
+			// RPC by default
+			_ if self.special.contains_key(&SpecialEndpoint::Rpc) => {
+				trace!(target: "dapps", "Resolving to RPC call.");
+				Response::None(req)
+			},
+			// 404 otherwise
+			_ => {
+				Response::Some(Box::new(future::ok(handlers::ContentHandler::error(
+					hyper::StatusCode::NotFound,
+					"404 Not Found",
+					"Requested content was not found.",
+					None,
+					self.embeddable_on.clone(),
+				).into())))
+			},
+		})
+	}
+}
+
+impl http::RequestMiddleware for Router {
+	fn on_request(&self, req: hyper::Request) -> http::RequestMiddlewareAction {
+		let is_origin_set = req.headers().get::<header::Origin>().is_some();
+		let (is_utils, response) = self.resolve_request(req, self.endpoints.is_some());
+		match response {
+			Response::Some(response) => http::RequestMiddlewareAction::Respond {
+				should_validate_hosts: !is_utils,
+				response,
+			},
+			Response::None(request) => http::RequestMiddlewareAction::Proceed {
+				should_continue_on_invalid_cors: !is_origin_set,
+				request,
+			},
+		}
+	}
+}
+
+impl Router {
+	pub fn new(
+		content_fetcher: Arc<Fetcher>,
+		endpoints: Option<Endpoints>,
+		special: HashMap<SpecialEndpoint, Option<Box<Endpoint>>>,
+		embeddable_on: Embeddable,
+		dapps_domain: String,
+	) -> Self {
+		Router {
+			endpoints: endpoints,
+			fetch: content_fetcher,
+			special: special,
+			embeddable_on: embeddable_on,
+			dapps_domain: format!(".{}", dapps_domain),
+		}
+	}
+}
+
+fn is_web_endpoint(path: &Option<EndpointPath>) -> bool {
+	match *path {
+		Some(ref path) if path.app_id == apps::WEB_PATH => true,
+		_ => false,
+	}
+}
+
+fn extract_referer_endpoint(req: &hyper::Request, dapps_domain: &str) -> Option<EndpointPath> {
+	let referer = req.headers().get::<header::Referer>();
+
+	let url = referer.and_then(|referer| referer.parse().ok());
+	url.and_then(|url| {
+		extract_url_referer_endpoint(&url, dapps_domain).or_else(|| {
+			extract_endpoint(&url, None, dapps_domain).0
+		})
+	})
+}
+
+fn extract_url_referer_endpoint(url: &Uri, dapps_domain: &str) -> Option<EndpointPath> {
+	let query = url.query();
+	match query {
+		Some(query) if query.starts_with(apps::URL_REFERER) => {
+			let scheme = url.scheme().unwrap_or("http");
+			let host = url.host().unwrap_or("unknown");
+			let port = default_port(url, None);
+			let referer_url = format!("{}://{}:{}/{}", scheme, host, port, &query[apps::URL_REFERER.len()..]);
+			debug!(target: "dapps", "Recovering referer from query parameter: {}", referer_url);
+
+			if let Some(referer_url) = referer_url.parse().ok() {
+				extract_endpoint(&referer_url, None, dapps_domain).0
+			} else {
+				None
+			}
+		},
+		_ => None,
+	}
+}
+
+fn extract_endpoint(url: &Uri, extra_host: Option<&header::Host>, dapps_domain: &str) -> (Option<EndpointPath>, SpecialEndpoint) {
+	fn special_endpoint(path: &[&str]) -> SpecialEndpoint {
+		if path.len() <= 1 {
+			return SpecialEndpoint::None;
+		}
+
+		match path[0].as_ref() {
+			apps::RPC_PATH => SpecialEndpoint::Rpc,
+			apps::API_PATH => SpecialEndpoint::Api,
+			apps::UTILS_PATH => SpecialEndpoint::Utils,
+			apps::HOME_PAGE => SpecialEndpoint::Home,
+			_ => SpecialEndpoint::None,
+		}
+	}
+
+	let port = default_port(url, extra_host.as_ref().and_then(|h| h.port()));
+	let host = url.host().or_else(|| extra_host.as_ref().map(|h| h.hostname()));
+	let query = url.query().map(str::to_owned);
+	let mut path_segments = url.path().split('/').skip(1).collect::<Vec<_>>();
+	trace!(
+		target: "dapps",
+		"Extracting endpoint from: {:?} (dapps: {}). Got host {:?}:{} with path {:?}",
+		url, dapps_domain, host, port, path_segments
+	);
+	match host {
+		Some(host) if host.ends_with(dapps_domain) => {
+			let id = &host[0..(host.len() - dapps_domain.len())];
+			let special = special_endpoint(&path_segments);
+
+			// remove special endpoint id from params
+			if special != SpecialEndpoint::None {
+				path_segments.remove(0);
+			}
+
+			let (app_id, app_params) = if let Some(split) = id.rfind('.') {
+				let (params, id) = id.split_at(split);
+				path_segments.insert(0, params);
+				(id[1..].to_owned(), path_segments)
+			} else {
+				(id.to_owned(), path_segments)
+			};
+
+			(Some(EndpointPath {
+				app_id,
+				app_params: app_params.into_iter().map(Into::into).collect(),
+				query,
+				host: host.to_owned(),
+				port,
+				using_dapps_domains: true,
+			}), special)
+		},
+		Some(host) if path_segments.len() > 1 => {
+			let special = special_endpoint(&path_segments);
+			let id = path_segments.remove(0);
+			(Some(EndpointPath {
+				app_id: id.to_owned(),
+				app_params: path_segments.into_iter().map(Into::into).collect(),
+				query,
+				host: host.to_owned(),
+				port,
+				using_dapps_domains: false,
+			}), special)
+		},
+		_ => (None, special_endpoint(&path_segments)),
+	}
+}
+
+fn default_port(url: &Uri, extra_port: Option<u16>) -> u16 {
+	let scheme = url.scheme().unwrap_or("http");
+	url.port().or(extra_port).unwrap_or_else(|| match scheme {
+		"http" => 80,
+		"https" => 443,
+		_ => 80,
+	})
+}
+
+#[cfg(test)]
+mod tests {
+	use super::{SpecialEndpoint, EndpointPath, extract_endpoint};
+
+	#[test]
+	fn should_extract_endpoint() {
+		let dapps_domain = ".web3.site";
+
+		// With path prefix
+		assert_eq!(
+			extract_endpoint(&"http://localhost:8080/status/index.html?q=1".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["index.html".to_owned()],
+				query: Some("q=1".into()),
+				host: "localhost".to_owned(),
+				port: 8080,
+				using_dapps_domains: false,
+			}), SpecialEndpoint::None)
+		);
+
+		// With path prefix
+		assert_eq!(
+			extract_endpoint(&"http://localhost:8080/rpc/".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "rpc".to_owned(),
+				app_params: vec!["".to_owned()],
+				query: None,
+				host: "localhost".to_owned(),
+				port: 8080,
+				using_dapps_domains: false,
+			}), SpecialEndpoint::Rpc)
+		);
+
+		assert_eq!(
+			extract_endpoint(&"http://my.status.web3.site/parity-utils/inject.js".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["my".into(), "inject.js".into()],
+				query: None,
+				host: "my.status.web3.site".to_owned(),
+				port: 80,
+				using_dapps_domains: true,
+			}), SpecialEndpoint::Utils)
+		);
+
+		assert_eq!(
+			extract_endpoint(&"http://my.status.web3.site/inject.js".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["my".into(), "inject.js".into()],
+				query: None,
+				host: "my.status.web3.site".to_owned(),
+				port: 80,
+				using_dapps_domains: true,
+			}), SpecialEndpoint::None)
+		);
+
+		// By Subdomain
+		assert_eq!(
+			extract_endpoint(&"http://status.web3.site/test.html".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["test.html".to_owned()],
+				query: None,
+				host: "status.web3.site".to_owned(),
+				port: 80,
+				using_dapps_domains: true,
+			}), SpecialEndpoint::None)
+		);
+
+		// RPC by subdomain
+		assert_eq!(
+			extract_endpoint(&"http://my.status.web3.site/rpc/".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["my".into(), "".into()],
+				query: None,
+				host: "my.status.web3.site".to_owned(),
+				port: 80,
+				using_dapps_domains: true,
+			}), SpecialEndpoint::Rpc)
+		);
+
+		// API by subdomain
+		assert_eq!(
+			extract_endpoint(&"http://my.status.web3.site/api/".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["my".into(), "".into()],
+				query: None,
+				host: "my.status.web3.site".to_owned(),
+				port: 80,
+				using_dapps_domains: true,
+			}), SpecialEndpoint::Api)
+		);
+	}
+}
--- a/dapps/src/tests/api.rs
+++ b/dapps/src/tests/api.rs
@@ -0,0 +1,86 @@
+// 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 tests::helpers::{serve, serve_with_registrar, request, assert_security_headers};
+
+#[test]
+fn should_return_error() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			GET /api/empty HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 404 Not Found");
+	response.assert_header("Content-Type", "application/json");
+	assert_eq!(response.body, format!("58\n{}\n0\n\n", r#"{"code":"404","title":"Not Found","detail":"Resource you requested has not been found."}"#));
+	assert_security_headers(&response.headers);
+}
+
+#[test]
+fn should_handle_ping() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			POST /api/ping HTTP/1.1\r\n\
+			Host: home.parity\r\n\
+			Content-Type: application/json\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	response.assert_header("Content-Type", "application/json");
+	assert_eq!(response.body, "0\n\n".to_owned());
+	assert_security_headers(&response.headers);
+}
+
+
+#[test]
+fn should_try_to_resolve_dapp() {
+	// given
+	let (server, registrar) = serve_with_registrar();
+
+	// when
+	let response = request(server,
+		"\
+			GET /api/content/1472a9e190620cdf6b31f383373e45efcfe869a820c91f9ccd7eb9fb45e4985d HTTP/1.1\r\n\
+			Host: home.parity\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 404 Not Found");
+	assert_eq!(registrar.calls.lock().len(), 2);
+	assert_security_headers(&response.headers);
+}
--- a/dapps/src/tests/fetch.rs
+++ b/dapps/src/tests/fetch.rs
@@ -0,0 +1,545 @@
+// 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 devtools::http_client;
+use rustc_hex::FromHex;
+use tests::helpers::{
+	serve_with_registrar, serve_with_registrar_and_sync, serve_with_fetch,
+	serve_with_registrar_and_fetch,
+	request, assert_security_headers_for_embed,
+};
+
+#[test]
+fn should_resolve_dapp() {
+	// given
+	let (server, registrar) = serve_with_registrar();
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: 1472a9e190620cdf6b31f383373e45efcfe869a820c91f9ccd7eb9fb45e4985d.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 404 Not Found");
+	assert_eq!(registrar.calls.lock().len(), 4);
+	assert_security_headers_for_embed(&response.headers);
+}
+
+#[test]
+fn should_return_503_when_syncing_but_should_make_the_calls() {
+	// given
+	let (server, registrar) = serve_with_registrar_and_sync();
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: 1472a9e190620cdf6b31f383373e45efcfe869a820c91f9ccd7eb9fb45e4985d.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 503 Service Unavailable");
+	assert_eq!(registrar.calls.lock().len(), 2);
+	assert_security_headers_for_embed(&response.headers);
+}
+
+const GAVCOIN_DAPP: &'static str = "00000000000000000000000000000000000000000000000000000000000000609faf32e1e3845e237cc6efd27187cee13b3b99db000000000000000000000000000000000000000000000000d8bd350823e28ff75e74a34215faefdc8a52fd8e00000000000000000000000000000000000000000000000000000000000000116761766f66796f726b2f676176636f696e000000000000000000000000000000";
+const GAVCOIN_ICON: &'static str = "00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d8bd350823e28ff75e74a34215faefdc8a52fd8e000000000000000000000000000000000000000000000000000000000000007768747470733a2f2f7261772e67697468756275736572636f6e74656e742e636f6d2f657468636f72652f646170702d6173736574732f623838653938336162616131613661363334356238643934343863313562313137646462353430652f746f6b656e732f676176636f696e2d36347836342e706e67000000000000000000";
+
+#[test]
+fn should_return_502_on_hash_mismatch() {
+	// given
+	let (server, fetch, registrar) = serve_with_registrar_and_fetch();
+	let gavcoin = GAVCOIN_DAPP.from_hex().unwrap();
+	registrar.set_result(
+		"94f093625c06887d94d9fee0d5f9cc4aaa46f33d24d1c7e4b5237e7c37d547dd".parse().unwrap(),
+		Ok(gavcoin.clone())
+	);
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: 94f093625c06887d94d9fee0d5f9cc4aaa46f33d24d1c7e4b5237e7c37d547dd.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	assert_eq!(registrar.calls.lock().len(), 4);
+
+	fetch.assert_requested("https://codeload.github.com/gavofyork/gavcoin/zip/9faf32e1e3845e237cc6efd27187cee13b3b99db");
+	fetch.assert_no_more_requests();
+
+	response.assert_status("HTTP/1.1 502 Bad Gateway");
+	assert!(response.body.contains("HashMismatch"), "Expected hash mismatch response, got: {:?}", response.body);
+	assert_security_headers_for_embed(&response.headers);
+}
+
+#[test]
+fn should_return_error_for_invalid_dapp_zip() {
+	// given
+	let (server, fetch, registrar) = serve_with_registrar_and_fetch();
+	let gavcoin = GAVCOIN_DAPP.from_hex().unwrap();
+	registrar.set_result(
+		"2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e".parse().unwrap(),
+		Ok(gavcoin.clone())
+	);
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	assert_eq!(registrar.calls.lock().len(), 4);
+
+	fetch.assert_requested("https://codeload.github.com/gavofyork/gavcoin/zip/9faf32e1e3845e237cc6efd27187cee13b3b99db");
+	fetch.assert_no_more_requests();
+
+	response.assert_status("HTTP/1.1 502 Bad Gateway");
+	assert!(response.body.contains("InvalidArchive"), "Expected invalid zip response, got: {:?}", response.body);
+	assert_security_headers_for_embed(&response.headers);
+}
+
+#[test]
+fn should_return_fetched_dapp_content() {
+	// given
+	let (server, fetch, registrar) = serve_with_registrar_and_fetch();
+	let gavcoin = GAVCOIN_DAPP.from_hex().unwrap();
+	registrar.set_result(
+		"9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a".parse().unwrap(),
+		Ok(gavcoin.clone())
+	);
+	fetch.set_response(include_bytes!("../../res/gavcoin.zip"));
+
+	// when
+	let response1 = http_client::request(server.addr(),
+		"\
+			GET /index.html HTTP/1.1\r\n\
+			Host: 9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+	let response2 = http_client::request(server.addr(),
+		"\
+			GET /manifest.json HTTP/1.1\r\n\
+			Host: 9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	assert_eq!(registrar.calls.lock().len(), 4);
+
+	fetch.assert_requested("https://codeload.github.com/gavofyork/gavcoin/zip/9faf32e1e3845e237cc6efd27187cee13b3b99db");
+	fetch.assert_no_more_requests();
+
+	response1.assert_status("HTTP/1.1 200 OK");
+	assert_security_headers_for_embed(&response1.headers);
+	assert!(
+		response1.body.contains(r#"18
+<h1>Hello Gavcoin!</h1>
+
+0
+
+"#),
+		"Expected Gavcoin body: {}",
+		response1.body
+	);
+
+	response2.assert_status("HTTP/1.1 200 OK");
+	assert_security_headers_for_embed(&response2.headers);
+	assert_eq!(
+		response2.body,
+		r#"EA
+{
+  "id": "9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a",
+  "name": "Gavcoin",
+  "description": "Gavcoin",
+  "version": "1.0.0",
+  "author": "",
+  "iconUrl": "icon.png",
+  "localUrl": null,
+  "allowJsEval": false
+}
+0
+
+"#
+	);
+}
+
+#[test]
+fn should_return_fetched_content() {
+	// given
+	let (server, fetch, registrar) = serve_with_registrar_and_fetch();
+	let gavcoin = GAVCOIN_ICON.from_hex().unwrap();
+	registrar.set_result(
+		"2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e".parse().unwrap(),
+		Ok(gavcoin.clone())
+	);
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	assert_eq!(registrar.calls.lock().len(), 4);
+
+	fetch.assert_requested("https://raw.githubusercontent.com/ethcore/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/tokens/gavcoin-64x64.png");
+	fetch.assert_no_more_requests();
+
+	response.assert_status("HTTP/1.1 200 OK");
+	response.assert_security_headers_present(None);
+}
+
+#[test]
+fn should_cache_content() {
+	// given
+	let (server, fetch, registrar) = serve_with_registrar_and_fetch();
+	let gavcoin = GAVCOIN_ICON.from_hex().unwrap();
+	registrar.set_result(
+		"2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e".parse().unwrap(),
+		Ok(gavcoin.clone())
+	);
+	let request_str = "\
+		GET / HTTP/1.1\r\n\
+		Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.web3.site\r\n\
+		Connection: close\r\n\
+		\r\n\
+	";
+
+	let response = http_client::request(server.addr(), request_str);
+	fetch.assert_requested("https://raw.githubusercontent.com/ethcore/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/tokens/gavcoin-64x64.png");
+	fetch.assert_no_more_requests();
+	response.assert_status("HTTP/1.1 200 OK");
+
+	// when
+	let response = http_client::request(server.addr(), request_str);
+
+	// then
+	fetch.assert_no_more_requests();
+	response.assert_status("HTTP/1.1 200 OK");
+}
+
+#[test]
+fn should_not_request_content_twice() {
+	use std::thread;
+
+	// given
+	let (server, fetch, registrar) = serve_with_registrar_and_fetch();
+	let gavcoin = GAVCOIN_ICON.from_hex().unwrap();
+	registrar.set_result(
+		"2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e".parse().unwrap(),
+		Ok(gavcoin.clone())
+	);
+	let request_str = "\
+		GET / HTTP/1.1\r\n\
+		Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.web3.site\r\n\
+		Connection: close\r\n\
+		\r\n\
+	";
+	let fire_request = || {
+		let addr = server.addr().to_owned();
+		let req = request_str.to_owned();
+		thread::spawn(move || {
+			http_client::request(&addr, &req)
+		})
+	};
+	let control = fetch.manual();
+
+	// when
+
+	// Fire two requests at the same time
+	let r1 = fire_request();
+	let r2 = fire_request();
+
+	// wait for single request in fetch, the second one should go into waiting state.
+	control.wait_for_requests(1);
+	control.respond();
+
+	let response1 = r1.join().unwrap();
+	let response2 = r2.join().unwrap();
+
+	// then
+	fetch.assert_requested("https://raw.githubusercontent.com/ethcore/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/tokens/gavcoin-64x64.png");
+	fetch.assert_no_more_requests();
+	response1.assert_status("HTTP/1.1 200 OK");
+	response2.assert_status("HTTP/1.1 200 OK");
+}
+
+#[test]
+fn should_encode_and_decode_base32() {
+	use base32;
+
+	let encoded = base32::encode(base32::Alphabet::Crockford, "token+https://parity.io".as_bytes());
+	assert_eq!("EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY", &encoded);
+
+	let data = base32::decode(base32::Alphabet::Crockford, "EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY").unwrap();
+	assert_eq!("token+https://parity.io", &String::from_utf8(data).unwrap());
+}
+
+#[test]
+fn should_stream_web_content() {
+	// given
+	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY.web.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	assert_security_headers_for_embed(&response.headers);
+
+	fetch.assert_requested("https://parity.io/");
+	fetch.assert_no_more_requests();
+}
+
+#[test]
+fn should_support_base32_encoded_web_urls() {
+	// given
+	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
+
+	// when
+	let response = request(server,
+		"\
+			GET /styles.css?test=123 HTTP/1.1\r\n\
+			Host: EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY.web.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	assert_security_headers_for_embed(&response.headers);
+
+	fetch.assert_requested("https://parity.io/styles.css?test=123");
+	fetch.assert_no_more_requests();
+}
+
+#[test]
+fn should_correctly_handle_long_label_when_splitted() {
+	// given
+	let (server, fetch) = serve_with_fetch("xolrg9fePeQyKLnL", "https://contribution.melonport.com");
+
+	// when
+	let response = request(server,
+		"\
+			GET /styles.css?test=123 HTTP/1.1\r\n\
+			Host: f1qprwk775k6am35a5wmpk3e9gnpgx3me1sk.mbsfcdqpwx3jd5h7ax39dxq2wvb5dhqpww3fe9t2wrvfdm.web.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	assert_security_headers_for_embed(&response.headers);
+
+	fetch.assert_requested("https://contribution.melonport.com/styles.css?test=123");
+	fetch.assert_no_more_requests();
+}
+
+
+#[test]
+fn should_support_base32_encoded_web_urls_as_path() {
+	// given
+	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
+
+	// when
+	let response = request(server,
+		"\
+			GET /web/EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY/styles.css?test=123 HTTP/1.1\r\n\
+			Host: localhost:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	assert_security_headers_for_embed(&response.headers);
+
+	fetch.assert_requested("https://parity.io/styles.css?test=123");
+	fetch.assert_no_more_requests();
+}
+
+#[test]
+fn should_return_error_on_non_whitelisted_domain() {
+	// given
+	let (server, fetch) = serve_with_fetch("token", "https://ethcore.io");
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY.web.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 400 Bad Request");
+	assert_security_headers_for_embed(&response.headers);
+
+	fetch.assert_no_more_requests();
+}
+
+#[test]
+fn should_return_error_on_invalid_token() {
+	// given
+	let (server, fetch) = serve_with_fetch("test", "https://parity.io");
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY.web.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 400 Bad Request");
+	assert_security_headers_for_embed(&response.headers);
+
+	fetch.assert_no_more_requests();
+}
+
+#[test]
+fn should_return_error_on_invalid_protocol() {
+	// given
+	let (server, fetch) = serve_with_fetch("token", "ftp://parity.io");
+
+	// when
+	let response = request(server,
+		"\
+			GET /web/token/ftp/parity.io/ HTTP/1.1\r\n\
+			Host: localhost:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 400 Bad Request");
+	assert_security_headers_for_embed(&response.headers);
+
+	fetch.assert_no_more_requests();
+}
+
+#[test]
+fn should_disallow_non_get_requests() {
+	// given
+	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
+
+	// when
+	let response = request(server,
+		"\
+			POST / HTTP/1.1\r\n\
+			Host: EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY.web.web3.site\r\n\
+			Content-Type: application/json\r\n\
+			Connection: close\r\n\
+			\r\n\
+			123\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 405 Method Not Allowed");
+	assert_security_headers_for_embed(&response.headers);
+
+	fetch.assert_no_more_requests();
+}
+
+#[test]
+fn should_fix_absolute_requests_based_on_referer() {
+	// given
+	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
+
+	// when
+	let response = request(server,
+		"\
+			GET /styles.css HTTP/1.1\r\n\
+			Host: localhost:8080\r\n\
+			Connection: close\r\n\
+			Referer: http://localhost:8080/web/EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY/\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 302 Found");
+	response.assert_header("Location", "/web/EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY/styles.css");
+
+	fetch.assert_no_more_requests();
+}
+
+#[test]
+fn should_fix_absolute_requests_based_on_referer_in_url() {
+	// given
+	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
+
+	// when
+	let response = request(server,
+		"\
+			GET /styles.css HTTP/1.1\r\n\
+			Host: localhost:8080\r\n\
+			Connection: close\r\n\
+			Referer: http://localhost:8080/?__referer=web/EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY/\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 302 Found");
+	response.assert_header("Location", "/web/EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY/styles.css");
+
+	fetch.assert_no_more_requests();
+}
--- a/dapps/src/tests/helpers/fetch.rs
+++ b/dapps/src/tests/helpers/fetch.rs
@@ -0,0 +1,118 @@
+// 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::{thread, time};
+use std::sync::{atomic, mpsc, Arc};
+use parking_lot::Mutex;
+use hyper;
+
+use futures::{self, Future};
+use fetch::{self, Fetch, Url};
+
+pub struct FetchControl {
+	sender: mpsc::Sender<()>,
+	fetch: FakeFetch,
+}
+
+impl FetchControl {
+	pub fn respond(self) {
+		self.sender.send(())
+			.expect("Fetch cannot be finished without sending a response at least once.");
+	}
+
+	pub fn wait_for_requests(&self, len: usize) {
+		const MAX_TIMEOUT_MS: u64 = 5000;
+		const ATTEMPTS: u64 = 10;
+		let mut attempts_left = ATTEMPTS;
+		loop {
+			let current = self.fetch.requested.lock().len();
+
+			if current == len {
+				break;
+			} else if attempts_left == 0 {
+				panic!(
+					"Timeout reached when waiting for pending requests. Expected: {}, current: {}",
+					len, current
+				);
+			} else {
+				attempts_left -= 1;
+				// Should we handle spurious timeouts better?
+				thread::park_timeout(time::Duration::from_millis(MAX_TIMEOUT_MS / ATTEMPTS));
+			}
+		}
+	}
+}
+
+#[derive(Clone, Default)]
+pub struct FakeFetch {
+	manual: Arc<Mutex<Option<mpsc::Receiver<()>>>>,
+	response: Arc<Mutex<Option<&'static [u8]>>>,
+	asserted: Arc<atomic::AtomicUsize>,
+	requested: Arc<Mutex<Vec<String>>>,
+}
+
+impl FakeFetch {
+	pub fn set_response(&self, data: &'static [u8]) {
+		*self.response.lock() = Some(data);
+	}
+
+	pub fn manual(&self) -> FetchControl {
+		assert!(self.manual.lock().is_none(), "Only one manual control may be active.");
+		let (tx, rx) = mpsc::channel();
+		*self.manual.lock() = Some(rx);
+
+		FetchControl {
+			sender: tx,
+			fetch: self.clone(),
+		}
+	}
+
+	pub fn assert_requested(&self, url: &str) {
+		let requests = self.requested.lock();
+		let idx = self.asserted.fetch_add(1, atomic::Ordering::SeqCst);
+
+		assert_eq!(requests.get(idx), Some(&url.to_owned()), "Expected fetch from specific URL.");
+	}
+
+	pub fn assert_no_more_requests(&self) {
+		let requests = self.requested.lock();
+		let len = self.asserted.load(atomic::Ordering::SeqCst);
+		assert_eq!(requests.len(), len, "Didn't expect any more requests, got: {:?}", &requests[len..]);
+	}
+}
+
+impl Fetch for FakeFetch {
+	type Result = Box<Future<Item = fetch::Response, Error = fetch::Error> + Send>;
+
+	fn fetch(&self, url: &str, abort: fetch::Abort) -> Self::Result {
+		let u = Url::parse(url).unwrap();
+		self.requested.lock().push(url.into());
+		let manual = self.manual.clone();
+		let response = self.response.clone();
+
+		let (tx, rx) = futures::oneshot();
+		thread::spawn(move || {
+			if let Some(rx) = manual.lock().take() {
+				// wait for manual resume
+				let _ = rx.recv();
+			}
+			let data = response.lock().take().unwrap_or(b"Some content");
+			tx.send(fetch::Response::new(u, hyper::Response::new().with_body(data), abort)).unwrap();
+		});
+
+		Box::new(rx.map_err(|_| fetch::Error::Aborted))
+	}
+}
--- a/dapps/src/tests/helpers/mod.rs
+++ b/dapps/src/tests/helpers/mod.rs
@@ -0,0 +1,290 @@
+// 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::{env, io, str};
+use std::net::SocketAddr;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+use env_logger::LogBuilder;
+use jsonrpc_core::IoHandler;
+use jsonrpc_http_server::{self as http, Host, DomainsValidation};
+use parity_reactor::Remote;
+
+use devtools::http_client;
+use hash_fetch::urlhint::ContractClient;
+use fetch::{Fetch, Client as FetchClient};
+use node_health::{NodeHealth, TimeChecker, CpuPool};
+
+use {Middleware, SyncStatus, WebProxyTokens};
+
+mod registrar;
+mod fetch;
+
+use self::registrar::FakeRegistrar;
+use self::fetch::FakeFetch;
+
+const SIGNER_PORT: u16 = 18180;
+
+#[derive(Debug)]
+struct FakeSync(bool);
+impl SyncStatus for FakeSync {
+	fn is_major_importing(&self) -> bool { self.0 }
+	fn peers(&self) -> (usize, usize) { (0, 5) }
+}
+
+fn init_logger() {
+	// Initialize logger
+	if let Ok(log) = env::var("RUST_LOG") {
+		let mut builder = LogBuilder::new();
+		builder.parse(&log);
+		let _ = builder.init();	// ignore errors since ./test.sh will call this multiple times.
+	}
+}
+
+pub fn init_server<F, B>(process: F, io: IoHandler) -> (Server, Arc<FakeRegistrar>) where
+	F: FnOnce(ServerBuilder) -> ServerBuilder<B>,
+	B: Fetch,
+{
+	init_logger();
+	let registrar = Arc::new(FakeRegistrar::new());
+	let mut dapps_path = env::temp_dir();
+	dapps_path.push("non-existent-dir-to-prevent-fs-files-from-loading");
+
+	let mut builder = ServerBuilder::new(FetchClient::new().unwrap(), &dapps_path, registrar.clone());
+	builder.signer_address = Some(("127.0.0.1".into(), SIGNER_PORT));
+	let server = process(builder).start_unsecured_http(&"127.0.0.1:0".parse().unwrap(), io).unwrap();
+	(
+		server,
+		registrar,
+	)
+}
+
+pub fn serve_with_rpc(io: IoHandler) -> Server {
+	init_server(|builder| builder, io).0
+}
+
+pub fn serve_hosts(hosts: Option<Vec<String>>) -> Server {
+	let hosts = hosts.map(|hosts| hosts.into_iter().map(Into::into).collect());
+	init_server(|mut builder| {
+		builder.allowed_hosts = hosts.into();
+		builder
+	}, Default::default()).0
+}
+
+pub fn serve_with_registrar() -> (Server, Arc<FakeRegistrar>) {
+	init_server(|builder| builder, Default::default())
+}
+
+pub fn serve_with_registrar_and_sync() -> (Server, Arc<FakeRegistrar>) {
+	init_server(|mut builder| {
+		builder.sync_status = Arc::new(FakeSync(true));
+		builder
+	}, Default::default())
+}
+
+pub fn serve_with_registrar_and_fetch() -> (Server, FakeFetch, Arc<FakeRegistrar>) {
+	let fetch = FakeFetch::default();
+	let f = fetch.clone();
+	let (server, reg) = init_server(move |builder| {
+		builder.fetch(f.clone())
+	}, Default::default());
+
+	(server, fetch, reg)
+}
+
+pub fn serve_with_fetch(web_token: &'static str, domain: &'static str) -> (Server, FakeFetch) {
+	let fetch = FakeFetch::default();
+	let f = fetch.clone();
+	let (server, _) = init_server(move |mut builder| {
+		builder.web_proxy_tokens = Arc::new(move |token| {
+			if &token == web_token { Some(domain.into()) } else { None }
+		});
+		builder.fetch(f.clone())
+	}, Default::default());
+
+	(server, fetch)
+}
+
+pub fn serve() -> Server {
+	init_server(|builder| builder, Default::default()).0
+}
+
+pub fn serve_ui() -> Server {
+	init_server(|mut builder| {
+		builder.serve_ui = true;
+		builder
+	}, Default::default()).0
+}
+
+pub fn request(server: Server, request: &str) -> http_client::Response {
+	http_client::request(server.addr(), request)
+}
+
+pub fn assert_security_headers(headers: &[String]) {
+	http_client::assert_security_headers_present(headers, None)
+}
+pub fn assert_security_headers_for_embed(headers: &[String]) {
+	http_client::assert_security_headers_present(headers, Some(SIGNER_PORT))
+}
+
+
+/// Webapps HTTP+RPC server build.
+pub struct ServerBuilder<T: Fetch = FetchClient> {
+	dapps_path: PathBuf,
+	registrar: Arc<ContractClient>,
+	sync_status: Arc<SyncStatus>,
+	web_proxy_tokens: Arc<WebProxyTokens>,
+	signer_address: Option<(String, u16)>,
+	allowed_hosts: DomainsValidation<Host>,
+	fetch: T,
+	serve_ui: bool,
+}
+
+impl ServerBuilder {
+	/// Construct new dapps server
+	pub fn new<P: AsRef<Path>>(fetch: FetchClient, dapps_path: P, registrar: Arc<ContractClient>) -> Self {
+		ServerBuilder {
+			dapps_path: dapps_path.as_ref().to_owned(),
+			registrar: registrar,
+			sync_status: Arc::new(FakeSync(false)),
+			web_proxy_tokens: Arc::new(|_| None),
+			signer_address: None,
+			allowed_hosts: DomainsValidation::Disabled,
+			fetch: fetch,
+			serve_ui: false,
+		}
+	}
+}
+
+impl<T: Fetch> ServerBuilder<T> {
+	/// Set a fetch client to use.
+	pub fn fetch<X: Fetch>(self, fetch: X) -> ServerBuilder<X> {
+		ServerBuilder {
+			dapps_path: self.dapps_path,
+			registrar: self.registrar,
+			sync_status: self.sync_status,
+			web_proxy_tokens: self.web_proxy_tokens,
+			signer_address: self.signer_address,
+			allowed_hosts: self.allowed_hosts,
+			fetch: fetch,
+			serve_ui: self.serve_ui,
+		}
+	}
+
+	/// Asynchronously start server with no authentication,
+	/// returns result with `Server` handle on success or an error.
+	pub fn start_unsecured_http(self, addr: &SocketAddr, io: IoHandler) -> io::Result<Server> {
+		Server::start_http(
+			addr,
+			io,
+			self.allowed_hosts,
+			self.signer_address,
+			self.dapps_path,
+			vec![],
+			self.registrar,
+			self.sync_status,
+			self.web_proxy_tokens,
+			Remote::new_sync(),
+			self.fetch,
+			self.serve_ui,
+		)
+	}
+}
+
+const DAPPS_DOMAIN: &'static str = "web3.site";
+
+/// Webapps HTTP server.
+pub struct Server {
+	server: Option<http::Server>,
+}
+
+impl Server {
+	fn start_http<F: Fetch>(
+		addr: &SocketAddr,
+		io: IoHandler,
+		allowed_hosts: DomainsValidation<Host>,
+		signer_address: Option<(String, u16)>,
+		dapps_path: PathBuf,
+		extra_dapps: Vec<PathBuf>,
+		registrar: Arc<ContractClient>,
+		sync_status: Arc<SyncStatus>,
+		web_proxy_tokens: Arc<WebProxyTokens>,
+		remote: Remote,
+		fetch: F,
+		serve_ui: bool,
+	) -> io::Result<Server> {
+		let health = NodeHealth::new(
+			sync_status.clone(),
+			TimeChecker::new::<String>(&[], CpuPool::new(1)),
+			remote.clone(),
+		);
+		let pool = ::futures_cpupool::CpuPool::new(1);
+		let middleware = if serve_ui {
+			Middleware::ui(
+				pool,
+				health,
+				DAPPS_DOMAIN.into(),
+				registrar,
+				sync_status,
+				fetch,
+				false,
+			)
+		} else {
+			Middleware::dapps(
+				pool,
+				health,
+				signer_address,
+				vec![],
+				vec![],
+				dapps_path,
+				extra_dapps,
+				DAPPS_DOMAIN.into(),
+				registrar,
+				sync_status,
+				web_proxy_tokens,
+				fetch,
+			)
+		};
+
+		let mut allowed_hosts: Option<Vec<Host>> = allowed_hosts.into();
+		allowed_hosts.as_mut().map(|hosts| {
+			hosts.push(format!("http://*.{}:*", DAPPS_DOMAIN).into());
+			hosts.push(format!("http://*.{}", DAPPS_DOMAIN).into());
+		});
+
+		http::ServerBuilder::new(io)
+			.request_middleware(middleware)
+			.allowed_hosts(allowed_hosts.into())
+			.cors(http::DomainsValidation::Disabled)
+			.start_http(addr)
+			.map(|server| Server {
+				server: Some(server),
+			})
+	}
+
+	/// Returns address that this server is bound to.
+	pub fn addr(&self) -> &SocketAddr {
+		self.server.as_ref()
+			.expect("server is always Some at the start; it's consumed only when object is dropped; qed")
+			.address()
+	}
+}
+
+impl Drop for Server {
+	fn drop(&mut self) {
+		self.server.take().unwrap().close()
+	}
+}
--- a/dapps/src/tests/helpers/registrar.rs
+++ b/dapps/src/tests/helpers/registrar.rs
@@ -0,0 +1,76 @@
+// 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::str;
+use std::sync::Arc;
+use std::collections::HashMap;
+
+use futures::Future;
+use ethereum_types::{H256, Address};
+use bytes::{Bytes, ToPretty};
+use hash_fetch::urlhint::ContractClient;
+use parking_lot::Mutex;
+use rustc_hex::FromHex;
+
+const REGISTRAR: &'static str = "8e4e9b13d4b45cb0befc93c3061b1408f67316b2";
+const URLHINT: &'static str = "deadbeefcafe0000000000000000000000000000";
+const URLHINT_RESOLVE: &'static str = "267b6922";
+const DEFAULT_HASH: &'static str = "1472a9e190620cdf6b31f383373e45efcfe869a820c91f9ccd7eb9fb45e4985d";
+
+pub struct FakeRegistrar {
+	pub calls: Arc<Mutex<Vec<(String, String)>>>,
+	pub responses: Mutex<HashMap<(String, String), Result<Bytes, String>>>,
+}
+
+impl FakeRegistrar {
+	pub fn new() -> Self {
+		FakeRegistrar {
+			calls: Arc::new(Mutex::new(Vec::new())),
+			responses: Mutex::new({
+				let mut map = HashMap::new();
+				map.insert(
+					(REGISTRAR.into(), "6795dbcd058740ee9a5a3fb9f1cfa10752baec87e09cc45cd7027fd54708271aca300c75000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000014100000000000000000000000000000000000000000000000000000000000000".into()),
+					Ok(format!("000000000000000000000000{}", URLHINT).from_hex().unwrap()),
+				);
+				map.insert(
+					(URLHINT.into(), format!("{}{}", URLHINT_RESOLVE, DEFAULT_HASH)),
+					Ok(vec![])
+				);
+				map
+			}),
+		}
+	}
+
+	pub fn set_result(&self, hash: H256, result: Result<Bytes, String>) {
+		self.responses.lock().insert(
+			(URLHINT.into(), format!("{}{:?}", URLHINT_RESOLVE, hash)),
+			result
+		);
+	}
+}
+
+impl ContractClient for FakeRegistrar {
+	fn registrar(&self) -> Result<Address, String> {
+		Ok(REGISTRAR.parse().unwrap())
+	}
+
+	fn call(&self, address: Address, data: Bytes) -> Box<Future<Item = Bytes, Error = String> + Send> {
+		let call = (address.to_hex(), data.to_hex());
+		self.calls.lock().push(call.clone());
+		let res = self.responses.lock().get(&call).cloned().expect(&format!("No response for call: {:?}", call));
+		Box::new(::futures::future::done(res))
+	}
+}
--- a/dapps/src/tests/home.rs
+++ b/dapps/src/tests/home.rs
@@ -0,0 +1,91 @@
+// 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 tests::helpers::{serve_ui, request, assert_security_headers};
+
+#[test]
+fn should_serve_home_js() {
+	// given
+	let server = serve_ui();
+
+	// when
+	let response = request(server,
+		"\
+			GET /inject.js HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	response.assert_header("Content-Type", "application/javascript");
+	assert_eq!(response.body.contains("function(){"), true, "Expected function in: {}", response.body);
+	assert_security_headers(&response.headers);
+}
+
+#[test]
+fn should_serve_home() {
+	// given
+	let server = serve_ui();
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	response.assert_header("Content-Type", "text/html");
+	assert_security_headers(&response.headers);
+}
+
+
+#[test]
+fn should_inject_js() {
+	// given
+	let server = serve_ui();
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	response.assert_header("Content-Type", "text/html");
+	assert_eq!(
+		response.body.contains(r#"/inject.js"></script>"#),
+		true,
+		"Expected inject script tag in: {}",
+		response.body
+	);
+	assert_security_headers(&response.headers);
+}
--- a/dapps/src/tests/mod.rs
+++ b/dapps/src/tests/mod.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/>.
+
+//! Dapps server test suite
+
+mod helpers;
+
+mod api;
+mod fetch;
+mod home;
+mod redirection;
+mod rpc;
+mod validation;
+
--- a/dapps/src/tests/redirection.rs
+++ b/dapps/src/tests/redirection.rs
@@ -0,0 +1,207 @@
+// 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 tests::helpers::{serve, request, assert_security_headers, assert_security_headers_for_embed};
+
+#[test]
+fn should_redirect_to_home() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 302 Found");
+	assert_eq!(response.headers.get(0).unwrap(), "Location: http://127.0.0.1:18180");
+}
+
+#[test]
+fn should_redirect_to_home_with_domain() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: home.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 302 Found");
+	assert_eq!(response.headers.get(0).unwrap(), "Location: http://127.0.0.1:18180");
+}
+
+#[test]
+fn should_redirect_to_home_when_trailing_slash_is_missing() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			GET /app HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 302 Found");
+	assert_eq!(response.headers.get(0).unwrap(), "Location: http://127.0.0.1:18180");
+}
+
+#[test]
+fn should_display_404_on_invalid_dapp() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			GET /invaliddapp/ HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 404 Not Found");
+	assert_security_headers_for_embed(&response.headers);
+}
+
+#[test]
+fn should_display_404_on_invalid_dapp_with_domain() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: invaliddapp.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 404 Not Found");
+	assert_security_headers_for_embed(&response.headers);
+}
+
+#[test]
+fn should_serve_rpc() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			POST / HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			Content-Type: application/json\r\n
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	assert_eq!(response.body, format!("4C\n{}\n\n0\n\n", r#"{"jsonrpc":"2.0","error":{"code":-32700,"message":"Parse error"},"id":null}"#));
+}
+
+#[test]
+fn should_serve_rpc_at_slash_rpc() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			POST /rpc HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			Content-Type: application/json\r\n
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	assert_eq!(response.body, format!("4C\n{}\n\n0\n\n", r#"{"jsonrpc":"2.0","error":{"code":-32700,"message":"Parse error"},"id":null}"#));
+}
+
+
+#[test]
+fn should_serve_proxy_pac() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			GET /proxy/proxy.pac HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	assert_eq!(response.body, "DB\n\nfunction FindProxyForURL(url, host) {\n\tif (shExpMatch(host, \"home.web3.site\"))\n\t{\n\t\treturn \"PROXY 127.0.0.1:18180\";\n\t}\n\n\tif (shExpMatch(host, \"*.web3.site\"))\n\t{\n\t\treturn \"PROXY 127.0.0.1:8080\";\n\t}\n\n\treturn \"DIRECT\";\n}\n\n0\n\n".to_owned());
+	assert_security_headers(&response.headers);
+}
+
+#[test]
+fn should_serve_utils() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			GET /parity-utils/inject.js HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	response.assert_header("Content-Type", "application/javascript");
+	assert_eq!(response.body.contains("function(){"), true, "Expected function in: {}", response.body);
+	assert_security_headers(&response.headers);
+}
--- a/dapps/src/tests/rpc.rs
+++ b/dapps/src/tests/rpc.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/>.
+
+use jsonrpc_core::{IoHandler, Value};
+
+use tests::helpers::{serve_with_rpc, request};
+
+#[test]
+fn should_serve_rpc() {
+	// given
+	let mut io = IoHandler::default();
+	io.add_method("rpc_test", |_| {
+		Ok(Value::String("Hello World!".into()))
+	});
+	let server = serve_with_rpc(io);
+
+	// when
+	let req = r#"{"jsonrpc":"2.0","id":1,"method":"rpc_test","params":[]}"#;
+	let response = request(server, &format!(
+		"\
+			POST /rpc/ HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			Content-Type: application/json\r\n\
+			Content-Length: {}\r\n\
+			\r\n\
+			{}\r\n\
+		",
+		req.as_bytes().len(),
+		req,
+	));
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	assert_eq!(response.body, "31\n{\"jsonrpc\":\"2.0\",\"result\":\"Hello World!\",\"id\":1}\n\n0\n\n".to_owned());
+}
--- a/dapps/src/tests/validation.rs
+++ b/dapps/src/tests/validation.rs
@@ -0,0 +1,99 @@
+// 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 tests::helpers::{serve_hosts, request};
+
+#[test]
+fn should_reject_invalid_host() {
+	// given
+	let server = serve_hosts(Some(vec!["localhost:8080".into()]));
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 403 Forbidden");
+	assert!(response.body.contains("Provided Host header is not whitelisted."), response.body);
+}
+
+#[test]
+fn should_allow_valid_host() {
+	// given
+	let server = serve_hosts(Some(vec!["localhost:8080".into()]));
+
+	// when
+	let response = request(server,
+		"\
+			GET /ui/ HTTP/1.1\r\n\
+			Host: localhost:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+}
+
+#[test]
+fn should_serve_dapps_domains() {
+	// given
+	let server = serve_hosts(Some(vec!["localhost:8080".into()]));
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: ui.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+}
+
+#[test]
+// NOTE [todr] This is required for error pages to be styled properly.
+fn should_allow_parity_utils_even_on_invalid_domain() {
+	// given
+	let server = serve_hosts(Some(vec!["localhost:8080".into()]));
+
+	// when
+	let response = request(server,
+		"\
+			GET /parity-utils/styles.css HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+}
--- a/dapps/src/web.rs
+++ b/dapps/src/web.rs
@@ -0,0 +1,171 @@
+// 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/>.
+
+//! Serving web-based content (proxying)
+
+use std::sync::Arc;
+
+use base32;
+use fetch::{self, Fetch};
+use hyper::{mime, StatusCode};
+
+use apps;
+use endpoint::{Endpoint, EndpointPath, Request, Response};
+use futures::future;
+use futures_cpupool::CpuPool;
+use handlers::{
+	ContentFetcherHandler, ContentHandler, ContentValidator, ValidatorResponse,
+	StreamingHandler,
+};
+use {Embeddable, WebProxyTokens};
+
+pub struct Web<F> {
+	embeddable_on: Embeddable,
+	web_proxy_tokens: Arc<WebProxyTokens>,
+	fetch: F,
+	pool: CpuPool,
+}
+
+impl<F: Fetch> Web<F> {
+	pub fn boxed(
+		embeddable_on: Embeddable,
+		web_proxy_tokens: Arc<WebProxyTokens>,
+		fetch: F,
+		pool: CpuPool,
+	) -> Box<Endpoint> {
+		Box::new(Web {
+			embeddable_on,
+			web_proxy_tokens,
+			fetch,
+			pool,
+		})
+	}
+
+	fn extract_target_url(&self, path: &EndpointPath) -> Result<String, ContentHandler> {
+		let token_and_url = path.app_params.get(0)
+			.map(|encoded| encoded.replace('.', ""))
+			.and_then(|encoded| base32::decode(base32::Alphabet::Crockford, &encoded.to_uppercase()))
+			.and_then(|data| String::from_utf8(data).ok())
+			.ok_or_else(|| ContentHandler::error(
+				StatusCode::BadRequest,
+				"Invalid parameter",
+				"Couldn't parse given parameter:",
+				path.app_params.get(0).map(String::as_str),
+				self.embeddable_on.clone()
+			))?;
+
+		let mut token_it = token_and_url.split('+');
+		let token = token_it.next();
+		let target_url = token_it.next();
+
+		// Check if token supplied in URL is correct.
+		let domain = match token.and_then(|token| self.web_proxy_tokens.domain(token)) {
+			Some(domain) => domain,
+			_ => {
+				return Err(ContentHandler::error(
+					StatusCode::BadRequest, "Invalid Access Token", "Invalid or old web proxy access token supplied.", Some("Try refreshing the page."), self.embeddable_on.clone()
+				));
+			}
+		};
+
+		// Validate protocol
+		let mut target_url = match target_url {
+			Some(url) if url.starts_with("http://") || url.starts_with("https://") => url.to_owned(),
+			_ => {
+				return Err(ContentHandler::error(
+					StatusCode::BadRequest, "Invalid Protocol", "Invalid protocol used.", None, self.embeddable_on.clone()
+				));
+			}
+		};
+
+		if !target_url.starts_with(&*domain) {
+			return Err(ContentHandler::error(
+				StatusCode::BadRequest, "Invalid Domain", "Dapp attempted to access invalid domain.", Some(&target_url), self.embeddable_on.clone(),
+			));
+		}
+
+		if !target_url.ends_with("/") {
+			target_url = format!("{}/", target_url);
+		}
+
+		// Skip the token
+		let query = path.query.as_ref().map_or_else(String::new, |query| format!("?{}", query));
+		let path = path.app_params[1..].join("/");
+
+		Ok(format!("{}{}{}", target_url, path, query))
+	}
+}
+
+impl<F: Fetch> Endpoint for Web<F> {
+	fn respond(&self, path: EndpointPath, req: Request) -> Response {
+		// First extract the URL (reject invalid URLs)
+		let target_url = match self.extract_target_url(&path) {
+			Ok(url) => url,
+			Err(response) => {
+				return Box::new(future::ok(response.into()));
+			}
+		};
+
+		let token = path.app_params.get(0)
+			.expect("`target_url` is valid; app_params is not empty;qed")
+			.to_owned();
+
+		Box::new(ContentFetcherHandler::new(
+			req.method(),
+			&target_url,
+			path,
+			WebInstaller {
+				embeddable_on: self.embeddable_on.clone(),
+				token,
+			},
+			self.embeddable_on.clone(),
+			self.fetch.clone(),
+			self.pool.clone(),
+		))
+	}
+}
+
+struct WebInstaller {
+	embeddable_on: Embeddable,
+	token: String,
+}
+
+impl ContentValidator for WebInstaller {
+	type Error = String;
+
+	fn validate_and_install(self, response: fetch::Response) -> Result<ValidatorResponse, String> {
+		let status = response.status();
+		let is_html = response.is_html();
+		let mime = response.content_type().unwrap_or(mime::TEXT_HTML);
+		let mut handler = StreamingHandler::new(
+			fetch::BodyReader::new(response),
+			status,
+			mime,
+			self.embeddable_on,
+		);
+		if is_html {
+			handler.set_initial_content(&format!(
+				r#"<script src="/{}/inject.js"></script><script>history.replaceState({{}}, "", "/?{}{}/{}")</script>"#,
+				apps::UTILS_PATH,
+				apps::URL_REFERER,
+				apps::WEB_PATH,
+				&self.token,
+			));
+		}
+		Ok(ValidatorResponse::Streaming(handler))
+	}
+}
+
--- a/dapps/ui-deprecation/Cargo.toml
+++ b/dapps/ui-deprecation/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+description = "Parity UI deprecation notice."
+name = "parity-ui-deprecation"
+version = "1.10.0"
+license = "GPL-3.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+build = "build.rs"
+
+[features]
+default = ["with-syntex", "use-precompiled-js"]
+use-precompiled-js = ["parity-dapps-glue/use-precompiled-js"]
+with-syntex = ["parity-dapps-glue/with-syntex"]
+
+[build-dependencies]
+parity-dapps-glue = "1.9"
+
+[dependencies]
+parity-dapps-glue = "1.9"
--- a/dapps/ui-deprecation/build.rs
+++ b/dapps/ui-deprecation/build.rs
@@ -0,0 +1,21 @@
+// 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/>.
+
+extern crate parity_dapps_glue;
+
+fn main() {
+	parity_dapps_glue::generate();
+}
--- a/dapps/ui-deprecation/build/index.html
+++ b/dapps/ui-deprecation/build/index.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width">
+		<title>Parity</title>
+		<style>
+		/* 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/>.
+		*/
+		:root, :root body {
+		  margin: 0;
+		  padding: 0;
+		  border: 0;
+		  font-size: 100%;
+		  font: inherit;
+		  vertical-align: baseline;
+		  background: rgb(95, 95, 95);
+		  color: rgba(255, 255, 255, 0.75);
+		  font-size: 16px;
+		  font-family: 'Roboto', sans-serif;
+		  font-weight: 300;
+		}
+
+		:root a, :root a:visited {
+		  text-decoration: none;
+		  cursor: pointer;
+		  color: rgb(0, 151, 167); /* #f80 */
+		}
+
+		:root a:hover {
+		  color: rgb(0, 174, 193);
+		}
+
+		h1,h2,h3,h4,h5,h6 {
+		  font-weight: 300;
+		  text-transform: uppercase;
+		  text-decoration: none;
+		}
+
+		h1 {
+		  font-size: 24px;
+		  line-height: 36px;
+		  color: rgb(0, 151, 167);
+		}
+
+		h2 {
+		  font-size: 20px;
+		  line-height: 34px;
+		}
+
+		code,kbd,pre,samp {
+		  font-family: 'Roboto Mono', monospace;
+		}
+
+		.parity-navbar {
+		  background: rgb(65, 65, 65);
+		  height: 72px;
+		  padding: 0 1rem;
+		  display: flex;
+		  justify-content: space-between;
+		}
+
+		.parity-status {
+		  clear: both;
+		  padding: 1rem;
+		  margin: 1rem 0;
+		  text-align: right;
+		  opacity: 0.75;
+		}
+
+		.parity-box {
+		  margin: 1rem;
+		  padding: 1rem;
+		  background-color: rgb(48, 48, 48);
+		  box-sizing: border-box;
+		  box-shadow: rgba(0, 0, 0, 0.117647) 0px 1px 6px, rgba(0, 0, 0, 0.117647) 0px 1px 4px;
+		  border-radius: 2px;
+		  z-index: 1;
+		  color: #aaa;
+		}
+
+		.parity-box h1,
+		.parity-box h2,
+		.parity-box h3,
+		.parity-box h4,
+		.parity-box h5,
+		.parity-box h6 {
+		  margin: 0;
+		}
+		</style>
+	</head>
+	<body>
+		<div class="parity-navbar">
+		</div>
+		<div class="parity-box">
+			<h1>Parity browser UI is deprecated.</h1>
+			<h3>Get a standalone Parity UI from <a href="https://github.com/Parity-JS/shell/releases">here</a></h3>
+			<p>
+
+			</p>
+		</div>
+		<div class="parity-status">
+		</div>
+	</body>
+</html>
--- a/dapps/ui-deprecation/src/lib.rs
+++ b/dapps/ui-deprecation/src/lib.rs
@@ -0,0 +1,21 @@
+// 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/>.
+
+#[cfg(feature = "with-syntex")]
+include!(concat!(env!("OUT_DIR"), "/lib.rs"));
+
+#[cfg(not(feature = "with-syntex"))]
+include!("lib.rs.in");
--- a/dapps/ui-deprecation/src/lib.rs.in
+++ b/dapps/ui-deprecation/src/lib.rs.in
@@ -0,0 +1,55 @@
+// 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/>.
+
+extern crate parity_dapps_glue;
+
+use std::collections::HashMap;
+use parity_dapps_glue::{WebApp, File, Info};
+
+#[derive(WebAppFiles)]
+#[webapp(path = "../build")]
+pub struct App {
+	pub files: HashMap<&'static str, File>,
+}
+
+impl Default for App {
+	fn default() -> App {
+		App {
+			files: Self::files(),
+		}
+	}
+}
+
+impl WebApp for App {
+	fn file(&self, path: &str) -> Option<&File> {
+		self.files.get(path)
+	}
+
+	fn info(&self) -> Info {
+		Info {
+			name: "Parity Wallet info page",
+			version: env!("CARGO_PKG_VERSION"),
+			author: "Parity <admin@parity.io>",
+			description: "Deprecation notice for Parity Wallet",
+			icon_url: "icon.png",
+		}
+	}
+}
+
+#[test]
+fn test_js() {
+	parity_dapps_glue::js::build(env!("CARGO_MANIFEST_DIR"), "build");
+}
--- a/dapps/ui/Cargo.toml
+++ b/dapps/ui/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+description = "Ethcore Parity UI"
+homepage = "http://parity.io"
+license = "GPL-3.0"
+name = "parity-ui"
+version = "1.9.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[build-dependencies]
+rustc_version = "0.2"
+
+[dependencies]
+parity-ui-dev = { git = "https://github.com/parity-js/shell.git", rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2", optional = true }
+parity-ui-old-dev = { git = "https://github.com/parity-js/dapp-wallet.git", rev = "65deb02e7c007a0fd8aab0c089c93e3fd1de6f87", optional = true }
+parity-ui-precompiled = { git = "https://github.com/js-dist-paritytech/parity-master-1-10-shell.git", rev="bd25b41cd642c6b822d820dded3aa601a29aa079", optional = true }
+parity-ui-old-precompiled = { git = "https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git", rev="4b6f112412716cd05123d32eeb7fda448288a6c6", optional = true }
+
+[features]
+no-precompiled-js = ["parity-ui-dev", "parity-ui-old-dev"]
+use-precompiled-js = ["parity-ui-precompiled", "parity-ui-old-precompiled"]
--- a/dapps/ui/src/lib.rs
+++ b/dapps/ui/src/lib.rs
@@ -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/>.
+
+
+#[cfg(feature = "parity-ui-dev")]
+mod inner {
+	extern crate parity_ui_dev;
+
+	pub use self::parity_ui_dev::*;
+}
+
+#[cfg(feature = "parity-ui-precompiled")]
+mod inner {
+	extern crate parity_ui_precompiled;
+
+	pub use self::parity_ui_precompiled::*;
+}
+
+#[cfg(feature = "parity-ui-old-dev")]
+pub mod old {
+	extern crate parity_ui_old_dev;
+
+	pub use self::parity_ui_old_dev::*;
+}
+
+#[cfg(feature = "parity-ui-old-precompiled")]
+pub mod old {
+	extern crate parity_ui_old_precompiled;
+
+	pub use self::parity_ui_old_precompiled::*;
+}
+
+pub use self::inner::*;
--- a/devtools/Cargo.toml
+++ b/devtools/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+description = "Ethcore development/test/build tools"
+homepage = "http://parity.io"
+license = "GPL-3.0"
+name = "ethcore-devtools"
+version = "1.9.0"
+authors = ["Parity Technologies <admin@parity.io>"]
--- a/rpc/src/tests/http_client.rs
+++ b/rpc/src/tests/http_client.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.

-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::thread;
 use std::time::Duration;
@@ -30,7 +30,7 @@ pub struct Response {
 impl Response {
 	pub fn assert_header(&self, header: &str, value: &str) {
 		let header = format!("{}: {}", header, value);
-		assert!(self.headers.iter().any(|h| h == &header), "Couldn't find header {} in {:?}", header, &self.headers)
+		assert!(self.headers.iter().find(|h| *h == &header).is_some(), "Couldn't find header {} in {:?}", header, &self.headers)
 	}

 	pub fn assert_status(&self, status: &str) {
@@ -98,35 +98,35 @@ pub fn request(address: &SocketAddr, request: &str) -> Response {
 	let mut lines = response.lines();
 	let status = lines.next().expect("Expected a response").to_owned();
 	let headers_raw = read_block(&mut lines, false);
-	let headers = headers_raw.split('\n').map(ToOwned::to_owned).collect();
+	let headers = headers_raw.split('\n').map(|v| v.to_owned()).collect();
 	let body = read_block(&mut lines, true);

 	Response {
-		status,
-		headers,
-		headers_raw,
-		body,
+		status: status,
+		headers: headers,
+		headers_raw: headers_raw,
+		body: body,
 	}
 }

 /// Check if all required security headers are present
 pub fn assert_security_headers_present(headers: &[String], port: Option<u16>) {
-	if port.is_none() {
+	if let None = port {
 		assert!(
-			headers.iter().any(|header| header.as_str() == "X-Frame-Options: SAMEORIGIN"),
+			headers.iter().find(|header| header.as_str() == "X-Frame-Options: SAMEORIGIN").is_some(),
 			"X-Frame-Options: SAMEORIGIN missing: {:?}", headers
 		);
 	}
 	assert!(
-		headers.iter().any(|header| header.as_str() == "X-XSS-Protection: 1; mode=block"),
+		headers.iter().find(|header| header.as_str() == "X-XSS-Protection: 1; mode=block").is_some(),
 		"X-XSS-Protection missing: {:?}", headers
 	);
 	assert!(
-		headers.iter().any(|header|  header.as_str() == "X-Content-Type-Options: nosniff"),
+		headers.iter().find(|header|  header.as_str() == "X-Content-Type-Options: nosniff").is_some(),
 		"X-Content-Type-Options missing: {:?}", headers
 	);
 	assert!(
-		headers.iter().any(|header| header.starts_with("Content-Security-Policy: ")),
+		headers.iter().find(|header| header.starts_with("Content-Security-Policy: ")).is_some(),
 		"Content-Security-Policy missing: {:?}", headers
 	)
 }
--- a/ethcore/pod/src/lib.rs
+++ b/ethcore/pod/src/lib.rs
@@ -1,23 +1,19 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.

-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

-pub mod account;
-pub mod state;
+//! dev-tools

-pub use {
-	account::PodAccount,
-	state::PodState,
-};
+pub mod http_client;
--- a/docker/README.md
+++ b/docker/README.md
@@ -0,0 +1,3 @@
+Usage
+
+```docker build -f docker/ubuntu/Dockerfile --tag ethcore/parity:branch_or_tag_name .```
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrew Jones	f468d705ad	Update shell32-sys to fix windows build (#8793 )	2018-06-05 10:24:11 +02:00
André Silva	c7202a771d	[stable] Backports (#8782 ) * Fix light sync with initial validator-set contract (#8528) * Fix #8468 * Use U256::max_value() instead * Fix again * Also change initial transaction gas * Don't open Browser post-install on Mac (#8641) Since we start parity with the UI disabled per default now, opening the browser post installation will show an annoying error message, confusing the user. This patch removes opening the browser to prevent that annoyance. fixes #8194 * Prefix uint fmt with `0x` with alternate flag * Set the request index to that of the current request (#8683) * Set the request index to that of the current request When setting up the chain of (two) requests to look up a block by hash, the second need to refer to the first. This fixes an issue where the back ref was set to the subsequent request, not the current one. When the requests are executed we loop through them in order and ensure the requests that should produce headers all match up. We do this by index so they better be right. In other words: off by one. * Node table sorting according to last contact data (#8541) * network-devp2p: sort nodes in node table using last contact data * network-devp2p: rename node contact types in node table json output * network-devp2p: fix node table tests * network-devp2p: note node failure when failed to establish connection * network-devp2p: handle UselessPeer error * network-devp2p: note failure when marking node as useless * network-devp2p: handle UselessPeer disconnect (#8686)	2018-06-04 22:28:15 +02:00
Afri Schoedon	02ffb9be42	parity: bump stable version to 1.10.5 (#8749 ) * parity: bump stable version to 1.10.5 * Fix failing doc tests running on non-code	2018-06-04 13:57:24 +02:00
André Silva	39b9f1e252	[stable] Backports (#8623 ) * Fix account list double 0x display (#8596) * Remove unused self import * Fix account list double 0x display * Trace precompiled contracts when the transfer value is not zero (#8486) * Trace precompiled contracts when the transfer value is not zero * Add tests for precompiled CALL tracing * Use byzantium test machine for the new test * Add notes in comments on why we don't trace all precompileds * Use is_transferred instead of transferred * Gitlab test script fixes (#8573) * Exclude /docs from modified files. * Ensure all references in the working tree are available * Remove duplicated line from test script	2018-05-14 15:52:51 +02:00
Afri Schoedon	226a1d31b6	Bump stable to 1.10.4 (#8626 )	2018-05-14 15:52:18 +02:00
Afri Schoedon	063b0761f5	Allow stable snaps to be stable. (#8582 )	2018-05-14 04:21:48 -05:00
Tomasz Drwięga	b9ceda38a6	[stable] Backports (#8557 ) * Update wasmi and pwasm-utils (#8493) * Update wasmi to 0.2 New wasmi supports 32bit platforms and no longer requires a special feature to build for such platforms. * Update pwasm-utils to 0.1.5 * Fetching logs by hash in blockchain database (#8463) * Fetch logs by hash in blockchain database * Fix tests * Add unit test for branch block logs fetching * Add docs that blocks must already be sorted * Handle branch block cases properly * typo: empty -> is_empty * Remove return_empty_if_none by using a closure * Use BTreeSet to avoid sorting again * Move is_canon to BlockChain * typo: pass value by reference * Use loop and wrap inside blocks to simplify the code Borrowed from https://github.com/paritytech/parity/pull/8463#discussion_r183453326 * typo: missed a comment * Pass on storage keys tracing to handle the case when it is not modified (#8491) * Pass on storage keys even if it is not modified * typo: account and storage query `to_pod_diff` builds both `touched_addresses` merge and storage keys merge. * Fix tests * Use state query directly because of suicided accounts * Fix a RefCell borrow issue * Add tests for unmodified storage trace * Address grumbles * typo: remove unwanted empty line * ensure_cached compiles with the original signature * Enable WebAssembly and Byzantium for Ellaism (#8520) * Enable WebAssembly and Byzantium for Ellaism * Fix indentation * Remove empty lines * Fix compilation.	2018-05-07 20:17:28 +02:00
Afri Schoedon	d9f6aba308	Stabilize 1.10.3 (#8474 ) * Stabelize 1.10 * Bump stable to 1.10.3 * Update Gitlab scripts * Fix snap builds (#8483) * fix docker build (#8462) * Use as Docker's ( is not used anymore)	2018-04-27 17:45:45 +02:00
Afri Schoedon	f4ae813fda	Update Parity beta to 1.10.2 + Backports (#8455 ) * Update Parity beta to 1.10.2 * Allow 32 bit pipelines to fail (#8454) * Disable 32bit tragets for gitlab * Rename linux pipelines * Update wasmi (#8452) * Fix Cargo.lock * Revert Cargo.lock changes * Revert Cargo.lock changes * Fix Cargo.lock	2018-04-23 10:31:05 +02:00
Wei Tang	7202f7ae82	[beta] Backports (#8450 ) * Use forked app_dirs crate for reverted Windows dir behavior (#8438) * Remove unused appdirs dependency in CLI * Use forked app_dirs crate for reverted Windows dir behavior * remove Tendermint extra_info due to seal inconsistencies (#8367) * handle queue import errors a bit more gracefully (#8385) * Improve VM executor stack size estimation rules (#8439) * Improve VM executor stack size estimation rules * typo: docs add "(Debug build)" comment * Fix an off by one typo and set minimal stack size This avoids the case if `depth_threshold == max_depth`. Usually setting stack size to zero will just rebound it to platform minimal stack size, but we set it here just in case. * Use saturating_sub to avoid potential overflow	2018-04-20 15:22:29 +02:00
Afri Schoedon	45c29a2a57	Bump beta to 1.10.1 (#8350 ) * Bump beta to 1.10.1 * Unflag critical release	2018-04-13 14:39:38 +02:00
Tomasz Drwięga	fc652db729	[beta] Backports (#8346 ) * Warp-only sync with warp-barrier [blocknumber] flag. (#8228) * Warp-only sync with warp-after [blocknumber] flag. * Fix tests. * Fix configuration tests. * Rename to warp barrier. * Allow unsafe js eval on Parity Wallet. (#8204) * Update musicoin spec in line with gmc v2.6.2 (#8242) * Supress TemporaryInvalid verification failures. (#8256) * Include suicided accounts in state diff (#8297) * Include suicided accounts in state diff * Shorten form match -> if let * Test suicide trace diff in State * replace_home for password_files, reserved_peers and log_file (#8324) * replace_home for password_files, reserved_peers and log_file * typo: arg_log_file is Option * Enable UI by default, but only display info page. * Fix test. * Fix naming and remove old todo. * Change "wallet" with "browser UI"	2018-04-10 12:16:08 +02:00
Amaury Martiny	68320e8e89	Change name Wallet -> UI (#8164 ) (#8205 ) * Change name Wallet -> UI * Make warning bold	2018-04-04 18:07:36 +02:00
Marek Kotewicz	fdd03cc40d	Backport #8099 (#8132 )	2018-04-04 21:33:14 +09:00
Nikolay Volf	c3d446420c	Beta backprots (WASM libs) (#8220 ) * bump wasm libs (#8171) * bump wasmi version (#8209)	2018-03-26 15:29:16 +02:00
Toralf Wittner	9e7f887606	Update hyper to 0.11.24 (#8203 )	2018-03-24 14:34:22 +09:00
Kirill Pimenov	5acdd091a2	Updated jsonrpc to include latest backports (beta) (#8181 ) * Updated jsonrpc to include latest backports * Update dependencies. - `jsonrpc` PR #244 required `hyper >= 0.11.20` which in turn required updating `tokio-core`, `mio` and `iovec`. - `jsonrpc` PR #246 required updating `https://github.com/tomusdrw/ws-rs`.	2018-03-23 14:32:42 +01:00
André Silva	0a9d41e294	Re-enable signer, even with no UI. (#8167 ) (#8168 ) * Re-enable signer, even with no UI. * Fix message.	2018-03-20 22:49:07 +01:00
André Silva	610f6f1425	[Beta] Backports (#8136 ) * Support parity protocol. (#8035) * updater: apply exponential backoff after download failure (#8059) * updater: apply exponential backoff after download failure * updater: reset backoff on new release * Max code size on Kovan (#8067) * Enable code size limit on kovan * Fix formatting. * Limit incoming connections. (#8060) * Limit ingress connections * Optimized handshakes logging * WASM libraries bump (#7970) * update wasmi, parity-wasm, wasm-utils to latest version * Update to new wasmi & error handling * also utilize new stack limiter * fix typo * replace dependency url * Cargo.lock update * add some dos protection (#8084) * revert removing blooms (#8066) * Revert "fix traces, removed bloomchain crate, closes #7228, closes #7167" This reverts commit 1bf62038678295e5586f02a38a0c5aab9a9efe62. * Revert "fixed broken logs (#7934)" This reverts commit `f8a2e53f3e`. * fixed broken logs * bring back old lock order * remove migration v13 * revert CURRENT_VERSION to 12 in migration.rs * more dos protection (#8104) * Const time comparison (#8113) * Use `subtle::slices_equal` for constant time comparison. Also update the existing version of subtle in `ethcrypto` from 0.1 to 0.5 * Test specifically for InvalidPassword error. * fix trace filter returning returning unrelated reward calls, closes #8070 (#8098) * network: init discovery using healthy nodes (#8061) * network: init discovery using healthy nodes * network: fix style grumble * network: fix typo * Postpone Kovan hard fork (#8137) * ethcore: postpone Kovan hard fork * util: update version fork metadata * Disable UI by default. (#8105) * dapps: update parity-ui dependencies (#8160)	2018-03-19 21:40:56 +01:00
Kirill Pimenov	2403fc52c1	Probe changes one step deeper (#8134 ) (#8135 )	2018-03-19 03:23:18 +01:00
Rando	0ab1930c04	Beta backports (#8053 ) * CI: Fix cargo cache (#7968) * Fix cache Blocking waiting for file lock on the registry index * Only clean locked cargo cache on windows * fixed ethstore sign (#8026) * fixed parsing ethash seals and verify_block_undordered (#8031) * fix for verify_block_basic crashing on invalid transaction rlp (#8032) * fix cache & snapcraft CI build (#8052) after successful testing it is necessary to port in a ```beta``` and ```stable``` * Add MCIP-6 Byzyantium transition to Musicoin spec (#7841) * Add test chain spec for musicoin byzantium testnet * Add MCIP-6 Byzyantium transition to Musicoin spec * Update mcip6_byz.json * ethcore: update musicoin byzantium block number * ethcore: update musicoin byzantium block number * ethcore: update musicoin bootnodes * Update musicoin.json * Update musicoin.json * More bootnodes.	2018-03-14 12:31:31 +01:00
Rando	3d6ede0c58	Make 1.10 beta (#8022 ) * Make 1.10 beta * Fix gitlab builds	2018-03-01 21:18:26 +03:00