v 1.6.2

Fix auto-updater. (#4868 )
Removed libudev-dev dep
2017-03-13 11:57:42 +01:00 · 2017-03-11 14:46:17 +01:00 · 2017-03-10 18:18:09 +01:00 · 2017-03-10 15:00:02 +01:00 · 2017-03-10 13:19:56 +00:00 · 2017-03-10 14:03:10 +01:00
1532 changed files with 37241 additions and 108671 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,22 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-target
-
-*.swp
-*.swo
-*.swn
-*.DS_Store
-
-# Visual Studio Code stuff
-.vscode
-
-# GitEye stuff
-.project
-
-# idea ide
-.idea
-
-# git stuff
-.git
-
-ethcore/res/ethereum/tests
--- a/.gitignore
+++ b/.gitignore
@@ -19,10 +19,6 @@
 # mac stuff
 .DS_Store

-# npm stuff
-npm-debug.log
-node_modules
-
 # gdb files
 .gdb_history

--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,33 +9,31 @@ variables:
  RUST_BACKTRACE: "1"
  RUSTFLAGS: ""
  CARGOFLAGS: ""
-  CI_SERVER_NAME: "GitLab CI"
 cache:
  key: "$CI_BUILD_STAGE/$CI_BUILD_REF_NAME"
  untracked: true
 linux-stable:
  stage: build
-  image: parity/rust:gitlab-ci
+  image: ethcore/rust:stable
  only:
    - beta
    - tags
    - stable
    - triggers
  script:
-    - rustup default stable
    - cargo build -j $(nproc) --release --features final $CARGOFLAGS
    - cargo build -j $(nproc) --release -p evmbin
-    - cargo build -j $(nproc) --release -p ethstore-cli
-    - cargo build -j $(nproc) --release -p ethkey-cli
+    - cargo build -j $(nproc) --release -p ethstore
+    - cargo build -j $(nproc) --release -p ethkey
    - strip target/release/parity
-    - strip target/release/parity-evm
+    - strip target/release/evm
    - strip target/release/ethstore
    - strip target/release/ethkey
    - export SHA3=$(target/release/parity tools hash target/release/parity)
    - md5sum target/release/parity > parity.md5
    - sh scripts/deb-build.sh amd64
    - cp target/release/parity deb/usr/bin/parity
-    - cp target/release/parity-evm deb/usr/bin/parity-evm
+    - cp target/release/evm deb/usr/bin/evm
    - cp target/release/ethstore deb/usr/bin/ethstore
    - cp target/release/ethkey deb/usr/bin/ethkey
    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
@@ -43,7 +41,7 @@ linux-stable:
    - md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity --body target/release/parity
    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity.md5 --body parity.md5
@@ -57,48 +55,13 @@ linux-stable:
  artifacts:
    paths:
    - target/release/parity
-    - target/release/parity-evm
-    - target/release/ethstore
-    - target/release/ethkey
+    - target/release/parity/evmbin
+    - target/release/parity/ethstore
+    - target/release/parity/ethkey
    name: "stable-x86_64-unknown-linux-gnu_parity"
-linux-snap:
-  stage: build
-  image: parity/snapcraft:gitlab-ci
-  only:
-    - snap
-    - beta
-    - tags
-    - triggers
-  script:
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - cd snap
-    - rm -rf *snap
-    - sed -i 's/master/'"$VER"'/g' snapcraft.yaml
-    - echo "Version:"$VER
-    - snapcraft
-    - ls
-    #- cp "parity_"$CI_BUILD"_amd64.snap" "parity_"$VER"_amd64.snap"
-    - md5sum "parity_"$VER"_amd64.snap" > "parity_"$VER"_amd64.snap.md5"
-    - file "parity_"$VER"_amd64.snap.md5"
-    - cat "parity_"$VER"_amd64.snap.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.snap" --body "parity_"$VER"_amd64.snap"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.snap.md5" --body "parity_"$VER"_amd64.snap.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
-  tags:
-    - rust
-    - rust-stable
-  artifacts:
-    paths:
-    - scripts/parity_*_amd64.snap
-    name: "stable-x86_64-unknown-snap-gnu_parity"
-  allow_failure: true  
 linux-stable-debian:
  stage: build
-  image: parity/rust-debian:gitlab-ci
+  image: ethcore/rust-debian:latest
  only:
    - beta
    - tags
@@ -107,17 +70,17 @@ linux-stable-debian:
  script:
    - cargo build -j $(nproc) --release --features final $CARGOFLAGS
    - cargo build -j $(nproc) --release -p evmbin
-    - cargo build -j $(nproc) --release -p ethstore-cli
-    - cargo build -j $(nproc) --release -p ethkey-cli
+    - cargo build -j $(nproc) --release -p ethstore
+    - cargo build -j $(nproc) --release -p ethkey
    - strip target/release/parity
-    - strip target/release/parity-evm
+    - strip target/release/evm
    - strip target/release/ethstore
    - strip target/release/ethkey
    - export SHA3=$(target/release/parity tools hash target/release/parity)
    - md5sum target/release/parity > parity.md5
    - sh scripts/deb-build.sh amd64
    - cp target/release/parity deb/usr/bin/parity
-    - cp target/release/parity-evm deb/usr/bin/parity-evm
+    - cp target/release/evm deb/usr/bin/evm
    - cp target/release/ethstore deb/usr/bin/ethstore
    - cp target/release/ethkey deb/usr/bin/ethkey
    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
@@ -125,7 +88,7 @@ linux-stable-debian:
    - md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu
    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/parity --body target/release/parity
    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/parity.md5 --body parity.md5
@@ -142,14 +105,13 @@ linux-stable-debian:
    name: "stable-x86_64-unknown-debian-gnu_parity"
 linux-beta:
  stage: build
-  image: parity/rust:gitlab-ci
+  image: ethcore/rust:beta
  only:
    - beta
    - tags
    - stable
    - triggers
  script:
-    - rustup default beta
    - cargo build -j $(nproc) --release $CARGOFLAGS
    - strip target/release/parity
  tags:
@@ -162,14 +124,13 @@ linux-beta:
  allow_failure: true
 linux-nightly:
  stage: build
-  image: parity/rust:gitlab-ci
+  image: ethcore/rust:nightly
  only:
    - beta
    - tags
    - stable
    - triggers
  script:
-    - rustup default nightly
    - cargo build -j $(nproc) --release $CARGOFLAGS
    - strip target/release/parity
  tags:
@@ -182,7 +143,7 @@ linux-nightly:
  allow_failure: true
 linux-centos:
  stage: build
-  image: parity/rust-centos:gitlab-ci
+  image: ethcore/rust-centos:latest
  only:
    - beta
    - tags
@@ -193,30 +154,15 @@ linux-centos:
    - export CC="gcc"
    - export PLATFORM=x86_64-unknown-centos-gnu
    - cargo build -j $(nproc) --release --features final $CARGOFLAGS
-    - cargo build -j $(nproc) --release -p evmbin
-    - cargo build -j $(nproc) --release -p ethstore-cli
-    - cargo build -j $(nproc) --release -p ethkey-cli
    - strip target/release/parity
-    - strip target/release/parity-evm
-    - strip target/release/ethstore
-    - strip target/release/ethkey
    - md5sum target/release/parity > parity.md5
-    - md5sum target/release/parity-evm > parity-evm.md5
-    - md5sum target/release/ethstore > ethstore.md5
-    - md5sum target/release/ethkey > ethkey.md5
    - export SHA3=$(target/release/parity tools hash target/release/parity)
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu
    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity --body target/release/parity
    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity-evm --body target/release/parity-evm
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity-evm.md5 --body parity-evm.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethstore --body target/release/ethstore
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethstore.md5 --body ethstore.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethkey --body target/release/ethkey
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethkey.md5 --body ethkey.md5
    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
  tags:
@@ -228,7 +174,7 @@ linux-centos:
    name: "x86_64-unknown-centos-gnu_parity"
 linux-i686:
  stage: build
-  image: parity/rust-i686:gitlab-ci
+  image: ethcore/rust-i686:latest
  only:
    - beta
    - tags
@@ -239,28 +185,18 @@ linux-i686:
    - export HOST_CXX=g++
    - export COMMIT=$(git rev-parse HEAD)
    - export PLATFORM=i686-unknown-linux-gnu
-    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
-    - strip target/$PLATFORM/release/parity
-    - strip target/$PLATFORM/release/parity-evm
-    - strip target/$PLATFORM/release/ethstore
-    - strip target/$PLATFORM/release/ethkey   
+    - cargo build -j $(nproc) --target i686-unknown-linux-gnu --features final --release $CARGOFLAGS
    - strip target/$PLATFORM/release/parity
    - md5sum target/$PLATFORM/release/parity > parity.md5
    - export SHA3=$(target/$PLATFORM/release/parity tools hash target/$PLATFORM/release/parity)
    - sh scripts/deb-build.sh i386
    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
-    - cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
    - dpkg-deb -b deb "parity_"$VER"_i386.deb"
    - md5sum "parity_"$VER"_i386.deb" > "parity_"$VER"_i386.deb.md5"
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
@@ -278,7 +214,7 @@ linux-i686:
  allow_failure: true
 linux-armv7:
  stage: build
-  image: parity/rust-armv7:gitlab-ci
+  image: ethcore/rust-armv7:latest
  only:
    - beta
    - tags
@@ -296,29 +232,17 @@ linux-armv7:
    - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
    - cat .cargo/config
    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - export SHA3=$(target/$PLATFORM/release/parity tools hash target/$PLATFORM/release/parity)
-    - sh scripts/deb-build.sh i386
    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity-evm
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/ethstore
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/ethkey
-    - export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
+    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
    - md5sum target/$PLATFORM/release/parity > parity.md5
    - sh scripts/deb-build.sh armhf
    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
-    - cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
    - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
    - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
@@ -336,7 +260,7 @@ linux-armv7:
  allow_failure: true
 linux-arm:
  stage: build
-  image: parity/rust-arm:gitlab-ci
+  image: ethcore/rust-arm:latest
  only:
    - beta
    - tags
@@ -354,26 +278,17 @@ linux-arm:
    - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
    - cat .cargo/config
    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity-evm
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/ethstore
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/ethkey
-    - export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
+    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
    - md5sum target/$PLATFORM/release/parity > parity.md5
    - sh scripts/deb-build.sh armhf
    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
-    - cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
    - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
    - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
@@ -389,9 +304,48 @@ linux-arm:
    - target/arm-unknown-linux-gnueabihf/release/parity
    name: "arm-unknown-linux-gnueabihf_parity"
  allow_failure: true
+linux-armv6:
+  stage: build
+  image: ethcore/rust-armv6:latest
+  only:
+    - beta
+#    - tags
+#    - stable
+#    - triggers
+  script:
+    - export CC=arm-linux-gnueabi-gcc
+    - export CXX=arm-linux-gnueabi-g++
+    - export HOST_CC=gcc
+    - export HOST_CXX=g++
+    - export PLATFORM=arm-unknown-linux-gnueabi
+    - rm -rf .cargo
+    - mkdir -p .cargo
+    - echo "[target.$PLATFORM]" >> .cargo/config
+    - echo "linker= \"arm-linux-gnueabi-gcc\"" >> .cargo/config
+    - cat .cargo/config
+    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
+    - arm-linux-gnueabi-strip target/$PLATFORM/release/parity
+    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
+    - md5sum target/$PLATFORM/release/parity > parity.md5
+    - aws configure set aws_access_key_id $s3_key
+    - aws configure set aws_secret_access_key $s3_secret
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
+    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+  tags:
+    - rust
+    - rust-arm
+  artifacts:
+    paths:
+    - target/arm-unknown-linux-gnueabi/release/parity
+    name: "arm-unknown-linux-gnueabi_parity"
+  allow_failure: true
 linux-aarch64:
  stage: build
-  image: parity/rust-arm64:gitlab-ci
+  image: ethcore/rust-aarch64:latest
  only:
    - beta
    - tags
@@ -409,26 +363,17 @@ linux-aarch64:
    - echo "linker= \"aarch64-linux-gnu-gcc\"" >> .cargo/config
    - cat .cargo/config
    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
    - aarch64-linux-gnu-strip target/$PLATFORM/release/parity
-    - aarch64-linux-gnu-strip target/$PLATFORM/release/parity-evm
-    - aarch64-linux-gnu-strip target/$PLATFORM/release/ethstore
-    - aarch64-linux-gnu-strip target/$PLATFORM/release/ethkey
-    - export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
+    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
    - md5sum target/$PLATFORM/release/parity > parity.md5
    - sh scripts/deb-build.sh arm64
    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
-    - cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
    - dpkg-deb -b deb "parity_"$VER"_arm64.deb"
    - md5sum "parity_"$VER"_arm64.deb" > "parity_"$VER"_arm64.deb.md5"
    - aws configure set aws_access_key_id $s3_key
    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_arm64.deb" --body "parity_"$VER"_arm64.deb"
@@ -453,12 +398,8 @@ darwin:
  script: |
      export COMMIT=$(git rev-parse HEAD)
      export PLATFORM=x86_64-apple-darwin
-      rustup default stable
-      cargo clean
      cargo build -j 8 --features final --release #$CARGOFLAGS
-      cargo build -j 8 --release -p ethstore-cli #$CARGOFLAGS
-      cargo build -j 8 --release -p ethkey-cli #$CARGOFLAGS
-      cargo build -j 8 --release -p evmbin #$CARGOFLAGS
+      cargo build -j 8 --features final --release -p ethstore #$CARGOFLAGS
      rm -rf parity.md5
      md5sum target/release/parity > parity.md5
      export SHA3=$(target/release/parity tools hash target/release/parity)
@@ -468,16 +409,16 @@ darwin:
      packagesbuild -v mac/Parity.pkgproj
      productsign --sign 'Developer ID Installer: PARITY TECHNOLOGIES LIMITED (P2PX3JU8FT)' target/release/Parity\ Ethereum.pkg target/release/Parity\ Ethereum-signed.pkg
      export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-      mv target/release/Parity\ Ethereum-signed.pkg "parity-"$VER"-macos-installer.pkg"
-      md5sum "parity-"$VER"-macos-installer.pkg" >> "parity-"$VER"-macos-installer.pkg.md5"
+      mv target/release/Parity\ Ethereum-signed.pkg "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg"
+      md5sum "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg" >> "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg.md5"
      aws configure set aws_access_key_id $s3_key
      aws configure set aws_secret_access_key $s3_secret
-      if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
+      if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
      aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/release/parity
      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity-"$VER"-macos-installer.pkg" --body "parity-"$VER"-macos-installer.pkg"
-      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity-"$VER"-macos-installer.pkg.md5" --body "parity-"$VER"-macos-installer.pkg.md5"
+      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity-"$VER"-osx-installer-EXPERIMENTAL.pkg" --body "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg"
+      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity-"$VER"-osx-installer-EXPERIMENTAL.pkg.md5" --body "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg.md5"
      curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
      curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
  tags:
@@ -503,16 +444,12 @@ windows:
    - set RUST_BACKTRACE=1
    - set RUSTFLAGS=%RUSTFLAGS%
    - rustup default stable-x86_64-pc-windows-msvc
-    - cargo clean
    - cargo build --features final --release #%CARGOFLAGS%
-    - cargo build --release -p ethstore-cli #%CARGOFLAGS%
-    - cargo build --release -p ethkey-cli #%CARGOFLAGS%
-    - cargo build --release -p evmbin #%CARGOFLAGS%
    - signtool sign /f %keyfile% /p %certpass% target\release\parity.exe
    - target\release\parity.exe tools hash target\release\parity.exe > parity.sha3
    - set /P SHA3=<parity.sha3
-    - curl -sL --url "https://github.com/paritytech/win-build/raw/master/SimpleFC.dll" -o nsis\SimpleFC.dll
-    - curl -sL --url "https://github.com/paritytech/win-build/raw/master/vc_redist.x64.exe" -o nsis\vc_redist.x64.exe
+    - curl -sL --url "https://github.com/ethcore/win-build/raw/master/SimpleFC.dll" -o nsis\SimpleFC.dll
+    - curl -sL --url "https://github.com/ethcore/win-build/raw/master/vc_redist.x64.exe" -o nsis\vc_redist.x64.exe
    - msbuild windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release
    - signtool sign /f %keyfile% /p %certpass% windows\ptray\x64\release\ptray.exe
    - cd nsis
@@ -530,10 +467,9 @@ windows:
    - aws configure set aws_access_key_id %s3_key%
    - aws configure set aws_secret_access_key %s3_secret%
    - echo %CI_BUILD_REF_NAME%
-    - echo %CI_BUILD_REF_NAME% | findstr /R "master" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
-    - echo %CI_BUILD_REF_NAME% | findstr /R "beta" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
-    - echo %CI_BUILD_REF_NAME% | findstr /R "stable" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
-    - echo %CI_BUILD_REF_NAME% | findstr /R "nightly" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
+    - echo %CI_BUILD_REF_NAME% | findstr /R "master" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
+    - echo %CI_BUILD_REF_NAME% | findstr /R "beta" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
+    - echo %CI_BUILD_REF_NAME% | findstr /R "stable" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
    - echo %S3_BUCKET%
    - aws s3 rm --recursive s3://%S3_BUCKET%/%CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc
    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe --body target\release\parity.exe
@@ -551,7 +487,6 @@ windows:
  artifacts:
    paths:
    - target/release/parity.exe
-    - target/release/parity.pdb
    - nsis/InstallParity.exe
    name: "x86_64-pc-windows-msvc_parity"
 docker-build:
@@ -563,33 +498,17 @@ docker-build:
    - docker info
  script:
    - if [ "$CI_BUILD_REF_NAME" == "beta-release" ]; 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
+    - docker login -u $Docker_Hub_User -p $Docker_Hub_Pass
    - sh scripts/docker-build.sh $DOCKER_TAG
-    - docker logout
  tags:
    - docker
-test-coverage:
-  stage: test
-  only:
-    - master
-  script:
-    - git submodule update --init --recursive
-    - rm -rf target/*
-    - rm -rf js/.coverage
-    - scripts/cov.sh
- #   - COVERAGE=$(grep -Po 'covered":.*?[^\\]"' target/cov/index.json | grep "[0-9]*\.[0-9]" -o)
- #   - echo "Coverage:" $COVERAGE
-  tags:
-    - kcov
-  allow_failure: true
 test-darwin:
  stage: test
  only:
    - triggers
  before_script:
    - git submodule update --init --recursive
-    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e "^js/" -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
+    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
  script:
    - export RUST_BACKTRACE=1
    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
@@ -604,26 +523,25 @@ test-windows:
    - git submodule update --init --recursive
  script:
    - set RUST_BACKTRACE=1
-    - echo cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p parity-dapps -p parity-rpc -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity-rpc-client -p parity %CARGOFLAGS% --verbose --release
+    - echo cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p ethcore-dapps -p ethcore-rpc -p ethcore-signer -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity %CARGOFLAGS% --verbose --release
  tags:
    - rust-windows
  allow_failure: true
 test-rust-stable:
  stage: test
-  image: parity/rust:gitlab-ci
+  image: ethcore/rust:stable
  before_script:
    - git submodule update --init --recursive
    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
  script:
-    - rustup show
    - export RUST_BACKTRACE=1
-    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
+    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS&&./scripts/cov.sh "$KCOV_CMD"; fi
  tags:
    - rust
    - rust-stable
 js-test:
  stage: test
-  image: parity/rust:gitlab-ci
+  image: ethcore/rust:stable
  before_script:
    - git submodule update --init --recursive
    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
@@ -637,13 +555,11 @@ test-rust-beta:
  stage: test
  only:
    - triggers
-    - master
-  image: parity/rust:gitlab-ci
+  image: ethcore/rust:beta
  before_script:
    - git submodule update --init --recursive
    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
  script:
-    - rustup default beta
    - export RUST_BACKTRACE=1
    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
  tags:
@@ -654,13 +570,11 @@ test-rust-nightly:
  stage: test
  only:
    - triggers
-    - master
-  image: parity/rust:gitlab-ci
+  image: ethcore/rust:nightly
  before_script:
    - git submodule update --init --recursive
    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
  script:
-    - rustup default nightly
    - export RUST_BACKTRACE=1
    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
  tags:
@@ -674,14 +588,12 @@ js-release:
    - beta
    - stable
    - tags
-    - triggers
-  image: parity/rust:gitlab-ci
+  image: ethcore/rust:stable
  before_script:
    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
    - echo $JS_FILES_MODIFIED
    - if [ $JS_FILES_MODIFIED -eq 0  ]; then echo "Skipping JS deps install since no JS files modified."; else ./js/scripts/install-deps.sh;fi
  script:
-    - rustup default stable
    - echo $JS_FILES_MODIFIED
    - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS rebuild since no JS files modified."; else ./js/scripts/build.sh && ./js/scripts/release.sh; fi
  tags:
@@ -690,10 +602,8 @@ push-release:
  stage: push-release
  only:
    - tags
-    - triggers
-  image: parity/rust:gitlab-ci
+  image: ethcore/rust:stable
  script:
-    - rustup default stable
    - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1337/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
    - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1338/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
  tags:
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,6 +2,3 @@
 	path = ethcore/res/ethereum/tests
 	url = https://github.com/ethereum/tests.git
 	branch = develop
-[submodule "ethcore/res/wasm-tests"]
-	path = ethcore/res/wasm-tests
-	url = https://github.com/paritytech/wasm-tests
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,69 +1,59 @@
 [package]
 description = "Parity Ethereum client"
 name = "parity"
-version = "1.7.2"
+version = "1.6.2"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"

 [dependencies]
 log = "0.3"
-env_logger = "0.4"
-rustc-hex = "1.0"
-docopt = "0.8"
+env_logger = "0.3"
+rustc-serialize = "0.3"
+docopt = "0.6"
 time = "0.1"
-num_cpus = "1.2"
+num_cpus = "0.2"
 number_prefix = "0.2"
 rpassword = "0.2.1"
-semver = "0.6"
-ansi_term = "0.9"
-regex = "0.2"
+semver = "0.5"
+ansi_term = "0.7"
+regex = "0.1"
 isatty = "0.1"
-toml = "0.4"
-serde = "1.0"
-serde_json = "1.0"
-serde_derive = "1.0"
+toml = "0.2"
+serde = "0.9"
+serde_json = "0.9"
 app_dirs = "1.1.1"
-futures = "0.1"
-futures-cpupool = "0.1"
 fdlimit = "0.1"
-ws2_32-sys = "0.2"
-ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
+hyper = { default-features = false, git = "https://github.com/ethcore/hyper" }
+ctrlc = { git = "https://github.com/ethcore/rust-ctrlc.git" }
+jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc.git" }
 ethsync = { path = "sync" }
 ethcore = { path = "ethcore" }
 ethcore-util = { path = "util" }
 ethcore-io = { path = "util/io" }
 ethcore-devtools = { path = "devtools" }
+ethcore-rpc = { path = "rpc" }
+ethcore-signer = { path = "signer" }
 ethcore-ipc = { path = "ipc/rpc" }
 ethcore-ipc-nano = { path = "ipc/nano" }
 ethcore-ipc-hypervisor = { path = "ipc/hypervisor" }
 ethcore-light = { path = "ethcore/light" }
 ethcore-logger = { path = "logger" }
 ethcore-stratum = { path = "stratum" }
-ethkey = { path = "ethkey" }
-node-health = { path = "dapps/node-health" }
+evmbin = { path = "evmbin" }
 rlp = { path = "util/rlp" }
 rpc-cli = { path = "rpc_cli" }
+parity-rpc-client = { path = "rpc_client" }
 parity-hash-fetch = { path = "hash-fetch" }
 parity-ipfs-api = { path = "ipfs" }
-parity-local-store = { path = "local-store" }
-parity-reactor = { path = "util/reactor" }
-parity-rpc = { path = "rpc" }
-parity-rpc-client = { path = "rpc_client" }
 parity-updater = { path = "updater" }
-path = { path = "util/path" }
-
-parity-dapps = { path = "dapps", optional = true }
+parity-reactor = { path = "util/reactor" }
+parity-local-store = { path = "local-store" }
+ethcore-dapps = { path = "dapps", optional = true }
 clippy = { version = "0.0.103", optional = true}
 ethcore-secretstore = { path = "secret_store", optional = true }

-[build-dependencies]
-rustc_version = "0.2"
-
 [dev-dependencies]
 ethcore-ipc-tests = { path = "ipc/tests" }
-pretty_assertions = "0.1"

 [target.'cfg(windows)'.dependencies]
 winapi = "0.2"
@@ -74,20 +64,23 @@ daemonize = "0.2"
 [features]
 default = ["ui-precompiled"]
 ui = [
-	"ui-enabled",
-	"parity-dapps/ui",
+	"dapps",
+	"ethcore-dapps/ui",
+	"ethcore-signer/ui",
 ]
 ui-precompiled = [
-	"ui-enabled",
-	"parity-dapps/ui-precompiled",
+	"dapps",
+	"ethcore-signer/ui-precompiled",
+	"ethcore-dapps/ui-precompiled",
 ]
-ui-enabled = ["dapps"]
-dapps = ["parity-dapps"]
+dapps = ["ethcore-dapps"]
 ipc = ["ethcore/ipc", "ethsync/ipc"]
 jit = ["ethcore/jit"]
-dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "parity-rpc/dev", "parity-dapps/dev"]
+dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "ethcore-rpc/dev", "ethcore-dapps/dev", "ethcore-signer/dev"]
 json-tests = ["ethcore/json-tests"]
 test-heavy = ["ethcore/test-heavy"]
+ethkey-cli = ["ethcore/ethkey-cli"]
+ethstore-cli = ["ethcore/ethstore-cli"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
@@ -98,13 +91,7 @@ secretstore = ["ethcore-secretstore"]
 path = "parity/main.rs"
 name = "parity"

-[profile.dev]
-panic = "abort"
-
 [profile.release]
 debug = false
 lto = false
 panic = "abort"
-
-[workspace]
-members = ["ethstore/cli", "ethkey/cli", "evmbin", "dapps/node-health"]
--- a/README.md
+++ b/README.md
@@ -1,47 +1,58 @@
-# [Parity](https://parity.io/parity.html) - fast, light, and robust Ethereum client
+# [Parity](https://ethcore.io/parity.html)
+### Fast, light, and robust Ethereum implementation

-[![build status](https://gitlab.parity.io/parity/parity/badges/master/build.svg)](https://gitlab.parity.io/parity/parity/commits/master)
-[![Snap Status](https://build.snapcraft.io/badge/paritytech/parity.svg)](https://build.snapcraft.io/user/paritytech/parity)
-[![GPLv3](https://img.shields.io/badge/license-GPL%20v3-green.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)
-
- [Download the latest release here.](https://github.com/paritytech/parity/releases)
+[![build status](https://gitlab.ethcore.io/parity/parity/badges/master/build.svg)](https://gitlab.ethcore.io/parity/parity/commits/master) [![Coverage Status][coveralls-image]][coveralls-url]  [![GPLv3][license-image]][license-url]

 ### Join the chat!

-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)
+Parity [![Join the chat at https://gitter.im/ethcore/parity][gitter-image]][gitter-url] and
+parity.js [![Join the chat at https://gitter.im/ethcore/parity.js](https://badges.gitter.im/ethcore/parity.js.svg)](https://gitter.im/ethcore/parity.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

-Be sure to check out [our wiki](https://github.com/paritytech/parity/wiki) and the [internal documentation](https://paritytech.github.io/parity/ethcore/index.html) for more information.
+[Internal Documentation][doc-url]
+
+
+Be sure to check out [our wiki][wiki-url] for more information.
+
+[coveralls-image]: https://coveralls.io/repos/github/ethcore/parity/badge.svg?branch=master
+[coveralls-url]: https://coveralls.io/github/ethcore/parity?branch=master
+[gitter-image]: https://badges.gitter.im/Join%20Chat.svg
+[gitter-url]: https://gitter.im/ethcore/parity?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+[license-image]: https://img.shields.io/badge/license-GPL%20v3-green.svg
+[license-url]: https://www.gnu.org/licenses/gpl-3.0.en.html
+[doc-url]: https://ethcore.github.io/parity/ethcore/index.html
+[wiki-url]: https://github.com/ethcore/parity/wiki
+
+**Parity requires Rust version 1.15.0 to build**

 ----

+
 ## About Parity

-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.
-
-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:
+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.

+Parity comes with a built-in wallet. To access [Parity Wallet](http://127.0.0.1:8080/) simply go to http://127.0.0.1:8080/. It
+includes various functionality allowing you to:
 - create and manage your Ethereum accounts;
 - manage your Ether and any Ethereum tokens;
 - create and register your own tokens;
- and much more.
+- and much more.    

-By default, Parity will also run a JSONRPC server on `127.0.0.1:8545`. This is fully configurable and supports a number of RPC APIs.
+By default, Parity will also run a JSONRPC server on `127.0.0.1:8545`. This is fully configurable and supports a number
+of RPC APIs.

-If you run into an issue while using parity, feel free to file one in this repository or hop on our [gitter chat room](https://gitter.im/paritytech/parity) to ask a question. We are glad to help!
+If you run into an issue while using parity, feel free to file one in this repository
+or hop on our [gitter chat room][gitter-url] to ask a question. We are glad to help!

-**For security-critical issues**, please refer to the security policy outlined in `SECURITY.MD`.
-
-Parity's current beta-release is 1.7. You can download it at https://github.com/paritytech/parity/releases or follow the instructions below to build from source.
+Parity's current release is 1.5. You can download it at https://ethcore.io/parity.html or follow the instructions
+below to build from source.

 ----

 ## Build dependencies

-**Parity 1.7.x-beta requires Rust version 1.19.0 to build**.
+Parity is fully compatible with Stable Rust.

 We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have rustup, you can install it like this:

@@ -49,7 +60,7 @@ We recommend installing Rust through [rustup](https://www.rustup.rs/). If you do
 	```bash
 	$ curl https://sh.rustup.rs -sSf | sh
 	```
-
+	
 	Parity also requires `gcc`, `g++`, `libssl-dev`/`openssl`, `libudev-dev` and `pkg-config` packages to be installed.
 - OSX:
 	```bash
@@ -69,23 +80,19 @@ Once you have rustup, install parity or download and build from source

 ----

-## Install from the snap store
-
-In any of the [supported Linux distros](https://snapcraft.io/docs/core/install):
+## Quick install

 ```bash
-sudo snap install parity --edge
+cargo install --git https://github.com/ethcore/parity.git parity
 ```

-(Note that this is an experimental and unstable release, at the moment)
-
 ----

 ## Build from source

 ```bash
 # download Parity code
-$ git clone https://github.com/paritytech/parity
+$ git clone https://github.com/ethcore/parity
 $ cd parity

 # build in release mode
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,54 +0,0 @@
-# Security Policy
-
-For security inquiries or vulnerability reports, please send a message to security@parity.io.
-
-Please use a descriptive subject line so we can identify the report as such.
-
-If you send a report, we will respond to the e-mail within 48 hours, and provide regular updates from that time onwards.
-
-If you would like to encrypt your report, please use the PGP key provided below.
-It is also reproduced [on MIT's key server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73)
-
-```
-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFlyIAwBCACe0keNPjgYzZ1Oy/8t3zj/Qw9bHHqrzx7FWy8NbXnYBM19NqOZ
-DIP7Oe0DvCaf/uruBskCS0iVstHlEFQ2AYe0Ei0REt9lQdy61GylU/DEB3879IG+
-6FO0SnFeYeerv1/hFI2K6uv8v7PyyVDiiJSW0I1KIs2OBwJicTKmWxLAeQsRgx9G
-yRGalrVk4KP+6pWTA7k3DxmDZKZyfYV/Ej10NtuzmsemwDbv98HKeomp/kgFOfSy
-3AZjeCpctlsNqpjUuXa0/HudmH2WLxZ0fz8XeoRh8XM9UudNIecjrDqmAFrt/btQ
-/3guvlzhFCdhYPVGsUusKMECk/JG+Xx1/1ZjABEBAAG0LFBhcml0eSBTZWN1cml0
-eSBDb250YWN0IDxzZWN1cml0eUBwYXJpdHkuaW8+iQFUBBMBCAA+FiEE2uUVYCjP
-N6B8aTiDXQ8DAY0H3nMFAllyIAwCGwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwEC
-HgECF4AACgkQXQ8DAY0H3nM60wgAkS3A36Zc+upiaxU7tumcGv+an17j7gin0sif
-+0ELSjVfrXInM6ovai+NhUdcLkJ7tCrKS90fvlaELK5Sg9CXBWCTFccKN4A/B7ey
-rOg2NPXUecnyBB/XqQgKYH7ujYlOlqBDXMfz6z8Hj6WToxg9PPMGGomyMGh8AWxM
-3yRPFs5RKt0VKgN++5N00oly5Y8ri5pgCidDvCLYMGTVDHFKwkuc9w6BlWlu1R1e
-/hXFWUFAP1ffTAul3QwyKhjPn2iotCdxXjvt48KaU8DN4iL7aMBN/ZBKqGS7yRdF
-D/JbJyaaJ0ZRvFSTSXy/sWY3z1B5mtCPBxco8hqqNfRkCwuZ6LkBDQRZciAMAQgA
-8BP8xrwe12TOUTqL/Vrbxv/FLdhKh53J6TrPKvC2TEEKOrTNo5ahRq+XOS5E7G2N
-x3b+fq8gR9BzFcldAx0XWUtGs/Wv++ulaSNqTBxj13J3G3WGsUfMKxRgj//piCUD
-bCFLQfGZdKk0M1o9QkPVARwwmvCNiNB/l++xGqPtfc44H5jWj3GoGvL2MkShPzrN
-yN/bJ+m+R5gtFGdInqa5KXBuxxuW25eDKJ+LzjbgUgeC76wNcfOiQHTdMkcupjdO
-bbGFwo10hcbRAOcZEv6//Zrlmk/6nPxEd2hN20St2bSN0+FqfZ267mWEu3ejsgF8
-ArdCpv5h4fBvJyNwiTZwIQARAQABiQE8BBgBCAAmFiEE2uUVYCjPN6B8aTiDXQ8D
-AY0H3nMFAllyIAwCGwwFCQPCZwAACgkQXQ8DAY0H3nNisggAl4fqhRlA34wIb190
-sqXHVxiCuzPaqS6krE9xAa1+gncX485OtcJNqnjugHm2rFE48lv7oasviuPXuInE
-/OgVFnXYv9d/Xx2JUeDs+bFTLouCDRY2Unh7KJZasfqnMcCHWcxHx5FvRNZRssaB
-WTZVo6sizPurGUtbpYe4/OLFhadBqAE0EUmVRFEUMc1YTnu4eLaRBzoWN4d2UWwi
-LN25RSrVSke7LTSFbgn9ntQrQ2smXSR+cdNkkfRCjFcpUaecvFl9HwIqoyVbT4Ym
-0hbpbbX/cJdc91tKa+psa29uMeGL/cgL9fAu19yNFRyOTMxjZnvql1X/WE1pLmoP
-ETBD1Q==
-=K9Qw
-----END PGP PUBLIC KEY BLOCK-----
-```
-
-Important Legal Information:
-
-Your submission might be eligible for a bug bounty. The bug bounty program is an experimental and discretionary rewards program for the Parity community to reward those who are helping to improve the Parity software. Rewards are at the sole discretion of Parity Technologies Ltd.. 
-
-We are not able to issue rewards to individuals who are on sanctions lists or who are in countries on sanctions lists (e.g. North Korea, Iran, etc). 
-
-You are responsible for all taxes. All rewards are subject to applicable law. 
-
-Finally, your testing must not violate any law or compromise any data that is not yours.
--- a/build.rs
+++ b/build.rs
@@ -1,35 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate rustc_version;
-
-const MIN_RUSTC_VERSION: &'static str = "1.15.1";
-
-fn main() {
-	let is = rustc_version::version().unwrap();
-	let required = MIN_RUSTC_VERSION.parse().unwrap();
-	assert!(is >= required, format!("
-
-It looks like you are compiling Parity with an old rustc compiler {}.
-Parity requires version {}. Please update your compiler.
-If you use rustup, try this:
-
-    rustup update stable
-
-and try building Parity again.
-
-", is, required));
-}
--- a/dapps/Cargo.toml
+++ b/dapps/Cargo.toml
@@ -1,48 +1,45 @@
 [package]
 description = "Parity Dapps crate"
-name = "parity-dapps"
-version = "1.7.0"
+name = "ethcore-dapps"
+version = "1.6.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]

 [lib]

 [dependencies]
-base32 = "0.3"
-futures = "0.1"
-linked-hash-map = "0.3"
-log = "0.3"
-parity-dapps-glue = "1.7"
-mime = "0.2"
-mime_guess = "1.6.1"
 rand = "0.3"
-rustc-hex = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
-serde_json = "1.0"
-time = "0.1.35"
+log = "0.3"
+env_logger = "0.3"
+futures = "0.1"
+jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc.git" }
+jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc.git" }
+hyper = { default-features = false, git = "https://github.com/ethcore/hyper" }
 unicase = "1.3"
 url = "1.0"
+rustc-serialize = "0.3"
+serde = "0.9"
+serde_json = "0.9"
+serde_derive = "0.9"
+linked-hash-map = "0.3"
+parity-dapps-glue = "1.4"
+base32 = "0.3"
+mime = "0.2"
+mime_guess = "1.6.1"
+time = "0.1.35"
 zip = { version = "0.1", default-features = false }
-
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
-jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
-
+ethcore-devtools = { path = "../devtools" }
+ethcore-rpc = { path = "../rpc" }
 ethcore-util = { path = "../util" }
 fetch = { path = "../util/fetch" }
-node-health = { path = "./node-health" }
+parity-ui = { path = "./ui" }
 parity-hash-fetch = { path = "../hash-fetch" }
 parity-reactor = { path = "../util/reactor" }
-parity-ui = { path = "./ui" }

 clippy = { version = "0.0.103", optional = true}

-[dev-dependencies]
-env_logger = "0.4"
-ethcore-devtools = { path = "../devtools" }
-
 [features]
-dev = ["clippy", "ethcore-util/dev"]
+dev = ["clippy", "ethcore-rpc/dev", "ethcore-util/dev"]

 ui = ["parity-ui/no-precompiled-js"]
 ui-precompiled = ["parity-ui/use-precompiled-js"]
--- a/dapps/js-glue/Cargo.toml
+++ b/dapps/js-glue/Cargo.toml
@@ -1,23 +1,23 @@
 [package]
 description = "Base Package for all Parity built-in dapps"
 name = "parity-dapps-glue"
-version = "1.7.0"
+version = "1.6.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"

 [build-dependencies]
-quasi_codegen = { version = "0.32", optional = true }
-syntex = { version = "0.58", optional = true }
+quasi_codegen = { version = "0.11", optional = true }
+syntex = { version = "0.33", optional = true }

 [dependencies]
 glob = { version = "0.2.11" }
 mime_guess = { version = "1.6.1" }
-aster = { version = "0.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 }
+aster = { version = "0.17", default-features = false }
+quasi = { version = "0.11", default-features = false }
+quasi_macros = { version = "0.11", optional = true }
+syntex = { version = "0.33", optional = true }
+syntex_syntax = { version = "0.33", optional = true }
 clippy = { version = "0.0.90", optional = true }

 [features]
--- a/dapps/js-glue/README.md
+++ b/dapps/js-glue/README.md
@@ -6,7 +6,7 @@ Code generator to simplify creating a built-in Parity Dapp
 1. Clone this repository.

   ```bash
-   $ git clone https://github.com/paritytech/parity.git
+   $ git clone https://github.com/ethcore/parity.git
   ```

 1. Create a new directory for your Dapp. (`./myapp`)
@@ -29,10 +29,10 @@ Code generator to simplify creating a built-in Parity Dapp

   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).
+1. Create `./parity/dapps/myapp/Cargo.toml` with you apps details. See example here: [parity-status Cargo.toml](https://github.com/ethcore/parity-ui/blob/master/status/Cargo.toml).

   ```bash
-   $ git clone https://github.com/paritytech/parity-ui.git
+   $ git clone https://github.com/ethcore/parity-ui.git
   $ cd ./parity-ui/
   $ cp ./home/Cargo.toml ../parity/dapps/myapp/Cargo.toml
   $ cp ./home/build.rs ../parity/dapps/myapp/build.rs
--- a/dapps/js-glue/build.rs
+++ b/dapps/js-glue/build.rs
@@ -25,11 +25,13 @@ mod inner {

 	pub fn main() {
 		let out_dir = env::var_os("OUT_DIR").unwrap();
+		let mut registry = syntex::Registry::new();
+		quasi_codegen::register(&mut registry);

 		let src = Path::new("src/lib.rs.in");
 		let dst = Path::new(&out_dir).join("lib.rs");

-		quasi_codegen::expand(&src, &dst).unwrap();
+		registry.expand("", &src, &dst).unwrap();
 	}
 }

--- a/dapps/js-glue/src/build.rs
+++ b/dapps/js-glue/src/build.rs
@@ -13,8 +13,9 @@ pub mod inner {

 		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;
+				match attr.node.value.node {
+					ast::MetaItemKind::List(ref n, _) if n == &"webapp" => { return None; }
+					_ => {}
 				}

 				Some(attr)
--- a/dapps/js-glue/src/codegen.rs
+++ b/dapps/js-glue/src/codegen.rs
@@ -22,12 +22,16 @@ use self::mime_guess::guess_mime_type;
 use std::path::{self, Path, PathBuf};
 use std::ops::Deref;

+use syntax::ast::{MetaItem, Item};
+
+use syntax::ast;
 use syntax::attr;
-use syntax::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;
+use syntax::ptr::P;
+use syntax::print::pprust::{lit_to_string};
+use syntax::parse::token::{InternedString};
+

 pub fn expand_webapp_implementation(
 	cx: &mut ExtCtxt,
@@ -44,7 +48,7 @@ pub fn expand_webapp_implementation(
 		},
 	};
 	let builder = aster::AstBuilder::new().span(span);
-	implement_webapp(cx, &builder, item, push);
+	implement_webapp(cx, &builder, &item, push);
 }

 fn implement_webapp(cx: &ExtCtxt, builder: &aster::AstBuilder, item: &Item, push: &mut FnMut(Annotatable)) {
@@ -113,12 +117,11 @@ fn implement_webapp(cx: &ExtCtxt, builder: &aster::AstBuilder, item: &Item, push
 }

 fn extract_path(cx: &ExtCtxt, item: &Item) -> String {
-	for meta_items in item.attrs.iter().filter_map(webapp_meta_items) {
+	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) {
+				ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"path" => {
+					if let Some(s) = get_str_from_lit(cx, name, lit) {
 						return s.deref().to_owned();
 					}
 				},
@@ -131,32 +134,14 @@ fn extract_path(cx: &ExtCtxt, item: &Item) -> String {
 	"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> {
+fn get_str_from_lit(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Option<InternedString> {
 	match lit.node {
-		ast::LitKind::Str(ref s, _) => Some(s.clone().as_str()),
+		ast::LitKind::Str(ref s, _) => Some(s.clone()),
 		_ => {
 			cx.span_err(
 				lit.span,
-				&format!("webapp annotation path must be a string, not `{}`",
+				&format!("webapp annotation `{}` must be a string, not `{}`",
+					name,
 					lit_to_string(lit)
 				)
 			);
@@ -165,6 +150,16 @@ fn get_str_from_lit(cx: &ExtCtxt, lit: &ast::Lit) -> Option<InternedString> {
 	}
 }

+fn webapp_meta_items(attr: &ast::Attribute) -> Option<&[P<ast::MetaItem>]> {
+	match attr.node.value.node {
+		ast::MetaItemKind::List(ref name, ref items) if name == &"webapp" => {
+			attr::mark_used(&attr);
+			Some(items)
+		}
+		_ => None
+	}
+}
+
 fn as_uri(path: &Path) -> String {
 	let mut s = String::new();
 	for component in path.iter() {
@@ -174,6 +169,7 @@ fn as_uri(path: &Path) -> String {
 	s[0..s.len()-1].into()
 }

+
 #[test]
 fn should_convert_path_separators_on_all_platforms() {
 	// given
--- a/dapps/js-glue/src/lib.rs
+++ b/dapps/js-glue/src/lib.rs
@@ -22,6 +22,7 @@
 extern crate syntex;

 #[cfg(feature = "with-syntex")]
+#[macro_use]
 extern crate syntex_syntax as syntax;

 #[cfg(feature = "with-syntex")]
--- a/dapps/node-health/Cargo.toml
+++ b/dapps/node-health/Cargo.toml
@@ -1,18 +0,0 @@
-[package]
-name = "node-health"
-description = "Node's health status"
-version = "0.1.0"
-license = "GPL-3.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-futures = "0.1"
-futures-cpupool = "0.1"
-log = "0.3"
-ntp = "0.2.0"
-parking_lot = "0.4"
-serde = "1.0"
-serde_derive = "1.0"
-time = "0.1.35"
-
-parity-reactor = { path = "../../util/reactor" }
--- a/dapps/node-health/src/health.rs
+++ b/dapps/node-health/src/health.rs
@@ -1,122 +0,0 @@
-// 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, BoxFuture};
-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) -> BoxFuture<Health, ()> {
-		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(()));
-			},
-		);
-
-		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})
-		}).boxed()
-	}
-}
--- a/dapps/node-health/src/lib.rs
+++ b/dapps/node-health/src/lib.rs
@@ -1,49 +0,0 @@
-// 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
@@ -1,355 +0,0 @@
-// 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::sync::Arc;
-use std::sync::atomic::{self, AtomicUsize};
-
-use std::collections::VecDeque;
-use futures::{self, Future, BoxFuture};
-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 = 500;
-
-#[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();
-		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
-		}).boxed()
-	}
-
-	/// 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 futures::done(select_result(res.1.iter())).boxed();
-			}
-		}
-		// 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
@@ -1,57 +0,0 @@
-// 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/src/api/api.rs
+++ b/dapps/src/api/api.rs
@@ -15,47 +15,56 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::sync::Arc;
-
+use unicase::UniCase;
 use hyper::{server, net, Decoder, Encoder, Next, Control};
+use hyper::header;
 use hyper::method::Method;
-use hyper::status::StatusCode;
+use hyper::header::AccessControlAllowOrigin;

-use api::{response, types};
+use api::types::{App, ApiError};
+use api::response;
 use apps::fetcher::Fetcher;
-use handlers::{self, extract_url};
-use endpoint::{Endpoint, Handler, EndpointPath};
-use node_health::{NodeHealth, HealthStatus, Health};
-use parity_reactor::Remote;
+
+use handlers::extract_url;
+use endpoint::{Endpoint, Endpoints, Handler, EndpointPath};
+use jsonrpc_http_server::cors;

 #[derive(Clone)]
 pub struct RestApi {
+	cors_domains: Option<Vec<AccessControlAllowOrigin>>,
+	endpoints: Arc<Endpoints>,
 	fetcher: Arc<Fetcher>,
-	health: NodeHealth,
-	remote: Remote,
 }

 impl RestApi {
-	pub fn new(
-		fetcher: Arc<Fetcher>,
-		health: NodeHealth,
-		remote: Remote,
-	) -> Box<Endpoint> {
+	pub fn new(cors_domains: Vec<String>, endpoints: Arc<Endpoints>, fetcher: Arc<Fetcher>) -> Box<Endpoint> {
 		Box::new(RestApi {
-			fetcher,
-			health,
-			remote,
+			cors_domains: Some(cors_domains.into_iter().map(|domain| match domain.as_ref() {
+				"all" | "*" | "any" => AccessControlAllowOrigin::Any,
+				"null" => AccessControlAllowOrigin::Null,
+				other => AccessControlAllowOrigin::Value(other.into()),
+			}).collect()),
+			endpoints: endpoints,
+			fetcher: fetcher,
 		})
 	}
+
+	fn list_apps(&self) -> Vec<App> {
+		self.endpoints.iter().filter_map(|(ref k, ref e)| {
+			e.info().map(|ref info| App::from_info(k, info))
+		}).collect()
+	}
 }

 impl Endpoint for RestApi {
 	fn to_async_handler(&self, path: EndpointPath, control: Control) -> Box<Handler> {
-		Box::new(RestApiRouter::new((*self).clone(), path, control))
+		Box::new(RestApiRouter::new(self.clone(), path, control))
 	}
 }

 struct RestApiRouter {
 	api: RestApi,
+	origin: Option<String>,
 	path: Option<EndpointPath>,
 	control: Option<Control>,
 	handler: Box<Handler>,
@@ -65,18 +74,18 @@ impl RestApiRouter {
 	fn new(api: RestApi, path: EndpointPath, control: Control) -> Self {
 		RestApiRouter {
 			path: Some(path),
+			origin: None,
 			control: Some(control),
 			api: api,
-			handler: Box::new(response::as_json_error(StatusCode::NotFound, &types::ApiError {
+			handler: response::as_json_error(&ApiError {
 				code: "404".into(),
 				title: "Not Found".into(),
 				detail: "Resource you requested has not been found.".into(),
-			})),
+			}),
 		}
 	}

 	fn resolve_content(&self, hash: Option<&str>, path: EndpointPath, control: Control) -> Option<Box<Handler>> {
-		trace!(target: "dapps", "Resolving content: {:?} from path: {:?}", hash, path);
 		match hash {
 			Some(hash) if self.api.fetcher.contains(hash) => {
 				Some(self.api.fetcher.to_async_handler(path, control))
@@ -85,29 +94,34 @@ impl RestApiRouter {
 		}
 	}

-	fn health(&self, control: Control) -> Box<Handler> {
-		let map = move |health: Result<Result<Health, ()>, ()>| {
-			let status = match health {
-				Ok(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
-			};
+	/// Returns basic headers for a response (it may be overwritten by the handler)
+	fn response_headers(&self) -> header::Headers {
+		let mut headers = header::Headers::new();
+		headers.set(header::AccessControlAllowCredentials);
+		headers.set(header::AccessControlAllowMethods(vec![
+			Method::Options,
+			Method::Post,
+			Method::Get,
+		]));
+		headers.set(header::AccessControlAllowHeaders(vec![
+			UniCase("origin".to_owned()),
+			UniCase("content-type".to_owned()),
+			UniCase("accept".to_owned()),
+		]));

-			response::as_json(status, &health)
-		};
-		let health = self.api.health.health();
-		let remote = self.api.remote.clone();
-		Box::new(handlers::AsyncHandler::new(health, map, remote, control))
+		if let Some(cors_header) = cors::get_cors_header(&self.api.cors_domains, &self.origin) {
+			headers.set(cors_header);
+		}
+
+		headers
 	}
 }

 impl server::Handler<net::HttpStream> for RestApiRouter {
+
 	fn on_request(&mut self, request: server::Request<net::HttpStream>) -> Next {
+		self.origin = cors::read_origin(&request);
+
 		if let Method::Options = *request.method() {
 			self.handler = response::empty();
 			return Next::write();
@@ -131,8 +145,8 @@ impl server::Handler<net::HttpStream> for RestApiRouter {
 		if let Some(ref hash) = hash { path.app_id = hash.clone().to_owned() }

 		let handler = endpoint.and_then(|v| match v {
+			"apps" => Some(response::as_json(&self.api.list_apps())),
 			"ping" => Some(response::ping()),
-			"health" => Some(self.health(control)),
 			"content" => self.resolve_content(hash, path, control),
 			_ => None
 		});
@@ -150,10 +164,12 @@ impl server::Handler<net::HttpStream> for RestApiRouter {
 	}

 	fn on_response(&mut self, res: &mut server::Response) -> Next {
+		*res.headers_mut() = self.response_headers();
 		self.handler.on_response(res)
 	}

 	fn on_response_writable(&mut self, encoder: &mut Encoder<net::HttpStream>) -> Next {
 		self.handler.on_response_writable(encoder)
 	}
+
 }
--- a/dapps/src/api/mod.rs
+++ b/dapps/src/api/mod.rs
@@ -21,3 +21,4 @@ mod response;
 mod types;

 pub use self::api::RestApi;
+pub use self::types::App;
--- a/dapps/src/api/response.rs
+++ b/dapps/src/api/response.rs
@@ -16,8 +16,6 @@

 use serde::Serialize;
 use serde_json;
-use hyper::status::StatusCode;
-
 use endpoint::Handler;
 use handlers::{ContentHandler, EchoHandler};

@@ -25,16 +23,16 @@ pub fn empty() -> Box<Handler> {
 	Box::new(ContentHandler::ok("".into(), mime!(Text/Plain)))
 }

-pub fn as_json<T: Serialize>(status: StatusCode, val: &T) -> ContentHandler {
+pub fn as_json<T: Serialize>(val: &T) -> Box<Handler> {
 	let json = serde_json::to_string(val)
 		.expect("serialization to string is infallible; qed");
-	ContentHandler::new(status, json, mime!(Application/Json))
+	Box::new(ContentHandler::ok(json, mime!(Application/Json)))
 }

-pub fn as_json_error<T: Serialize>(status: StatusCode, val: &T) -> ContentHandler {
+pub fn as_json_error<T: Serialize>(val: &T) -> Box<Handler> {
 	let json = serde_json::to_string(val)
 		.expect("serialization to string is infallible; qed");
-	ContentHandler::new(status, json, mime!(Application/Json))
+	Box::new(ContentHandler::not_found(json, mime!(Application/Json)))
 }

 pub fn ping() -> Box<Handler> {
--- a/dapps/src/api/types.rs
+++ b/dapps/src/api/types.rs
@@ -14,14 +14,51 @@
 // 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.
+use endpoint::EndpointInfo;
+
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct App {
+	pub id: String,
+	pub name: String,
+	pub description: String,
+	pub version: String,
+	pub author: String,
+	#[serde(rename="iconUrl")]
+	pub icon_url: String,
+}
+
+impl App {
+	/// Creates `App` instance from `EndpointInfo` and `id`.
+	pub fn from_info(id: &str, info: &EndpointInfo) -> Self {
+		App {
+			id: id.to_owned(),
+			name: info.name.to_owned(),
+			description: info.description.to_owned(),
+			version: info.version.to_owned(),
+			author: info.author.to_owned(),
+			icon_url: info.icon_url.to_owned(),
+		}
+	}
+}
+
+impl Into<EndpointInfo> for App {
+	fn into(self) -> EndpointInfo {
+		EndpointInfo {
+			name: self.name,
+			description: self.description,
+			version: self.version,
+			author: self.author,
+			icon_url: self.icon_url,
+		}
+	}
+}
+
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct ApiError {
-	/// 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
@@ -1,55 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use endpoint::EndpointInfo;
-
-#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct App {
-	pub id: String,
-	pub name: String,
-	pub description: String,
-	pub version: String,
-	pub author: String,
-	#[serde(rename="iconUrl")]
-	pub icon_url: String,
-}
-
-impl App {
-	/// Creates `App` instance from `EndpointInfo` and `id`.
-	pub fn from_info(id: &str, info: &EndpointInfo) -> Self {
-		App {
-			id: id.to_owned(),
-			name: info.name.to_owned(),
-			description: info.description.to_owned(),
-			version: info.version.to_owned(),
-			author: info.author.to_owned(),
-			icon_url: info.icon_url.to_owned(),
-		}
-	}
-}
-
-impl Into<EndpointInfo> for App {
-	fn into(self) -> EndpointInfo {
-		EndpointInfo {
-			name: self.name,
-			description: self.description,
-			version: self.version,
-			author: self.author,
-			icon_url: self.icon_url,
-		}
-	}
-}
--- a/dapps/src/apps/fetcher/installers.rs
+++ b/dapps/src/apps/fetcher/installers.rs
@@ -25,7 +25,6 @@ use util::sha3::sha3;
 use page::{LocalPageEndpoint, PageCache};
 use handlers::{ContentValidator, ValidatorResponse};
 use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest, serialize_manifest, Manifest};
-use Embeddable;

 type OnDone = Box<Fn(Option<LocalPageEndpoint>) + Send>;

@@ -117,16 +116,16 @@ pub struct Dapp {
 	id: String,
 	dapps_path: PathBuf,
 	on_done: OnDone,
-	embeddable_on: Embeddable,
+	embeddable_on: Option<(String, u16)>,
 }

 impl Dapp {
-	pub fn new(id: String, dapps_path: PathBuf, on_done: OnDone, embeddable_on: Embeddable) -> Self {
+	pub fn new(id: String, dapps_path: PathBuf, on_done: OnDone, embeddable_on: Option<(String, u16)>) -> Self {
 		Dapp {
-			id,
-			dapps_path,
-			on_done,
-			embeddable_on,
+			id: id,
+			dapps_path: dapps_path,
+			on_done: on_done,
+			embeddable_on: embeddable_on,
 		}
 	}

--- a/dapps/src/apps/fetcher/mod.rs
+++ b/dapps/src/apps/fetcher/mod.rs
@@ -23,7 +23,7 @@ mod installers;
 use std::{fs, env};
 use std::path::PathBuf;
 use std::sync::Arc;
-use rustc_hex::FromHex;
+use rustc_serialize::hex::FromHex;
 use fetch::{Client as FetchClient, Fetch};
 use hash_fetch::urlhint::{URLHintContract, URLHint, URLHintResult};
 use parity_reactor::Remote;
@@ -31,7 +31,7 @@ use parity_reactor::Remote;
 use hyper;
 use hyper::status::StatusCode;

-use {Embeddable, SyncStatus, random_filename};
+use {SyncStatus, random_filename};
 use util::Mutex;
 use page::LocalPageEndpoint;
 use handlers::{ContentHandler, ContentFetcherHandler};
@@ -47,73 +47,46 @@ pub trait Fetcher: Send + Sync + 'static {
 	fn to_async_handler(&self, path: EndpointPath, control: hyper::Control) -> Box<Handler>;
 }

-pub struct ContentFetcher<F: Fetch = FetchClient, R: URLHint + 'static = URLHintContract> {
-	cache_path: PathBuf,
+pub struct ContentFetcher<F: Fetch = FetchClient, R: URLHint + Send + Sync + 'static = URLHintContract> {
+	dapps_path: PathBuf,
 	resolver: R,
 	cache: Arc<Mutex<ContentCache>>,
 	sync: Arc<SyncStatus>,
-	embeddable_on: Embeddable,
+	embeddable_on: Option<(String, u16)>,
 	remote: Remote,
 	fetch: F,
-	only_content: bool,
 }

-impl<R: URLHint + 'static, F: Fetch> Drop for ContentFetcher<F, R> {
+impl<R: URLHint + Send + Sync + 'static, F: Fetch> Drop for ContentFetcher<F, R> {
 	fn drop(&mut self) {
 		// Clear cache path
-		let _ = fs::remove_dir_all(&self.cache_path);
+		let _ = fs::remove_dir_all(&self.dapps_path);
 	}
 }

-impl<R: URLHint + 'static, F: Fetch> ContentFetcher<F, R> {
+impl<R: URLHint + Send + Sync + 'static, F: Fetch> ContentFetcher<F, R> {

-	pub fn new(
-		resolver: R,
-		sync_status: Arc<SyncStatus>,
-		remote: Remote,
-		fetch: F,
-	) -> Self {
-		let mut cache_path = env::temp_dir();
-		cache_path.push(random_filename());
+	pub fn new(resolver: R, sync_status: Arc<SyncStatus>, embeddable_on: Option<(String, u16)>, remote: Remote, fetch: F) -> Self {
+		let mut dapps_path = env::temp_dir();
+		dapps_path.push(random_filename());

 		ContentFetcher {
-			cache_path: cache_path,
+			dapps_path: dapps_path,
 			resolver: resolver,
 			sync: sync_status,
 			cache: Arc::new(Mutex::new(ContentCache::default())),
-			embeddable_on: None,
+			embeddable_on: embeddable_on,
 			remote: remote,
 			fetch: fetch,
-			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 still_syncing(embeddable: Embeddable) -> Box<Handler> {
+	fn still_syncing(address: Option<(String, u16)>) -> Box<Handler> {
 		Box::new(ContentHandler::error(
 			StatusCode::ServiceUnavailable,
 			"Sync In Progress",
 			"Your node is still syncing. We cannot resolve any content before it's fully synced.",
 			Some("<a href=\"javascript:window.location.reload()\">Refresh</a>"),
-			embeddable,
-		))
-	}
-
-	fn dapps_disabled(address: Embeddable) -> Box<Handler> {
-		Box::new(ContentHandler::error(
-			StatusCode::ServiceUnavailable,
-			"Network Dapps Not Available",
-			"This interface doesn't support network dapps for security reasons.",
-			None,
 			address,
 		))
 	}
@@ -122,19 +95,9 @@ impl<R: URLHint + 'static, F: Fetch> ContentFetcher<F, R> {
 	fn set_status(&self, content_id: &str, status: ContentStatus) {
 		self.cache.lock().insert(content_id.to_owned(), status);
 	}
-
-	// resolve contract call synchronously.
-	// TODO: port to futures-based hyper and make it all async.
-	fn resolve(&self, content_id: Vec<u8>) -> Option<URLHintResult> {
-		use futures::Future;
-
-		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> {
+impl<R: URLHint + Send + Sync + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
 	fn contains(&self, content_id: &str) -> bool {
 		{
 			let mut cache = self.cache.lock();
@@ -145,8 +108,10 @@ impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
 		}
 		// fallback to resolver
 		if let Ok(content_id) = content_id.from_hex() {
+			// else try to resolve the app_id
+			let has_content = self.resolver.resolve(content_id).is_some();
 			// if there is content or we are syncing return true
-			self.sync.is_major_importing() || self.resolve(content_id).is_some()
+			has_content || self.sync.is_major_importing()
 		} else {
 			false
 		}
@@ -172,7 +137,7 @@ impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
 				_ => {
 					trace!(target: "dapps", "Content unavailable. Fetching... {:?}", content_id);
 					let content_hex = content_id.from_hex().expect("to_handler is called only when `contains` returns true.");
-					let content = self.resolve(content_hex);
+					let content = self.resolver.resolve(content_hex);

 					let cache = self.cache.clone();
 					let id = content_id.clone();
@@ -190,9 +155,6 @@ impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
 						Some(URLHintResult::Dapp(_)) if self.sync.is_major_importing() => {
 							(None, Self::still_syncing(self.embeddable_on.clone()))
 						},
-						Some(URLHintResult::Dapp(_)) if self.only_content => {
-							(None, Self::dapps_disabled(self.embeddable_on.clone()))
-						},
 						Some(URLHintResult::Dapp(dapp)) => {
 							let handler = ContentFetcherHandler::new(
 								dapp.url(),
@@ -200,7 +162,7 @@ impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
 								control,
 								installers::Dapp::new(
 									content_id.clone(),
-									self.cache_path.clone(),
+									self.dapps_path.clone(),
 									Box::new(on_done),
 									self.embeddable_on.clone(),
 								),
@@ -219,7 +181,7 @@ impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
 								installers::Content::new(
 									content_id.clone(),
 									content.mime,
-									self.cache_path.clone(),
+									self.dapps_path.clone(),
 									Box::new(on_done),
 								),
 								self.embeddable_on.clone(),
@@ -263,7 +225,6 @@ mod tests {
 	use std::sync::Arc;
 	use util::Bytes;
 	use fetch::{Fetch, Client};
-	use futures::{future, Future, BoxFuture};
 	use hash_fetch::urlhint::{URLHint, URLHintResult};
 	use parity_reactor::Remote;

@@ -271,29 +232,19 @@ mod tests {
 	use endpoint::EndpointInfo;
 	use page::LocalPageEndpoint;
 	use super::{ContentFetcher, Fetcher};
-	use {SyncStatus};

-	#[derive(Clone)]
 	struct FakeResolver;
 	impl URLHint for FakeResolver {
-		fn resolve(&self, _id: Bytes) -> BoxFuture<Option<URLHintResult>, String> {
-			future::ok(None).boxed()
+		fn resolve(&self, _id: Bytes) -> Option<URLHintResult> {
+			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 path = env::temp_dir();
-		let fetcher = ContentFetcher::new(FakeResolver, Arc::new(FakeSync(false)), Remote::new_sync(), Client::new().unwrap())
-			.allow_dapps(true);
+		let fetcher = ContentFetcher::new(FakeResolver, Arc::new(|| false), None, Remote::new_sync(), Client::new().unwrap());
 		let handler = LocalPageEndpoint::new(path, EndpointInfo {
 			name: "fake".into(),
 			description: "".into(),
--- a/dapps/src/apps/fs.rs
+++ b/dapps/src/apps/fs.rs
@@ -14,15 +14,13 @@
 // 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 page::{LocalPageEndpoint, PageCache};
-use endpoint::{Endpoint, EndpointInfo};
+use endpoint::{Endpoints, EndpointInfo};
 use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest};
-use Embeddable;

 struct LocalDapp {
 	id: String,
@@ -61,14 +59,14 @@ fn read_manifest(name: &str, mut path: PathBuf) -> EndpointInfo {
 /// 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) -> Option<(String, Box<LocalPageEndpoint>)> {
+pub fn local_endpoint<P: AsRef<Path>>(path: P, signer_address: Option<(String, u16)>) -> Option<(String, Box<LocalPageEndpoint>)> {
 	let path = path.as_ref().to_owned();
 	path.canonicalize().ok().and_then(|path| {
 		let name = path.file_name().and_then(|name| name.to_str());
 		name.map(|name| {
 			let dapp = local_dapp(name.into(), path.clone());
 			(dapp.id, Box::new(LocalPageEndpoint::new(
-				dapp.path, dapp.info, PageCache::Disabled, embeddable.clone())
+				dapp.path, dapp.info, PageCache::Disabled, signer_address.clone())
 			))
 		})
 	})
@@ -87,12 +85,12 @@ fn local_dapp(name: String, path: PathBuf) -> LocalDapp {

 /// Returns endpoints for Local Dapps found for given filesystem path.
 /// Scans the directory and collects `LocalPageEndpoints`.
-pub fn local_endpoints<P: AsRef<Path>>(dapps_path: P, embeddable: Embeddable) -> BTreeMap<String, Box<Endpoint>> {
-	let mut pages = BTreeMap::<String, Box<Endpoint>>::new();
+pub fn local_endpoints<P: AsRef<Path>>(dapps_path: P, signer_address: Option<(String, u16)>) -> Endpoints {
+	let mut pages = Endpoints::new();
 	for dapp in local_dapps(dapps_path.as_ref()) {
 		pages.insert(
 			dapp.id,
-			Box::new(LocalPageEndpoint::new(dapp.path, dapp.info, PageCache::Disabled, embeddable.clone()))
+			Box::new(LocalPageEndpoint::new(dapp.path, dapp.info, PageCache::Disabled, signer_address.clone()))
 		);
 	}
 	pages
--- a/dapps/src/apps/manifest.rs
+++ b/dapps/src/apps/manifest.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use serde_json;
-pub use apps::App as Manifest;
+pub use api::App as Manifest;

 pub const MANIFEST_FILENAME: &'static str = "manifest.json";

--- a/dapps/src/apps/mod.rs
+++ b/dapps/src/apps/mod.rs
@@ -14,10 +14,8 @@
 // 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::path::PathBuf;
 use std::sync::Arc;
-
 use endpoint::{Endpoints, Endpoint};
 use page::PageEndpoint;
 use proxypac::ProxyPac;
@@ -25,19 +23,17 @@ use web::Web;
 use fetch::Fetch;
 use parity_dapps::WebApp;
 use parity_reactor::Remote;
-use parity_ui;
-use {WebProxyTokens, ParentFrameSettings};
+use {WebProxyTokens};

-mod app;
 mod cache;
 mod fs;
-mod ui;
 pub mod fetcher;
 pub mod manifest;

-pub use self::app::App;
+extern crate parity_ui;

-pub const HOME_PAGE: &'static str = "home";
+pub const HOME_PAGE: &'static str = "parity";
+pub const DAPPS_DOMAIN: &'static str = ".web3.site";
 pub const RPC_PATH: &'static str =  "rpc";
 pub const API_PATH: &'static str =  "api";
 pub const UTILS_PATH: &'static str =  "parity-utils";
@@ -48,27 +44,18 @@ pub fn utils() -> Box<Endpoint> {
 	Box::new(PageEndpoint::with_prefix(parity_ui::App::default(), UTILS_PATH.to_owned()))
 }

-pub fn ui() -> Box<Endpoint> {
-	Box::new(PageEndpoint::with_fallback_to_index(parity_ui::App::default()))
-}
-
-pub fn ui_redirection(embeddable: Option<ParentFrameSettings>) -> Box<Endpoint> {
-	Box::new(ui::Redirection::new(embeddable))
-}
-
 pub fn all_endpoints<F: Fetch>(
 	dapps_path: PathBuf,
 	extra_dapps: Vec<PathBuf>,
-	dapps_domain: &str,
-	embeddable: Option<ParentFrameSettings>,
+	signer_address: Option<(String, u16)>,
 	web_proxy_tokens: Arc<WebProxyTokens>,
 	remote: Remote,
 	fetch: F,
 ) -> Endpoints {
 	// fetch fs dapps at first to avoid overwriting builtins
-	let mut pages = fs::local_endpoints(dapps_path, embeddable.clone());
+	let mut pages = fs::local_endpoints(dapps_path, signer_address.clone());
 	for path in extra_dapps {
-		if let Some((id, endpoint)) = fs::local_endpoint(path.clone(), embeddable.clone()) {
+		if let Some((id, endpoint)) = fs::local_endpoint(path.clone(), signer_address.clone()) {
 			pages.insert(id, endpoint);
 		} else {
 			warn!(target: "dapps", "Ignoring invalid dapp at {}", path.display());
@@ -76,14 +63,14 @@ pub fn all_endpoints<F: Fetch>(
 	}

 	// NOTE [ToDr] Dapps will be currently embeded on 8180
-	insert::<parity_ui::App>(&mut pages, "ui", Embeddable::Yes(embeddable.clone()));
-	pages.insert("proxy".into(), ProxyPac::boxed(embeddable.clone(), dapps_domain.to_owned()));
-	pages.insert(WEB_PATH.into(), Web::boxed(embeddable.clone(), web_proxy_tokens.clone(), remote.clone(), fetch.clone()));
+	insert::<parity_ui::App>(&mut pages, "ui", Embeddable::Yes(signer_address.clone()));
+	pages.insert("proxy".into(), ProxyPac::boxed(signer_address.clone()));
+	pages.insert(WEB_PATH.into(), Web::boxed(signer_address.clone(), web_proxy_tokens.clone(), remote.clone(), fetch.clone()));

-	Arc::new(pages)
+	pages
 }

-fn insert<T : WebApp + Default + 'static>(pages: &mut BTreeMap<String, Box<Endpoint>>, id: &str, embed_at: Embeddable) {
+fn insert<T : WebApp + Default + 'static>(pages: &mut Endpoints, id: &str, embed_at: Embeddable) {
 	pages.insert(id.to_owned(), Box::new(match embed_at {
 		Embeddable::Yes(address) => PageEndpoint::new_safe_to_embed(T::default(), address),
 		Embeddable::No => PageEndpoint::new(T::default()),
@@ -91,7 +78,7 @@ fn insert<T : WebApp + Default + 'static>(pages: &mut BTreeMap<String, Box<Endpo
 }

 enum Embeddable {
-	Yes(Option<ParentFrameSettings>),
+	Yes(Option<(String, u16)>),
 	#[allow(dead_code)]
 	No,
 }
--- a/dapps/src/apps/ui.rs
+++ b/dapps/src/apps/ui.rs
@@ -1,55 +0,0 @@
-// 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::{Control, StatusCode};
-
-use endpoint::{Endpoint, Handler, 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 to_async_handler(&self, _path: EndpointPath, _control: Control) -> Box<Handler> {
-		if let Some(ref frame) = self.embeddable_on {
-			trace!(target: "dapps", "Redirecting to signer interface.");
-			handlers::Redirection::boxed(&format!("http://{}:{}", &frame.host, frame.port))
-		} else {
-			trace!(target: "dapps", "Signer disabled, returning 404.");
-			Box::new(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,
-			))
-		}
-	}
-}
--- a/dapps/src/endpoint.rs
+++ b/dapps/src/endpoint.rs
@@ -16,10 +16,8 @@

 //! URL Endpoint traits

-use std::sync::Arc;
-use std::collections::BTreeMap;
-
 use hyper::{self, server, net};
+use std::collections::BTreeMap;

 #[derive(Debug, PartialEq, Default, Clone)]
 pub struct EndpointPath {
@@ -39,7 +37,7 @@ pub struct EndpointInfo {
 	pub icon_url: String,
 }

-pub type Endpoints = Arc<BTreeMap<String, Box<Endpoint>>>;
+pub type Endpoints = BTreeMap<String, Box<Endpoint>>;
 pub type Handler = server::Handler<net::HttpStream> + Send;

 pub trait Endpoint : Send + Sync {
--- a/dapps/src/handlers/async.rs
+++ b/dapps/src/handlers/async.rs
@@ -1,112 +0,0 @@
-// 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/>.
-
-//! Async Content Handler
-//! Temporary solution until we switch to future-based server.
-//! Wraps a future and converts it to hyper::server::Handler;
-
-use std::{mem, time};
-use std::sync::mpsc;
-use futures::Future;
-use hyper::{server, Decoder, Encoder, Next, Control};
-use hyper::net::HttpStream;
-
-use handlers::ContentHandler;
-use parity_reactor::Remote;
-
-const TIMEOUT_SECS: u64 = 15;
-
-enum State<F, T, M> {
-	Initial(F, M, Remote, Control),
-	Waiting(mpsc::Receiver<Result<T, ()>>, M),
-	Done(ContentHandler),
-	Invalid,
-}
-
-pub struct AsyncHandler<F, T, M> {
-	state: State<F, T, M>,
-}
-
-impl<F, T, M> AsyncHandler<F, T, M> {
-	pub fn new(future: F, map: M, remote: Remote, control: Control) -> Self {
-		AsyncHandler {
-			state: State::Initial(future, map, remote, control),
-		}
-	}
-}
-
-impl<F, T, E, M> server::Handler<HttpStream> for AsyncHandler<F, Result<T, E>, M> where
-	F: Future<Item=T, Error=E> + Send + 'static,
-	M: FnOnce(Result<Result<T, E>, ()>) -> ContentHandler,
-	T: Send + 'static,
-	E: Send + 'static,
-{
-	fn on_request(&mut self, _request: server::Request<HttpStream>) -> Next {
-		if let State::Initial(future, map, remote, control) = mem::replace(&mut self.state, State::Invalid) {
-			let (tx, rx) = mpsc::sync_channel(1);
-			let control2 = control.clone();
-			let tx2 = tx.clone();
-			remote.spawn_with_timeout(move || future.then(move |result| {
-				// Send a result (ignore errors if the connection was dropped)
-				let _ = tx.send(Ok(result));
-				// Resume handler
-				let _ = control.ready(Next::read());
-
-				Ok(())
-			}), time::Duration::from_secs(TIMEOUT_SECS), move || {
-				// Notify about error
-				let _ = tx2.send(Err(()));
-				// Resume handler
-				let _ = control2.ready(Next::read());
-			});
-
-			self.state = State::Waiting(rx, map);
-		}
-
-		Next::wait()
-	}
-
-	fn on_request_readable(&mut self, _decoder: &mut Decoder<HttpStream>) -> Next {
-		if let State::Waiting(rx, map) = mem::replace(&mut self.state, State::Invalid) {
-			match rx.try_recv() {
-				Ok(result) => {
-					self.state = State::Done(map(result));
-				},
-				Err(err) => {
-					warn!("Resuming handler in incorrect state: {:?}", err);
-				}
-			}
-		}
-
-		Next::write()
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		if let State::Done(ref mut handler) = self.state {
-			handler.on_response(res)
-		} else {
-			Next::end()
-		}
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		if let State::Done(ref mut handler) = self.state {
-			handler.on_response_writable(encoder)
-		} else {
-			Next::end()
-		}
-	}
-}
--- a/dapps/src/handlers/auth.rs
+++ b/dapps/src/handlers/auth.rs
@@ -0,0 +1,44 @@
+// 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/>.
+
+//! Authorization Handlers
+
+use hyper::{server, Decoder, Encoder, Next};
+use hyper::net::HttpStream;
+use hyper::status::StatusCode;
+
+pub struct AuthRequiredHandler;
+
+impl server::Handler<HttpStream> for AuthRequiredHandler {
+	fn on_request(&mut self, _request: server::Request<HttpStream>) -> Next {
+		Next::write()
+	}
+
+	fn on_request_readable(&mut self, _decoder: &mut Decoder<HttpStream>) -> Next {
+		Next::write()
+	}
+
+	fn on_response(&mut self, res: &mut server::Response) -> Next {
+		res.set_status(StatusCode::Unauthorized);
+		res.headers_mut().set_raw("WWW-Authenticate", vec![b"Basic realm=\"Parity\"".to_vec()]);
+		Next::write()
+	}
+
+	fn on_response_writable(&mut self, _encoder: &mut Encoder<HttpStream>) -> Next {
+		Next::end()
+	}
+}
+
--- a/dapps/src/handlers/content.rs
+++ b/dapps/src/handlers/content.rs
@@ -24,7 +24,6 @@ use hyper::status::StatusCode;
 use util::version;

 use handlers::add_security_headers;
-use Embeddable;

 #[derive(Clone)]
 pub struct ContentHandler {
@@ -32,7 +31,7 @@ pub struct ContentHandler {
 	content: String,
 	mimetype: Mime,
 	write_pos: usize,
-	safe_to_embed_on: Embeddable,
+	safe_to_embed_on: Option<(String, u16)>,
 }

 impl ContentHandler {
@@ -40,17 +39,15 @@ impl ContentHandler {
 		Self::new(StatusCode::Ok, content, mimetype)
 	}

-	pub fn html(code: StatusCode, content: String, embeddable_on: Embeddable) -> Self {
+	pub fn not_found(content: String, mimetype: Mime) -> Self {
+		Self::new(StatusCode::NotFound, content, mimetype)
+	}
+
+	pub fn html(code: StatusCode, content: String, embeddable_on: Option<(String, u16)>) -> 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 {
+	pub fn error(code: StatusCode, title: &str, message: &str, details: Option<&str>, embeddable_on: Option<(String, u16)>) -> Self {
 		Self::html(code, format!(
 			include_str!("../error_tpl.html"),
 			title=title,
@@ -64,18 +61,13 @@ impl ContentHandler {
 		Self::new_embeddable(code, content, mimetype, None)
 	}

-	pub fn new_embeddable(
-		code: StatusCode,
-		content: String,
-		mimetype: Mime,
-		safe_to_embed_on: Embeddable,
-	) -> Self {
+	pub fn new_embeddable(code: StatusCode, content: String, mimetype: Mime, embeddable_on: Option<(String, u16)>) -> Self {
 		ContentHandler {
-			code,
-			content,
-			mimetype,
+			code: code,
+			content: content,
+			mimetype: mimetype,
 			write_pos: 0,
-			safe_to_embed_on,
+			safe_to_embed_on: embeddable_on,
 		}
 	}
 }
@@ -92,7 +84,7 @@ impl server::Handler<HttpStream> for ContentHandler {
 	fn on_response(&mut self, res: &mut server::Response) -> Next {
 		res.set_status(self.code);
 		res.headers_mut().set(header::ContentType(self.mimetype.clone()));
-		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on.take());
+		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on.clone());
 		Next::write()
 	}

--- a/dapps/src/handlers/fetch.rs
+++ b/dapps/src/handlers/fetch.rs
@@ -33,7 +33,6 @@ use hyper::status::StatusCode;
 use endpoint::EndpointPath;
 use handlers::{ContentHandler, StreamingHandler};
 use page::{LocalPageEndpoint, PageHandlerWaiting};
-use {Embeddable};

 const FETCH_TIMEOUT: u64 = 300;

@@ -180,7 +179,7 @@ impl server::Handler<HttpStream> for WaitingHandler {

 #[derive(Clone)]
 struct Errors {
-	embeddable_on: Embeddable,
+	embeddable_on: Option<(String, u16)>,
 }

 impl Errors {
@@ -242,20 +241,20 @@ impl<H: ContentValidator, F: Fetch> ContentFetcherHandler<H, F> {
 		path: EndpointPath,
 		control: Control,
 		installer: H,
-		embeddable_on: Embeddable,
+		embeddable_on: Option<(String, u16)>,
 		remote: Remote,
 		fetch: F,
 	) -> Self {
 		ContentFetcherHandler {
 			fetch_control: FetchControl::default(),
-			control,
-			remote,
-			fetch,
+			control: control,
+			remote: remote,
+			fetch: fetch,
 			status: FetchState::NotStarted(url),
 			installer: Some(installer),
-			path,
+			path: path,
 			errors: Errors {
-				embeddable_on,
+				embeddable_on: embeddable_on,
 			},
 		}
 	}
--- a/dapps/src/handlers/mod.rs
+++ b/dapps/src/handlers/mod.rs
@@ -16,105 +16,39 @@

 //! Hyper handlers implementations.

-mod async;
+mod auth;
 mod content;
 mod echo;
 mod fetch;
 mod redirect;
 mod streaming;

-pub use self::async::AsyncHandler;
+pub use self::auth::AuthRequiredHandler;
 pub use self::content::ContentHandler;
 pub use self::echo::EchoHandler;
 pub use self::fetch::{ContentFetcherHandler, ContentValidator, FetchControl, ValidatorResponse};
 pub use self::redirect::Redirection;
 pub use self::streaming::StreamingHandler;

-use std::iter;
-use util::Itertools;
-
 use url::Url;
 use hyper::{server, header, net, uri};
-use {apps, address, Embeddable};
+use address;

 /// Adds security-related headers to the Response.
-pub fn add_security_headers(headers: &mut header::Headers, embeddable_on: Embeddable) {
+pub fn add_security_headers(headers: &mut header::Headers, embeddable_on: Option<(String, u16)>) {
 	headers.set_raw("X-XSS-Protection", vec![b"1; mode=block".to_vec()]);
 	headers.set_raw("X-Content-Type-Options", vec![b"nosniff".to_vec()]);

 	// Embedding header:
-	if let None = embeddable_on {
+	if let Some(embeddable_on) = embeddable_on {
+		headers.set_raw(
+			"X-Frame-Options",
+			vec![format!("ALLOW-FROM http://{}", address(&embeddable_on)).into_bytes()]
+			);
+	} else {
+		// TODO [ToDr] Should we be more strict here (DENY?)?
 		headers.set_raw("X-Frame-Options",  vec![b"SAMEORIGIN".to_vec()]);
 	}
-
-	// Content Security Policy headers
-	headers.set_raw("Content-Security-Policy", vec![
-		// Allow connecting to WS servers and HTTP(S) servers.
-		// We could be more restrictive and allow only RPC server URL.
-		b"connect-src http: https: ws: wss:;".to_vec(),
-		// Allow framing any content from HTTP(S).
-		// Again we could only allow embedding from RPC server URL.
-		// (deprecated)
-		b"frame-src 'self' http: https:;".to_vec(),
-		// Allow framing and web workers from HTTP(S).
-		b"child-src 'self' http: https:;".to_vec(),
-		// 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)
-		b"img-src 'self' 'unsafe-inline' data: blob: http: https:;".to_vec(),
-		// Allow style from data: blob: and HTTPS.
-		b"style-src 'self' 'unsafe-inline' data: blob: https:;".to_vec(),
-		// Allow fonts from data: and HTTPS.
-		b"font-src 'self' data: https:;".to_vec(),
-		// Allow inline scripts and scripts eval (webpack/jsconsole)
-		{
-			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();
-			format!(
-				"script-src 'self' 'unsafe-inline' 'unsafe-eval' {};",
-				script_src
-			).into_bytes()
-		},
-		// Same restrictions as script-src with additional
-		// blob: that is required for camera access (worker)
-		b"worker-src 'self' 'unsafe-inline' 'unsafe-eval' https: blob:;".to_vec(),
-		// Restrict everything else to the same origin.
-		b"default-src 'self';".to_vec(),
-		// Run in sandbox mode (although it's not fully safe since we allow same-origin and script)
-		b"sandbox allow-same-origin allow-forms allow-modals allow-popups allow-presentation allow-scripts;".to_vec(),
-		// Disallow subitting forms from any dapps
-		b"form-action 'none';".to_vec(),
-		// Never allow mixed content
-		b"block-all-mixed-content;".to_vec(),
-		// 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';"),
-		}.into_bytes(),
-	]);
 }


@@ -153,3 +87,4 @@ pub fn convert_uri_to_url(uri: &uri::RequestUri, host: Option<&header::Host>) ->
 		_ => None,
 	}
 }
+
--- a/dapps/src/handlers/streaming.rs
+++ b/dapps/src/handlers/streaming.rs
@@ -24,7 +24,6 @@ use hyper::mime::Mime;
 use hyper::status::StatusCode;

 use handlers::add_security_headers;
-use Embeddable;

 const BUFFER_SIZE: usize = 1024;

@@ -34,11 +33,11 @@ pub struct StreamingHandler<R: io::Read> {
 	status: StatusCode,
 	content: io::BufReader<R>,
 	mimetype: Mime,
-	safe_to_embed_on: Embeddable,
+	safe_to_embed_on: Option<(String, u16)>,
 }

 impl<R: io::Read> StreamingHandler<R> {
-	pub fn new(content: R, status: StatusCode, mimetype: Mime, embeddable_on: Embeddable) -> Self {
+	pub fn new(content: R, status: StatusCode, mimetype: Mime, embeddable_on: Option<(String, u16)>) -> Self {
 		StreamingHandler {
 			buffer: [0; BUFFER_SIZE],
 			buffer_leftover: 0,
@@ -69,7 +68,7 @@ impl<R: io::Read> server::Handler<HttpStream> for StreamingHandler<R> {
 	fn on_response(&mut self, res: &mut server::Response) -> Next {
 		res.set_status(self.status);
 		res.headers_mut().set(header::ContentType(self.mimetype.clone()));
-		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on.take());
+		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on.clone());
 		Next::write()
 	}

--- a/dapps/src/lib.rs
+++ b/dapps/src/lib.rs
@@ -20,28 +20,26 @@
 #![cfg_attr(feature="nightly", plugin(clippy))]

 extern crate base32;
-extern crate futures;
-extern crate linked_hash_map;
-extern crate mime_guess;
-extern crate rand;
-extern crate rustc_hex;
+extern crate hyper;
+extern crate time;
+extern crate url as url_lib;
+extern crate unicase;
 extern crate serde;
 extern crate serde_json;
-extern crate time;
-extern crate unicase;
-extern crate url as url_lib;
 extern crate zip;
-
+extern crate rand;
 extern crate jsonrpc_core;
 extern crate jsonrpc_http_server;
-
+extern crate mime_guess;
+extern crate rustc_serialize;
+extern crate ethcore_rpc;
 extern crate ethcore_util as util;
-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 linked_hash_map;
+extern crate fetch;
+extern crate parity_dapps_glue as parity_dapps;
+extern crate futures;
 extern crate parity_reactor;
-extern crate parity_ui;

 #[macro_use]
 extern crate log;
@@ -55,11 +53,13 @@ extern crate ethcore_devtools as devtools;
 #[cfg(test)]
 extern crate env_logger;

+
 mod endpoint;
 mod apps;
 mod page;
 mod router;
 mod handlers;
+mod rpc;
 mod api;
 mod proxypac;
 mod url;
@@ -67,197 +67,333 @@ mod web;
 #[cfg(test)]
 mod tests;

-use std::path::PathBuf;
-use std::sync::Arc;
+use std::path::{Path, PathBuf};
+use std::sync::{Arc, Mutex};
+use std::net::SocketAddr;
 use std::collections::HashMap;

-use jsonrpc_http_server::{self as http, hyper, Origin};
-
-use fetch::Fetch;
-use node_health::NodeHealth;
+use ethcore_rpc::{Metadata};
+use fetch::{Fetch, Client as FetchClient};
+use hash_fetch::urlhint::ContractClient;
+use jsonrpc_core::Middleware;
+use jsonrpc_core::reactor::RpcHandler;
+use router::auth::{Authorization, NoAuth, HttpBasicAuth};
 use parity_reactor::Remote;

-pub use hash_fetch::urlhint::ContractClient;
-pub use node_health::SyncStatus;
+use self::apps::{HOME_PAGE, DAPPS_DOMAIN};

+/// Indicates sync status
+pub trait SyncStatus: Send + Sync {
+	/// Returns true if there is a major sync happening.
+	fn is_major_importing(&self) -> bool;
+}
+
+impl<F> SyncStatus for F where F: Fn() -> bool + Send + Sync {
+	fn is_major_importing(&self) -> bool { self() }
+}

 /// 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>;
+	/// Should return true if token is a valid web proxy access token.
+	fn is_web_proxy_token_valid(&self, token: &str) -> bool;
 }

-impl<F> WebProxyTokens for F where F: Fn(String) -> Option<Origin> + Send + Sync {
-	fn domain(&self, token: &str) -> Option<Origin> { self(token.to_owned()) }
+impl<F> WebProxyTokens for F where F: Fn(String) -> bool + Send + Sync {
+	fn is_web_proxy_token_valid(&self, token: &str) -> bool { self(token.to_owned()) }
 }

-/// Current supported endpoints.
-pub struct Endpoints {
-	endpoints: endpoint::Endpoints,
+/// Webapps HTTP+RPC server build.
+pub struct ServerBuilder<T: Fetch = FetchClient> {
+	dapps_path: PathBuf,
+	extra_dapps: Vec<PathBuf>,
+	registrar: Arc<ContractClient>,
+	sync_status: Arc<SyncStatus>,
+	web_proxy_tokens: Arc<WebProxyTokens>,
+	signer_address: Option<(String, u16)>,
+	allowed_hosts: Option<Vec<String>>,
+	extra_cors: Option<Vec<String>>,
+	remote: Remote,
+	fetch: Option<T>,
 }

-impl Endpoints {
-	/// Returns a current list of app endpoints.
-	pub fn list(&self) -> Vec<apps::App> {
-		self.endpoints.iter().filter_map(|(ref k, ref e)| {
-			e.info().map(|ref info| apps::App::from_info(k, info))
-		}).collect()
+impl ServerBuilder {
+	/// Construct new dapps server
+	pub fn new<P: AsRef<Path>>(dapps_path: P, registrar: Arc<ContractClient>, remote: Remote) -> Self {
+		ServerBuilder {
+			dapps_path: dapps_path.as_ref().to_owned(),
+			extra_dapps: vec![],
+			registrar: registrar,
+			sync_status: Arc::new(|| false),
+			web_proxy_tokens: Arc::new(|_| false),
+			signer_address: None,
+			allowed_hosts: Some(vec![]),
+			extra_cors: None,
+			remote: remote,
+			fetch: None,
+		}
 	}
 }

-/// Dapps server as `jsonrpc-http-server` request middleware.
-pub struct Middleware {
-	router: router::Router,
-	endpoints: endpoint::Endpoints,
-}
-
-impl Middleware {
-	/// Get local endpoints handle.
-	pub fn endpoints(&self) -> Endpoints {
-		Endpoints {
-			endpoints: self.endpoints.clone(),
+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,
+			extra_dapps: vec![],
+			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,
+			extra_cors: self.extra_cors,
+			remote: self.remote,
+			fetch: Some(fetch),
 		}
 	}

-	/// Creates new middleware for UI server.
-	pub fn ui<F: Fetch>(
-		health: NodeHealth,
-		remote: Remote,
-		dapps_domain: &str,
-		registrar: Arc<ContractClient>,
-		sync_status: Arc<SyncStatus>,
-		fetch: F,
-	) -> Self {
-		let content_fetcher = Arc::new(apps::fetcher::ContentFetcher::new(
-			hash_fetch::urlhint::URLHintContract::new(registrar),
-			sync_status.clone(),
-			remote.clone(),
-			fetch.clone(),
-		).embeddable_on(None).allow_dapps(false));
-		let special = {
-			let mut special = special_endpoints(
-				health,
-				content_fetcher.clone(),
-				remote.clone(),
-			);
-			special.insert(router::SpecialEndpoint::Home, Some(apps::ui()));
-			special
+	/// Change default sync status.
+	pub fn sync_status(mut self, status: Arc<SyncStatus>) -> Self {
+		self.sync_status = status;
+		self
+	}
+
+	/// Change default web proxy tokens validator.
+	pub fn web_proxy_tokens(mut self, tokens: Arc<WebProxyTokens>) -> Self {
+		self.web_proxy_tokens = tokens;
+		self
+	}
+
+	/// Change default signer port.
+	pub fn signer_address(mut self, signer_address: Option<(String, u16)>) -> Self {
+		self.signer_address = signer_address;
+		self
+	}
+
+	/// Change allowed hosts.
+	/// `None` - All hosts are allowed
+	/// `Some(whitelist)` - Allow only whitelisted hosts (+ listen address)
+	pub fn allowed_hosts(mut self, allowed_hosts: Option<Vec<String>>) -> Self {
+		self.allowed_hosts = allowed_hosts;
+		self
+	}
+
+	/// Extra cors headers.
+	/// `None` - no additional CORS URLs
+	pub fn extra_cors_headers(mut self, cors: Option<Vec<String>>) -> Self {
+		self.extra_cors = cors;
+		self
+	}
+
+	/// Change extra dapps paths (apart from `dapps_path`)
+	pub fn extra_dapps<P: AsRef<Path>>(mut self, extra_dapps: &[P]) -> Self {
+		self.extra_dapps = extra_dapps.iter().map(|p| p.as_ref().to_owned()).collect();
+		self
+	}
+
+	/// Asynchronously start server with no authentication,
+	/// returns result with `Server` handle on success or an error.
+	pub fn start_unsecured_http<S: Middleware<Metadata>>(self, addr: &SocketAddr, handler: RpcHandler<Metadata, S>) -> Result<Server, ServerError> {
+		let fetch = self.fetch_client()?;
+		Server::start_http(
+			addr,
+			self.allowed_hosts,
+			self.extra_cors,
+			NoAuth,
+			handler,
+			self.dapps_path,
+			self.extra_dapps,
+			self.signer_address,
+			self.registrar,
+			self.sync_status,
+			self.web_proxy_tokens,
+			self.remote,
+			fetch,
+		)
+	}
+
+	/// Asynchronously start server with `HTTP Basic Authentication`,
+	/// return result with `Server` handle on success or an error.
+	pub fn start_basic_auth_http<S: Middleware<Metadata>>(self, addr: &SocketAddr, username: &str, password: &str, handler: RpcHandler<Metadata, S>) -> Result<Server, ServerError> {
+		let fetch = self.fetch_client()?;
+		Server::start_http(
+			addr,
+			self.allowed_hosts,
+			self.extra_cors,
+			HttpBasicAuth::single_user(username, password),
+			handler,
+			self.dapps_path,
+			self.extra_dapps,
+			self.signer_address,
+			self.registrar,
+			self.sync_status,
+			self.web_proxy_tokens,
+			self.remote,
+			fetch,
+		)
+	}
+
+	fn fetch_client(&self) -> Result<T, ServerError> {
+		match self.fetch.clone() {
+			Some(fetch) => Ok(fetch),
+			None => T::new().map_err(|_| ServerError::FetchInitialization),
+		}
+	}
+}
+
+/// Webapps HTTP server.
+pub struct Server {
+	server: Option<hyper::server::Listening>,
+	panic_handler: Arc<Mutex<Option<Box<Fn() -> () + Send>>>>,
+}
+
+impl Server {
+	/// Returns a list of allowed hosts or `None` if all hosts are allowed.
+	fn allowed_hosts(hosts: Option<Vec<String>>, bind_address: String) -> Option<Vec<String>> {
+		let mut allowed = Vec::new();
+
+		match hosts {
+			Some(hosts) => allowed.extend_from_slice(&hosts),
+			None => return None,
+		}
+
+		// Add localhost domain as valid too if listening on loopback interface.
+		allowed.push(bind_address.replace("127.0.0.1", "localhost").into());
+		allowed.push(bind_address.into());
+		Some(allowed)
+	}
+
+	/// Returns a list of CORS domains for API endpoint.
+	fn cors_domains(signer_address: Option<(String, u16)>, extra_cors: Option<Vec<String>>) -> Vec<String> {
+		let basic_cors = match signer_address {
+			Some(signer_address) => vec![
+				format!("http://{}{}", HOME_PAGE, DAPPS_DOMAIN),
+				format!("http://{}{}:{}", HOME_PAGE, DAPPS_DOMAIN, signer_address.1),
+				format!("http://{}", address(&signer_address)),
+				format!("https://{}{}", HOME_PAGE, DAPPS_DOMAIN),
+				format!("https://{}{}:{}", HOME_PAGE, DAPPS_DOMAIN, signer_address.1),
+				format!("https://{}", address(&signer_address)),
+			],
+			None => vec![],
 		};
-		let router = router::Router::new(
-			content_fetcher,
-			None,
-			special,
-			None,
-			dapps_domain.to_owned(),
-		);

-		Middleware {
-			router: router,
-			endpoints: Default::default(),
+		match extra_cors {
+			None => basic_cors,
+			Some(extra_cors) => basic_cors.into_iter().chain(extra_cors).collect(),
 		}
 	}

-	/// Creates new Dapps server middleware.
-	pub fn dapps<F: Fetch>(
-		health: NodeHealth,
-		remote: Remote,
-		ui_address: Option<(String, u16)>,
-		extra_embed_on: Vec<(String, u16)>,
-		extra_script_src: Vec<(String, u16)>,
+	fn start_http<A: Authorization + 'static, F: Fetch, T: Middleware<Metadata>>(
+		addr: &SocketAddr,
+		hosts: Option<Vec<String>>,
+		extra_cors: Option<Vec<String>>,
+		authorization: A,
+		handler: RpcHandler<Metadata, T>,
 		dapps_path: PathBuf,
 		extra_dapps: Vec<PathBuf>,
-		dapps_domain: &str,
+		signer_address: Option<(String, u16)>,
 		registrar: Arc<ContractClient>,
 		sync_status: Arc<SyncStatus>,
 		web_proxy_tokens: Arc<WebProxyTokens>,
+		remote: Remote,
 		fetch: F,
-	) -> Self {
-		let embeddable = as_embeddable(ui_address, extra_embed_on, extra_script_src, dapps_domain);
+	) -> Result<Server, ServerError> {
+		let panic_handler = Arc::new(Mutex::new(None));
+		let authorization = Arc::new(authorization);
 		let content_fetcher = Arc::new(apps::fetcher::ContentFetcher::new(
 			hash_fetch::urlhint::URLHintContract::new(registrar),
-			sync_status.clone(),
+			sync_status,
+			signer_address.clone(),
 			remote.clone(),
 			fetch.clone(),
-		).embeddable_on(embeddable.clone()).allow_dapps(true));
-		let endpoints = apps::all_endpoints(
+		));
+		let endpoints = Arc::new(apps::all_endpoints(
 			dapps_path,
 			extra_dapps,
-			dapps_domain,
-			embeddable.clone(),
+			signer_address.clone(),
 			web_proxy_tokens,
 			remote.clone(),
 			fetch.clone(),
-		);
+		));
+		let cors_domains = Self::cors_domains(signer_address.clone(), extra_cors);

-		let special = {
-			let mut special = special_endpoints(
-				health,
-				content_fetcher.clone(),
-				remote.clone(),
-			);
+		let special = Arc::new({
+			let mut special = HashMap::new();
+			special.insert(router::SpecialEndpoint::Rpc, rpc::rpc(handler, cors_domains.clone(), panic_handler.clone()));
+			special.insert(router::SpecialEndpoint::Utils, apps::utils());
 			special.insert(
-				router::SpecialEndpoint::Home,
-				Some(apps::ui_redirection(embeddable.clone())),
+				router::SpecialEndpoint::Api,
+				api::RestApi::new(cors_domains, endpoints.clone(), content_fetcher.clone())
 			);
 			special
-		};
+		});
+		let hosts = Self::allowed_hosts(hosts, format!("{}", addr));

-		let router = router::Router::new(
-			content_fetcher,
-			Some(endpoints.clone()),
-			special,
-			embeddable,
-			dapps_domain.to_owned(),
-		);
+		hyper::Server::http(addr)?
+			.handle(move |ctrl| router::Router::new(
+				ctrl,
+				signer_address.clone(),
+				content_fetcher.clone(),
+				endpoints.clone(),
+				special.clone(),
+				authorization.clone(),
+				hosts.clone(),
+			))
+			.map(|(l, srv)| {

-		Middleware {
-			router: router,
-			endpoints: endpoints,
+				::std::thread::spawn(move || {
+					srv.run();
+				});
+
+				Server {
+					server: Some(l),
+					panic_handler: panic_handler,
+				}
+			})
+			.map_err(ServerError::from)
+	}
+
+	/// Set callback for panics.
+	pub fn set_panic_handler<F>(&self, handler: F) where F : Fn() -> () + Send + 'static {
+		*self.panic_handler.lock().unwrap() = Some(Box::new(handler));
+	}
+
+	#[cfg(test)]
+	/// 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")
+			.addrs()
+			.first()
+			.expect("You cannot start the server without binding to at least one address; qed")
+	}
+}
+
+impl Drop for Server {
+	fn drop(&mut self) {
+		self.server.take().unwrap().close()
+	}
+}
+
+/// Webapp Server startup error
+#[derive(Debug)]
+pub enum ServerError {
+	/// Wrapped `std::io::Error`
+	IoError(std::io::Error),
+	/// Other `hyper` error
+	Other(hyper::error::Error),
+	/// Fetch service initialization error
+	FetchInitialization,
+}
+
+impl From<hyper::error::Error> for ServerError {
+	fn from(err: hyper::error::Error) -> Self {
+		match err {
+			hyper::error::Error::Io(e) => ServerError::IoError(e),
+			e => ServerError::Other(e),
 		}
 	}
 }

-impl http::RequestMiddleware for Middleware {
-	fn on_request(&self, req: &hyper::server::Request<hyper::net::HttpStream>, control: &hyper::Control) -> http::RequestMiddlewareAction {
-		self.router.on_request(req, control)
-	}
-}
-
-fn special_endpoints(
-	health: NodeHealth,
-	content_fetcher: Arc<apps::fetcher::Fetcher>,
-	remote: Remote,
-) -> 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()));
-	special.insert(router::SpecialEndpoint::Api, Some(api::RestApi::new(
-		content_fetcher,
-		health,
-		remote,
-	)));
-	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;
@@ -265,19 +401,49 @@ fn random_filename() -> String {
 	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,
+fn address(address: &(String, u16)) -> String {
+	format!("{}:{}", address.0, address.1)
+}
+
+#[cfg(test)]
+mod util_tests {
+	use super::Server;
+
+	#[test]
+	fn should_return_allowed_hosts() {
+		// given
+		let bind_address = "127.0.0.1".to_owned();
+
+		// when
+		let all = Server::allowed_hosts(None, bind_address.clone());
+		let address = Server::allowed_hosts(Some(Vec::new()), bind_address.clone());
+		let some = Server::allowed_hosts(Some(vec!["ethcore.io".into()]), bind_address.clone());
+
+		// then
+		assert_eq!(all, None);
+		assert_eq!(address, Some(vec!["localhost".into(), "127.0.0.1".into()]));
+		assert_eq!(some, Some(vec!["ethcore.io".into(), "localhost".into(), "127.0.0.1".into()]));
+	}
+
+	#[test]
+	fn should_return_cors_domains() {
+		// given
+
+		// when
+		let none = Server::cors_domains(None, None);
+		let some = Server::cors_domains(Some(("127.0.0.1".into(), 18180)), None);
+		let extra = Server::cors_domains(None, Some(vec!["all".to_owned()]));
+
+		// then
+		assert_eq!(none, Vec::<String>::new());
+		assert_eq!(some, vec![
+			"http://parity.web3.site".to_owned(),
+			"http://parity.web3.site:18180".into(),
+			"http://127.0.0.1:18180".into(),
+			"https://parity.web3.site".into(),
+			"https://parity.web3.site:18180".into(),
+			"https://127.0.0.1:18180".into()
+		]);
+		assert_eq!(extra, vec!["all".to_owned()]);
+	}
 }
--- a/dapps/src/page/builtin.rs
+++ b/dapps/src/page/builtin.rs
@@ -18,7 +18,6 @@ use page::{handler, PageCache};
 use std::sync::Arc;
 use endpoint::{Endpoint, EndpointInfo, EndpointPath, Handler};
 use parity_dapps::{WebApp, File, Info};
-use Embeddable;

 pub struct PageEndpoint<T : WebApp + 'static> {
 	/// Content of the files
@@ -26,9 +25,8 @@ pub struct PageEndpoint<T : WebApp + 'static> {
 	/// Prefix to strip from the path (when `None` deducted from `app_id`)
 	pub prefix: Option<String>,
 	/// Safe to be loaded in frame by other origin. (use wisely!)
-	safe_to_embed_on: Embeddable,
+	safe_to_embed_on: Option<(String, u16)>,
 	info: EndpointInfo,
-	fallback_to_index_html: bool,
 }

 impl<T: WebApp + 'static> PageEndpoint<T> {
@@ -40,20 +38,6 @@ impl<T: WebApp + 'static> PageEndpoint<T> {
 			prefix: None,
 			safe_to_embed_on: None,
 			info: EndpointInfo::from(info),
-			fallback_to_index_html: false,
-		}
-	}
-
-	/// Creates a new `PageEndpoint` for builtin (compile time) Dapp.
-	/// Instead of returning 404 this endpoint will always server index.html.
-	pub fn with_fallback_to_index(app: T) -> Self {
-		let info = app.info();
-		PageEndpoint {
-			app: Arc::new(app),
-			prefix: None,
-			safe_to_embed_on: None,
-			info: EndpointInfo::from(info),
-			fallback_to_index_html: true,
 		}
 	}

@@ -67,21 +51,19 @@ impl<T: WebApp + 'static> PageEndpoint<T> {
 			prefix: Some(prefix),
 			safe_to_embed_on: None,
 			info: EndpointInfo::from(info),
-			fallback_to_index_html: false,
 		}
 	}

 	/// Creates new `PageEndpoint` which can be safely used in iframe
 	/// even from different origin. It might be dangerous (clickjacking).
 	/// Use wisely!
-	pub fn new_safe_to_embed(app: T, address: Embeddable) -> Self {
+	pub fn new_safe_to_embed(app: T, address: Option<(String, u16)>) -> Self {
 		let info = app.info();
 		PageEndpoint {
 			app: Arc::new(app),
 			prefix: None,
 			safe_to_embed_on: address,
 			info: EndpointInfo::from(info),
-			fallback_to_index_html: false,
 		}
 	}
 }
@@ -94,7 +76,7 @@ impl<T: WebApp> Endpoint for PageEndpoint<T> {

 	fn to_handler(&self, path: EndpointPath) -> Box<Handler> {
 		Box::new(handler::PageHandler {
-			app: BuiltinDapp::new(self.app.clone(), self.fallback_to_index_html),
+			app: BuiltinDapp::new(self.app.clone()),
 			prefix: self.prefix.clone(),
 			path: path,
 			file: handler::ServedFile::new(self.safe_to_embed_on.clone()),
@@ -118,14 +100,12 @@ impl From<Info> for EndpointInfo {

 struct BuiltinDapp<T: WebApp + 'static> {
 	app: Arc<T>,
-	fallback_to_index_html: bool,
 }

 impl<T: WebApp + 'static> BuiltinDapp<T> {
-	fn new(app: Arc<T>, fallback_to_index_html: bool) -> Self {
+	fn new(app: Arc<T>) -> Self {
 		BuiltinDapp {
 			app: app,
-			fallback_to_index_html: fallback_to_index_html,
 		}
 	}
 }
@@ -134,19 +114,13 @@ impl<T: WebApp + 'static> handler::Dapp for BuiltinDapp<T> {
 	type DappFile = BuiltinDappFile<T>;

 	fn file(&self, path: &str) -> Option<Self::DappFile> {
-		let file = |path| self.app.file(path).map(|_| {
+		self.app.file(path).map(|_| {
 			BuiltinDappFile {
 				app: self.app.clone(),
 				path: path.into(),
 				write_pos: 0,
 			}
-		});
-		let res = file(path);
-		if self.fallback_to_index_html {
-			res.or_else(|| file("index.html"))
-		} else {
-			res
-		}
+		})
 	}
 }

--- a/dapps/src/page/handler.rs
+++ b/dapps/src/page/handler.rs
@@ -24,7 +24,6 @@ use hyper::status::StatusCode;
 use hyper::{Decoder, Encoder, Next};
 use endpoint::EndpointPath;
 use handlers::{ContentHandler, add_security_headers};
-use {Embeddable};

 /// Represents a file that can be sent to client.
 /// Implementation should keep track of bytes already sent internally.
@@ -60,7 +59,7 @@ pub enum ServedFile<T: Dapp> {
 }

 impl<T: Dapp> ServedFile<T> {
-	pub fn new(embeddable_on: Embeddable) -> Self {
+	pub fn new(embeddable_on: Option<(String, u16)>) -> Self {
 		ServedFile::Error(ContentHandler::error(
 			StatusCode::NotFound,
 			"404 Not Found",
@@ -103,7 +102,7 @@ pub struct PageHandler<T: Dapp> {
 	/// Requested path.
 	pub path: EndpointPath,
 	/// Flag indicating if the file can be safely embeded (put in iframe).
-	pub safe_to_embed_on: Embeddable,
+	pub safe_to_embed_on: Option<(String, u16)>,
 	/// Cache settings for this page.
 	pub cache: PageCache,
 }
@@ -175,7 +174,7 @@ impl<T: Dapp> server::Handler<HttpStream> for PageHandler<T> {
 				}

 				// Security headers:
-				add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on.take());
+				add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on.clone());
 				Next::write()
 			},
 			ServedFile::Error(ref mut handler) => {
--- a/dapps/src/page/local.rs
+++ b/dapps/src/page/local.rs
@@ -21,7 +21,6 @@ use std::path::{Path, PathBuf};
 use page::handler::{self, PageCache, PageHandlerWaiting};
 use endpoint::{Endpoint, EndpointInfo, EndpointPath, Handler};
 use mime::Mime;
-use Embeddable;

 #[derive(Debug, Clone)]
 pub struct LocalPageEndpoint {
@@ -29,11 +28,11 @@ pub struct LocalPageEndpoint {
 	mime: Option<Mime>,
 	info: Option<EndpointInfo>,
 	cache: PageCache,
-	embeddable_on: Embeddable,
+	embeddable_on: Option<(String, u16)>,
 }

 impl LocalPageEndpoint {
-	pub fn new(path: PathBuf, info: EndpointInfo, cache: PageCache, embeddable_on: Embeddable) -> Self {
+	pub fn new(path: PathBuf, info: EndpointInfo, cache: PageCache, embeddable_on: Option<(String, u16)>) -> Self {
 		LocalPageEndpoint {
 			path: path,
 			mime: None,
--- a/dapps/src/proxypac.rs
+++ b/dapps/src/proxypac.rs
@@ -18,36 +18,37 @@

 use endpoint::{Endpoint, Handler, EndpointPath};
 use handlers::ContentHandler;
-use apps::HOME_PAGE;
-use {address, Embeddable};
+use apps::{HOME_PAGE, DAPPS_DOMAIN};
+use address;

 pub struct ProxyPac {
-	embeddable: Embeddable,
-	dapps_domain: String,
+	signer_address: Option<(String, u16)>,
 }

 impl ProxyPac {
-	pub fn boxed(embeddable: Embeddable, dapps_domain: String) -> Box<Endpoint> {
-		Box::new(ProxyPac { embeddable, dapps_domain })
+	pub fn boxed(signer_address: Option<(String, u16)>) -> Box<Endpoint> {
+		Box::new(ProxyPac {
+			signer_address: signer_address
+		})
 	}
 }

 impl Endpoint for ProxyPac {
 	fn to_handler(&self, path: EndpointPath) -> Box<Handler> {
-		let ui = self.embeddable
+		let signer = self.signer_address
 			.as_ref()
-			.map(|ref parent| address(&parent.host, parent.port))
+			.map(address)
 			.unwrap_or_else(|| format!("{}:{}", path.host, path.port));

 		let content = format!(
 r#"
 function FindProxyForURL(url, host) {{
-	if (shExpMatch(host, "{0}.{1}"))
+	if (shExpMatch(host, "{0}{1}"))
 	{{
 		return "PROXY {4}";
 	}}

-	if (shExpMatch(host, "*.{1}"))
+	if (shExpMatch(host, "*{1}"))
 	{{
 		return "PROXY {2}:{3}";
 	}}
@@ -55,7 +56,7 @@ function FindProxyForURL(url, host) {{
 	return "DIRECT";
 }}
 "#,
-		HOME_PAGE, self.dapps_domain, path.host, path.port, ui);
+		HOME_PAGE, DAPPS_DOMAIN, path.host, path.port, signer);

 		Box::new(ContentHandler::ok(content, mime!(Application/Javascript)))
 	}
--- a/dapps/src/router/auth.rs
+++ b/dapps/src/router/auth.rs
@@ -0,0 +1,106 @@
+// 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 Authorization implementations
+
+use std::collections::HashMap;
+use hyper::{server, net, header, status};
+use endpoint::Handler;
+use handlers::{AuthRequiredHandler, ContentHandler};
+
+/// Authorization result
+pub enum Authorized {
+	/// Authorization was successful.
+	Yes,
+	/// Unsuccessful authorization. Handler for further work is returned.
+	No(Box<Handler>),
+}
+
+/// Authorization interface
+pub trait Authorization : Send + Sync {
+	/// Checks if authorization is valid.
+	fn is_authorized(&self, req: &server::Request<net::HttpStream>)-> Authorized;
+}
+
+/// HTTP Basic Authorization handler
+pub struct HttpBasicAuth {
+	users: HashMap<String, String>,
+}
+
+/// No-authorization implementation (authorization disabled)
+pub struct NoAuth;
+
+impl Authorization for NoAuth {
+	fn is_authorized(&self, _req: &server::Request<net::HttpStream>)-> Authorized {
+		Authorized::Yes
+	}
+}
+
+impl Authorization for HttpBasicAuth {
+	fn is_authorized(&self, req: &server::Request<net::HttpStream>) -> Authorized {
+		let auth = self.check_auth(&req);
+
+		match auth {
+			Access::Denied => {
+				Authorized::No(Box::new(ContentHandler::error(
+					status::StatusCode::Unauthorized,
+					"Unauthorized",
+					"You need to provide valid credentials to access this page.",
+					None,
+					None,
+				)))
+			},
+			Access::AuthRequired => {
+				Authorized::No(Box::new(AuthRequiredHandler))
+			},
+			Access::Granted => {
+				Authorized::Yes
+			},
+		}
+	}
+}
+
+#[derive(Debug)]
+enum Access {
+	Granted,
+	Denied,
+	AuthRequired,
+}
+
+impl HttpBasicAuth {
+	/// Creates `HttpBasicAuth` instance with only one user.
+	pub fn single_user(username: &str, password: &str) -> Self {
+		let mut users = HashMap::new();
+		users.insert(username.to_owned(), password.to_owned());
+		HttpBasicAuth {
+			users: users
+		}
+	}
+
+	fn is_authorized(&self, username: &str, password: &str) -> bool {
+		self.users.get(&username.to_owned()).map_or(false, |pass| pass == password)
+	}
+
+	fn check_auth(&self, req: &server::Request<net::HttpStream>) -> Access {
+		match req.headers().get::<header::Authorization<header::Basic>>() {
+			Some(&header::Authorization(
+				header::Basic { ref username, password: Some(ref password) }
+			)) if self.is_authorized(username, password) => Access::Granted,
+			Some(_) => Access::Denied,
+			None => Access::AuthRequired,
+		}
+	}
+}
--- a/dapps/src/router/host_validation.rs
+++ b/dapps/src/router/host_validation.rs
@@ -0,0 +1,47 @@
+// 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 apps::DAPPS_DOMAIN;
+use hyper::{server, header, StatusCode};
+use hyper::net::HttpStream;
+
+use jsonrpc_http_server::{is_host_header_valid};
+use handlers::ContentHandler;
+
+pub fn is_valid(request: &server::Request<HttpStream>, allowed_hosts: &[String], endpoints: Vec<String>) -> bool {
+	let mut endpoints = endpoints.iter()
+		.map(|endpoint| format!("{}{}", endpoint, DAPPS_DOMAIN))
+		.collect::<Vec<String>>();
+	endpoints.extend_from_slice(allowed_hosts);
+
+	let header_valid = is_host_header_valid(request, &endpoints);
+
+	match (header_valid, request.headers().get::<header::Host>()) {
+		(true, _) => true,
+		(_, Some(host)) => host.hostname.ends_with(DAPPS_DOMAIN),
+		_ => false,
+	}
+}
+
+pub fn host_invalid_response() -> Box<server::Handler<HttpStream> + Send> {
+	Box::new(ContentHandler::error(StatusCode::Forbidden,
+		"Current Host Is Disallowed",
+		"You are trying to access your node using incorrect address.",
+		Some("Use allowed URL or specify different <code>hosts</code> CLI options."),
+		None,
+	))
+}
--- a/dapps/src/router/mod.rs
+++ b/dapps/src/router/mod.rs
@@ -15,22 +15,23 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Router implementation
-//! Dispatch requests to proper application.
+//! Processes request handling authorization and dispatching it to proper application.

+pub mod auth;
+mod host_validation;
+
+use address;
 use std::cmp;
 use std::sync::Arc;
 use std::collections::HashMap;
-
 use url::{Url, Host};
-use hyper::{self, server, header, Control};
+use hyper::{self, server, header, Next, Encoder, Decoder, Control, StatusCode};
 use hyper::net::HttpStream;
-use jsonrpc_http_server as http;
-
-use apps;
+use apps::{self, DAPPS_DOMAIN};
 use apps::fetcher::Fetcher;
-use endpoint::{Endpoint, Endpoints, EndpointPath, Handler};
-use handlers;
-use Embeddable;
+use endpoint::{Endpoint, Endpoints, EndpointPath};
+use handlers::{self, Redirection, ContentHandler};
+use self::auth::{Authorization, Authorized};

 /// Special endpoints are accessible on every domain (every dapp)
 #[derive(Debug, PartialEq, Hash, Eq)]
@@ -38,38 +39,60 @@ pub enum SpecialEndpoint {
 	Rpc,
 	Api,
 	Utils,
-	Home,
 	None,
 }

-pub struct Router {
-	endpoints: Option<Endpoints>,
+pub struct Router<A: Authorization + 'static> {
+	control: Option<Control>,
+	signer_address: Option<(String, u16)>,
+	endpoints: Arc<Endpoints>,
 	fetch: Arc<Fetcher>,
-	special: HashMap<SpecialEndpoint, Option<Box<Endpoint>>>,
-	embeddable_on: Embeddable,
-	dapps_domain: String,
+	special: Arc<HashMap<SpecialEndpoint, Box<Endpoint>>>,
+	authorization: Arc<A>,
+	allowed_hosts: Option<Vec<String>>,
+	handler: Box<server::Handler<HttpStream> + Send>,
 }

-impl http::RequestMiddleware for Router {
-	fn on_request(&self, req: &server::Request<HttpStream>, control: &Control) -> http::RequestMiddlewareAction {
+impl<A: Authorization + 'static> server::Handler<HttpStream> for Router<A> {
+
+	fn on_request(&mut self, req: server::Request<HttpStream>) -> Next {
 		// Choose proper handler depending on path / domain
-		let url = handlers::extract_url(req);
-		let endpoint = extract_endpoint(&url, &self.dapps_domain);
-		let referer = extract_referer_endpoint(req, &self.dapps_domain);
+		let url = handlers::extract_url(&req);
+		let endpoint = extract_endpoint(&url);
+		let referer = extract_referer_endpoint(&req);
 		let is_utils = endpoint.1 == SpecialEndpoint::Utils;
-		let is_origin_set = req.headers().get::<header::Origin>().is_some();
 		let is_get_request = *req.method() == hyper::Method::Get;
-		let is_head_request = *req.method() == hyper::Method::Head;

 		trace!(target: "dapps", "Routing request to {:?}. Details: {:?}", url, req);

-		let control = control.clone();
+		// Validate Host header
+		if let Some(ref hosts) = self.allowed_hosts {
+			trace!(target: "dapps", "Validating host headers against: {:?}", hosts);
+			let is_valid = is_utils || host_validation::is_valid(&req, hosts, self.endpoints.keys().cloned().collect());
+			if !is_valid {
+				debug!(target: "dapps", "Rejecting invalid host header.");
+				self.handler = host_validation::host_invalid_response();
+				return self.handler.on_request(req);
+			}
+		}
+
+		trace!(target: "dapps", "Checking authorization.");
+		// Check authorization
+		let auth = self.authorization.is_authorized(&req);
+		if let Authorized::No(handler) = auth {
+			debug!(target: "dapps", "Authorization denied.");
+			self.handler = handler;
+			return self.handler.on_request(req);
+		}
+
+
+		let control = self.control.take().expect("on_request is called only once; control is always defined at start; qed");
 		debug!(target: "dapps", "Handling endpoint request: {:?}", endpoint);
-		let handler: Option<Box<Handler>> = match (endpoint.0, endpoint.1, referer) {
+		self.handler = match (endpoint.0, endpoint.1, referer) {
 			// Handle invalid web requests that we can recover from
 			(ref path, SpecialEndpoint::None, Some((ref referer, ref referer_url)))
 				if referer.app_id == apps::WEB_PATH
-					&& self.endpoints.as_ref().map(|ep| ep.contains_key(apps::WEB_PATH)).unwrap_or(false)
+					&& self.endpoints.contains_key(apps::WEB_PATH)
 					&& !is_web_endpoint(path)
 				=>
 			{
@@ -77,87 +100,110 @@ impl http::RequestMiddleware for Router {
 				let len = cmp::min(referer_url.path.len(), 2); // /web/<encoded>/
 				let base = referer_url.path[..len].join("/");
 				let requested = url.map(|u| u.path.join("/")).unwrap_or_default();
-				Some(handlers::Redirection::boxed(&format!("/{}/{}", base, requested)))
+				Redirection::boxed(&format!("/{}/{}", base, requested))
 			},
 			// First check special endpoints
 			(ref path, ref endpoint, _) if self.special.contains_key(endpoint) => {
 				trace!(target: "dapps", "Resolving to special endpoint.");
 				self.special.get(endpoint)
 					.expect("special known to contain key; qed")
-					.as_ref()
-					.map(|special| special.to_async_handler(path.clone().unwrap_or_default(), control))
+					.to_async_handler(path.clone().unwrap_or_default(), control)
 			},
 			// Then delegate to dapp
-			(Some(ref path), _, _) if self.endpoints.as_ref().map(|ep| ep.contains_key(&path.app_id)).unwrap_or(false) => {
+			(Some(ref path), _, _) if self.endpoints.contains_key(&path.app_id) => {
 				trace!(target: "dapps", "Resolving to local/builtin dapp.");
-				Some(self.endpoints
-					.as_ref()
-					.expect("endpoints known to be set; qed")
-					.get(&path.app_id)
+				self.endpoints.get(&path.app_id)
 					.expect("endpoints known to contain key; qed")
-					.to_async_handler(path.clone(), control))
+					.to_async_handler(path.clone(), control)
 			},
 			// Try to resolve and fetch the dapp
 			(Some(ref path), _, _) if self.fetch.contains(&path.app_id) => {
 				trace!(target: "dapps", "Resolving to fetchable content.");
-				Some(self.fetch.to_async_handler(path.clone(), control))
+				self.fetch.to_async_handler(path.clone(), control)
 			},
-			// 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
-				=>
-			{
+			// NOTE [todr] /home is redirected to home page since some users may have the redirection cached
+			// (in the past we used 301 instead of 302)
+			// It should be safe to remove it in (near) future.
+			//
+			// 404 for non-existent content
+			(Some(ref path), _, _) if is_get_request && path.app_id != "home" => {
 				trace!(target: "dapps", "Resolving to 404.");
-				Some(Box::new(handlers::ContentHandler::error(
-					hyper::StatusCode::NotFound,
+				Box::new(ContentHandler::error(
+					StatusCode::NotFound,
 					"404 Not Found",
 					"Requested content was not found.",
 					None,
-					self.embeddable_on.clone(),
-				)))
+					self.signer_address.clone(),
+				))
 			},
-			// Any other GET|HEAD requests to home page.
-			_ if (is_get_request || is_head_request) && self.special.contains_key(&SpecialEndpoint::Home) => {
-				self.special.get(&SpecialEndpoint::Home)
-					.expect("special known to contain key; qed")
-					.as_ref()
-					.map(|special| special.to_async_handler(Default::default(), control))
+			// Redirect any other GET request to signer.
+			_ if is_get_request => {
+				if let Some(ref signer_address) = self.signer_address {
+					trace!(target: "dapps", "Redirecting to signer interface.");
+					Redirection::boxed(&format!("http://{}", address(signer_address)))
+				} else {
+					trace!(target: "dapps", "Signer disabled, returning 404.");
+					Box::new(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."),
+						self.signer_address.clone(),
+					))
+				}
 			},
 			// RPC by default
 			_ => {
 				trace!(target: "dapps", "Resolving to RPC call.");
-				None
+				self.special.get(&SpecialEndpoint::Rpc)
+					.expect("RPC endpoint always stored; qed")
+					.to_async_handler(EndpointPath::default(), control)
 			}
 		};

-		match handler {
-			Some(handler) => http::RequestMiddlewareAction::Respond {
-				should_validate_hosts: !is_utils,
-				handler: handler,
-			},
-			None => http::RequestMiddlewareAction::Proceed {
-				should_continue_on_invalid_cors: !is_origin_set,
-			},
-		}
+		// Delegate on_request to proper handler
+		self.handler.on_request(req)
+	}
+
+	/// This event occurs each time the `Request` is ready to be read from.
+	fn on_request_readable(&mut self, decoder: &mut Decoder<HttpStream>) -> Next {
+		self.handler.on_request_readable(decoder)
+	}
+
+	/// This event occurs after the first time this handled signals `Next::write()`.
+	fn on_response(&mut self, response: &mut server::Response) -> Next {
+		self.handler.on_response(response)
+	}
+
+	/// This event occurs each time the `Response` is ready to be written to.
+	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
+		self.handler.on_response_writable(encoder)
 	}
 }

-impl Router {
+impl<A: Authorization> Router<A> {
 	pub fn new(
+		control: Control,
+		signer_address: Option<(String, u16)>,
 		content_fetcher: Arc<Fetcher>,
-		endpoints: Option<Endpoints>,
-		special: HashMap<SpecialEndpoint, Option<Box<Endpoint>>>,
-		embeddable_on: Embeddable,
-		dapps_domain: String,
-	) -> Self {
+		endpoints: Arc<Endpoints>,
+		special: Arc<HashMap<SpecialEndpoint, Box<Endpoint>>>,
+		authorization: Arc<A>,
+		allowed_hosts: Option<Vec<String>>,
+		) -> Self {
+
+		let handler = special.get(&SpecialEndpoint::Utils)
+			.expect("Utils endpoint always stored; qed")
+			.to_handler(EndpointPath::default());
 		Router {
+			control: Some(control),
+			signer_address: signer_address,
 			endpoints: endpoints,
 			fetch: content_fetcher,
 			special: special,
-			embeddable_on: embeddable_on,
-			dapps_domain: format!(".{}", dapps_domain),
+			authorization: authorization,
+			allowed_hosts: allowed_hosts,
+			handler: handler,
 		}
 	}
 }
@@ -169,19 +215,19 @@ fn is_web_endpoint(path: &Option<EndpointPath>) -> bool {
 	}
 }

-fn extract_referer_endpoint(req: &server::Request<HttpStream>, dapps_domain: &str) -> Option<(EndpointPath, Url)> {
+fn extract_referer_endpoint(req: &server::Request<HttpStream>) -> Option<(EndpointPath, Url)> {
 	let referer = req.headers().get::<header::Referer>();

 	let url = referer.and_then(|referer| Url::parse(&referer.0).ok());
 	url.and_then(|url| {
 		let option = Some(url);
-		extract_url_referer_endpoint(&option, dapps_domain).or_else(|| {
-			extract_endpoint(&option, dapps_domain).0.map(|endpoint| (endpoint, option.expect("Just wrapped; qed")))
+		extract_url_referer_endpoint(&option).or_else(|| {
+			extract_endpoint(&option).0.map(|endpoint| (endpoint, option.expect("Just wrapped; qed")))
 		})
 	})
 }

-fn extract_url_referer_endpoint(url: &Option<Url>, dapps_domain: &str) -> Option<(EndpointPath, Url)> {
+fn extract_url_referer_endpoint(url: &Option<Url>) -> Option<(EndpointPath, Url)> {
 	let query = url.as_ref().and_then(|url| url.query.as_ref());
 	match (url, query) {
 		(&Some(ref url), Some(ref query)) if query.starts_with(apps::URL_REFERER) => {
@@ -189,7 +235,7 @@ fn extract_url_referer_endpoint(url: &Option<Url>, dapps_domain: &str) -> Option
 			debug!(target: "dapps", "Recovering referer from query parameter: {}", referer_url);

 			let referer_url = Url::parse(&referer_url).ok();
-			extract_endpoint(&referer_url, dapps_domain).0.map(|endpoint| {
+			extract_endpoint(&referer_url).0.map(|endpoint| {
 				(endpoint, referer_url.expect("Endpoint returned only when url `is_some`").clone())
 			})
 		},
@@ -197,7 +243,7 @@ fn extract_url_referer_endpoint(url: &Option<Url>, dapps_domain: &str) -> Option
 	}
 }

-fn extract_endpoint(url: &Option<Url>, dapps_domain: &str) -> (Option<EndpointPath>, SpecialEndpoint) {
+fn extract_endpoint(url: &Option<Url>) -> (Option<EndpointPath>, SpecialEndpoint) {
 	fn special_endpoint(url: &Url) -> SpecialEndpoint {
 		if url.path.len() <= 1 {
 			return SpecialEndpoint::None;
@@ -207,15 +253,14 @@ fn extract_endpoint(url: &Option<Url>, dapps_domain: &str) -> (Option<EndpointPa
 			apps::RPC_PATH => SpecialEndpoint::Rpc,
 			apps::API_PATH => SpecialEndpoint::Api,
 			apps::UTILS_PATH => SpecialEndpoint::Utils,
-			apps::HOME_PAGE => SpecialEndpoint::Home,
 			_ => SpecialEndpoint::None,
 		}
 	}

 	match *url {
 		Some(ref url) => match url.host {
-			Host::Domain(ref domain) if domain.ends_with(dapps_domain) => {
-				let id = &domain[0..(domain.len() - dapps_domain.len())];
+			Host::Domain(ref domain) if domain.ends_with(DAPPS_DOMAIN) => {
+				let id = &domain[0..(domain.len() - DAPPS_DOMAIN.len())];
 				let (id, params) = if let Some(split) = id.rfind('.') {
 					let (params, id) = id.split_at(split);
 					(id[1..].to_owned(), [params.to_owned()].into_iter().chain(&url.path).cloned().collect())
@@ -249,12 +294,11 @@ fn extract_endpoint(url: &Option<Url>, dapps_domain: &str) -> (Option<EndpointPa

 #[test]
 fn should_extract_endpoint() {
-	let dapps_domain = ".web3.site";
-	assert_eq!(extract_endpoint(&None, dapps_domain), (None, SpecialEndpoint::None));
+	assert_eq!(extract_endpoint(&None), (None, SpecialEndpoint::None));

 	// With path prefix
 	assert_eq!(
-		extract_endpoint(&Url::parse("http://localhost:8080/status/index.html").ok(), dapps_domain),
+		extract_endpoint(&Url::parse("http://localhost:8080/status/index.html").ok()),
 		(Some(EndpointPath {
 			app_id: "status".to_owned(),
 			app_params: vec!["index.html".to_owned()],
@@ -266,7 +310,7 @@ fn should_extract_endpoint() {

 	// With path prefix
 	assert_eq!(
-		extract_endpoint(&Url::parse("http://localhost:8080/rpc/").ok(), dapps_domain),
+		extract_endpoint(&Url::parse("http://localhost:8080/rpc/").ok()),
 		(Some(EndpointPath {
 			app_id: "rpc".to_owned(),
 			app_params: vec!["".to_owned()],
@@ -277,7 +321,7 @@ fn should_extract_endpoint() {
 	);

 	assert_eq!(
-		extract_endpoint(&Url::parse("http://my.status.web3.site/parity-utils/inject.js").ok(), dapps_domain),
+		extract_endpoint(&Url::parse("http://my.status.web3.site/parity-utils/inject.js").ok()),
 		(Some(EndpointPath {
 			app_id: "status".to_owned(),
 			app_params: vec!["my".to_owned(), "parity-utils".into(), "inject.js".into()],
@@ -289,7 +333,7 @@ fn should_extract_endpoint() {

 	// By Subdomain
 	assert_eq!(
-		extract_endpoint(&Url::parse("http://status.web3.site/test.html").ok(), dapps_domain),
+		extract_endpoint(&Url::parse("http://status.web3.site/test.html").ok()),
 		(Some(EndpointPath {
 			app_id: "status".to_owned(),
 			app_params: vec!["test.html".to_owned()],
@@ -301,7 +345,7 @@ fn should_extract_endpoint() {

 	// RPC by subdomain
 	assert_eq!(
-		extract_endpoint(&Url::parse("http://my.status.web3.site/rpc/").ok(), dapps_domain),
+		extract_endpoint(&Url::parse("http://my.status.web3.site/rpc/").ok()),
 		(Some(EndpointPath {
 			app_id: "status".to_owned(),
 			app_params: vec!["my".to_owned(), "rpc".into(), "".into()],
@@ -313,7 +357,7 @@ fn should_extract_endpoint() {

 	// API by subdomain
 	assert_eq!(
-		extract_endpoint(&Url::parse("http://my.status.web3.site/api/").ok(), dapps_domain),
+		extract_endpoint(&Url::parse("http://my.status.web3.site/api/").ok()),
 		(Some(EndpointPath {
 			app_id: "status".to_owned(),
 			app_params: vec!["my".to_owned(), "api".into(), "".into()],
--- a/dapps/src/rpc.rs
+++ b/dapps/src/rpc.rs
@@ -0,0 +1,83 @@
+// 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, Mutex};
+use hyper;
+
+use ethcore_rpc::{Metadata, Origin};
+use jsonrpc_core::Middleware;
+use jsonrpc_core::reactor::RpcHandler;
+use jsonrpc_http_server::{Rpc, ServerHandler, PanicHandler, AccessControlAllowOrigin, HttpMetaExtractor};
+use endpoint::{Endpoint, EndpointPath, Handler};
+
+pub fn rpc<T: Middleware<Metadata>>(
+	handler: RpcHandler<Metadata, T>,
+	cors_domains: Vec<String>,
+	panic_handler: Arc<Mutex<Option<Box<Fn() -> () + Send>>>>,
+) -> Box<Endpoint> {
+	Box::new(RpcEndpoint {
+		handler: handler,
+		meta_extractor: Arc::new(MetadataExtractor),
+		panic_handler: panic_handler,
+		cors_domain: Some(cors_domains.into_iter().map(AccessControlAllowOrigin::Value).collect()),
+		// NOTE [ToDr] We don't need to do any hosts validation here. It's already done in router.
+		allowed_hosts: None,
+	})
+}
+
+struct RpcEndpoint<T: Middleware<Metadata>> {
+	handler: RpcHandler<Metadata, T>,
+	meta_extractor: Arc<HttpMetaExtractor<Metadata>>,
+	panic_handler: Arc<Mutex<Option<Box<Fn() -> () + Send>>>>,
+	cors_domain: Option<Vec<AccessControlAllowOrigin>>,
+	allowed_hosts: Option<Vec<String>>,
+}
+
+impl<T: Middleware<Metadata>> Endpoint for RpcEndpoint<T> {
+	fn to_async_handler(&self, _path: EndpointPath, control: hyper::Control) -> Box<Handler> {
+		let panic_handler = PanicHandler { handler: self.panic_handler.clone() };
+		Box::new(ServerHandler::new(
+				Rpc::new(self.handler.clone(), self.meta_extractor.clone()),
+				self.cors_domain.clone(),
+				self.allowed_hosts.clone(),
+				panic_handler,
+				control,
+		))
+	}
+}
+
+struct MetadataExtractor;
+impl HttpMetaExtractor<Metadata> for MetadataExtractor {
+	fn read_metadata(&self, request: &hyper::server::Request<hyper::net::HttpStream>) -> Metadata {
+		let dapp_id = request.headers().get::<hyper::header::Origin>()
+			.map(|origin| format!("{}://{}", origin.scheme, origin.host))
+			.or_else(|| {
+				// fallback to custom header, but only if origin is null
+				request.headers().get_raw("origin")
+					.and_then(|raw| raw.one())
+					.and_then(|raw| if raw == "null".as_bytes() {
+						request.headers().get_raw("x-parity-origin")
+							.and_then(|raw| raw.one())
+							.map(|raw| String::from_utf8_lossy(raw).into_owned())
+					} else {
+						None
+					})
+			});
+		Metadata {
+			origin: Origin::Dapps(dapp_id.map(Into::into).unwrap_or_default()),
+		}
+	}
+}
--- a/dapps/src/tests/api.rs
+++ b/dapps/src/tests/api.rs
@@ -14,7 +14,7 @@
 // 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};
+use tests::helpers::{serve, serve_with_registrar, serve_extra_cors, request, assert_security_headers};

 #[test]
 fn should_return_error() {
@@ -33,12 +33,35 @@ fn should_return_error() {
 	);

 	// then
-	response.assert_status("HTTP/1.1 404 Not Found");
-	response.assert_header("Content-Type", "application/json");
+	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
+	assert_eq!(response.headers.get(3).unwrap(), "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_serve_apps() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			GET /api/apps HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	assert_eq!(response.headers.get(3).unwrap(), "Content-Type: application/json");
+	assert!(response.body.contains("Parity UI"), response.body);
+	assert_security_headers(&response.headers);
+}
+
 #[test]
 fn should_handle_ping() {
 	// given
@@ -56,8 +79,8 @@ fn should_handle_ping() {
 	);

 	// then
-	response.assert_status("HTTP/1.1 200 OK");
-	response.assert_header("Content-Type", "application/json");
+	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	assert_eq!(response.headers.get(3).unwrap(), "Content-Type: application/json");
 	assert_eq!(response.body, "0\n\n".to_owned());
 	assert_security_headers(&response.headers);
 }
@@ -79,7 +102,135 @@ fn should_try_to_resolve_dapp() {
 	);

 	// then
-	response.assert_status("HTTP/1.1 404 Not Found");
+	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
 	assert_eq!(registrar.calls.lock().len(), 2);
 	assert_security_headers(&response.headers);
 }
+
+#[test]
+fn should_return_signer_port_cors_headers() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			POST /api/ping HTTP/1.1\r\n\
+			Host: localhost:8080\r\n\
+			Origin: http://127.0.0.1:18180\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	assert!(
+		response.headers_raw.contains("Access-Control-Allow-Origin: http://127.0.0.1:18180"),
+		"CORS header for signer missing: {:?}",
+		response.headers
+	);
+}
+
+#[test]
+fn should_return_signer_port_cors_headers_for_home_parity() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			POST /api/ping HTTP/1.1\r\n\
+			Host: localhost:8080\r\n\
+			Origin: http://parity.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	assert!(
+		response.headers_raw.contains("Access-Control-Allow-Origin: http://parity.web3.site"),
+		"CORS header for parity.web3.site missing: {:?}",
+		response.headers
+	);
+}
+
+
+#[test]
+fn should_return_signer_port_cors_headers_for_home_parity_with_https() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			POST /api/ping HTTP/1.1\r\n\
+			Host: localhost:8080\r\n\
+			Origin: https://parity.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	assert!(
+		response.headers_raw.contains("Access-Control-Allow-Origin: https://parity.web3.site"),
+		"CORS header for parity.web3.site missing: {:?}",
+		response.headers
+	);
+}
+
+#[test]
+fn should_return_signer_port_cors_headers_for_home_parity_with_port() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			POST /api/ping HTTP/1.1\r\n\
+			Host: localhost:8080\r\n\
+			Origin: http://parity.web3.site:18180\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	assert!(
+		response.headers_raw.contains("Access-Control-Allow-Origin: http://parity.web3.site:18180"),
+		"CORS header for parity.web3.site missing: {:?}",
+		response.headers
+	);
+}
+
+#[test]
+fn should_return_extra_cors_headers() {
+	// given
+	let server = serve_extra_cors(Some(vec!["all".to_owned()]));
+
+	// when
+	let response = request(server,
+		"\
+			POST /api/ping HTTP/1.1\r\n\
+			Host: localhost:8080\r\n\
+			Origin: http://somedomain.io\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	response.assert_header("Access-Control-Allow-Origin", "http://somedomain.io");
+}
+
--- a/dapps/src/tests/authorization.rs
+++ b/dapps/src/tests/authorization.rs
@@ -0,0 +1,80 @@
+// 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_with_auth, request, assert_security_headers_for_embed};
+
+#[test]
+fn should_require_authorization() {
+	// given
+	let server = serve_with_auth("test", "test");
+
+	// 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
+	assert_eq!(response.status, "HTTP/1.1 401 Unauthorized".to_owned());
+	assert_eq!(response.headers.get(0).unwrap(), "WWW-Authenticate: Basic realm=\"Parity\"");
+}
+
+#[test]
+fn should_reject_on_invalid_auth() {
+	// given
+	let server = serve_with_auth("test", "test");
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			Authorization: Basic QWxhZGRpbjpPcGVuU2VzYW1l\r\n
+			\r\n\
+		"
+	);
+
+	// then
+	assert_eq!(response.status, "HTTP/1.1 401 Unauthorized".to_owned());
+	assert!(response.body.contains("Unauthorized"), response.body);
+	assert_eq!(response.headers_raw.contains("WWW-Authenticate"), false);
+}
+
+#[test]
+fn should_allow_on_valid_auth() {
+	// given
+	let server = serve_with_auth("Aladdin", "OpenSesame");
+
+	// when
+	let response = request(server,
+		"\
+			GET /ui/ HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			Authorization: Basic QWxhZGRpbjpPcGVuU2VzYW1l\r\n
+			\r\n\
+		"
+	);
+
+	// then
+	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	assert_security_headers_for_embed(&response.headers);
+}
--- a/dapps/src/tests/fetch.rs
+++ b/dapps/src/tests/fetch.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use devtools::http_client;
-use rustc_hex::FromHex;
+use rustc_serialize::hex::FromHex;
 use tests::helpers::{
 	serve_with_registrar, serve_with_registrar_and_sync, serve_with_fetch,
 	serve_with_registrar_and_fetch, serve_with_registrar_and_fetch_and_threads,
@@ -60,7 +60,7 @@ fn should_return_503_when_syncing_but_should_make_the_calls() {

 	// then
 	response.assert_status("HTTP/1.1 503 Service Unavailable");
-	assert_eq!(registrar.calls.lock().len(), 2);
+	assert_eq!(registrar.calls.lock().len(), 4);
 	assert_security_headers_for_embed(&response.headers);
 }

@@ -312,7 +312,7 @@ fn should_encode_and_decode_base32() {
 #[test]
 fn should_stream_web_content() {
 	// given
-	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
+	let (server, fetch) = serve_with_fetch("token");

 	// when
 	let response = request(server,
@@ -335,7 +335,7 @@ fn should_stream_web_content() {
 #[test]
 fn should_support_base32_encoded_web_urls() {
 	// given
-	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
+	let (server, fetch) = serve_with_fetch("token");

 	// when
 	let response = request(server,
@@ -358,7 +358,7 @@ fn should_support_base32_encoded_web_urls() {
 #[test]
 fn should_correctly_handle_long_label_when_splitted() {
 	// given
-	let (server, fetch) = serve_with_fetch("xolrg9fePeQyKLnL", "https://contribution.melonport.com");
+	let (server, fetch) = serve_with_fetch("xolrg9fePeQyKLnL");

 	// when
 	let response = request(server,
@@ -382,7 +382,7 @@ fn should_correctly_handle_long_label_when_splitted() {
 #[test]
 fn should_support_base32_encoded_web_urls_as_path() {
 	// given
-	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
+	let (server, fetch) = serve_with_fetch("token");

 	// when
 	let response = request(server,
@@ -402,32 +402,10 @@ fn should_support_base32_encoded_web_urls_as_path() {
 	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");
+	let (server, fetch) = serve_with_fetch("test");

 	// when
 	let response = request(server,
@@ -449,7 +427,7 @@ fn should_return_error_on_invalid_token() {
 #[test]
 fn should_return_error_on_invalid_protocol() {
 	// given
-	let (server, fetch) = serve_with_fetch("token", "ftp://parity.io");
+	let (server, fetch) = serve_with_fetch("token");

 	// when
 	let response = request(server,
@@ -471,7 +449,7 @@ fn should_return_error_on_invalid_protocol() {
 #[test]
 fn should_disallow_non_get_requests() {
 	// given
-	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
+	let (server, fetch) = serve_with_fetch("token");

 	// when
 	let response = request(server,
@@ -496,7 +474,7 @@ fn should_disallow_non_get_requests() {
 #[test]
 fn should_fix_absolute_requests_based_on_referer() {
 	// given
-	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
+	let (server, fetch) = serve_with_fetch("token");

 	// when
 	let response = request(server,
@@ -519,7 +497,7 @@ fn should_fix_absolute_requests_based_on_referer() {
 #[test]
 fn should_fix_absolute_requests_based_on_referer_in_url() {
 	// given
-	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
+	let (server, fetch) = serve_with_fetch("token");

 	// when
 	let response = request(server,
--- a/dapps/src/tests/helpers/fetch.rs
+++ b/dapps/src/tests/helpers/fetch.rs
@@ -114,7 +114,7 @@ impl Fetch for FakeFetch {

 			let data = response.lock().take().unwrap_or(b"Some content");
 			let cursor = io::Cursor::new(data);
-			tx.send(fetch::Response::from_reader(cursor)).unwrap();
+			tx.complete(fetch::Response::from_reader(cursor));
 		});

 		rx.map_err(|_| fetch::Error::Aborted).boxed()
--- a/dapps/src/tests/helpers/mod.rs
+++ b/dapps/src/tests/helpers/mod.rs
@@ -16,21 +16,19 @@

 use std::env;
 use std::str;
-use std::net::SocketAddr;
-use std::path::{Path, PathBuf};
+use std::ops::Deref;
 use std::sync::Arc;
 use env_logger::LogBuilder;
-use jsonrpc_core::IoHandler;
-use jsonrpc_http_server::{self as http, Host, DomainsValidation};
+use ethcore_rpc::Metadata;
+use jsonrpc_core::MetaIoHandler;
+use jsonrpc_core::reactor::RpcEventLoop;

+use ServerBuilder;
+use Server;
+use fetch::Fetch;
 use devtools::http_client;
-use hash_fetch::urlhint::ContractClient;
-use fetch::{Fetch, Client as FetchClient};
-use node_health::{NodeHealth, TimeChecker, CpuPool};
 use parity_reactor::Remote;

-use {Middleware, SyncStatus, WebProxyTokens};
-
 mod registrar;
 mod fetch;

@@ -39,13 +37,6 @@ 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") {
@@ -55,7 +46,20 @@ fn init_logger() {
 	}
 }

-pub fn init_server<F, B>(process: F, io: IoHandler, remote: Remote) -> (Server, Arc<FakeRegistrar>) where
+pub struct ServerLoop {
+	pub server: Server,
+	pub event_loop: RpcEventLoop,
+}
+
+impl Deref for ServerLoop {
+	type Target = Server;
+
+	fn deref(&self) -> &Self::Target {
+		&self.server
+	}
+}
+
+pub fn init_server<F, B>(process: F, io: MetaIoHandler<Metadata>, remote: Remote) -> (ServerLoop, Arc<FakeRegistrar>) where
 	F: FnOnce(ServerBuilder) -> ServerBuilder<B>,
 	B: Fetch,
 {
@@ -64,69 +68,95 @@ pub fn init_server<F, B>(process: F, io: IoHandler, remote: Remote) -> (Server,
 	let mut dapps_path = env::temp_dir();
 	dapps_path.push("non-existent-dir-to-prevent-fs-files-from-loading");

+	// TODO [ToDr] When https://github.com/ethcore/jsonrpc/issues/26 is resolved
+	// this additional EventLoop wouldn't be needed, we should be able to re-use remote.
+	let event_loop = RpcEventLoop::spawn();
+	let handler = event_loop.handler(Arc::new(io));
 	let server = process(ServerBuilder::new(
 		&dapps_path, registrar.clone(), remote,
 	))
 		.signer_address(Some(("127.0.0.1".into(), SIGNER_PORT)))
-		.start_unsecured_http(&"127.0.0.1:0".parse().unwrap(), io).unwrap();
+		.start_unsecured_http(&"127.0.0.1:0".parse().unwrap(), handler).unwrap();
 	(
-		server,
+		ServerLoop { server: server, event_loop: event_loop },
 		registrar,
 	)
 }

-pub fn serve_with_rpc(io: IoHandler) -> Server {
-	init_server(|builder| builder, io, Remote::new_sync()).0
+pub fn serve_with_auth(user: &str, pass: &str) -> ServerLoop {
+	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 event_loop = RpcEventLoop::spawn();
+	let handler = event_loop.handler(Arc::new(MetaIoHandler::default()));
+	let server = ServerBuilder::new(&dapps_path, registrar, Remote::new(event_loop.remote()))
+		.signer_address(Some(("127.0.0.1".into(), SIGNER_PORT)))
+		.allowed_hosts(None)
+		.start_basic_auth_http(&"127.0.0.1:0".parse().unwrap(), user, pass, handler).unwrap();
+	ServerLoop {
+		server: server,
+		event_loop: event_loop,
+	}
 }

-pub fn serve_hosts(hosts: Option<Vec<String>>) -> Server {
-	let hosts = hosts.map(|hosts| hosts.into_iter().map(Into::into).collect());
-	init_server(|builder| builder.allowed_hosts(hosts.into()), Default::default(), Remote::new_sync()).0
+pub fn serve_with_rpc(io: MetaIoHandler<Metadata>) -> ServerLoop {
+	init_server(|builder| builder.allowed_hosts(None), io, Remote::new_sync()).0
 }

-pub fn serve_with_registrar() -> (Server, Arc<FakeRegistrar>) {
-	init_server(|builder| builder, Default::default(), Remote::new_sync())
+pub fn serve_hosts(hosts: Option<Vec<String>>) -> ServerLoop {
+	init_server(|builder| builder.allowed_hosts(hosts), Default::default(), Remote::new_sync()).0
 }

-pub fn serve_with_registrar_and_sync() -> (Server, Arc<FakeRegistrar>) {
+pub fn serve_extra_cors(extra_cors: Option<Vec<String>>) -> ServerLoop {
+	init_server(|builder| builder.allowed_hosts(None).extra_cors_headers(extra_cors), Default::default(), Remote::new_sync()).0
+}
+
+pub fn serve_with_registrar() -> (ServerLoop, Arc<FakeRegistrar>) {
+	init_server(|builder| builder.allowed_hosts(None), Default::default(), Remote::new_sync())
+}
+
+pub fn serve_with_registrar_and_sync() -> (ServerLoop, Arc<FakeRegistrar>) {
 	init_server(|builder| {
-		builder.sync_status(Arc::new(FakeSync(true)))
+		builder
+			.sync_status(Arc::new(|| true))
+			.allowed_hosts(None)
 	}, Default::default(), Remote::new_sync())
 }

-pub fn serve_with_registrar_and_fetch() -> (Server, FakeFetch, Arc<FakeRegistrar>) {
+pub fn serve_with_registrar_and_fetch() -> (ServerLoop, FakeFetch, Arc<FakeRegistrar>) {
 	serve_with_registrar_and_fetch_and_threads(false)
 }

-pub fn serve_with_registrar_and_fetch_and_threads(multi_threaded: bool) -> (Server, FakeFetch, Arc<FakeRegistrar>) {
+pub fn serve_with_registrar_and_fetch_and_threads(multi_threaded: bool) -> (ServerLoop, FakeFetch, Arc<FakeRegistrar>) {
 	let fetch = FakeFetch::default();
 	let f = fetch.clone();
 	let (server, reg) = init_server(move |builder| {
-		builder.fetch(f.clone())
+		builder.allowed_hosts(None).fetch(f.clone())
 	}, Default::default(), if multi_threaded { Remote::new_thread_per_future() } else { Remote::new_sync() });

 	(server, fetch, reg)
 }

-pub fn serve_with_fetch(web_token: &'static str, domain: &'static str) -> (Server, FakeFetch) {
+pub fn serve_with_fetch(web_token: &'static str) -> (ServerLoop, FakeFetch) {
 	let fetch = FakeFetch::default();
 	let f = fetch.clone();
 	let (server, _) = init_server(move |builder| {
 		builder
+			.allowed_hosts(None)
 			.fetch(f.clone())
-			.web_proxy_tokens(Arc::new(move |token| {
-				if &token == web_token { Some(domain.into()) } else { None }
-			}))
+			.web_proxy_tokens(Arc::new(move |token| &token == web_token))
 	}, Default::default(), Remote::new_sync());

 	(server, fetch)
 }

-pub fn serve() -> Server {
-	init_server(|builder| builder, Default::default(), Remote::new_sync()).0
+pub fn serve() -> ServerLoop {
+	init_server(|builder| builder.allowed_hosts(None), Default::default(), Remote::new_sync()).0
 }

-pub fn request(server: Server, request: &str) -> http_client::Response {
+pub fn request(server: ServerLoop, request: &str) -> http_client::Response {
 	http_client::request(server.addr(), request)
 }

@@ -136,173 +166,3 @@ pub fn assert_security_headers(headers: &[String]) {
 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>,
-	remote: Remote,
-	fetch: Option<T>,
-}
-
-impl ServerBuilder {
-	/// Construct new dapps server
-	pub fn new<P: AsRef<Path>>(dapps_path: P, registrar: Arc<ContractClient>, remote: Remote) -> 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,
-			remote: remote,
-			fetch: None,
-		}
-	}
-}
-
-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,
-			remote: self.remote,
-			fetch: Some(fetch),
-		}
-	}
-
-	/// Change default sync status.
-	pub fn sync_status(mut self, status: Arc<SyncStatus>) -> Self {
-		self.sync_status = status;
-		self
-	}
-
-	/// Change default web proxy tokens validator.
-	pub fn web_proxy_tokens(mut self, tokens: Arc<WebProxyTokens>) -> Self {
-		self.web_proxy_tokens = tokens;
-		self
-	}
-
-	/// Change default signer port.
-	pub fn signer_address(mut self, signer_address: Option<(String, u16)>) -> Self {
-		self.signer_address = signer_address;
-		self
-	}
-
-	/// Change allowed hosts.
-	/// `None` - All hosts are allowed
-	/// `Some(whitelist)` - Allow only whitelisted hosts (+ listen address)
-	pub fn allowed_hosts(mut self, allowed_hosts: DomainsValidation<Host>) -> Self {
-		self.allowed_hosts = allowed_hosts;
-		self
-	}
-
-	/// 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) -> Result<Server, http::Error> {
-		let fetch = self.fetch_client();
-		Server::start_http(
-			addr,
-			io,
-			self.allowed_hosts,
-			self.signer_address,
-			self.dapps_path,
-			vec![],
-			self.registrar,
-			self.sync_status,
-			self.web_proxy_tokens,
-			self.remote,
-			fetch,
-		)
-	}
-
-	fn fetch_client(&self) -> T {
-		match self.fetch.clone() {
-			Some(fetch) => fetch,
-			None => T::new().unwrap(),
-		}
-	}
-}
-
-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,
-	) -> Result<Server, http::Error> {
-		let health = NodeHealth::new(
-			sync_status.clone(),
-			TimeChecker::new::<String>(&[], CpuPool::new(1)),
-			remote.clone(),
-		);
-		let middleware = Middleware::dapps(
-			health,
-			remote,
-			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(|mut 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")
-			.addrs()
-			.first()
-			.expect("You cannot start the server without binding to at least one address; qed")
-	}
-}
-
-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
@@ -17,7 +17,7 @@
 use std::str;
 use std::sync::Arc;
 use std::collections::HashMap;
-use rustc_hex::FromHex;
+use rustc_serialize::hex::FromHex;

 use hash_fetch::urlhint::ContractClient;
 use util::{Bytes, Address, Mutex, H256, ToPretty};
@@ -64,10 +64,9 @@ impl ContractClient for FakeRegistrar {
 		Ok(REGISTRAR.parse().unwrap())
 	}

-	fn call(&self, address: Address, data: Bytes) -> ::futures::BoxFuture<Bytes, String> {
+	fn call(&self, address: Address, data: Bytes) -> Result<Bytes, String> {
 		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))
+		self.responses.lock().get(&call).cloned().expect(&format!("No response for call: {:?}", call))
 	}
 }
--- a/dapps/src/tests/mod.rs
+++ b/dapps/src/tests/mod.rs
@@ -19,6 +19,7 @@
 mod helpers;

 mod api;
+mod authorization;
 mod fetch;
 mod redirection;
 mod rpc;
--- a/dapps/src/tests/redirection.rs
+++ b/dapps/src/tests/redirection.rs
@@ -32,27 +32,7 @@ fn should_redirect_to_home() {
 	);

 	// 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.status, "HTTP/1.1 302 Found".to_owned());
 	assert_eq!(response.headers.get(0).unwrap(), "Location: http://127.0.0.1:18180");
 }

@@ -72,7 +52,27 @@ fn should_redirect_to_home_when_trailing_slash_is_missing() {
 	);

 	// then
-	response.assert_status("HTTP/1.1 302 Found");
+	assert_eq!(response.status, "HTTP/1.1 302 Found".to_owned());
+	assert_eq!(response.headers.get(0).unwrap(), "Location: http://127.0.0.1:18180");
+}
+
+#[test]
+fn should_redirect_to_home_for_users_with_cached_redirection() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			GET /home/ HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	assert_eq!(response.status, "HTTP/1.1 302 Found".to_owned());
 	assert_eq!(response.headers.get(0).unwrap(), "Location: http://127.0.0.1:18180");
 }

@@ -92,7 +92,7 @@ fn should_display_404_on_invalid_dapp() {
 	);

 	// then
-	response.assert_status("HTTP/1.1 404 Not Found");
+	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
 	assert_security_headers_for_embed(&response.headers);
 }

@@ -112,7 +112,7 @@ fn should_display_404_on_invalid_dapp_with_domain() {
 	);

 	// then
-	response.assert_status("HTTP/1.1 404 Not Found");
+	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
 	assert_security_headers_for_embed(&response.headers);
 }

@@ -134,8 +134,8 @@ fn should_serve_rpc() {
 	);

 	// 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}"#));
+	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	assert_eq!(response.body, format!("58\n{}\n\n0\n\n", r#"{"jsonrpc":"2.0","error":{"code":-32700,"message":"Parse error","data":null},"id":null}"#));
 }

 #[test]
@@ -156,8 +156,8 @@ fn should_serve_rpc_at_slash_rpc() {
 	);

 	// 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}"#));
+	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	assert_eq!(response.body, format!("58\n{}\n\n0\n\n", r#"{"jsonrpc":"2.0","error":{"code":-32700,"message":"Parse error","data":null},"id":null}"#));
 }


@@ -178,8 +178,8 @@ fn should_serve_proxy_pac() {
 	);

 	// 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_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	assert_eq!(response.body, "DD\n\nfunction FindProxyForURL(url, host) {\n\tif (shExpMatch(host, \"parity.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);
 }

@@ -200,7 +200,7 @@ fn should_serve_utils() {
 	);

 	// then
-	response.assert_status("HTTP/1.1 200 OK");
+	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
 	assert_eq!(response.body.contains("function(){"), true);
 	assert_security_headers(&response.headers);
 }
--- a/dapps/src/tests/rpc.rs
+++ b/dapps/src/tests/rpc.rs
@@ -14,14 +14,16 @@
 // 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 futures::{future, Future};
+use ethcore_rpc::{Metadata, Origin};
+use jsonrpc_core::{MetaIoHandler, Value};

 use tests::helpers::{serve_with_rpc, request};

 #[test]
 fn should_serve_rpc() {
 	// given
-	let mut io = IoHandler::default();
+	let mut io = MetaIoHandler::default();
 	io.add_method("rpc_test", |_| {
 		Ok(Value::String("Hello World!".into()))
 	});
@@ -47,3 +49,71 @@ fn should_serve_rpc() {
 	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());
 }
+
+#[test]
+fn should_extract_metadata() {
+	// given
+	let mut io = MetaIoHandler::default();
+	io.add_method_with_meta("rpc_test", |_params, meta: Metadata| {
+		assert_eq!(meta.origin, Origin::Dapps("https://parity.io/".into()));
+		assert_eq!(meta.dapp_id(), "https://parity.io/".into());
+		future::ok(Value::String("Hello World!".into())).boxed()
+	});
+	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\
+			Origin: https://parity.io/\r\n\
+			X-Parity-Origin: https://this.should.be.ignored\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());
+}
+
+#[test]
+fn should_extract_metadata_from_custom_header() {
+	// given
+	let mut io = MetaIoHandler::default();
+	io.add_method_with_meta("rpc_test", |_params, meta: Metadata| {
+		assert_eq!(meta.origin, Origin::Dapps("https://parity.io/".into()));
+		assert_eq!(meta.dapp_id(), "https://parity.io/".into());
+		future::ok(Value::String("Hello World!".into())).boxed()
+	});
+	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\
+			Origin: null\r\n\
+			X-Parity-Origin: https://parity.io/\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
@@ -34,7 +34,7 @@ fn should_reject_invalid_host() {

 	// then
 	assert_eq!(response.status, "HTTP/1.1 403 Forbidden".to_owned());
-	assert!(response.body.contains("Provided Host header is not whitelisted."), response.body);
+	assert!(response.body.contains("Current Host Is Disallowed"), response.body);
 }

 #[test]
@@ -97,3 +97,31 @@ fn should_allow_parity_utils_even_on_invalid_domain() {
 	// then
 	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
 }
+
+#[test]
+fn should_not_return_cors_headers_for_rpc() {
+	// given
+	let server = serve_hosts(Some(vec!["localhost:8080".into()]));
+
+	// when
+	let response = request(server,
+		"\
+			POST /rpc HTTP/1.1\r\n\
+			Host: localhost:8080\r\n\
+			Origin: null\r\n\
+			Content-Type: application/json\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	assert!(
+		!response.headers_raw.contains("Access-Control-Allow-Origin"),
+		"CORS headers were not expected: {:?}",
+		response.headers
+	);
+}
+
--- a/dapps/src/web.rs
+++ b/dapps/src/web.rs
@@ -31,7 +31,9 @@ use handlers::{
 	StreamingHandler, extract_url,
 };
 use url::Url;
-use {Embeddable, WebProxyTokens};
+use WebProxyTokens;
+
+pub type Embeddable = Option<(String, u16)>;

 pub struct Web<F> {
 	embeddable_on: Embeddable,
@@ -41,17 +43,12 @@ pub struct Web<F> {
 }

 impl<F: Fetch> Web<F> {
-	pub fn boxed(
-		embeddable_on: Embeddable,
-		web_proxy_tokens: Arc<WebProxyTokens>,
-		remote: Remote,
-		fetch: F,
-	) -> Box<Endpoint> {
+	pub fn boxed(embeddable_on: Embeddable, web_proxy_tokens: Arc<WebProxyTokens>, remote: Remote, fetch: F) -> Box<Endpoint> {
 		Box::new(Web {
-			embeddable_on,
-			web_proxy_tokens,
-			remote,
-			fetch,
+			embeddable_on: embeddable_on,
+			web_proxy_tokens: web_proxy_tokens,
+			remote: remote,
+			fetch: fetch,
 		})
 	}
 }
@@ -136,14 +133,14 @@ impl<F: Fetch> WebHandler<F> {
 		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,
+		match token {
+			Some(token) if self.web_proxy_tokens.is_web_proxy_token_valid(token) => {},
 			_ => {
 				return Err(State::Error(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 {
@@ -155,12 +152,6 @@ impl<F: Fetch> WebHandler<F> {
 			}
 		};

-		if !target_url.starts_with(&*domain) {
-			return Err(State::Error(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);
 		}
--- a/dapps/ui/Cargo.toml
+++ b/dapps/ui/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore Parity UI"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "parity-ui"
-version = "1.7.0"
+version = "1.6.0"
 authors = ["Parity Technologies <admin@parity.io>"]

 [build-dependencies]
@@ -11,8 +11,7 @@ rustc_version = "0.1"

 [dependencies]
 parity-ui-dev = { path = "../../js", optional = true }
-# This is managed by the js/scripts/release.sh script on CI - keep it in a single line
-parity-ui-precompiled = { git = "https://github.com/paritytech/js-precompiled.git", optional = true, branch = "beta" }
+parity-ui-precompiled = { git = "https://github.com/ethcore/js-precompiled.git", branch = "beta", optional = true }

 [features]
 no-precompiled-js = ["parity-ui-dev"]
--- a/db/Cargo.toml
+++ b/db/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+description = "Ethcore Database"
+homepage = "http://parity.io"
+license = "GPL-3.0"
+name = "ethcore-db"
+version = "1.6.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+build = "build.rs"
+
+[build-dependencies]
+ethcore-ipc-codegen = { path = "../ipc/codegen" }
+
+[dependencies]
+clippy = { version = "0.0.103", optional = true}
+ethcore-devtools = { path = "../devtools" }
+ethcore-ipc = { path = "../ipc/rpc" }
+rocksdb = { git = "https://github.com/ethcore/rust-rocksdb" }
+semver = "0.5"
+ethcore-ipc-nano = { path = "../ipc/nano" }
+nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" }
+crossbeam = "0.2"
+ethcore-util = { path = "../util" }
+
+[features]
+dev = ["clippy"]
--- a/rpc/src/v1/helpers/dapps.rs
+++ b/rpc/src/v1/helpers/dapps.rs
@@ -14,20 +14,25 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

-//! Dapps Service
+extern crate ethcore_ipc_codegen as codegen;

-use v1::types::LocalDapp;
+use std::env;
+use std::path::Path;

-/// Dapps Server service.
-pub trait DappsService: Send + Sync + 'static {
-	/// List available local dapps.
-	fn list_dapps(&self) -> Vec<LocalDapp>;
-}
+pub fn main() {
+	let out_dir = env::var_os("OUT_DIR").unwrap();

-impl<F> DappsService for F where
-	F: Fn() -> Vec<LocalDapp> + Send + Sync + 'static
-{
-	fn list_dapps(&self) -> Vec<LocalDapp> {
-		(*self)()
+	// ipc pass
+	{
+		let src = Path::new("src/lib.rs.in");
+		let dst = Path::new(&out_dir).join("lib.intermediate.rs.in");
+		codegen::expand(&src, &dst);
+	}
+
+	// binary serialization pass
+	{
+		let src = Path::new(&out_dir).join("lib.intermediate.rs.in");
+		let dst = Path::new(&out_dir).join("lib.rs");
+		codegen::expand(&src, &dst);
 	}
 }
--- a/db/src/database.rs
+++ b/db/src/database.rs
@@ -0,0 +1,565 @@
+// 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 rocksdb ipc service
+
+use traits::*;
+use rocksdb::{DB, Writable, WriteBatch, IteratorMode, DBIterator, IndexType, Options, DBCompactionStyle, BlockBasedOptions, Direction};
+use std::sync::{RwLock, Arc};
+use std::convert::From;
+use ipc::IpcConfig;
+use std::mem;
+use ipc::binary::BinaryConvertError;
+use std::collections::{VecDeque, HashMap, BTreeMap};
+
+enum WriteCacheEntry {
+	Remove,
+	Write(Vec<u8>),
+}
+
+pub struct WriteCache {
+	entries: HashMap<Vec<u8>, WriteCacheEntry>,
+	preferred_len: usize,
+}
+
+const FLUSH_BATCH_SIZE: usize = 4096;
+
+impl WriteCache {
+	fn new(cache_len: usize) -> WriteCache {
+		WriteCache {
+			entries: HashMap::new(),
+			preferred_len: cache_len,
+		}
+	}
+
+	fn write(&mut self, key: Vec<u8>, val: Vec<u8>) {
+		self.entries.insert(key, WriteCacheEntry::Write(val));
+	}
+
+	fn remove(&mut self, key: Vec<u8>) {
+		self.entries.insert(key, WriteCacheEntry::Remove);
+	}
+
+	fn get(&self, key: &[u8]) -> Option<Vec<u8>> {
+		self.entries.get(key).and_then(
+			|vec_ref| match vec_ref {
+				&WriteCacheEntry::Write(ref val) => Some(val.clone()),
+				&WriteCacheEntry::Remove => None
+			})
+	}
+
+	/// WriteCache should be locked for this
+	fn flush(&mut self, db: &DB, amount: usize) -> Result<(), Error> {
+		let batch = WriteBatch::new();
+		let mut removed_so_far = 0;
+		while removed_so_far < amount {
+			if self.entries.len() == 0 { break; }
+			let removed_key = {
+				let (key, cache_entry) = self.entries.iter().nth(0)
+				.expect("if entries.len == 0, we should have break in the loop, still we got here somehow");
+
+				match *cache_entry {
+					WriteCacheEntry::Write(ref val) => {
+						batch.put(&key, val)?;
+					},
+					WriteCacheEntry::Remove => {
+						batch.delete(&key)?;
+					},
+				}
+				key.clone()
+			};
+
+			self.entries.remove(&removed_key);
+
+			removed_so_far = removed_so_far + 1;
+		}
+		if removed_so_far > 0 {
+			db.write(batch)?;
+		}
+		Ok(())
+	}
+
+	/// flushes until cache is empty
+	fn flush_all(&mut self, db: &DB) -> Result<(), Error> {
+		while !self.is_empty() { self.flush(db, FLUSH_BATCH_SIZE)?; }
+		Ok(())
+	}
+
+	fn is_empty(&self) -> bool {
+		self.entries.is_empty()
+	}
+
+	fn try_shrink(&mut self, db: &DB) -> Result<(), Error> {
+		if self.entries.len() > self.preferred_len {
+			self.flush(db, FLUSH_BATCH_SIZE)?;
+		}
+		Ok(())
+	}
+}
+
+pub struct Database {
+	db: RwLock<Option<DB>>,
+	/// Iterators - dont't use between threads!
+	iterators: RwLock<BTreeMap<IteratorHandle, DBIterator>>,
+	write_cache: RwLock<WriteCache>,
+}
+
+unsafe impl Send for Database {}
+unsafe impl Sync for Database {}
+
+impl Database {
+	pub fn new() -> Database {
+		Database {
+			db: RwLock::new(None),
+			iterators: RwLock::new(BTreeMap::new()),
+			write_cache: RwLock::new(WriteCache::new(DEFAULT_CACHE_LEN)),
+		}
+	}
+
+	pub fn flush(&self) -> Result<(), Error> {
+		let mut cache_lock = self.write_cache.write();
+		let db_lock = self.db.read();
+		if db_lock.is_none() { return Ok(()); }
+		let db = db_lock.as_ref().unwrap();
+
+		cache_lock.try_shrink(&db)?;
+		Ok(())
+	}
+
+	pub fn flush_all(&self) -> Result<(), Error> {
+		let mut cache_lock = self.write_cache.write();
+		let db_lock = self.db.read();
+		if db_lock.is_none() { return Ok(()); }
+		let db = db_lock.as_ref().expect("we should have exited with Ok(()) on the previous step");
+
+		cache_lock.flush_all(&db)?;
+		Ok(())
+
+	}
+}
+
+impl Drop for Database {
+	fn drop(&mut self) {
+		self.flush().unwrap();
+	}
+}
+
+#[ipc]
+impl DatabaseService for Database {
+	fn open(&self, config: DatabaseConfig, path: String) -> Result<(), Error> {
+		let mut db = self.db.write();
+		if db.is_some() { return Err(Error::AlreadyOpen); }
+
+		let mut opts = Options::new();
+		opts.set_max_open_files(256);
+		opts.create_if_missing(true);
+		opts.set_use_fsync(false);
+		opts.set_compaction_style(DBCompactionStyle::DBUniversalCompaction);
+		if let Some(size) = config.prefix_size {
+			let mut block_opts = BlockBasedOptions::new();
+			block_opts.set_index_type(IndexType::HashSearch);
+			opts.set_block_based_table_factory(&block_opts);
+			opts.set_prefix_extractor_fixed_size(size);
+		}
+		*db = Some(DB::open(&opts, &path)?);
+
+		Ok(())
+	}
+
+	/// Opens database in the specified path with the default config
+	fn open_default(&self, path: String) -> Result<(), Error> {
+		self.open(DatabaseConfig::default(), path)
+	}
+
+	fn close(&self) -> Result<(), Error> {
+		self.flush_all()?;
+
+		let mut db = self.db.write();
+		if db.is_none() { return Err(Error::IsClosed); }
+
+		*db = None;
+		Ok(())
+	}
+
+	fn put(&self, key: &[u8], value: &[u8]) -> Result<(), Error> {
+		let mut cache_lock = self.write_cache.write();
+		cache_lock.write(key.to_vec(), value.to_vec());
+		Ok(())
+	}
+
+	fn delete(&self, key: &[u8]) -> Result<(), Error> {
+		let mut cache_lock = self.write_cache.write();
+		cache_lock.remove(key.to_vec());
+		Ok(())
+	}
+
+	fn write(&self, transaction: DBTransaction) -> Result<(), Error> {
+		let mut cache_lock = self.write_cache.write();
+
+		let mut writes = transaction.writes.borrow_mut();
+		for kv in writes.drain(..) {
+			cache_lock.write(kv.key, kv.value);
+		}
+
+		let mut removes = transaction.removes.borrow_mut();
+		for k in removes.drain(..) {
+			cache_lock.remove(k);
+		}
+		Ok(())
+	}
+
+	fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Error> {
+		{
+			let key_vec = key.to_vec();
+			let cache_hit = self.write_cache.read().get(&key_vec);
+
+			if cache_hit.is_some() {
+				return Ok(Some(cache_hit.expect("cache_hit.is_some() = true, still there is none somehow here")))
+			}
+		}
+		let db_lock = self.db.read();
+		let db = db_lock.as_ref().ok_or(Error::IsClosed)?;
+
+		match db.get(key)? {
+			Some(db_vec) => {
+				Ok(Some(db_vec.to_vec()))
+			},
+			None => Ok(None),
+		}
+	}
+
+	fn get_by_prefix(&self, prefix: &[u8]) -> Result<Option<Vec<u8>>, Error> {
+		let db_lock = self.db.read();
+		let db = db_lock.as_ref().ok_or(Error::IsClosed)?;
+
+		let mut iter = db.iterator(IteratorMode::From(prefix, Direction::Forward));
+		match iter.next() {
+			// TODO: use prefix_same_as_start read option (not availabele in C API currently)
+			Some((k, v)) => if k[0 .. prefix.len()] == prefix[..] { Ok(Some(v.to_vec())) } else { Ok(None) },
+			_ => Ok(None)
+		}
+	}
+
+	fn is_empty(&self) -> Result<bool, Error> {
+		let db_lock = self.db.read();
+		let db = db_lock.as_ref().ok_or(Error::IsClosed)?;
+
+		Ok(db.iterator(IteratorMode::Start).next().is_none())
+	}
+
+	fn iter(&self) -> Result<IteratorHandle, Error> {
+		let db_lock = self.db.read();
+		let db = db_lock.as_ref().ok_or(Error::IsClosed)?;
+
+		let mut iterators = self.iterators.write();
+		let next_iterator = iterators.keys().last().unwrap_or(&0) + 1;
+		iterators.insert(next_iterator, db.iterator(IteratorMode::Start));
+		Ok(next_iterator)
+	}
+
+	fn iter_next(&self, handle: IteratorHandle) -> Option<KeyValue> {
+		let mut iterators = self.iterators.write();
+		let mut iterator = match iterators.get_mut(&handle) {
+			Some(some_iterator) => some_iterator,
+			None => { return None; },
+		};
+
+		iterator.next().and_then(|(some_key, some_val)| {
+			Some(KeyValue {
+				key: some_key.to_vec(),
+				value: some_val.to_vec(),
+			})
+		})
+	}
+
+	fn dispose_iter(&self, handle: IteratorHandle) -> Result<(), Error> {
+		let mut iterators = self.iterators.write();
+		iterators.remove(&handle);
+		Ok(())
+	}
+}
+
+// TODO : put proper at compile-time
+impl IpcConfig for Database {}
+
+/// Database iterator
+pub struct DatabaseIterator {
+	client: Arc<DatabaseClient<::nanomsg::Socket>>,
+	handle: IteratorHandle,
+}
+
+impl Iterator for DatabaseIterator {
+	type Item = (Vec<u8>, Vec<u8>);
+
+	fn next(&mut self) -> Option<Self::Item> {
+		self.client.iter_next(self.handle).and_then(|kv| Some((kv.key, kv.value)))
+	}
+}
+
+impl Drop for DatabaseIterator {
+	fn drop(&mut self) {
+		self.client.dispose_iter(self.handle).unwrap();
+	}
+}
+
+#[cfg(test)]
+mod test {
+
+	use super::Database;
+	use traits::*;
+	use devtools::*;
+
+	#[test]
+	fn can_be_created() {
+		let db = Database::new();
+		assert!(db.is_empty().is_err());
+	}
+
+	#[test]
+	fn can_be_open_empty() {
+		let db = Database::new();
+		let path = RandomTempPath::create_dir();
+		db.open_default(path.as_str().to_owned()).unwrap();
+
+		assert!(db.is_empty().is_ok());
+	}
+
+	#[test]
+	fn can_store_key() {
+		let db = Database::new();
+		let path = RandomTempPath::create_dir();
+		db.open_default(path.as_str().to_owned()).unwrap();
+
+		db.put("xxx".as_bytes(), "1".as_bytes()).unwrap();
+		db.flush_all().unwrap();
+		assert!(!db.is_empty().unwrap());
+	}
+
+	#[test]
+	fn can_retrieve() {
+		let db = Database::new();
+		let path = RandomTempPath::create_dir();
+		db.open_default(path.as_str().to_owned()).unwrap();
+		db.put("xxx".as_bytes(), "1".as_bytes()).unwrap();
+		db.close().unwrap();
+
+		db.open_default(path.as_str().to_owned()).unwrap();
+		assert_eq!(db.get("xxx".as_bytes()).unwrap().unwrap(), "1".as_bytes().to_vec());
+	}
+}
+
+#[cfg(test)]
+mod write_cache_tests {
+	use super::Database;
+	use traits::*;
+	use devtools::*;
+
+	#[test]
+	fn cache_write_flush() {
+		let db = Database::new();
+		let path = RandomTempPath::create_dir();
+
+		db.open_default(path.as_str().to_owned()).unwrap();
+		db.put("100500".as_bytes(), "1".as_bytes()).unwrap();
+		db.delete("100500".as_bytes()).unwrap();
+		db.flush_all().unwrap();
+
+		let val = db.get("100500".as_bytes()).unwrap();
+		assert!(val.is_none());
+	}
+
+}
+
+#[cfg(test)]
+mod client_tests {
+	use super::{DatabaseClient, Database};
+	use traits::*;
+	use devtools::*;
+	use nanoipc;
+	use std::sync::Arc;
+	use std::sync::atomic::{Ordering, AtomicBool};
+	use crossbeam;
+	use run_worker;
+
+	fn init_worker(addr: &str) -> nanoipc::Worker<Database> {
+		let mut worker = nanoipc::Worker::<Database>::new(&Arc::new(Database::new()));
+		worker.add_duplex(addr).unwrap();
+		worker
+	}
+
+	#[test]
+	fn can_call_handshake() {
+		let url = "ipc:///tmp/parity-db-ipc-test-10.ipc";
+		let worker_should_exit = Arc::new(AtomicBool::new(false));
+		let worker_is_ready = Arc::new(AtomicBool::new(false));
+		let c_worker_should_exit = worker_should_exit.clone();
+		let c_worker_is_ready = worker_is_ready.clone();
+
+		::std::thread::spawn(move || {
+			let mut worker = init_worker(url);
+			while !c_worker_should_exit.load(Ordering::Relaxed) {
+				worker.poll();
+				c_worker_is_ready.store(true, Ordering::Relaxed);
+			}
+		});
+
+		while !worker_is_ready.load(Ordering::Relaxed) { }
+		let client = nanoipc::init_duplex_client::<DatabaseClient<_>>(url).unwrap();
+
+		let hs = client.handshake();
+
+		worker_should_exit.store(true, Ordering::Relaxed);
+		assert!(hs.is_ok());
+	}
+
+	#[test]
+	fn can_open_db() {
+		let url = "ipc:///tmp/parity-db-ipc-test-20.ipc";
+		let path = RandomTempPath::create_dir();
+
+		let worker_should_exit = Arc::new(AtomicBool::new(false));
+		let worker_is_ready = Arc::new(AtomicBool::new(false));
+		let c_worker_should_exit = worker_should_exit.clone();
+		let c_worker_is_ready = worker_is_ready.clone();
+
+		::std::thread::spawn(move || {
+			let mut worker = init_worker(url);
+			while !c_worker_should_exit.load(Ordering::Relaxed) {
+				worker.poll();
+				c_worker_is_ready.store(true, Ordering::Relaxed);
+			}
+		});
+
+		while !worker_is_ready.load(Ordering::Relaxed) { }
+		let client = nanoipc::init_duplex_client::<DatabaseClient<_>>(url).unwrap();
+
+		client.open_default(path.as_str().to_owned()).unwrap();
+		assert!(client.is_empty().unwrap());
+		worker_should_exit.store(true, Ordering::Relaxed);
+	}
+
+	#[test]
+	fn can_put() {
+		let url = "ipc:///tmp/parity-db-ipc-test-30.ipc";
+		let path = RandomTempPath::create_dir();
+
+		crossbeam::scope(move |scope| {
+			let stop = Arc::new(AtomicBool::new(false));
+			run_worker(scope, stop.clone(), url);
+			let client = nanoipc::generic_client::<DatabaseClient<_>>(url).unwrap();
+			client.open_default(path.as_str().to_owned()).unwrap();
+			client.put("xxx".as_bytes(), "1".as_bytes()).unwrap();
+			client.close().unwrap();
+
+			stop.store(true, Ordering::Relaxed);
+		});
+	}
+
+	#[test]
+	fn can_put_and_read() {
+		let url = "ipc:///tmp/parity-db-ipc-test-40.ipc";
+		let path = RandomTempPath::create_dir();
+
+		crossbeam::scope(move |scope| {
+			let stop = Arc::new(AtomicBool::new(false));
+			run_worker(scope, stop.clone(), url);
+			let client = nanoipc::generic_client::<DatabaseClient<_>>(url).unwrap();
+
+			client.open_default(path.as_str().to_owned()).unwrap();
+			client.put("xxx".as_bytes(), "1".as_bytes()).unwrap();
+			client.close().unwrap();
+
+			client.open_default(path.as_str().to_owned()).unwrap();
+			assert_eq!(client.get("xxx".as_bytes()).unwrap().unwrap(), "1".as_bytes().to_vec());
+
+			stop.store(true, Ordering::Relaxed);
+		});
+	}
+
+	#[test]
+	fn can_read_empty() {
+		let url = "ipc:///tmp/parity-db-ipc-test-45.ipc";
+		let path = RandomTempPath::create_dir();
+
+		crossbeam::scope(move |scope| {
+			let stop = Arc::new(AtomicBool::new(false));
+			run_worker(scope, stop.clone(), url);
+			let client = nanoipc::generic_client::<DatabaseClient<_>>(url).unwrap();
+
+			client.open_default(path.as_str().to_owned()).unwrap();
+			assert!(client.get("xxx".as_bytes()).unwrap().is_none());
+
+			stop.store(true, Ordering::Relaxed);
+		});
+	}
+
+
+	#[test]
+	fn can_commit_client_transaction() {
+		let url = "ipc:///tmp/parity-db-ipc-test-60.ipc";
+		let path = RandomTempPath::create_dir();
+
+		crossbeam::scope(move |scope| {
+			let stop = Arc::new(AtomicBool::new(false));
+			run_worker(scope, stop.clone(), url);
+			let client = nanoipc::generic_client::<DatabaseClient<_>>(url).unwrap();
+			client.open_default(path.as_str().to_owned()).unwrap();
+
+			let transaction = DBTransaction::new();
+			transaction.put("xxx".as_bytes(), "1".as_bytes());
+			client.write(transaction).unwrap();
+
+			client.close().unwrap();
+
+			client.open_default(path.as_str().to_owned()).unwrap();
+			assert_eq!(client.get("xxx".as_bytes()).unwrap().unwrap(), "1".as_bytes().to_vec());
+
+			stop.store(true, Ordering::Relaxed);
+		});
+	}
+
+	#[test]
+	fn key_write_read_ipc() {
+		let url = "ipc:///tmp/parity-db-ipc-test-70.ipc";
+		let path = RandomTempPath::create_dir();
+
+		crossbeam::scope(|scope| {
+			let stop = StopGuard::new();
+			run_worker(&scope, stop.share(), url);
+
+			let client = nanoipc::generic_client::<DatabaseClient<_>>(url).unwrap();
+
+			client.open_default(path.as_str().to_owned()).unwrap();
+			let mut batch = Vec::new();
+			for _ in 0..100 {
+				batch.push((random_str(256).as_bytes().to_vec(), random_str(256).as_bytes().to_vec()));
+				batch.push((random_str(256).as_bytes().to_vec(), random_str(2048).as_bytes().to_vec()));
+				batch.push((random_str(2048).as_bytes().to_vec(), random_str(2048).as_bytes().to_vec()));
+				batch.push((random_str(2048).as_bytes().to_vec(), random_str(256).as_bytes().to_vec()));
+			}
+
+			for &(ref k, ref v) in batch.iter() {
+				client.put(k, v).unwrap();
+			}
+			client.close().unwrap();
+
+			client.open_default(path.as_str().to_owned()).unwrap();
+			for &(ref k, ref v) in batch.iter() {
+				assert_eq!(v, &client.get(k).unwrap().unwrap());
+			}
+		});
+	}
+}
--- a/ethcore/native_contracts/src/test_contracts/mod.rs
+++ b/ethcore/native_contracts/src/test_contracts/mod.rs
@@ -14,8 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

-//! Contracts used for testing.
+//! Database ipc service

-pub mod validator_set;
-
-pub use self::validator_set::ValidatorSet;
+#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues
+include!(concat!(env!("OUT_DIR"), "/lib.rs"));
--- a/db/src/lib.rs.in
+++ b/db/src/lib.rs.in
@@ -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/>.
+
+extern crate ethcore_ipc as ipc;
+extern crate rocksdb;
+extern crate ethcore_devtools as devtools;
+extern crate semver;
+extern crate ethcore_ipc_nano as nanoipc;
+extern crate nanomsg;
+extern crate crossbeam;
+extern crate ethcore_util as util;
+
+pub mod database;
+pub mod traits;
+
+pub use traits::{DatabaseService, DBTransaction, Error};
+pub use database::{Database, DatabaseClient, DatabaseIterator};
+
+use std::sync::Arc;
+use std::sync::atomic::*;
+use std::path::PathBuf;
+
+pub type DatabaseNanoClient = DatabaseClient<::nanomsg::Socket>;
+pub type DatabaseConnection = nanoipc::GuardedSocket<DatabaseNanoClient>;
+
+#[derive(Debug)]
+pub enum ServiceError {
+	Io(std::io::Error),
+	Socket(nanoipc::SocketError),
+}
+
+impl std::convert::From<std::io::Error> for ServiceError {
+	fn from(io_error: std::io::Error) -> ServiceError { ServiceError::Io(io_error) }
+}
+
+impl std::convert::From<nanoipc::SocketError> for ServiceError {
+	fn from(socket_error: nanoipc::SocketError) -> ServiceError { ServiceError::Socket(socket_error) }
+}
+
+pub fn blocks_service_url(db_path: &str) -> Result<String, std::io::Error> {
+	let mut path = PathBuf::from(db_path);
+	::std::fs::create_dir_all(db_path)?;
+	path.push("blocks.ipc");
+	Ok(format!("ipc://{}", path.to_str().unwrap()))
+}
+
+pub fn extras_service_url(db_path: &str) -> Result<String, ::std::io::Error> {
+	let mut path = PathBuf::from(db_path);
+	::std::fs::create_dir_all(db_path)?;
+	path.push("extras.ipc");
+	Ok(format!("ipc://{}", path.to_str().unwrap()))
+}
+
+pub fn blocks_client(db_path: &str) -> Result<DatabaseConnection, ServiceError> {
+	let url = blocks_service_url(db_path)?;
+	let client = nanoipc::generic_client::<DatabaseClient<_>>(&url)?;
+	Ok(client)
+}
+
+pub fn extras_client(db_path: &str) -> Result<DatabaseConnection, ServiceError> {
+	let url = extras_service_url(db_path)?;
+	let client = nanoipc::generic_client::<DatabaseClient<_>>(&url)?;
+	Ok(client)
+}
+
+// for tests
+pub fn run_worker(scope: &crossbeam::Scope, stop: Arc<AtomicBool>, socket_path: &str) {
+	let socket_path = socket_path.to_owned();
+	scope.spawn(move || {
+		let mut worker = nanoipc::Worker::new(&Arc::new(Database::new()));
+		worker.add_reqrep(&socket_path).unwrap();
+		while !stop.load(Ordering::Relaxed) {
+			worker.poll();
+		}
+	});
+}
--- a/db/src/traits.rs
+++ b/db/src/traits.rs
@@ -0,0 +1,135 @@
+// 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 database trait
+
+use std::cell::RefCell;
+
+pub type IteratorHandle = u32;
+
+pub const DEFAULT_CACHE_LEN: usize = 12288;
+
+#[derive(Binary)]
+pub struct KeyValue {
+	pub key: Vec<u8>,
+	pub value: Vec<u8>,
+}
+
+#[derive(Debug, Binary)]
+pub enum Error {
+	AlreadyOpen,
+	IsClosed,
+	RocksDb(String),
+	TransactionUnknown,
+	IteratorUnknown,
+	UncommitedTransactions,
+}
+
+impl From<String> for Error {
+	fn from(s: String) -> Error {
+		Error::RocksDb(s)
+	}
+}
+
+/// Database configuration
+#[derive(Binary)]
+pub struct DatabaseConfig {
+	/// Optional prefix size in bytes. Allows lookup by partial key.
+	pub prefix_size: Option<usize>,
+	/// write cache length
+	pub cache: usize,
+}
+
+impl Default for DatabaseConfig {
+	fn default() -> DatabaseConfig {
+		DatabaseConfig {
+			prefix_size: None,
+			cache: DEFAULT_CACHE_LEN,
+		}
+	}
+}
+
+impl DatabaseConfig {
+	fn with_prefix(prefix: usize) -> DatabaseConfig {
+		DatabaseConfig {
+			prefix_size: Some(prefix),
+			cache: DEFAULT_CACHE_LEN,
+		}
+	}
+}
+
+pub trait DatabaseService : Sized {
+	/// Opens database in the specified path
+	fn open(&self, config: DatabaseConfig, path: String) -> Result<(), Error>;
+
+	/// Opens database in the specified path with the default config
+	fn open_default(&self, path: String) -> Result<(), Error>;
+
+	/// Closes database
+	fn close(&self) -> Result<(), Error>;
+
+	/// Insert a key-value pair in the transaction. Any existing value value will be overwritten.
+	fn put(&self, key: &[u8], value: &[u8]) -> Result<(), Error>;
+
+	/// Delete value by key.
+	fn delete(&self, key: &[u8]) -> Result<(), Error>;
+
+	/// Get value by key.
+	fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Error>;
+
+	/// Get value by partial key. Prefix size should match configured prefix size.
+	fn get_by_prefix(&self, prefix: &[u8]) -> Result<Option<Vec<u8>>, Error>;
+
+	/// Check if there is anything in the database.
+	fn is_empty(&self) -> Result<bool, Error>;
+
+	/// Get handle to iterate through keys
+	fn iter(&self) -> Result<IteratorHandle, Error>;
+
+	/// Next key-value for the the given iterator
+	fn iter_next(&self, iterator: IteratorHandle) -> Option<KeyValue>;
+
+	/// Dispose iteration that is no longer needed
+	fn dispose_iter(&self, handle: IteratorHandle) -> Result<(), Error>;
+
+	/// Write client transaction
+	fn write(&self, transaction: DBTransaction) -> Result<(), Error>;
+}
+
+#[derive(Binary)]
+pub struct DBTransaction {
+	pub writes: RefCell<Vec<KeyValue>>,
+	pub removes: RefCell<Vec<Vec<u8>>>,
+}
+
+impl DBTransaction {
+	pub fn new() -> DBTransaction {
+		DBTransaction {
+			writes: RefCell::new(Vec::new()),
+			removes: RefCell::new(Vec::new()),
+		}
+	}
+
+	pub fn put(&self, key: &[u8], value: &[u8]) {
+		let mut brw = self.writes.borrow_mut();
+		brw.push(KeyValue { key: key.to_vec(), value: value.to_vec() });
+	}
+
+	pub fn delete(&self, key: &[u8]) {
+		let mut brw = self.removes.borrow_mut();
+		brw.push(key.to_vec());
+	}
+}
--- a/devtools/Cargo.toml
+++ b/devtools/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore development/test/build tools"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-devtools"
-version = "1.7.0"
+version = "1.6.0"
 authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
--- a/devtools/src/http_client.rs
+++ b/devtools/src/http_client.rs
@@ -102,7 +102,12 @@ pub fn request(address: &SocketAddr, request: &str) -> Response {

 /// Check if all required security headers are present
 pub fn assert_security_headers_present(headers: &[String], port: Option<u16>) {
-	if let None = port {
+	if let Some(port) = port {
+		assert!(
+			headers.iter().find(|header| header.as_str() == &format!("X-Frame-Options: ALLOW-FROM http://127.0.0.1:{}", port)).is_some(),
+			"X-Frame-Options: ALLOW-FROM missing: {:?}", headers
+		);
+	} else {
 		assert!(
 			headers.iter().find(|header| header.as_str() == "X-Frame-Options: SAMEORIGIN").is_some(),
 			"X-Frame-Options: SAMEORIGIN missing: {:?}", headers
@@ -116,8 +121,4 @@ pub fn assert_security_headers_present(headers: &[String], port: Option<u16>) {
 		headers.iter().find(|header|  header.as_str() == "X-Content-Type-Options: nosniff").is_some(),
 		"X-Content-Type-Options missing: {:?}", headers
 	);
-	assert!(
-		headers.iter().find(|header| header.starts_with("Content-Security-Policy: ")).is_some(),
-		"Content-Security-Policy missing: {:?}", headers
-	)
 }
--- a/devtools/src/random_path.rs
+++ b/devtools/src/random_path.rs
@@ -96,7 +96,7 @@ impl Drop for RandomTempPath {

 pub struct GuardedTempResult<T> {
 	pub result: Option<T>,
-	pub _temp: RandomTempPath,
+	pub _temp: RandomTempPath
 }

 impl<T> GuardedTempResult<T> {
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,3 +0,0 @@
-Usage
-
-```docker build -f docker/ubuntu/Dockerfile --tag ethcore/parity:branch_or_tag_name .```
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -1,32 +1,29 @@
 FROM centos:latest
 WORKDIR /build
-
 # install tools and dependencies
 RUN yum -y update&& \
    yum install -y git make gcc-c++ gcc file binutils
-
 # install rustup
 RUN curl -sSf https://static.rust-lang.org/rustup.sh -o rustup.sh &&\
 ls&&\
- sh rustup.sh --disable-sudo
-
+ sh rustup.sh -s -- --disable-sudo
 # show backtraces
 ENV RUST_BACKTRACE 1
-
 # set compiler
 ENV CXX g++
 ENV CC gcc
-
 # show tools
 RUN rustc -vV && \
 cargo -V && \
 gcc -v &&\
 g++ -v
-
 # build parity
-ADD . /build/parity
-RUN cd parity&&\
-    cargo build --release --verbose && \
+RUN git clone https://github.com/ethcore/parity && \
+	cd parity&&\
+	git checkout beta && \
+        git pull && \
+        ls -a&&\
+        cargo build --release --verbose && \
 	ls /build/parity/target/release/parity &&	\
 	strip /build/parity/target/release/parity

--- a/docker/hub/Dockerfile
+++ b/docker/hub/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /build
 #ENV for build TAG
 ARG BUILD_TAG
 ENV BUILD_TAG ${BUILD_TAG:-master}
-RUN echo "Build tag:" $BUILD_TAG
+RUN echo $BUILD_TAG
 # install tools and dependencies
 RUN apt-get update && \
        apt-get install -y --force-yes --no-install-recommends \
@@ -48,7 +48,7 @@ RUN apt-get update && \
 # show backtraces
 RUST_BACKTRACE=1 && \
 # build parity
-cd /build&&git clone https://github.com/paritytech/parity && \
+ cd /build&&git clone https://github.com/ethcore/parity && \
        cd parity && \
 	git pull&& \
 	git checkout $BUILD_TAG && \
--- a/docker/ubuntu-aarch64/Dockerfile
+++ b/docker/ubuntu-aarch64/Dockerfile
@@ -1,6 +1,5 @@
 FROM ubuntu:14.04
 WORKDIR /build
-
 # install tools and dependencies
 RUN apt-get -y update && \
        apt-get install -y --force-yes --no-install-recommends \
@@ -25,11 +24,14 @@ RUN rustup target add aarch64-unknown-linux-gnu
 ENV RUST_BACKTRACE 1

 # show tools
-RUN rustc -vV && cargo -V
+ RUN rustc -vV && \
+ cargo -V 

 # build parity
-ADD . /build/parity
-RUN cd parity && \
+RUN git clone https://github.com/ethcore/parity && \
+        cd parity && \
+        git checkout beta && \
+        git pull && \
        mkdir -p .cargo && \
        echo '[target.aarch64-unknown-linux-gnu]\n\
        linker = "aarch64-linux-gnu-gcc"\n'\
--- a/docker/ubuntu-arm/Dockerfile
+++ b/docker/ubuntu-arm/Dockerfile
@@ -1,6 +1,5 @@
 FROM ubuntu:14.04
 WORKDIR /build
-
 # install tools and dependencies
 RUN apt-get -y update && \
        apt-get install -y --force-yes --no-install-recommends \
@@ -24,12 +23,16 @@ RUN rustup target add armv7-unknown-linux-gnueabihf
 # show backtraces
 ENV RUST_BACKTRACE 1

+
 # show tools
-RUN rustc -vV && cargo -V
+ RUN rustc -vV && \
+ cargo -V 

 # build parity
-ADD . /build/parity
-RUN cd parity && \
+RUN git clone https://github.com/ethcore/parity && \
+        cd parity && \
+        git checkout beta && \
+        git pull && \
        mkdir -p .cargo && \
        echo '[target.armv7-unknown-linux-gnueabihf]\n\
        linker = "arm-linux-gnueabihf-gcc"\n'\
--- a/docker/ubuntu-dev/Dockerfile
+++ b/docker/ubuntu-dev/Dockerfile
@@ -0,0 +1,37 @@
+FROM ubuntu:14.04
+
+# install tools and dependencies
+RUN apt-get update && \
+	apt-get install -y \
+	# make
+	build-essential \
+	# add-apt-repository
+	software-properties-common \
+	curl \
+	g++ \
+	wget \
+	git \
+	# evmjit dependencies
+	zlib1g-dev \
+	libedit-dev
+
+# cmake, llvm and rocksdb ppas. then update ppas
+RUN add-apt-repository -y "ppa:george-edison55/cmake-3.x" && \
+	add-apt-repository "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main" && \
+	apt-get update && \
+	apt-get install -y --force-yes cmake llvm-3.7-dev
+
+# install evmjit
+RUN git clone https://github.com/debris/evmjit && \
+	cd evmjit && \
+	mkdir build && cd build && \
+	cmake .. && make && make install && cd
+
+# install rustup
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+# rustup directory
+ENV PATH /root/.cargo/bin:$PATH
+
+# show backtraces
+ENV RUST_BACKTRACE 1
--- a/docker/ubuntu-jit/Dockerfile
+++ b/docker/ubuntu-jit/Dockerfile
@@ -1,6 +1,5 @@
 FROM ubuntu:14.04
 WORKDIR /build
-
 # install tools and dependencies
 RUN apt-get update && \
        apt-get install -y \
@@ -46,8 +45,10 @@ gcc -v &&\
 g++ -v

 # build parity
-ADD . /build/parity
-RUN cd parity && \
+RUN git clone https://github.com/ethcore/parity && \
+        cd parity && \
+        git checkout beta && \
+        git pull && \
        cargo build --release --features ethcore/jit --verbose && \
        ls /build/parity/target/release/parity &&       \
        strip /build/parity/target/release/parity
--- a/docker/ubuntu-stable/Dockerfile
+++ b/docker/ubuntu-stable/Dockerfile
@@ -0,0 +1,40 @@
+FROM ubuntu:14.04
+WORKDIR /build
+# install tools and dependencies
+RUN apt-get update && \
+        apt-get install -y \
+        build-essential \
+        g++ \
+        curl \
+        git \
+        file \
+        binutils
+
+# install rustup
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+# rustup directory
+ENV PATH /root/.cargo/bin:$PATH
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+# show tools
+RUN rustc -vV && \
+cargo -V && \
+gcc -v &&\
+g++ -v
+
+# build parity
+RUN git clone https://github.com/ethcore/parity && \
+        cd parity && \
+        git checkout stable && \
+        git pull && \
+        cargo build --release --verbose && \
+        ls /build/parity/target/release/parity && \
+        strip /build/parity/target/release/parity
+
+RUN file /build/parity/target/release/parity
+
+EXPOSE 8080 8545 8180
+ENTRYPOINT ["/build/parity/target/release/parity"]
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -1,6 +1,5 @@
 FROM ubuntu:14.04
 WORKDIR /build
-
 # install tools and dependencies
 RUN apt-get update && \
        apt-get install -y \
@@ -9,10 +8,7 @@ RUN apt-get update && \
        curl \
        git \
        file \
-        binutils \
-        libssl-dev \
-        pkg-config \
-        libudev-dev
+        binutils

 # install rustup
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
@@ -30,8 +26,10 @@ gcc -v &&\
 g++ -v

 # build parity
-ADD . /build/parity
-RUN cd parity && \
+RUN git clone https://github.com/ethcore/parity && \
+        cd parity && \
+        git checkout beta && \
+        git pull && \
        cargo build --release --verbose && \
        ls /build/parity/target/release/parity && \
        strip /build/parity/target/release/parity
--- a/ethash/Cargo.toml
+++ b/ethash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ethash"
-version = "1.7.0"
+version = "1.6.0"
 authors = ["Parity Technologies <admin@parity.io>"]

 [lib]
@@ -9,4 +9,4 @@ authors = ["Parity Technologies <admin@parity.io>"]
 log = "0.3"
 sha3 = { path = "../util/sha3" }
 primal = "0.2.3"
-parking_lot = "0.4"
+parking_lot = "0.3"
--- a/ethash/src/compute.rs
+++ b/ethash/src/compute.rs
@@ -25,7 +25,7 @@ use std::mem;
 use std::ptr;
 use sha3;
 use std::slice;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::io::{self, Read, Write};
 use std::fs::{self, File};

@@ -86,7 +86,6 @@ impl Node {
 pub type H256 = [u8; 32];

 pub struct Light {
-	cache_dir: PathBuf,
 	block_number: u64,
 	cache: Vec<Node>,
 	seed_compute: Mutex<SeedHashCompute>,
@@ -95,8 +94,8 @@ pub struct Light {
 /// Light cache structure
 impl Light {
 	/// Create a new light cache for a given block number
-	pub fn new<T: AsRef<Path>>(cache_dir: T, block_number: u64) -> Light {
-		light_new(cache_dir, block_number)
+	pub fn new(block_number: u64) -> Light {
+		light_new(block_number)
 	}

 	/// Calculate the light boundary data
@@ -106,15 +105,17 @@ impl Light {
 		light_compute(self, header_hash, nonce)
 	}

-	pub fn file_path<T: AsRef<Path>>(cache_dir: T, seed_hash: H256) -> PathBuf {
-		let mut cache_dir = cache_dir.as_ref().to_path_buf();
-		cache_dir.push(to_hex(&seed_hash));
-		cache_dir
+	pub fn file_path(seed_hash: H256) -> PathBuf {
+		let mut home = ::std::env::home_dir().unwrap();
+		home.push(".ethash");
+		home.push("light");
+		home.push(to_hex(&seed_hash));
+		home
 	}

-	pub fn from_file<T: AsRef<Path>>(cache_dir: T, block_number: u64) -> io::Result<Light> {
+	pub fn from_file(block_number: u64) -> io::Result<Light> {
 		let seed_compute = SeedHashCompute::new();
-		let path = Light::file_path(&cache_dir, seed_compute.get_seedhash(block_number));
+		let path = Light::file_path(seed_compute.get_seedhash(block_number));
 		let mut file = File::open(path)?;

 		let cache_size = get_cache_size(block_number);
@@ -122,27 +123,24 @@ impl Light {
 			return Err(io::Error::new(io::ErrorKind::Other, "Cache file size mismatch"));
 		}
 		let num_nodes = cache_size / NODE_BYTES;
-		let mut nodes: Vec<Node> = Vec::with_capacity(num_nodes);
+		let mut nodes: Vec<Node> = Vec::new();
 		nodes.resize(num_nodes, unsafe { mem::uninitialized() });
 		let buf = unsafe { slice::from_raw_parts_mut(nodes.as_mut_ptr() as *mut u8, cache_size) };
 		file.read_exact(buf)?;
 		Ok(Light {
-			block_number,
-			cache_dir: cache_dir.as_ref().to_path_buf(),
 			cache: nodes,
+			block_number: block_number,
 			seed_compute: Mutex::new(seed_compute),
 		})
 	}

 	pub fn to_file(&self) -> io::Result<PathBuf> {
 		let seed_compute = self.seed_compute.lock();
-		let path = Light::file_path(&self.cache_dir, seed_compute.get_seedhash(self.block_number));
+		let path = Light::file_path(seed_compute.get_seedhash(self.block_number));

 		if self.block_number >= ETHASH_EPOCH_LENGTH * 2 {
 			let deprecated = Light::file_path(
-				&self.cache_dir,
-				seed_compute.get_seedhash(self.block_number - ETHASH_EPOCH_LENGTH * 2)
-			);
+				seed_compute.get_seedhash(self.block_number - ETHASH_EPOCH_LENGTH * 2));

 			if deprecated.exists() {
 				debug!(target: "ethash", "removing: {:?}", &deprecated);
@@ -343,12 +341,15 @@ fn calculate_dag_item(node_index: u32, cache: &[Node]) -> Node {
 	}
 }

-fn light_new<T: AsRef<Path>>(cache_dir: T, block_number: u64) -> Light {
+fn light_new(block_number: u64) -> Light {
+
 	let seed_compute = SeedHashCompute::new();
 	let seedhash = seed_compute.get_seedhash(block_number);
 	let cache_size = get_cache_size(block_number);

-	assert!(cache_size % NODE_BYTES == 0, "Unaligned cache size");
+	if cache_size % NODE_BYTES != 0 {
+		panic!("Unaligned cache size");
+	}
 	let num_nodes = cache_size / NODE_BYTES;

 	let mut nodes = Vec::with_capacity(num_nodes);
@@ -372,9 +373,8 @@ fn light_new<T: AsRef<Path>>(cache_dir: T, block_number: u64) -> Light {
 	}

 	Light {
-		block_number,
-		cache_dir: cache_dir.as_ref().to_path_buf(),
 		cache: nodes,
+		block_number: block_number,
 		seed_compute: Mutex::new(seed_compute),
 	}
 }
@@ -433,7 +433,7 @@ fn test_light_compute() {
 	let boundary = [0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0x9b, 0x6c, 0x69, 0xbc, 0x2c, 0xe2, 0xa2, 0x4a, 0x8e, 0x95, 0x69, 0xef, 0xc7, 0xd7, 0x1b, 0x33, 0x35, 0xdf, 0x36, 0x8c, 0x9a, 0xe9, 0x7e, 0x53, 0x84];
 	let nonce = 0xd7b3ac70a301a249;
 	// difficulty = 0x085657254bd9u64;
-	let light = Light::new(&::std::env::temp_dir(), 486382);
+	let light = Light::new(486382);
 	let result = light_compute(&light, &hash, nonce);
 	assert_eq!(result.mix_hash[..], mix_hash[..]);
 	assert_eq!(result.value[..], boundary[..]);
@@ -472,16 +472,15 @@ fn test_seed_compute_after_newer() {

 #[test]
 fn test_drop_old_data() {
-	let path = ::std::env::temp_dir();
-	let first = Light::new(&path, 0).to_file().unwrap();
+	let first = Light::new(0).to_file().unwrap();

-	let second = Light::new(&path, ETHASH_EPOCH_LENGTH).to_file().unwrap();
+	let second = Light::new(ETHASH_EPOCH_LENGTH).to_file().unwrap();
 	assert!(fs::metadata(&first).is_ok());

-	let _ = Light::new(&path, ETHASH_EPOCH_LENGTH * 2).to_file();
+	let _ = Light::new(ETHASH_EPOCH_LENGTH * 2).to_file();
 	assert!(fs::metadata(&first).is_err());
 	assert!(fs::metadata(&second).is_ok());

-	let _ = Light::new(&path, ETHASH_EPOCH_LENGTH * 3).to_file();
+	let _ = Light::new(ETHASH_EPOCH_LENGTH * 3).to_file();
 	assert!(fs::metadata(&second).is_err());
 }
--- a/ethash/src/lib.rs
+++ b/ethash/src/lib.rs
@@ -25,7 +25,6 @@ extern crate log;
 mod compute;

 use std::mem;
-use std::path::{Path, PathBuf};
 use compute::Light;
 pub use compute::{ETHASH_EPOCH_LENGTH, H256, ProofOfWork, SeedHashCompute, quick_get_difficulty, slow_get_seedhash};

@@ -42,14 +41,12 @@ struct LightCache {
 /// Light/Full cache manager.
 pub struct EthashManager {
 	cache: Mutex<LightCache>,
-	cache_dir: PathBuf,
 }

 impl EthashManager {
 	/// Create a new new instance of ethash manager
-	pub fn new<T: AsRef<Path>>(cache_dir: T) -> EthashManager {
+	pub fn new() -> EthashManager {
 		EthashManager {
-			cache_dir: cache_dir.as_ref().to_path_buf(),
 			cache: Mutex::new(LightCache {
 				recent_epoch: None,
 				recent: None,
@@ -91,11 +88,11 @@ impl EthashManager {
 			};
 			match light {
 				None => {
-					let light = match Light::from_file(&self.cache_dir, block_number) {
+					let light = match Light::from_file(block_number) {
 						Ok(light) => Arc::new(light),
 						Err(e) => {
 							debug!("Light cache file not found for {}:{}", block_number, e);
-							let light = Light::new(&self.cache_dir, block_number);
+							let light = Light::new(block_number);
 							if let Err(e) = light.to_file() {
 								warn!("Light cache file write error: {}", e);
 							}
@@ -115,7 +112,7 @@ impl EthashManager {

 #[test]
 fn test_lru() {
-	let ethash = EthashManager::new(&::std::env::temp_dir());
+	let ethash = EthashManager::new();
 	let hash = [0u8; 32];
 	ethash.compute_light(1, &hash, 1);
 	ethash.compute_light(50000, &hash, 1);
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore"
-version = "1.7.0"
+version = "1.6.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"

@@ -11,55 +11,46 @@ build = "build.rs"
 "ethcore-ipc-codegen" = { path = "../ipc/codegen" }

 [dependencies]
-bit-set = "0.4"
-bloomchain = "0.1"
-bn = { git = "https://github.com/paritytech/bn" }
-byteorder = "1.0"
-clippy = { version = "0.0.103", optional = true}
-common-types = { path = "types" }
-crossbeam = "0.2.9"
-env_logger = "0.4"
-ethabi = "2.0"
-ethash = { path = "../ethash" }
-ethcore-bloom-journal = { path = "../util/bloom" }
-ethcore-devtools = { path = "../devtools" }
-ethcore-io = { path = "../util/io" }
-ethcore-ipc = { path = "../ipc/rpc" }
-ethcore-ipc-nano = { path = "../ipc/nano" }
-ethcore-logger = { path = "../logger" }
-ethcore-stratum = { path = "../stratum" }
-ethcore-util = { path = "../util" }
-ethjson = { path = "../json" }
-ethkey = { path = "../ethkey" }
-ethstore = { path = "../ethstore" }
-evm = { path = "evm" }
-futures = "0.1"
-hardware-wallet = { path = "../hw" }
-hyper = { git = "https://github.com/paritytech/hyper", default-features = false }
-itertools = "0.5"
-lazy_static = "0.2"
-linked-hash-map = "0.3.0"
 log = "0.3"
-lru-cache = "0.1.0"
-native-contracts = { path = "native_contracts" }
-num = "0.1"
-num_cpus = "1.2"
-rayon = "0.8"
-rand = "0.3"
-rlp = { path = "../util/rlp" }
-rust-crypto = "0.2.34"
-rustc-hex = "1.0"
+env_logger = "0.3"
 rustc-serialize = "0.3"
-semver = "0.6"
-stats = { path = "../util/stats" }
+rust-crypto = "0.2.34"
+num_cpus = "0.2"
+crossbeam = "0.2.9"
+lazy_static = "0.2"
+bloomchain = "0.1"
+semver = "0.5"
+bit-set = "0.4"
 time = "0.1"
-transient-hashmap = "0.4"
+rand = "0.3"
+byteorder = "1.0"
+transient-hashmap = "0.1"
+linked-hash-map = "0.3.0"
+lru-cache = "0.1.0"
+ethabi = "1.0.0"
+evmjit = { path = "../evmjit", optional = true }
+clippy = { version = "0.0.103", optional = true}
+ethash = { path = "../ethash" }
+ethcore-util = { path = "../util" }
+ethcore-io = { path = "../util/io" }
+ethcore-devtools = { path = "../devtools" }
+ethjson = { path = "../json" }
+ethcore-ipc = { path = "../ipc/rpc" }
+ethstore = { path = "../ethstore" }
+ethkey = { path = "../ethkey" }
+ethcore-ipc-nano = { path = "../ipc/nano" }
+rlp = { path = "../util/rlp" }
+ethcore-stratum = { path = "../stratum" }
+ethcore-bloom-journal = { path = "../util/bloom" }
+hardware-wallet = { path = "../hw" }
+stats = { path = "../util/stats" }

-[dev-dependencies]
-native-contracts = { path = "native_contracts", features = ["test_contracts"] }
+[dependencies.hyper]
+git = "https://github.com/ethcore/hyper"
+default-features = false

 [features]
-jit = ["evm/jit"]
+jit = ["evmjit"]
 evm-debug = ["slow-blocks"]
 evm-debug-tests = ["evm-debug"]
 slow-blocks = [] # Use SLOW_TX_DURATION="50" (compile time!) to track transactions over 50ms
@@ -69,3 +60,5 @@ dev = ["clippy"]
 default = []
 benches = []
 ipc = []
+ethkey-cli = ["ethkey/cli"]
+ethstore-cli = ["ethstore/cli"]
--- a/ethcore/benches/evm.rs
+++ b/ethcore/benches/evm.rs
@@ -1,97 +0,0 @@
-// 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/>.
-
-#![feature(test)]
-
-extern crate test;
-extern crate ethcore_util as util;
-extern crate rand;
-extern crate bn;
-extern crate crypto;
-extern crate rustc_serialize;
-extern crate ethkey;
-
-use self::test::{Bencher};
-use rand::{StdRng};
-
-
-#[bench]
-fn bn_128_pairing(b: &mut Bencher) {
-	use bn::{pairing, G1, G2, Fr, Group};
-
-	let rng = &mut ::rand::thread_rng();
-
-	let sk0 = Fr::random(rng);
-	let sk1 = Fr::random(rng);
-
-	let pk0 = G1::one() * sk0;
-	let pk1 = G2::one() * sk1;
-
-	b.iter(|| {
-		let _ = pairing(pk0, pk1);
-	});
-}
-
-#[bench]
-fn bn_128_mul(b: &mut Bencher) {
-	use bn::{AffineG1, G1, Fr, Group};
-
-	let mut rng = StdRng::new().unwrap();
-	let p: G1 = G1::random(&mut rng);
-	let fr = Fr::random(&mut rng);
-
-	b.iter(|| {
-		let _ = AffineG1::from_jacobian(p * fr);
-	});
-}
-
-#[bench]
-fn sha256(b: &mut Bencher) {
-	use crypto::sha2::Sha256;
-	use crypto::digest::Digest;
-
-	let mut input: [u8; 256] = [0; 256];
-	let mut out = [0; 32];
-
-	b.iter(|| {
-		let mut sha = Sha256::new();
-		sha.input(&input);
-		sha.result(&mut input[0..32]);
-	});
-}
-
-#[bench]
-fn ecrecover(b: &mut Bencher) {
-	use rustc_serialize::hex::FromHex;
-	use ethkey::{Signature, recover as ec_recover};
-	use util::H256;
-	let input = FromHex::from_hex("47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad000000000000000000000000000000000000000000000000000000000000001b650acf9d3f5f0a2c799776a1254355d5f4061762a237396a99a0e0e3fc2bcd6729514a0dacb2e623ac4abd157cb18163ff942280db4d5caad66ddf941ba12e03").unwrap();
-	let hash = H256::from_slice(&input[0..32]);
-	let v = H256::from_slice(&input[32..64]);
-	let r = H256::from_slice(&input[64..96]);
-	let s = H256::from_slice(&input[96..128]);
-
-	let bit = match v[31] {
-		27 | 28 if &v.0[..31] == &[0; 31] => v[31] - 27,
-		_ => { return; },
-	};
-
-	let s = Signature::from_rsv(&r, &s, bit);
-	b.iter(|| {
-		let _ = ec_recover(&s, &hash);
-	});
-}
-
--- a/ethcore/build.rs
+++ b/ethcore/build.rs
@@ -17,6 +17,7 @@
 extern crate ethcore_ipc_codegen;

 fn main() {
+	ethcore_ipc_codegen::derive_binary("src/types/mod.rs.in").unwrap();
 	ethcore_ipc_codegen::derive_ipc_cond("src/client/traits.rs", cfg!(feature="ipc")).unwrap();
 	ethcore_ipc_codegen::derive_ipc_cond("src/snapshot/snapshot_service_trait.rs", cfg!(feature="ipc")).unwrap();
 	ethcore_ipc_codegen::derive_ipc_cond("src/client/chain_notify.rs", cfg!(feature="ipc")).unwrap();
--- a/ethcore/evm/Cargo.toml
+++ b/ethcore/evm/Cargo.toml
@@ -1,23 +0,0 @@
-[package]
-name = "evm"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-bit-set = "0.4"
-byteorder = "1.0"
-common-types = { path = "../types" }
-ethcore-util = { path = "../../util" }
-evmjit = { path = "../../evmjit", optional = true }
-ethjson = { path = "../../json" }
-lazy_static = "0.2"
-log = "0.3"
-rlp = { path = "../../util/rlp" }
-parity-wasm = "0.12"
-wasm-utils = { git = "https://github.com/paritytech/wasm-utils" }
-
-[dev-dependencies]
-rustc-hex = "1.0"
-
-[features]
-jit = ["evmjit"]
--- a/ethcore/evm/src/call_type.rs
+++ b/ethcore/evm/src/call_type.rs
@@ -1,70 +0,0 @@
-//! EVM call types.
-
-use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
-
-/// The type of the call-like instruction.
-#[derive(Debug, PartialEq, Clone)]
-pub enum CallType {
-	/// Not a CALL.
-	None,
-	/// CALL.
-	Call,
-	/// CALLCODE.
-	CallCode,
-	/// DELEGATECALL.
-	DelegateCall,
-	/// STATICCALL
-	StaticCall,
-}
-
-impl Encodable for CallType {
-	fn rlp_append(&self, s: &mut RlpStream) {
-		let v = match *self {
-			CallType::None => 0u32,
-			CallType::Call => 1,
-			CallType::CallCode => 2,
-			CallType::DelegateCall => 3,
-			CallType::StaticCall => 4,
-		};
-		Encodable::rlp_append(&v, s);
-	}
-}
-
-impl Decodable for CallType {
-	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
-		rlp.as_val().and_then(|v| Ok(match v {
-			0u32 => CallType::None,
-			1 => CallType::Call,
-			2 => CallType::CallCode,
-			3 => CallType::DelegateCall,
-			4 => CallType::StaticCall,
-			_ => return Err(DecoderError::Custom("Invalid value of CallType item")),
-		}))
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use rlp::*;
-	use super::CallType;
-
-	#[test]
-	fn encode_call_type() {
-		let ct = CallType::Call;
-
-		let mut s = RlpStream::new_list(2);
-		s.append(&ct);
-		assert!(!s.is_finished(), "List shouldn't finished yet");
-		s.append(&ct);
-		assert!(s.is_finished(), "List should be finished now");
-		s.out();
-	}
-
-	#[test]
-	fn should_encode_and_decode_call_type() {
-		let original = CallType::Call;
-		let encoded = encode(&original);
-		let decoded = decode(&encoded);
-		assert_eq!(original, decoded);
-	}
-}
--- a/ethcore/evm/src/lib.rs
+++ b/ethcore/evm/src/lib.rs
@@ -1,70 +0,0 @@
-// 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/>.
-
-//! Ethereum virtual machine.
-
-extern crate byteorder;
-extern crate bit_set;
-extern crate common_types as types;
-extern crate ethcore_util as util;
-extern crate ethjson;
-extern crate rlp;
-extern crate parity_wasm;
-extern crate wasm_utils;
-
-#[macro_use]
-extern crate lazy_static;
-
-#[macro_use]
-extern crate log;
-
-#[cfg(feature = "jit")]
-extern crate evmjit;
-
-#[cfg(test)]
-extern crate rustc_hex;
-
-pub mod action_params;
-pub mod call_type;
-pub mod env_info;
-pub mod ext;
-pub mod evm;
-pub mod interpreter;
-pub mod schedule;
-pub mod wasm;
-
-#[macro_use]
-pub mod factory;
-mod vmtype;
-mod instructions;
-
-#[cfg(feature = "jit" )]
-mod jit;
-
-#[cfg(test)]
-mod tests;
-#[cfg(all(feature="benches", test))]
-mod benches;
-
-pub use self::action_params::ActionParams;
-pub use self::call_type::CallType;
-pub use self::env_info::EnvInfo;
-pub use self::evm::{Evm, Error, Finalize, FinalizationResult, GasLeft, Result, CostType, ReturnData};
-pub use self::ext::{Ext, ContractCreateResult, MessageCallResult, CreateContractAddress};
-pub use self::instructions::{InstructionInfo, INSTRUCTIONS, push_bytes};
-pub use self::vmtype::VMType;
-pub use self::factory::Factory;
-pub use self::schedule::{Schedule, CleanDustMode};
--- a/ethcore/evm/src/vmtype.rs
+++ b/ethcore/evm/src/vmtype.rs
@@ -1,75 +0,0 @@
-// 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::fmt;
-
-/// Type of EVM to use.
-#[derive(Debug, PartialEq, Clone)]
-pub enum VMType {
-	/// JIT EVM
-	#[cfg(feature = "jit")]
-	Jit,
-	/// RUST EVM
-	Interpreter
-}
-
-impl fmt::Display for VMType {
-	#[cfg(feature="jit")]
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		write!(f, "{}", match *self {
-			VMType::Jit => "JIT",
-			VMType::Interpreter => "INT"
-		})
-	}
-	#[cfg(not(feature="jit"))]
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		write!(f, "{}", match *self {
-			VMType::Interpreter => "INT"
-		})
-	}
-}
-
-impl Default for VMType {
-	fn default() -> Self {
-		VMType::Interpreter
-	}
-}
-
-impl VMType {
-	/// Return all possible VMs (JIT, Interpreter)
-	#[cfg(feature = "jit")]
-	pub fn all() -> Vec<VMType> {
-		vec![VMType::Jit, VMType::Interpreter]
-	}
-
-	/// Return all possible VMs (Interpreter)
-	#[cfg(not(feature = "jit"))]
-	pub fn all() -> Vec<VMType> {
-		vec![VMType::Interpreter]
-	}
-
-	/// Return new jit if it's possible
-	#[cfg(not(feature = "jit"))]
-	pub fn jit() -> Option<Self> {
-		None
-	}
-
-	/// Return new jit if it's possible
-	#[cfg(feature = "jit")]
-	pub fn jit() -> Option<Self> {
-		Some(VMType::Jit)
-	}
-}
--- a/ethcore/evm/src/wasm/call_args.rs
+++ b/ethcore/evm/src/wasm/call_args.rs
@@ -1,62 +0,0 @@
-// 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/>.
-
-//! Wasm evm call arguments helper
-
-use util::{U256, H160};
-
-/// Input part of the wasm call descriptor
-pub struct CallArgs {
-	/// Receiver of the transaction
-	pub address: [u8; 20],
-
-	/// Sender of the transaction
-	pub sender: [u8; 20],
-
-	/// Original transaction initiator
-	pub origin: [u8; 20],
-
-	/// Transfer value
-	pub value: [u8; 32],
-
-	/// call/create params
-	pub data: Vec<u8>,
-}
-
-impl CallArgs {
-	/// New contract call payload with known parameters
-	pub fn new(address: H160, sender: H160, origin: H160, value: U256, data: Vec<u8>) -> Self {
-		let mut descriptor = CallArgs {
-			address: [0u8; 20],
-			sender: [0u8; 20],
-			origin: [0u8; 20],
-			value: [0u8; 32],
-			data: data,
-		};
-
-		descriptor.address.copy_from_slice(&*address);
-		descriptor.sender.copy_from_slice(&*sender);
-		descriptor.origin.copy_from_slice(&*origin);
-		value.to_big_endian(&mut descriptor.value);
-
-		descriptor
-	}
-
-	/// Total call payload length in linear memory
-	pub fn len(&self) -> u32 {
-		self.data.len() as u32 + 92
-	}
-}
--- a/ethcore/evm/src/wasm/env.rs
+++ b/ethcore/evm/src/wasm/env.rs
@@ -1,119 +0,0 @@
-// 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/>.
-
-//! Wasm env module bindings 
-
-use parity_wasm::elements::ValueType::*;
-use parity_wasm::interpreter::UserFunctionDescriptor;
-use parity_wasm::interpreter::UserFunctionDescriptor::*;
-
-pub const SIGNATURES: &'static [UserFunctionDescriptor] = &[
-	Static(
-		"_storage_read",
-		&[I32; 2],
-		Some(I32),
-	),
-	Static(
-		"_storage_write",
-		&[I32; 2],
-		Some(I32),
-	),
-	Static(
-		"_malloc",
-		&[I32],
-		Some(I32),
-	),
-	Static(
-		"_free",
-		&[I32],
-		None,
-	),
-	Static(
-		"gas",
-		&[I32],
-		None,
-	),
-	Static(
-		"_debug",
-		&[I32; 2],
-		None,
-	),
-	Static(
-		"_suicide",
-		&[I32],
-		None,
-	),
-	Static(
-		"_create",
-		&[I32; 4],
-		Some(I32),
-	),
-	Static(
-		"abort",
-		&[I32],
-		None,
-	),
-	Static(
-		"_abort",
-		&[],
-		None,
-	),
-	Static(
-		"invoke_vii",
-		&[I32; 3],
-		None,
-	),
-	Static(
-		"invoke_vi",
-		&[I32; 2],
-		None,
-	),
-	Static(
-		"invoke_v",
-		&[I32],
-		None,
-	),
-	Static(
-		"invoke_iii",
-		&[I32; 3],
-		Some(I32),
-	),
-	Static(
-		"___resumeException",
-		&[I32],
-		None,
-	),
-	Static(
-		"_rust_begin_unwind",
-		&[I32; 4],
-		None,
-	),
-	Static(
-		"___cxa_find_matching_catch_2",
-		&[],
-		Some(I32),
-	),
-	Static(
-		"___gxx_personality_v0",
-		&[I32; 6],
-		Some(I32),
-	),
-	Static(
-		"_emscripten_memcpy_big",
-		&[I32; 3],
-		Some(I32),
-	)
-];
--- a/ethcore/evm/src/wasm/mod.rs
+++ b/ethcore/evm/src/wasm/mod.rs
@@ -1,159 +0,0 @@
-// 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/>.
-
-//! Wasm Interpreter
-
-mod runtime;
-mod ptr;
-mod call_args;
-mod result;
-#[cfg(test)]
-mod tests;
-mod env;
-
-use std::sync::Arc;
-
-const DEFAULT_STACK_SPACE: u32 = 5 * 1024 * 1024;
-
-use parity_wasm::{interpreter, elements};
-use parity_wasm::interpreter::ModuleInstanceInterface;
-use wasm_utils;
-
-use evm::{self, GasLeft, ReturnData};
-use action_params::ActionParams;
-use self::runtime::Runtime;
-
-pub use self::runtime::Error as RuntimeError;
-
-const DEFAULT_RESULT_BUFFER: usize = 1024;
-
-/// Wasm interpreter instance
-pub struct WasmInterpreter {
-	program: interpreter::ProgramInstance,
-	result: Vec<u8>,
-}
-
-impl WasmInterpreter {
-	/// New wasm interpreter instance
-	pub fn new() -> Result<WasmInterpreter, RuntimeError> {
-		Ok(WasmInterpreter {
-			program: interpreter::ProgramInstance::new()?,
-			result: Vec::with_capacity(DEFAULT_RESULT_BUFFER),
-		})
-	}
-}
-
-impl evm::Evm for WasmInterpreter {
-
-	fn exec(&mut self, params: ActionParams, ext: &mut ::ext::Ext) -> evm::Result<GasLeft> {
-		use parity_wasm::elements::Deserialize;
-
-		let code = params.code.expect("exec is only called on contract with code; qed");
-
-		trace!(target: "wasm", "Started wasm interpreter with code.len={:?}", code.len());
-
-		let env_instance = self.program.module("env")
-			// prefer explicit panic here
-			.expect("Wasm program to contain env module");
-
-		let env_memory = env_instance.memory(interpreter::ItemIndex::Internal(0))
-			// prefer explicit panic here
-			.expect("Linear memory to exist in wasm runtime");
-
-		if params.gas > ::std::u64::MAX.into() {
-			return Err(evm::Error::Wasm("Wasm interpreter cannot run contracts with gas >= 2^64".to_owned()));
-		}
-
-		let mut runtime = Runtime::with_params(
-			ext,
-			env_memory,
-			DEFAULT_STACK_SPACE,
-			params.gas.low_u64(),
-		);
-
-		let mut cursor = ::std::io::Cursor::new(&*code);
-
-		let contract_module = wasm_utils::inject_gas_counter(
-			elements::Module::deserialize(
-				&mut cursor
-			).map_err(|err| {
-				evm::Error::Wasm(format!("Error deserializing contract code ({:?})", err))
-			})?
-		);
-
-		let d_ptr = runtime.write_descriptor(
-			call_args::CallArgs::new(
-				params.address,
-				params.sender,
-				params.origin,
-				params.value.value(),
-				params.data.unwrap_or(Vec::with_capacity(0)),
-			)
-		)?;
-
-		{
-			let execution_params = interpreter::ExecutionParams::with_external(
-				"env".into(),
-				Arc::new(
-					interpreter::env_native_module(env_instance, native_bindings(&mut runtime))
-						.map_err(|err| {
-							// todo: prefer explicit panic here also?
-							evm::Error::Wasm(format!("Error instantiating native bindings: {:?}", err))
-						})?
-				)
-			).add_argument(interpreter::RuntimeValue::I32(d_ptr.as_raw() as i32));
-
-			let module_instance = self.program.add_module("contract", contract_module, Some(&execution_params.externals))
-				.map_err(|err| {
-					trace!(target: "wasm", "Error adding contract module: {:?}", err);
-					evm::Error::from(RuntimeError::Interpreter(err))
-				})?;
-
-			module_instance.execute_export("_call", execution_params)
-				.map_err(|err| {
-					trace!(target: "wasm", "Error executing contract: {:?}", err);
-					evm::Error::from(RuntimeError::Interpreter(err))
-				})?;
-		}
-
-		let result = result::WasmResult::new(d_ptr);
-		if result.peek_empty(&*runtime.memory())? {
-			trace!(target: "wasm", "Contract execution result is empty.");
-			Ok(GasLeft::Known(runtime.gas_left()?.into()))
-		} else {
-			self.result.clear();
-			// todo: use memory views to avoid copy
-			self.result.extend(result.pop(&*runtime.memory())?);
-			let len = self.result.len();
-			Ok(GasLeft::NeedsReturn {
-				gas_left: runtime.gas_left()?.into(),
-				data: ReturnData::new(
-					::std::mem::replace(&mut self.result, Vec::with_capacity(DEFAULT_RESULT_BUFFER)),
-					0,
-					len,
-				),
-				apply_state: true,
-			})
-		}
-	}
-}
-
-fn native_bindings<'a>(runtime: &'a mut Runtime) -> interpreter::UserFunctions<'a> {
-	interpreter::UserFunctions {
-		executor: runtime,
-		functions: ::std::borrow::Cow::from(env::SIGNATURES),
-	}
-}
--- a/ethcore/evm/src/wasm/ptr.rs
+++ b/ethcore/evm/src/wasm/ptr.rs
@@ -1,52 +0,0 @@
-// 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/>.
-
-//! Wasm bound-checked ptr
-
-use parity_wasm::interpreter;
-
-/// Bound-checked wrapper for webassembly memory 
-pub struct WasmPtr(u32);
-
-/// Error in bound check
-#[derive(Debug)]
-pub enum Error {
-	AccessViolation,
-}
-
-impl From<u32> for WasmPtr {
-	fn from(raw: u32) -> Self { 
-		WasmPtr(raw)
-	}
-}
-
-impl WasmPtr {
-	// todo: use memory view when they are on
-	/// Check memory range and return data with given length starting from the current pointer value
-	pub fn slice(&self, len: u32, mem: &interpreter::MemoryInstance) -> Result<Vec<u8>, Error> {
-		mem.get(self.0, len as usize).map_err(|_| Error::AccessViolation)
-	}
-
-	// todo: maybe 2gb limit can be enhanced
-	/// Convert i32 from wasm stack to the wrapped pointer
-	pub fn from_i32(raw_ptr: i32) -> Result<Self, Error> {
-		if raw_ptr < 0 { return Err(Error::AccessViolation); }
-		Ok(WasmPtr(raw_ptr as u32))
-	}
-
-	/// Return pointer raw value
-	pub fn as_raw(&self) -> u32 { self.0 }
-}
--- a/ethcore/evm/src/wasm/result.rs
+++ b/ethcore/evm/src/wasm/result.rs
@@ -1,51 +0,0 @@
-// 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/>.
-
-//! Wasm evm results helper
-
-use byteorder::{LittleEndian, ByteOrder};
-
-use parity_wasm::interpreter;
-
-use super::ptr::WasmPtr;
-use super::runtime::Error as RuntimeError;
-
-/// Wrapper for wasm contract call result
-pub struct WasmResult {
-	ptr: WasmPtr,
-}
-
-impl WasmResult {
-	/// New call result from given ptr
-	pub fn new(descriptor_ptr: WasmPtr) -> WasmResult {
-		WasmResult { ptr: descriptor_ptr }
-	}
-
-	/// Check if the result contains any data
-	pub fn peek_empty(&self, mem: &interpreter::MemoryInstance) -> Result<bool, RuntimeError> {
-		let result_len = LittleEndian::read_u32(&self.ptr.slice(16, mem)?[12..16]);
-		Ok(result_len == 0)
-	}
-
-	/// Consume the result ptr and return the actual data from wasm linear memory
-	pub fn pop(self, mem: &interpreter::MemoryInstance) -> Result<Vec<u8>, RuntimeError> {
-		let result_ptr = LittleEndian::read_u32(&self.ptr.slice(16, mem)?[8..12]);
-		let result_len = LittleEndian::read_u32(&self.ptr.slice(16, mem)?[12..16]);
-		trace!(target: "wasm", "contract result: {} bytes at @{}", result_len, result_ptr);
-
-		Ok(mem.get(result_ptr, result_len as usize)?)
-	}
-}
--- a/ethcore/evm/src/wasm/runtime.rs
+++ b/ethcore/evm/src/wasm/runtime.rs
@@ -1,365 +0,0 @@
-// 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/>.
-
-//! Wasm evm program runtime intstance
-
-use std::sync::Arc;
-
-use byteorder::{LittleEndian, ByteOrder};
-
-use ext;
-
-use parity_wasm::interpreter;
-use util::{Address, H256, U256};
-
-use super::ptr::{WasmPtr, Error as PtrError};
-use super::call_args::CallArgs;
-
-/// Wasm runtime error
-#[derive(Debug)]
-pub enum Error {
-	/// Storage error
-	Storage,
-	/// Allocator error
-	Allocator,
-	/// Invalid gas state during the call
-	InvalidGasState,
-	/// Memory access violation
-	AccessViolation,
-	/// Interpreter runtime error
-	Interpreter(interpreter::Error),
-}
-
-impl From<interpreter::Error> for Error {
-	fn from(err: interpreter::Error) -> Self {
-		Error::Interpreter(err)
-	}
-}
-
-impl From<PtrError> for Error {
-	fn from(err: PtrError) -> Self {
-		match err {
-			PtrError::AccessViolation => Error::AccessViolation,
-		}
-	}
-}
-
-/// Runtime enviroment data for wasm contract execution
-pub struct Runtime<'a> {
-	gas_counter: u64,
-	gas_limit: u64,
-	dynamic_top: u32,
-	ext: &'a mut ext::Ext,
-	memory: Arc<interpreter::MemoryInstance>,
-}
-
-impl<'a> Runtime<'a> {
-	/// New runtime for wasm contract with specified params
-	pub fn with_params<'b>(
-		ext: &'b mut ext::Ext,
-		memory: Arc<interpreter::MemoryInstance>,
-		stack_space: u32,
-		gas_limit: u64,
-	) -> Runtime<'b> {
-		Runtime {
-			gas_counter: 0,
-			gas_limit: gas_limit,
-			dynamic_top: stack_space,
-			memory: memory,
-			ext: ext,
-		}
-	}
-
-	/// Write to the storage from wasm memory
-	pub fn storage_write(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		let mut context = context;
-		let val = self.pop_h256(&mut context)?;
-		let key = self.pop_h256(&mut context)?;
-		trace!(target: "wasm", "storage_write: value {} at @{}", &val, &key);
-
-		self.ext.set_storage(key, val)
-			.map_err(|_| interpreter::Error::Trap("Storage update error".to_owned()))?;
-
-		Ok(Some(0i32.into()))
-	}
-
-	/// Read from the storage to wasm memory
-	pub fn storage_read(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		let mut context = context;
-		let val_ptr = context.value_stack.pop_as::<i32>()?;
-		let key = self.pop_h256(&mut context)?;
-
-		let val = self.ext.storage_at(&key)
-			.map_err(|_| interpreter::Error::Trap("Storage read error".to_owned()))?;
-
-		self.memory.set(val_ptr as u32, &*val)?;
-
-		Ok(Some(0.into()))
-	}
-
-	/// Pass suicide to state runtime
-	pub fn suicide(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		let mut context = context;
-		let refund_address = self.pop_address(&mut context)?;
-
-		self.ext.suicide(&refund_address)
-			.map_err(|_| interpreter::Error::Trap("Suicide error".to_owned()))?;
-
-		Ok(None)
-	}
-
-	/// Invoke create in the state runtime
-	pub fn create(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		//
-		// method signature:
-		//   fn create(endowment: *const u8, code_ptr: *const u8, code_len: u32, result_ptr: *mut u8) -> i32;
-		//
-
-		trace!(target: "wasm", "runtime: create contract");
-		let mut context = context;
-		let result_ptr = context.value_stack.pop_as::<i32>()? as u32;
-		trace!(target: "wasm", "    result_ptr: {:?}", result_ptr);
-		let code_len = context.value_stack.pop_as::<i32>()? as u32;
-		trace!(target: "wasm", "    code_len: {:?}", code_len);
-		let code_ptr = context.value_stack.pop_as::<i32>()? as u32;
-		trace!(target: "wasm", "    code_ptr: {:?}", code_ptr);
-		let endowment = self.pop_u256(&mut context)?;
-		trace!(target: "wasm", "    val: {:?}", endowment);
-
-		let code = self.memory.get(code_ptr, code_len as usize)?;
-
-		let gas_left = self.gas_left()
-			.map_err(|_| interpreter::Error::Trap("Gas state error".to_owned()))?
-			.into();
-
-		match self.ext.create(&gas_left, &endowment, &code, ext::CreateContractAddress::FromSenderAndCodeHash) {
-			ext::ContractCreateResult::Created(address, gas_left) => {
-				self.memory.set(result_ptr, &*address)?;
-				self.gas_counter = self.gas_limit - gas_left.low_u64();
-				trace!(target: "wasm", "runtime: create contract success (@{:?})", address);
-				Ok(Some(0i32.into()))
-			},
-			ext::ContractCreateResult::Failed => {
-				trace!(target: "wasm", "runtime: create contract fail");
-				Ok(Some((-1i32).into()))
-			},
-			ext::ContractCreateResult::Reverted(gas_left, _) => {
-				trace!(target: "wasm", "runtime: create contract reverted");
-				self.gas_counter = self.gas_limit - gas_left.low_u64();
-				Ok(Some((-1i32).into()))
-			},
-			ext::ContractCreateResult::FailedInStaticCall => {
-				trace!(target: "wasm", "runtime: create contract called in static context");
-				Err(interpreter::Error::Trap("CREATE in static context".to_owned()))
-			},
-		}
-	}
-
-	/// Allocate memory using the wasm stack params
-	pub fn malloc(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		let amount = context.value_stack.pop_as::<i32>()? as u32;
-		let previous_top = self.dynamic_top;
-		self.dynamic_top = previous_top + amount;
-		Ok(Some((previous_top as i32).into()))
-	}
-
-	/// Allocate memory in wasm memory instance
-	pub fn alloc(&mut self, amount: u32) -> Result<u32, Error> {
-		let previous_top = self.dynamic_top;
-		self.dynamic_top = previous_top + amount;
-		Ok(previous_top.into())
-	}
-
-	/// Report gas cost with the params passed in wasm stack
-	fn gas(&mut self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		let amount = context.value_stack.pop_as::<i32>()? as u64;
-		if self.charge_gas(amount) {
-			Ok(None)
-		} else {
-			Err(interpreter::Error::Trap(format!("Gas exceeds limits of {}", self.gas_limit)))
-		}
-	}
-
-	fn charge_gas(&mut self, amount: u64) -> bool {
-		let prev = self.gas_counter;
-		if prev + amount > self.gas_limit {
-			// exceeds gas
-			false
-		} else {
-			self.gas_counter = prev + amount;
-			true
-		}
-	}
-
-	fn h256_at(&self, ptr: WasmPtr) -> Result<H256, interpreter::Error> {
-		Ok(H256::from_slice(&ptr.slice(32, &*self.memory)
-			.map_err(|_| interpreter::Error::Trap("Memory access violation".to_owned()))?
-		))
-	}
-
-	fn pop_h256(&self, context: &mut interpreter::CallerContext) -> Result<H256, interpreter::Error> {
-		let ptr = WasmPtr::from_i32(context.value_stack.pop_as::<i32>()?)
-			.map_err(|_| interpreter::Error::Trap("Memory access violation".to_owned()))?;
-		self.h256_at(ptr)
-	}
-
-	fn pop_u256(&self, context: &mut interpreter::CallerContext) -> Result<U256, interpreter::Error> {
-		let ptr = WasmPtr::from_i32(context.value_stack.pop_as::<i32>()?)
-			.map_err(|_| interpreter::Error::Trap("Memory access violation".to_owned()))?;
-		self.h256_at(ptr).map(Into::into)
-	}
-
-	fn address_at(&self, ptr: WasmPtr) -> Result<Address, interpreter::Error> {
-		Ok(Address::from_slice(&ptr.slice(20, &*self.memory)
-			.map_err(|_| interpreter::Error::Trap("Memory access violation".to_owned()))?
-		))
-	}
-
-	fn pop_address(&self, context: &mut interpreter::CallerContext) -> Result<Address, interpreter::Error> {
-		let ptr = WasmPtr::from_i32(context.value_stack.pop_as::<i32>()?)
-			.map_err(|_| interpreter::Error::Trap("Memory access violation".to_owned()))?;
-		self.address_at(ptr)
-	}
-
-	fn user_trap(&mut self, _context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		Err(interpreter::Error::Trap("unknown trap".to_owned()))
-	}
-
-	fn user_noop(&mut self,
-		_context: interpreter::CallerContext
-	) -> Result<Option<interpreter::RuntimeValue>, interpreter::Error> {
-		Ok(None)
-	}
-
-	/// Write call descriptor to wasm memory
-	pub fn write_descriptor(&mut self, call_args: CallArgs) -> Result<WasmPtr, Error> {
-		let d_ptr = self.alloc(16)?;
-
-		let args_len = call_args.len();
-		let args_ptr = self.alloc(args_len)?;
-
-		// write call descriptor
-		// call descriptor is [args_ptr, args_len, return_ptr, return_len]
-		//   all are 4 byte length, last 2 are zeroed
-		let mut d_buf = [0u8; 16];
-		LittleEndian::write_u32(&mut d_buf[0..4], args_ptr);
-		LittleEndian::write_u32(&mut d_buf[4..8], args_len);
-		self.memory.set(d_ptr, &d_buf)?;
-
-		// write call args to memory
-		self.memory.set(args_ptr, &call_args.address)?;
-		self.memory.set(args_ptr+20, &call_args.sender)?;
-		self.memory.set(args_ptr+40, &call_args.origin)?;
-		self.memory.set(args_ptr+60, &call_args.value)?;
-		self.memory.set(args_ptr+92, &call_args.data)?;
-
-		Ok(d_ptr.into())
-	}
-
-	fn debug_log(&mut self, context: interpreter::CallerContext)
-			-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		let msg_len = context.value_stack.pop_as::<i32>()? as u32;
-		let msg_ptr = context.value_stack.pop_as::<i32>()? as u32;
-
-		let msg = String::from_utf8(self.memory.get(msg_ptr, msg_len as usize)?)
-			.map_err(|_| interpreter::Error::Trap("Debug log utf-8 decoding error".to_owned()))?;
-
-		trace!(target: "wasm", "Contract debug message: {}", msg);
-
-		Ok(None)
-	}
-
-	/// Query current gas left for execution
-	pub fn gas_left(&self) -> Result<u64, Error> {
-		if self.gas_counter > self.gas_limit { return Err(Error::InvalidGasState); }
-		Ok(self.gas_limit - self.gas_counter)
-	}
-
-	/// Shared memory reference
-	pub fn memory(&self) -> &interpreter::MemoryInstance {
-		&*self.memory
-	}
-
-	fn mem_copy(&self, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		let len = context.value_stack.pop_as::<i32>()? as u32;
-		let dst = context.value_stack.pop_as::<i32>()? as u32;
-		let src = context.value_stack.pop_as::<i32>()? as u32;
-
-		let mem = self.memory().get(src, len as usize)?;
-		self.memory().set(dst, &mem)?;
-
-		Ok(Some(0i32.into()))
-	}
-}
-
-impl<'a> interpreter::UserFunctionExecutor for Runtime<'a> {
-	fn execute(&mut self, name: &str, context: interpreter::CallerContext)
-		-> Result<Option<interpreter::RuntimeValue>, interpreter::Error>
-	{
-		match name {
-			"_malloc" => {
-				self.malloc(context)
-			},
-			"_free" => {
-				// Since it is arena allocator, free does nothing
-				// todo: update if changed
-				self.user_noop(context)
-			},
-			"_storage_read" => {
-				self.storage_read(context)
-			},
-			"_storage_write" => {
-				self.storage_write(context)
-			},
-			"_suicide" => {
-				self.suicide(context)
-			},
-			"_create" => {
-				self.create(context)
-			},
-			"_debug" => {
-				self.debug_log(context)
-			},
-			"gas" => {
-				self.gas(context)
-			},
-			"_emscripten_memcpy_big" => {
-				self.mem_copy(context)
-			},
-			_ => {
-				trace!("Unknown env func: '{}'", name);
-				self.user_trap(context)
-			}
-		}
-	}
-}
--- a/ethcore/evm/src/wasm/tests.rs
+++ b/ethcore/evm/src/wasm/tests.rs
@@ -1,274 +0,0 @@
-// 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 super::super::tests::{FakeExt, FakeCall, FakeCallType};
-use super::WasmInterpreter;
-use evm::{self, Evm, GasLeft};
-use action_params::{ActionParams, ActionValue};
-use util::{U256, H256, Address};
-
-macro_rules! load_sample {
-	($name: expr) => {
-		include_bytes!(concat!("../../../res/wasm-tests/compiled/", $name)).to_vec()
-	}
-}
-
-fn test_finalize(res: Result<GasLeft, evm::Error>) -> Result<U256, evm::Error> {
-	match res {
-		Ok(GasLeft::Known(gas)) => Ok(gas),
-		Ok(GasLeft::NeedsReturn{..}) => unimplemented!(), // since ret is unimplemented.
-		Err(e) => Err(e),
-	}
-}
-
-fn wasm_interpreter() -> WasmInterpreter {
-	WasmInterpreter::new().expect("wasm interpreter to create without errors")
-}
-
-/// Empty contract does almost nothing except producing 1 (one) local node debug log message
-#[test]
-fn empty() {
-	let code = load_sample!("empty.wasm");
-	let address: Address = "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6".parse().unwrap();
-
-	let mut params = ActionParams::default();
-	params.address = address.clone();
-	params.gas = U256::from(100_000);
-	params.code = Some(Arc::new(code));
-	let mut ext = FakeExt::new();
-
-	let gas_left = {
-		let mut interpreter = wasm_interpreter();
-		test_finalize(interpreter.exec(params, &mut ext)).unwrap()
-	};
-
-	assert_eq!(gas_left, U256::from(99_996));
-}
-
-// This test checks if the contract deserializes payload header properly.
-//   Contract is provided with receiver(address), sender, origin and transaction value
-//   logger.wasm writes all these provided fixed header fields to some arbitrary storage keys.
-#[test]
-fn logger() {
-	let code = load_sample!("logger.wasm");
-	let address: Address = "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6".parse().unwrap();
-	let sender: Address = "0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d".parse().unwrap();
-	let origin: Address = "0102030405060708090a0b0c0d0e0f1011121314".parse().unwrap();
-
-	let mut params = ActionParams::default();
-	params.address = address.clone();
-	params.sender = sender.clone();
-	params.origin = origin.clone();
-	params.gas = U256::from(100_000);
-	params.value = ActionValue::transfer(1_000_000_000);
-	params.code = Some(Arc::new(code));
-	let mut ext = FakeExt::new();
-
-	let gas_left = {
-		let mut interpreter = wasm_interpreter();
-		test_finalize(interpreter.exec(params, &mut ext)).unwrap()
-	};
-
-	println!("ext.store: {:?}", ext.store);
-	assert_eq!(gas_left, U256::from(99581));
-	let address_val: H256 = address.into();
-	assert_eq!(
-		ext.store.get(&"0100000000000000000000000000000000000000000000000000000000000000".parse().unwrap()).expect("storage key to exist"),
-		&address_val,
-		"Logger sets 0x01 key to the provided address"
-	);
-	let sender_val: H256 = sender.into();
-	assert_eq!(
-		ext.store.get(&"0200000000000000000000000000000000000000000000000000000000000000".parse().unwrap()).expect("storage key to exist"),
-		&sender_val,
-		"Logger sets 0x02 key to the provided sender"
-	);
-	let origin_val: H256 = origin.into();
-	assert_eq!(
-		ext.store.get(&"0300000000000000000000000000000000000000000000000000000000000000".parse().unwrap()).expect("storage key to exist"),
-		&origin_val,
-		"Logger sets 0x03 key to the provided origin"
-	);
-	assert_eq!(
-		U256::from(ext.store.get(&"0400000000000000000000000000000000000000000000000000000000000000".parse().unwrap()).expect("storage key to exist")),
-		U256::from(1_000_000_000),
-		"Logger sets 0x04 key to the trasferred value"
-	);
-}
-
-// This test checks if the contract can allocate memory and pass pointer to the result stream properly.
-//   1. Contract is being provided with the call descriptor ptr
-//   2. Descriptor ptr is 16 byte length
-//   3. The last 8 bytes of call descriptor is the space for the contract to fill [result_ptr[4], result_len[4]]
-//      if it has any result.
-#[test]
-fn identity() {
-	let code = load_sample!("identity.wasm");
-	let sender: Address = "01030507090b0d0f11131517191b1d1f21232527".parse().unwrap();
-
-	let mut params = ActionParams::default();
-	params.sender = sender.clone();
-	params.gas = U256::from(100_000);
-	params.code = Some(Arc::new(code));
-	let mut ext = FakeExt::new();
-
-	let (gas_left, result) = {
-		let mut interpreter = wasm_interpreter();
-		let result = interpreter.exec(params, &mut ext).expect("Interpreter to execute without any errors");
-		match result {
-			GasLeft::Known(_) => { panic!("Identity contract should return payload"); },
-			GasLeft::NeedsReturn { gas_left: gas, data: result, apply_state: _apply } => (gas, result.to_vec()),
-		}
-	};
-
-	assert_eq!(gas_left, U256::from(99_689));
-
-	assert_eq!(
-		Address::from_slice(&result),
-		sender,
-		"Idenity test contract does not return the sender passed"
-	);
-}
-
-// Dispersion test sends byte array and expect the contract to 'disperse' the original elements with
-// their modulo 19 dopant.
-// The result is always twice as long as the input.
-// This also tests byte-perfect memory allocation and in/out ptr lifecycle.
-#[test]
-fn dispersion() {
-	let code = load_sample!("dispersion.wasm");
-
-	let mut params = ActionParams::default();
-	params.gas = U256::from(100_000);
-	params.code = Some(Arc::new(code));
-	params.data = Some(vec![
-		0u8, 125, 197, 255, 19
-	]);
-	let mut ext = FakeExt::new();
-
-	let (gas_left, result) = {
-		let mut interpreter = wasm_interpreter();
-		let result = interpreter.exec(params, &mut ext).expect("Interpreter to execute without any errors");
-		match result {
-			GasLeft::Known(_) => { panic!("Dispersion routine should return payload"); },
-			GasLeft::NeedsReturn { gas_left: gas, data: result, apply_state: _apply } => (gas, result.to_vec()),
-		}
-	};
-
-	assert_eq!(gas_left, U256::from(99_402));
-
-	assert_eq!(
-		result,
-		vec![0u8, 0, 125, 11, 197, 7, 255, 8, 19, 0]
-	);
-}
-
-#[test]
-fn suicide_not() {
-	let code = load_sample!("suicidal.wasm");
-
-	let mut params = ActionParams::default();
-	params.gas = U256::from(100_000);
-	params.code = Some(Arc::new(code));
-	params.data = Some(vec![
-		0u8
-	]);
-	let mut ext = FakeExt::new();
-
-	let (gas_left, result) = {
-		let mut interpreter = wasm_interpreter();
-		let result = interpreter.exec(params, &mut ext).expect("Interpreter to execute without any errors");
-		match result {
-			GasLeft::Known(_) => { panic!("Suicidal contract should return payload when had not actualy killed himself"); },
-			GasLeft::NeedsReturn { gas_left: gas, data: result, apply_state: _apply } => (gas, result.to_vec()),
-		}
-	};
-
-	assert_eq!(gas_left, U256::from(99_703));
-
-	assert_eq!(
-		result,
-		vec![0u8]
-	);
-}
-
-#[test]
-fn suicide() {
-	let code = load_sample!("suicidal.wasm");
-
-	let refund: Address = "01030507090b0d0f11131517191b1d1f21232527".parse().unwrap();
-	let mut params = ActionParams::default();
-	params.gas = U256::from(100_000);
-	params.code = Some(Arc::new(code));
-
-	let mut args = vec![127u8];
-	args.extend(refund.to_vec());
-	params.data = Some(args);
-
-	let mut ext = FakeExt::new();
-
-	let gas_left = {
-		let mut interpreter = wasm_interpreter();
-		let result = interpreter.exec(params, &mut ext).expect("Interpreter to execute without any errors");
-		match result {
-			GasLeft::Known(gas) => gas,
-			GasLeft::NeedsReturn { .. } => {
-				panic!("Suicidal contract should not return anything when had killed itself");
-			},
-		}
-	};
-
-	assert_eq!(gas_left, U256::from(99_747));
-	assert!(ext.suicides.contains(&refund));
-}
-
-#[test]
-fn create() {
-	let mut params = ActionParams::default();
-	params.gas = U256::from(100_000);
-	params.code = Some(Arc::new(load_sample!("creator.wasm")));
-	params.data = Some(vec![0u8, 2, 4, 8, 16, 32, 64, 128]);
-	params.value = ActionValue::transfer(1_000_000_000);
-
-	let mut ext = FakeExt::new();
-
-	let gas_left = {
-		let mut interpreter = wasm_interpreter();
-		let result = interpreter.exec(params, &mut ext).expect("Interpreter to execute without any errors");
-		match result {
-			GasLeft::Known(gas) => gas,
-			GasLeft::NeedsReturn { .. } => {
-				panic!("Create contract should not return anthing because ext always fails on creation");
-			},
-		}
-	};
-
-	trace!(target: "wasm", "fake_calls: {:?}", &ext.calls);
-	assert!(ext.calls.contains(
-		&FakeCall {
-			call_type: FakeCallType::Create,
-			gas: U256::from(99_778),
-			sender_address: None,
-			receive_address: None,
-			value: Some(1_000_000_000.into()),
-			data: vec![0u8, 2, 4, 8, 16, 32, 64, 128],
-			code_address: None,
-		}
-	));
-	assert_eq!(gas_left, U256::from(99_768));
-}
--- a/ethcore/light/Cargo.toml
+++ b/ethcore/light/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-description = "Parity Light Client Implementation"
+description = "Parity LES primitives"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-light"
-version = "1.7.0"
+version = "1.6.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"

@@ -17,17 +17,12 @@ ethcore-util = { path = "../../util" }
 ethcore-network = { path = "../../util/network" }
 ethcore-io = { path = "../../util/io" }
 ethcore-ipc = { path = "../../ipc/rpc", optional = true }
-ethcore-devtools = { path = "../../devtools" }
-evm = { path = "../evm" }
 rlp = { path = "../../util/rlp" }
 time = "0.1"
-smallvec = "0.4"
+smallvec = "0.3.1"
 futures = "0.1"
 rand = "0.3"
 itertools = "0.5"
-bincode = "0.8.0"
-serde = "1.0"
-serde_derive = "1.0"
 stats = { path = "../../util/stats" }

 [features]
--- a/ethcore/light/src/cache.rs
+++ b/ethcore/light/src/cache.rs
@@ -26,7 +26,7 @@ use ethcore::receipt::Receipt;

 use stats::Corpus;
 use time::{SteadyTime, Duration};
-use util::{U256, H256, HeapSizeOf};
+use util::{U256, H256};
 use util::cache::MemoryLruCache;

 /// Configuration for how much data to cache.
@@ -61,7 +61,6 @@ impl Default for CacheSizes {
 ///
 /// Note that almost all getter methods take `&mut self` due to the necessity to update
 /// the underlying LRU-caches on read.
-/// [LRU-cache](https://en.wikipedia.org/wiki/Cache_replacement_policies#Least_Recently_Used_.28LRU.29)
 pub struct Cache {
 	headers: MemoryLruCache<H256, encoded::Header>,
 	canon_hashes: MemoryLruCache<BlockNumber, H256>,
@@ -153,22 +152,6 @@ impl Cache {
 	pub fn set_gas_price_corpus(&mut self, corpus: Corpus<U256>) {
 		self.corpus = Some((corpus, SteadyTime::now()))
 	}
-
-	/// Get the memory used.
-	pub fn mem_used(&self) -> usize {
-		self.heap_size_of_children()
-	}
-}
-
-impl HeapSizeOf for Cache {
-	fn heap_size_of_children(&self) -> usize {
-		self.headers.current_size()
-			+ self.canon_hashes.current_size()
-			+ self.bodies.current_size()
-			+ self.receipts.current_size()
-			+ self.chain_score.current_size()
-			// TODO: + corpus
-	}
 }

 #[cfg(test)]
--- a/ethcore/light/src/cht.rs
+++ b/ethcore/light/src/cht.rs
@@ -15,7 +15,7 @@
 //!
 //! Each CHT is a trie mapping block numbers to canonical hashes and total difficulty.
 //! One is generated for every `SIZE` blocks, allowing us to discard those blocks in
-//! favor of the trie root. When the "ancient" blocks need to be accessed, we simply
+//! favor the the trie root. When the "ancient" blocks need to be accessed, we simply
 //! request an inclusion proof of a specific block number against the trie with the
 //! root has. A correct proof implies that the claimed block is identical to the one
 //! we discarded.
@@ -23,7 +23,7 @@
 use ethcore::ids::BlockId;
 use util::{Bytes, H256, U256, HashDB, MemoryDB};
 use util::trie::{self, TrieMut, TrieDBMut, Trie, TrieDB, Recorder};
-use rlp::{RlpStream, UntrustedRlp};
+use rlp::{Stream, RlpStream, UntrustedRlp, View};

 // encode a key.
 macro_rules! key {
@@ -126,7 +126,7 @@ pub fn compute_root<I>(cht_num: u64, iterable: I) -> Option<H256>
 	let start_num = start_number(cht_num) as usize;

 	for (i, (h, td)) in iterable.into_iter().take(SIZE as usize).enumerate() {
-		v.push((key!(i + start_num).into_vec(), val!(h, td).into_vec()))
+		v.push((key!(i + start_num).to_vec(), val!(h, td).to_vec()))
 	}

 	if v.len() == SIZE as usize {
--- a/ethcore/light/src/client/header_chain.rs
+++ b/ethcore/light/src/client/header_chain.rs
@@ -23,9 +23,10 @@
 //! This is separate from the `BlockChain` for two reasons:
 //!   - It stores only headers (and a pruned subset of them)
 //!   - To allow for flexibility in the database layout once that's incorporated.
+// TODO: use DB instead of memory. DB Layout: just the contents of `candidates`/`headers`
+//

-use std::collections::BTreeMap;
-use std::sync::Arc;
+use std::collections::{BTreeMap, HashMap};

 use cht;

@@ -34,13 +35,7 @@ use ethcore::error::BlockError;
 use ethcore::encoded;
 use ethcore::header::Header;
 use ethcore::ids::BlockId;
-
-use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp, UntrustedRlp};
-use util::{H256, U256, HeapSizeOf, RwLock};
-use util::kvdb::{DBTransaction, KeyValueDB};
-
-use cache::Cache;
-use util::Mutex;
+use util::{H256, U256, HeapSizeOf, Mutex, RwLock};

 use smallvec::SmallVec;

@@ -49,9 +44,6 @@ use smallvec::SmallVec;
 /// relevant to any blocks we've got in memory.
 const HISTORY: u64 = 2048;

-/// The best block key. Maps to an RLP list: [best_era, last_era]
-const CURRENT_KEY: &'static [u8] = &*b"best_and_latest";
-
 /// Information about a block.
 #[derive(Debug, Clone)]
 pub struct BlockDescriptor {
@@ -84,145 +76,42 @@ impl HeapSizeOf for Entry {
 	}
 }

-impl Encodable for Entry {
-	fn rlp_append(&self, s: &mut RlpStream) {
-		s.begin_list(self.candidates.len());
-
-		for candidate in &self.candidates {
-			s.begin_list(3)
-				.append(&candidate.hash)
-				.append(&candidate.parent_hash)
-				.append(&candidate.total_difficulty);
-		}
-	}
-}
-
-impl Decodable for Entry {
-	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
-
-		let mut candidates = SmallVec::<[Candidate; 3]>::new();
-
-		for item in rlp.iter() {
-			candidates.push(Candidate {
-				hash: item.val_at(0)?,
-				parent_hash: item.val_at(1)?,
-				total_difficulty: item.val_at(2)?,
-			})
-		}
-
-		if candidates.is_empty() { return Err(DecoderError::Custom("Empty candidates vector submitted.")) }
-
-		// rely on the invariant that the canonical entry is always first.
-		let canon_hash = candidates[0].hash;
-		Ok(Entry {
-			candidates: candidates,
-			canonical_hash: canon_hash,
-		})
-	}
-}
-
-fn cht_key(number: u64) -> String {
-	format!("{:08x}_canonical", number)
-}
-
-fn era_key(number: u64) -> String {
-	format!("candidates_{}", number)
-}
-
-/// Pending changes from `insert` to be applied after the database write has finished.
-pub struct PendingChanges {
-	best_block: Option<BlockDescriptor>, // new best block.
-}
-
 /// Header chain. See module docs for more details.
 pub struct HeaderChain {
 	genesis_header: encoded::Header, // special-case the genesis.
 	candidates: RwLock<BTreeMap<u64, Entry>>,
+	headers: RwLock<HashMap<H256, encoded::Header>>,
 	best_block: RwLock<BlockDescriptor>,
-	db: Arc<KeyValueDB>,
-	col: Option<u32>,
-	cache: Arc<Mutex<Cache>>,
+	cht_roots: Mutex<Vec<H256>>,
 }

 impl HeaderChain {
-	/// Create a new header chain given this genesis block and database to read from.
-	pub fn new(db: Arc<KeyValueDB>, col: Option<u32>, genesis: &[u8], cache: Arc<Mutex<Cache>>) -> Result<Self, String> {
+	/// Create a new header chain given this genesis block.
+	pub fn new(genesis: &[u8]) -> Self {
 		use ethcore::views::HeaderView;

-		let chain = if let Some(current) = db.get(col, CURRENT_KEY)? {
-			let (best_number, highest_number) = {
-				let rlp = Rlp::new(&current);
-				(rlp.val_at(0), rlp.val_at(1))
-			};
+		let g_view = HeaderView::new(genesis);

-			let mut cur_number = highest_number;
-			let mut candidates = BTreeMap::new();
-
-			// load all era entries and referenced headers within them.
-			while let Some(entry) = db.get(col, era_key(cur_number).as_bytes())? {
-				let entry: Entry = ::rlp::decode(&entry);
-				trace!(target: "chain", "loaded header chain entry for era {} with {} candidates",
-					cur_number, entry.candidates.len());
-
-				candidates.insert(cur_number, entry);
-
-				cur_number -= 1;
-			}
-
-			// fill best block block descriptor.
-			let best_block = {
-				let era = match candidates.get(&best_number) {
-					Some(era) => era,
-					None => return Err(format!("Database corrupt: highest block referenced but no data.")),
-				};
-
-				let best = &era.candidates[0];
-				BlockDescriptor {
-					hash: best.hash,
-					number: best_number,
-					total_difficulty: best.total_difficulty,
-				}
-			};
-
-			HeaderChain {
-				genesis_header: encoded::Header::new(genesis.to_owned()),
-				best_block: RwLock::new(best_block),
-				candidates: RwLock::new(candidates),
-				db: db,
-				col: col,
-				cache: cache,
-			}
-		} else {
-			let g_view = HeaderView::new(genesis);
-			HeaderChain {
-				genesis_header: encoded::Header::new(genesis.to_owned()),
-				best_block: RwLock::new(BlockDescriptor {
-					hash: g_view.hash(),
-					number: 0,
-					total_difficulty: g_view.difficulty(),
-				}),
-				candidates: RwLock::new(BTreeMap::new()),
-				db: db,
-				col: col,
-				cache: cache,
-			}
-		};
-
-		Ok(chain)
+		HeaderChain {
+			genesis_header: encoded::Header::new(genesis.to_owned()),
+			best_block: RwLock::new(BlockDescriptor {
+				hash: g_view.hash(),
+				number: 0,
+				total_difficulty: g_view.difficulty(),
+			}),
+			candidates: RwLock::new(BTreeMap::new()),
+			headers: RwLock::new(HashMap::new()),
+			cht_roots: Mutex::new(Vec::new()),
+		}
 	}

 	/// Insert a pre-verified header.
 	///
 	/// This blindly trusts that the data given to it is sensible.
-	/// Returns a set of pending changes to be applied with `apply_pending`
-	/// before the next call to insert and after the transaction has been written.
-	pub fn insert(&self, transaction: &mut DBTransaction, header: Header) -> Result<PendingChanges, BlockError> {
+	pub fn insert(&self, header: Header) -> Result<(), BlockError> {
 		let hash = header.hash();
 		let number = header.number();
 		let parent_hash = *header.parent_hash();
-		let mut pending = PendingChanges {
-			best_block: None,
-		};

 		// hold candidates the whole time to guard import order.
 		let mut candidates = self.candidates.write();
@@ -240,41 +129,20 @@ impl HeaderChain {

 		let total_difficulty = parent_td + *header.difficulty();

-		// insert headers and candidates entries and write era to disk.
-		{
-			let cur_era = candidates.entry(number)
-				.or_insert_with(|| Entry { candidates: SmallVec::new(), canonical_hash: hash });
-			cur_era.candidates.push(Candidate {
+		// insert headers and candidates entries.
+		candidates.entry(number).or_insert_with(|| Entry { candidates: SmallVec::new(), canonical_hash: hash })
+			.candidates.push(Candidate {
 				hash: hash,
 				parent_hash: parent_hash,
 				total_difficulty: total_difficulty,
-			});
+		});

-			// fix ordering of era before writing.
-			if total_difficulty > cur_era.candidates[0].total_difficulty {
-				let cur_pos = cur_era.candidates.len() - 1;
-				cur_era.candidates.swap(cur_pos, 0);
-				cur_era.canonical_hash = hash;
-			}
-
-			transaction.put(self.col, era_key(number).as_bytes(), &::rlp::encode(&*cur_era))
-		}
-
-		let raw = ::rlp::encode(&header);
-		transaction.put(self.col, &hash[..], &*raw);
-
-		let (best_num, is_new_best) = {
-			let cur_best = self.best_block.read();
-			if cur_best.total_difficulty < total_difficulty {
-				(number, true)
-			} else {
-				(cur_best.number, false)
-			}
-		};
+		let raw = ::rlp::encode(&header).to_vec();
+		self.headers.write().insert(hash, encoded::Header::new(raw));

 		// reorganize ancestors so canonical entries are first in their
 		// respective candidates vectors.
-		if is_new_best {
+		if self.best_block.read().total_difficulty < total_difficulty {
 			let mut canon_hash = hash;
 			for (&height, entry) in candidates.iter_mut().rev().skip_while(|&(height, _)| *height > number) {
 				if height != number && entry.canonical_hash == canon_hash { break; }
@@ -293,26 +161,23 @@ impl HeaderChain {
 				// what about reorgs > cht::SIZE + HISTORY?
 				// resetting to the last block of a given CHT should be possible.
 				canon_hash = entry.candidates[0].parent_hash;
-
-				// write altered era to disk
-				if height != number {
-					let rlp_era = ::rlp::encode(&*entry);
-					transaction.put(self.col, era_key(height).as_bytes(), &rlp_era);
-				}
 			}

 			trace!(target: "chain", "New best block: ({}, {}), TD {}", number, hash, total_difficulty);
-			pending.best_block = Some(BlockDescriptor {
+			*self.best_block.write() = BlockDescriptor {
 				hash: hash,
 				number: number,
 				total_difficulty: total_difficulty,
-			});
+			};

 			// produce next CHT root if it's time.
 			let earliest_era = *candidates.keys().next().expect("at least one era just created; qed");
 			if earliest_era + HISTORY + cht::SIZE <= number {
 				let cht_num = cht::block_to_cht_number(earliest_era)
 					.expect("fails only for number == 0; genesis never imported; qed");
+				debug_assert_eq!(cht_num as usize, self.cht_roots.lock().len());
+
+				let mut headers = self.headers.write();

 				let cht_root = {
 					let mut i = earliest_era;
@@ -322,12 +187,10 @@ impl HeaderChain {
 					let iter = || {
 						let era_entry = candidates.remove(&i)
 							.expect("all eras are sequential with no gaps; qed");
-						transaction.delete(self.col, era_key(i).as_bytes());
-
 						i += 1;

 						for ancient in &era_entry.candidates {
-							transaction.delete(self.col, &ancient.hash);
+							headers.remove(&ancient.hash);
 						}

 						let canon = &era_entry.candidates[0];
@@ -337,86 +200,28 @@ impl HeaderChain {
 						.expect("fails only when too few items; this is checked; qed")
 				};

-				// write the CHT root to the database.
 				debug!(target: "chain", "Produced CHT {} root: {:?}", cht_num, cht_root);
-				transaction.put(self.col, cht_key(cht_num).as_bytes(), &::rlp::encode(&cht_root));
+
+				self.cht_roots.lock().push(cht_root);
 			}
 		}

-		// write the best and latest eras to the database.
-		{
-			let latest_num = *candidates.iter().rev().next().expect("at least one era just inserted; qed").0;
-			let mut stream = RlpStream::new_list(2);
-			stream.append(&best_num).append(&latest_num);
-			transaction.put(self.col, CURRENT_KEY, &stream.out())
-		}
-		Ok(pending)
-	}
-
-	/// Apply pending changes from a previous `insert` operation.
-	/// Must be done before the next `insert` call.
-	pub fn apply_pending(&self, pending: PendingChanges) {
-		if let Some(best_block) = pending.best_block {
-			*self.best_block.write() = best_block;
-		}
-	}
-
-	/// Get a block's hash by ID. In the case of query by number, only canonical results
-	/// will be returned.
-	pub fn block_hash(&self, id: BlockId) -> Option<H256> {
-		match id {
-			BlockId::Earliest => Some(self.genesis_hash()),
-			BlockId::Hash(hash) => Some(hash),
-			BlockId::Number(num) => {
-				if self.best_block.read().number < num { return None }
-				self.candidates.read().get(&num).map(|entry| entry.canonical_hash)
-			}
-			BlockId::Latest | BlockId::Pending => {
-				Some(self.best_block.read().hash)
-			}
-		}
+		Ok(())
 	}

 	/// Get a block header. In the case of query by number, only canonical blocks
 	/// will be returned.
 	pub fn block_header(&self, id: BlockId) -> Option<encoded::Header> {
-		let load_from_db = |hash: H256| {
-			let mut cache = self.cache.lock();
-
-			match cache.block_header(&hash) {
-				Some(header) => Some(header),
-				None => {
-					match self.db.get(self.col, &hash) {
-						Ok(db_value) => {
-							db_value.map(|x| x.into_vec()).map(encoded::Header::new)
-								.and_then(|header| {
-									cache.insert_block_header(hash.clone(), header.clone());
-									Some(header)
-								 })
-						},
-						Err(e) => {
-							warn!(target: "chain", "Failed to read from database: {}", e);
-							None
-						}
-					}
-				}
-			}
-		};
-
 		match id {
 			BlockId::Earliest | BlockId::Number(0) => Some(self.genesis_header.clone()),
-			BlockId::Hash(hash) if hash == self.genesis_hash() => { Some(self.genesis_header.clone()) }
-			BlockId::Hash(hash) => load_from_db(hash),
+			BlockId::Hash(hash) => self.headers.read().get(&hash).cloned(),
 			BlockId::Number(num) => {
 				if self.best_block.read().number < num { return None }

 				self.candidates.read().get(&num).map(|entry| entry.canonical_hash)
-					.and_then(load_from_db)
+					.and_then(|hash| self.headers.read().get(&hash).cloned())
 			}
 			BlockId::Latest | BlockId::Pending => {
-				// hold candidates hear to prevent deletion of the header
-				// as we read it.
-				let _candidates = self.candidates.read();
 				let hash = {
 					let best = self.best_block.read();
 					if best.number == 0 {
@@ -426,33 +231,11 @@ impl HeaderChain {
 					best.hash
 				};

-				load_from_db(hash)
+				self.headers.read().get(&hash).cloned()
 			}
 		}
 	}

-	/// Get a block's chain score.
-	/// Returns nothing for non-canonical blocks.
-	pub fn score(&self, id: BlockId) -> Option<U256> {
-		let genesis_hash = self.genesis_hash();
-		match id {
-			BlockId::Earliest | BlockId::Number(0) => Some(self.genesis_header.difficulty()),
-			BlockId::Hash(hash) if hash == genesis_hash => Some(self.genesis_header.difficulty()),
-			BlockId::Hash(hash) => match self.block_header(BlockId::Hash(hash)) {
-				Some(header) => self.candidates.read().get(&header.number())
-					.and_then(|era| era.candidates.iter().find(|e| e.hash == hash))
-					.map(|c| c.total_difficulty),
-				None => None,
-			},
-			BlockId::Number(num) => {
-				let candidates = self.candidates.read();
-				if self.best_block.read().number < num { return None }
-				candidates.get(&num).map(|era| era.candidates[0].total_difficulty)
-			}
-			BlockId::Latest | BlockId::Pending => Some(self.best_block.read().total_difficulty)
-		}
-	}
-
 	/// Get the best block's header.
 	pub fn best_header(&self) -> encoded::Header {
 		self.block_header(BlockId::Latest).expect("Header for best block always stored; qed")
@@ -475,13 +258,7 @@ impl HeaderChain {
 	/// This is because it's assumed that the genesis hash is known,
 	/// so including it within a CHT would be redundant.
 	pub fn cht_root(&self, n: usize) -> Option<H256> {
-		match self.db.get(self.col, cht_key(n as u64).as_bytes()) {
-			Ok(val) => val.map(|x| ::rlp::decode(&x)),
-			Err(e) => {
-				warn!(target: "chain", "Error reading from database: {}", e);
-				None
-			}
-		}
+		self.cht_roots.lock().get(n).map(|h| h.clone())
 	}

 	/// Get the genesis hash.
@@ -511,7 +288,7 @@ impl HeaderChain {

 	/// Get block status.
 	pub fn status(&self, hash: &H256) -> BlockStatus {
-		match self.db.get(self.col, &*hash).ok().map_or(false, |x| x.is_some()) {
+		match self.headers.read().contains_key(hash) {
 			true => BlockStatus::InChain,
 			false => BlockStatus::Unknown,
 		}
@@ -520,7 +297,9 @@ impl HeaderChain {

 impl HeapSizeOf for HeaderChain {
 	fn heap_size_of_children(&self) -> usize {
-		self.candidates.read().heap_size_of_children()
+		self.candidates.read().heap_size_of_children() +
+			self.headers.read().heap_size_of_children() +
+			self.cht_roots.lock().heap_size_of_children()
 	}
 }

@@ -546,29 +325,16 @@ impl<'a> Iterator for AncestryIter<'a> {
 #[cfg(test)]
 mod tests {
 	use super::HeaderChain;
-	use std::sync::Arc;
-
 	use ethcore::ids::BlockId;
 	use ethcore::header::Header;
 	use ethcore::spec::Spec;
-  	use cache::Cache;
-
-	use time::Duration;
-	use util::Mutex;
-
-	fn make_db() -> Arc<::util::KeyValueDB> {
-		Arc::new(::util::kvdb::in_memory(0))
-	}

 	#[test]
 	fn basic_chain() {
 		let spec = Spec::new_test();
 		let genesis_header = spec.genesis_header();
-		let db = make_db();

-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
-
-		let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache).unwrap();
+		let chain = HeaderChain::new(&::rlp::encode(&genesis_header));

 		let mut parent_hash = genesis_header.hash();
 		let mut rolling_timestamp = genesis_header.timestamp();
@@ -580,10 +346,7 @@ mod tests {
 			header.set_difficulty(*genesis_header.difficulty() * i.into());
 			parent_hash = header.hash();

-			let mut tx = db.transaction();
-			let pending = chain.insert(&mut tx, header).unwrap();
-			db.write(tx).unwrap();
-			chain.apply_pending(pending);
+			chain.insert(header).unwrap();

 			rolling_timestamp += 10;
 		}
@@ -598,10 +361,8 @@ mod tests {
 	fn reorganize() {
 		let spec = Spec::new_test();
 		let genesis_header = spec.genesis_header();
-		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));

-		let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache).unwrap();
+		let chain = HeaderChain::new(&::rlp::encode(&genesis_header));

 		let mut parent_hash = genesis_header.hash();
 		let mut rolling_timestamp = genesis_header.timestamp();
@@ -613,10 +374,7 @@ mod tests {
 			header.set_difficulty(*genesis_header.difficulty() * i.into());
 			parent_hash = header.hash();

-			let mut tx = db.transaction();
-			let pending = chain.insert(&mut tx, header).unwrap();
-			db.write(tx).unwrap();
-			chain.apply_pending(pending);
+			chain.insert(header).unwrap();

 			rolling_timestamp += 10;
 		}
@@ -632,10 +390,7 @@ mod tests {
 				header.set_difficulty(*genesis_header.difficulty() * i.into());
 				parent_hash = header.hash();

-				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, header).unwrap();
-				db.write(tx).unwrap();
-				chain.apply_pending(pending);
+				chain.insert(header).unwrap();

 				rolling_timestamp += 10;
 			}
@@ -656,10 +411,7 @@ mod tests {
 				header.set_difficulty(*genesis_header.difficulty() * (i * i).into());
 				parent_hash = header.hash();

-				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, header).unwrap();
-				db.write(tx).unwrap();
-				chain.apply_pending(pending);
+				chain.insert(header).unwrap();

 				rolling_timestamp += 11;
 			}
@@ -681,119 +433,11 @@ mod tests {
 	fn earliest_is_latest() {
 		let spec = Spec::new_test();
 		let genesis_header = spec.genesis_header();
-		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
-
-		let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache).unwrap();

+		let chain = HeaderChain::new(&::rlp::encode(&genesis_header));

 		assert!(chain.block_header(BlockId::Earliest).is_some());
 		assert!(chain.block_header(BlockId::Latest).is_some());
 		assert!(chain.block_header(BlockId::Pending).is_some());
 	}
-
-	#[test]
-	fn restore_from_db() {
-		let spec = Spec::new_test();
-		let genesis_header = spec.genesis_header();
-		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
-
-		{
-			let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache.clone()).unwrap();
-			let mut parent_hash = genesis_header.hash();
-			let mut rolling_timestamp = genesis_header.timestamp();
-			for i in 1..10000 {
-				let mut header = Header::new();
-				header.set_parent_hash(parent_hash);
-				header.set_number(i);
-				header.set_timestamp(rolling_timestamp);
-				header.set_difficulty(*genesis_header.difficulty() * i.into());
-				parent_hash = header.hash();
-
-				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, header).unwrap();
-				db.write(tx).unwrap();
-				chain.apply_pending(pending);
-
-				rolling_timestamp += 10;
-			}
-		}
-
-		let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache.clone()).unwrap();
-		assert!(chain.block_header(BlockId::Number(10)).is_none());
-		assert!(chain.block_header(BlockId::Number(9000)).is_some());
-		assert!(chain.cht_root(2).is_some());
-		assert!(chain.cht_root(3).is_none());
-		assert_eq!(chain.block_header(BlockId::Latest).unwrap().number(), 9999);
-	}
-
-	#[test]
-	fn restore_higher_non_canonical() {
-		let spec = Spec::new_test();
-		let genesis_header = spec.genesis_header();
-		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
-
-		{
-			let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache.clone()).unwrap();
-			let mut parent_hash = genesis_header.hash();
-			let mut rolling_timestamp = genesis_header.timestamp();
-
-			// push 100 low-difficulty blocks.
-			for i in 1..101 {
-				let mut header = Header::new();
-				header.set_parent_hash(parent_hash);
-				header.set_number(i);
-				header.set_timestamp(rolling_timestamp);
-				header.set_difficulty(*genesis_header.difficulty() * i.into());
-				parent_hash = header.hash();
-
-				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, header).unwrap();
-				db.write(tx).unwrap();
-				chain.apply_pending(pending);
-
-				rolling_timestamp += 10;
-			}
-
-			// push fewer high-difficulty blocks.
-			for i in 1..11 {
-				let mut header = Header::new();
-				header.set_parent_hash(parent_hash);
-				header.set_number(i);
-				header.set_timestamp(rolling_timestamp);
-				header.set_difficulty(*genesis_header.difficulty() * i.into() * 1000.into());
-				parent_hash = header.hash();
-
-				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, header).unwrap();
-				db.write(tx).unwrap();
-				chain.apply_pending(pending);
-
-				rolling_timestamp += 10;
-			}
-
-			assert_eq!(chain.block_header(BlockId::Latest).unwrap().number(), 10);
-		}
-
-		// after restoration, non-canonical eras should still be loaded.
-		let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache.clone()).unwrap();
-		assert_eq!(chain.block_header(BlockId::Latest).unwrap().number(), 10);
-		assert!(chain.candidates.read().get(&100).is_some())
-	}
-
-	#[test]
-	fn genesis_header_available() {
-		let spec = Spec::new_test();
-		let genesis_header = spec.genesis_header();
-		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
-
-		let chain = HeaderChain::new(db.clone(), None, &::rlp::encode(&genesis_header), cache.clone()).unwrap();
-
-		assert!(chain.block_header(BlockId::Earliest).is_some());
-		assert!(chain.block_header(BlockId::Number(0)).is_some());
-		assert!(chain.block_header(BlockId::Hash(genesis_header.hash())).is_some());
-	}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
arkpar	e2bc251ff4	v 1.6.2	2017-03-13 11:57:42 +01:00
Gav Wood	d15372c8a6	Fix auto-updater. (#4868 )	2017-03-11 14:46:17 +01:00
arkpar	bcf2245110	Removed libudev-dev dep	2017-03-10 18:18:09 +01:00
Arkadiy Paronyan	36f74fdf0d	Supress USB error message (#4839 )	2017-03-10 15:00:02 +01:00
GitLab Build Bot	45402544d3	[ci skip] js-precompiled 20170310-131332	2017-03-10 13:19:56 +00:00
Jaco Greeff	ab236690df	[beta] UI backports (#4855 ) * Added React Hot Reload to dapps + TokenDeplpoy fix (#4846) * Fix method decoding (#4845) * Fix contract deployment method decoding in Signer * Linting * Fix TxViewer when no `to` (contract deployment) (#4847) * Added React Hot Reload to dapps + TokenDeplpoy fix * Fixes to the LocalTx dapp * Don't send the nonce for mined transactions * Don't encode empty to values for options * Pull steps from actual available steps (#4848) * Wait for the value to have changed in the input (#4844) * Backport Regsirty changes from #4589 * Test fixes for #4589	2017-03-10 14:03:10 +01:00
keorn	34e81101d7	[beta] Simple score (#4852 ) * simple score * ignore part of a test	2017-03-10 13:38:16 +01:00
GitLab Build Bot	07d4b9bbc9	[ci skip] js-precompiled 20170310-094757	2017-03-10 09:57:26 +00:00
Arkadiy Paronyan	d25a20b274	Backporting to beta (#4840 ) * Fixes to the Registry dapp (#4838) * Fix wrong ABI methods * Fix * v1.6.1	2017-03-10 10:08:04 +01:00
arkpar	70d17ce1d8	Reverted build order changes	2017-03-08 23:33:59 +01:00
GitLab Build Bot	3b14bcf29a	js-precompiled 20170308-175401	2017-03-08 20:02:33 +01:00
Jaco Greeff	4fc69e11d6	Show token icons on list summary pages (#4826 ) (#4827 ) * Adjust balance overlay margins (no jumps) * Img only balances, small verifications * Invalid tests removed * Always wrap display (Thanks @ngotchac) * Update tests to reflect reality	2017-03-08 18:35:00 +01:00
GitLab Build Bot	8e4df824b0	[ci skip] js-precompiled 20170308-160101	2017-03-08 16:08:54 +00:00
arkpar	e1f2e840cb	Force js update	2017-03-08 16:28:56 +01:00
keorn	2a36a89c36	[beta] Engine backports (#4806 ) * calibrate before rejection * change flag name * add eip155 * make network_id default	2017-03-08 15:26:26 +01:00
Arkadiy Paronyan	b643f4011d	Better windows icon (#4804 )	2017-03-08 14:53:25 +01:00
Jaco Greeff	814304bdd7	Better logic for contract deployments (#4821 ) (#4823 )	2017-03-08 14:44:21 +01:00
GitLab Build Bot	f90607302d	[ci skip] js-precompiled 20170308-122022	2017-03-08 12:25:16 +00:00
Jaco Greeff	af826f877e	[beta] UI backports (#4818 ) * Update the key (#4817) * Adjust selection colours/display (#4811) * Adjust selection colours to match with mui * allow -> disable (simplify selections) * Only use top-border * Overlay selection line * Slightly more muted unselected * Restore address icon * Fix default values for contract queries	2017-03-08 12:50:44 +01:00
GitLab Build Bot	f9a0aa0022	[ci skip] js-precompiled 20170308-095118	2017-03-08 09:58:51 +00:00
Jaco Greeff	c4196a5de3	[beta] UI backports (#4809 ) * Update Wallet to new Wallet Code (#4805) * Update Wallet Version * Update Wallet Library * Update Wallets Bytecodes * Typo * Separate Deploy in Contract API * Use the new Wallet ABI // Update wallet code * WIP .// Deploy from Wallet * Update Wallet contract * Contract Deployment for Wallet * Working deployments for Single Owned Wallet contracts * Linting * Create a Wallet from a Wallet * Linting * Fix Signer transactions // Add Gas Used for transactions * Deploy wallet contract fix * Fix too high gas estimate for Wallet Contract Deploys * Final piece ; deploying from Wallet owned by wallet * Update Wallet Code * Updated the Wallet Codes * Fixing Wallet Deployments * Add Support for older wallets * Linting * SMS Faucet (#4774) * Faucet * Remove flakey button-index testing * Only display faucet when sms verified (mainnet) * simplify availability checks * WIP * Resuest from verified -> verified * Update endpoint, display response text * Error icon on errors * Parse hash text response * Use /api/:address endpoint * hash -> data * Adjust sms-certified message * Fix SectionList hovering issue (#4749) * Fix SectionList Items hover when <3 items * Even easier... * lint (new)	2017-03-08 10:43:59 +01:00
arkpar	3b56e8eded	Switch js branch to beta	2017-03-07 17:50:12 +01:00
Tomasz Drwięga	b3ccbbe913	Allow specifying extra cors headers for dapps (#4710 )	2017-03-07 17:37:26 +01:00
arkpar	fe0f037f23	beta channel	2017-03-07 17:26:57 +01:00