[stable] Bump react-qr-reader (#7941)

* Bump react-qr-reader

* Explicit add webrtc-adapter, non-napa qrcode-generator

.dockerignore

@@ -0,0 +1,22 @@
+# Generated by Cargo
+# will have compiled files and executables
+target
+
+*.swp
+*.swo
+*.swn
+*.DS_Store
+
+# Visual Studio Code stuff
+.vscode
+
+# GitEye stuff
+.project
+
+# idea ide
+.idea
+
+# git stuff
+.git
+
+ethcore/res/ethereum/tests

.editorconfig

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

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,12 @@
+_Before filing a new issue, please **provide the following information**._
+
+> I'm running:
+>
+> - **Parity version**: 0.0.0
+> - **Operating system**: Windows / MacOS / Linux
+> - **And installed**: via installer / homebrew / binaries / from source
+
+_Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._
+
+---
+

.gitignore

@@ -15,10 +15,15 @@
 
 # vim stuff
 *.swp
+*.swo
 
 # mac stuff
 .DS_Store
 
+# npm stuff
+npm-debug.log
+node_modules
+
 # gdb files
 .gdb_history
 

.gitlab-ci.yml

@@ -4,333 +4,147 @@ stages:
   - push-release
   - build
 variables:
-  GIT_DEPTH: "3"
-  SIMPLECOV: "true"
   RUST_BACKTRACE: "1"
   RUSTFLAGS: ""
   CARGOFLAGS: ""
+  CI_SERVER_NAME: "GitLab CI"
+  LIBSSL: "libssl1.0.0 (>=1.0.0)"
 cache:
-  key: "$CI_BUILD_STAGE/$CI_BUILD_REF_NAME"
+  key: "$CI_BUILD_STAGE-$CI_BUILD_REF_NAME"
+  paths:
+    - target
   untracked: true
 linux-stable:
   stage: build
-  image: ethcore/rust:stable
+  image: parity/rust:gitlab-ci
   only:
     - beta
     - tags
     - stable
     - triggers
   script:
-    - cargo build -j $(nproc) --release --features final $CARGOFLAGS
-    - strip target/release/parity
-    - 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
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_amd64.deb"
-    - md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity --body target/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.deb" --body "parity_"$VER"_amd64.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.deb.md5" --body "parity_"$VER"_amd64.deb.md5"
-#    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
+    - rustup default stable
+    # ARGUMENTS: 1. BUILD_PLATFORM (target for binaries) 2. PLATFORM (target for cargo) 3. ARC (architecture) 4. & 5. CC & CXX flags 6. binary identifier
+    - scripts/gitlab-build.sh x86_64-unknown-linux-gnu x86_64-unknown-linux-gnu amd64 gcc g++ ubuntu
   tags:
-    - rust
     - rust-stable
   artifacts:
     paths:
-    - target/release/parity
+    - parity.zip
     name: "stable-x86_64-unknown-linux-gnu_parity"
-linux-beta:
+linux-stable-debian:
   stage: build
-  image: ethcore/rust:beta
+  image: parity/rust-debian:gitlab-ci
   only:
     - beta
     - tags
     - stable
     - triggers
   script:
-    - cargo build -j $(nproc) --release $CARGOFLAGS
-    - strip target/release/parity
+    - export LIBSSL="libssl1.1 (>=1.1.0)"
+    - scripts/gitlab-build.sh x86_64-unknown-debian-gnu x86_64-unknown-linux-gnu amd64 gcc g++ debian
   tags:
-    - rust
-    - rust-beta
+    - rust-debian
   artifacts:
     paths:
-    - target/release/parity
-    name: "beta-x86_64-unknown-linux-gnu_parity"
-  allow_failure: true
-linux-nightly:
-  stage: build
-  image: ethcore/rust:nightly
-  only:
-    - beta
-    - tags
-    - stable
-    - triggers
-  script:
-    - cargo build -j $(nproc) --release $CARGOFLAGS
-    - strip target/release/parity
-  tags:
-    - rust
-    - rust-nightly
-  artifacts:
-    paths:
-    - target/release/parity
-    name: "nigthly-x86_64-unknown-linux-gnu_parity"
-  allow_failure: true
+    - parity.zip
+    name: "stable-x86_64-unknown-debian-gnu_parity"
 linux-centos:
   stage: build
-  image: ethcore/rust-centos:latest
+  image: parity/rust-centos:gitlab-ci
   only:
     - beta
     - tags
     - stable
     - triggers
   script:
-    - export CXX="g++"
-    - export CC="gcc"
-    - export PLATFORM=x86_64-unknown-centos-gnu
-    - cargo build -j $(nproc) --release --features final $CARGOFLAGS
-    - strip target/release/parity
-    - md5sum target/release/parity > parity.md5
-    - export SHA3=$(target/release/parity tools hash target/release/parity)
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity --body target/release/parity
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity.md5 --body parity.md5
-#    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - scripts/gitlab-build.sh x86_64-unknown-centos-gnu x86_64-unknown-linux-gnu x86_64 gcc g++ centos
   tags:
-    - rust
     - rust-centos
   artifacts:
     paths:
-    - target/release/parity
+    - parity.zip
     name: "x86_64-unknown-centos-gnu_parity"
 linux-i686:
   stage: build
-  image: ethcore/rust-i686:latest
+  image: parity/rust-i686:gitlab-ci
   only:
     - beta
     - tags
     - stable
     - triggers
   script:
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
-    - export COMMIT=$(git rev-parse HEAD)
-    - export PLATFORM=i686-unknown-linux-gnu
-    - cargo build -j $(nproc) --target i686-unknown-linux-gnu --features final --release $CARGOFLAGS
-    - strip target/$PLATFORM/release/parity
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - export SHA3=$(target/$PLATFORM/release/parity tools hash target/$PLATFORM/release/parity)
-    - sh scripts/deb-build.sh i386
-    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_i386.deb"
-    - md5sum "parity_"$VER"_i386.deb" > "parity_"$VER"_i386.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_i386.deb" --body "parity_"$VER"_i386.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_i386.deb.md5" --body "parity_"$VER"_i386.deb.md5"
-#    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - scripts/gitlab-build.sh i686-unknown-linux-gnu i686-unknown-linux-gnu i386 gcc g++ ubuntu
   tags:
-    - rust
     - rust-i686
   artifacts:
     paths:
-      - target/i686-unknown-linux-gnu/release/parity
+      - parity.zip
     name: "i686-unknown-linux-gnu"
-  allow_failure: true
 linux-armv7:
   stage: build
-  image: ethcore/rust-armv7:latest
+  image: parity/rust-armv7:gitlab-ci
   only:
     - beta
     - tags
     - stable
     - triggers
   script:
-    - export CC=arm-linux-gnueabihf-gcc
-    - export CXX=arm-linux-gnueabihf-g++
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
-    - export PLATFORM=armv7-unknown-linux-gnueabihf
-    - rm -rf .cargo
-    - mkdir -p .cargo
-    - echo "[target.$PLATFORM]" >> .cargo/config
-    - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
-    - cat .cargo/config
-    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity
-    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - sh scripts/deb-build.sh armhf
-    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
-    - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
-#    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - scripts/gitlab-build.sh armv7-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ ubuntu
   tags:
-    - rust
     - rust-arm
   artifacts:
     paths:
-    - target/armv7-unknown-linux-gnueabihf/release/parity
+    - parity.zip
     name: "armv7_unknown_linux_gnueabihf_parity"
-  allow_failure: true
 linux-arm:
   stage: build
-  image: ethcore/rust-arm:latest
+  image: parity/rust-arm:gitlab-ci
   only:
     - beta
     - tags
     - stable
     - triggers
   script:
-    - export CC=arm-linux-gnueabihf-gcc
-    - export CXX=arm-linux-gnueabihf-g++
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
-    - export PLATFORM=arm-unknown-linux-gnueabihf
-    - rm -rf .cargo
-    - mkdir -p .cargo
-    - echo "[target.$PLATFORM]" >> .cargo/config
-    - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
-    - cat .cargo/config
-    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity
-    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - sh scripts/deb-build.sh armhf
-    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
-    - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://icarus.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
+    - scripts/gitlab-build.sh arm-unknown-linux-gnueabihf arm-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ ubuntu
   tags:
-    - rust
     - rust-arm
   artifacts:
     paths:
-    - target/arm-unknown-linux-gnueabihf/release/parity
+    - parity.zip
     name: "arm-unknown-linux-gnueabihf_parity"
-  allow_failure: true
-linux-armv6:
-  stage: build
-  image: ethcore/rust-armv6:latest
-  only:
-    - beta
-#    - tags
-#    - stable
-#    - triggers
-  script:
-    - export CC=arm-linux-gnueabi-gcc
-    - export CXX=arm-linux-gnueabi-g++
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
-    - export PLATFORM=arm-unknown-linux-gnueabi
-    - rm -rf .cargo
-    - mkdir -p .cargo
-    - echo "[target.$PLATFORM]" >> .cargo/config
-    - echo "linker= \"arm-linux-gnueabi-gcc\"" >> .cargo/config
-    - cat .cargo/config
-    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - arm-linux-gnueabi-strip target/$PLATFORM/release/parity
-    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-#    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-  tags:
-    - rust
-    - rust-arm
-  artifacts:
-    paths:
-    - target/arm-unknown-linux-gnueabi/release/parity
-    name: "arm-unknown-linux-gnueabi_parity"
-  allow_failure: true
 linux-aarch64:
   stage: build
-  image: ethcore/rust-aarch64:latest
+  image: parity/rust-arm64:gitlab-ci
   only:
     - beta
     - tags
     - stable
     - triggers
   script:
-    - export CC=aarch64-linux-gnu-gcc
-    - export CXX=aarch64-linux-gnu-g++
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
-    - export PLATFORM=aarch64-unknown-linux-gnu
-    - rm -rf .cargo
-    - mkdir -p .cargo
-    - echo "[target.$PLATFORM]" >> .cargo/config
-    - echo "linker= \"aarch64-linux-gnu-gcc\"" >> .cargo/config
-    - cat .cargo/config
-    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - aarch64-linux-gnu-strip target/$PLATFORM/release/parity
-    - export SHA3=$(rhash --sha3-256 ~/Core/parity/target/release/parity -p %h)
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - sh scripts/deb-build.sh arm64
-    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_arm64.deb"
-    - md5sum "parity_"$VER"_arm64.deb" > "parity_"$VER"_arm64.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_arm64.deb" --body "parity_"$VER"_arm64.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_arm64.deb.md5" --body "parity_"$VER"_arm64.deb.md5"
-#    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - scripts/gitlab-build.sh aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu arm64 aarch64-linux-gnu-gcc aarch64-linux-gnu-g++ ubuntu
   tags:
-    - rust
     - rust-arm
   artifacts:
     paths:
-    - target/aarch64-unknown-linux-gnu/release/parity
+    - parity.zip
     name: "aarch64-unknown-linux-gnu_parity"
+linux-snap:
+  stage: build
+  image: snapcore/snapcraft:stable
+  only:
+    - stable
+    - beta
+    - tags
+    - triggers
+  script:
+    - scripts/gitlab-build.sh x86_64-unknown-snap-gnu x86_64-unknown-linux-gnu amd64 gcc g++ snap
+  tags:
+    - rust-stable
+  artifacts:
+    paths:
+    - parity.zip
+    name: "stable-x86_64-unknown-snap-gnu_parity"
   allow_failure: true
 darwin:
   stage: build
@@ -340,36 +154,16 @@ darwin:
     - stable
     - triggers
   script:
-    - export COMMIT=$(git rev-parse HEAD)
-    - export PLATFORM=x86_64-apple-darwin
-    - cargo build -j 8 --features final --release #$CARGOFLAGS
-    - cargo build -j 8 --features final --release -p ethstore #$CARGOFLAGS
-    - rm -rf parity.md5
-    - md5sum target/release/parity > parity.md5
-    - export SHA3=$(target/release/parity tools hash target/release/parity)
-    - packagesbuild -v mac/Parity.pkgproj
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - mv target/release/Parity\ Ethereum.pkg "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg"
-    - md5sum "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg" >> "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity-"$VER"-osx-installer-EXPERIMENTAL.pkg" --body "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity-"$VER"-osx-installer-EXPERIMENTAL.pkg.md5" --body "parity-"$VER"-osx-installer-EXPERIMENTAL.pkg.md5"
-#    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - scripts/gitlab-build.sh x86_64-apple-darwin x86_64-apple-darwin macos gcc g++ macos
   tags:
     - osx
   artifacts:
     paths:
-    - target/release/parity
+    - parity.zip
     name: "x86_64-apple-darwin_parity"
 windows:
   cache:
-    key: "%CI_BUILD_STAGE%/%CI_BUILD_REF_NAME%"
+    key: "%CI_BUILD_STAGE%-%CI_BUILD_REF_NAME%"
     untracked: true
   stage: build
   only:
@@ -378,164 +172,94 @@ windows:
     - stable
     - triggers
   script:
-    - set PLATFORM=x86_64-pc-windows-msvc
-    - set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt
-    - set LIB=C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64
-    - set RUST_BACKTRACE=1
-    - set RUSTFLAGS=%RUSTFLAGS%
-    - rustup default stable-x86_64-pc-windows-msvc
-    - cargo build --features final --release #%CARGOFLAGS%
-    - signtool sign /f %keyfile% /p %certpass% target\release\parity.exe
-    - target\release\parity.exe tools hash target\release\parity.exe > parity.sha3
-    - set /P SHA3=<parity.sha3
-    - curl -sL --url "https://github.com/ethcore/win-build/raw/master/SimpleFC.dll" -o nsis\SimpleFC.dll
-    - curl -sL --url "https://github.com/ethcore/win-build/raw/master/vc_redist.x64.exe" -o nsis\vc_redist.x64.exe
-    - msbuild windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release
-    - signtool sign /f %keyfile% /p %certpass% windows\ptray\x64\release\ptray.exe
-    - cd nsis
-    - makensis.exe installer.nsi
-    - copy installer.exe InstallParity.exe
-    - signtool sign /f %keyfile% /p %certpass% InstallParity.exe
-    - md5sums InstallParity.exe > InstallParity.exe.md5
-    - zip win-installer.zip InstallParity.exe InstallParity.exe.md5
-    - md5sums win-installer.zip > win-installer.zip.md5
-    - cd ..\target\release\
-    - md5sums parity.exe parity.pdb > parity.md5
-    - md5sums parity.exe > parity.exe.md5
-    - zip parity.zip parity.exe parity.pdb parity.md5
-    - md5sums parity.zip > parity.zip.md5
-    - cd ..\..
-    - aws configure set aws_access_key_id %s3_key%
-    - aws configure set aws_secret_access_key %s3_secret%
-    - echo %CI_BUILD_REF_NAME%
-    - echo %CI_BUILD_REF_NAME% | findstr /R "master" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
-    - echo %CI_BUILD_REF_NAME% | findstr /R "beta" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
-    - echo %CI_BUILD_REF_NAME% | findstr /R "stable" >nul 2>&1 && set S3_BUCKET=builds-parity-published || set S3_BUCKET=builds-parity
-    - echo %S3_BUCKET%
-    - aws s3 rm --recursive s3://%S3_BUCKET%/%CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe --body target\release\parity.exe
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe.md5 --body target\release\parity.exe.md5
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip --body target\release\parity.zip
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip.md5 --body target\release\parity.zip.md5
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe --body nsis\InstallParity.exe
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe.md5 --body nsis\InstallParity.exe.md5
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip --body nsis\win-installer.zip
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip.md5 --body nsis\win-installer.zip.md5
-#    - curl --data "commit=%CI_BUILD_REF%&sha3=%SHA3%&filename=parity.exe&secret=%RELEASES_SECRET%" http://update.parity.io:1337/push-build/%CI_BUILD_REF_NAME%/%PLATFORM%
-    - curl --data "commit=%CI_BUILD_REF%&sha3=%SHA3%&filename=parity.exe&secret=%RELEASES_SECRET%" http://update.parity.io:1338/push-build/%CI_BUILD_REF_NAME%/%PLATFORM%
+    - sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc installer "" "" windows
   tags:
    - rust-windows
   artifacts:
     paths:
-    - target/release/parity.exe
-    - target/release/parity.pdb
-    - nsis/InstallParity.exe
+    - parity.zip
     name: "x86_64-pc-windows-msvc_parity"
-test-darwin:
-  stage: test
+docker-build:
+  stage: build
   only:
+    - tags
     - 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)
+    - docker info
   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
+    - 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
+    - scripts/docker-build.sh $DOCKER_TAG
+    - docker logout
   tags:
-    - osx
-  allow_failure: true
-test-windows:
+    - docker
+test-coverage:
   stage: test
   only:
-    - triggers
-  before_script:
-    - git submodule update --init --recursive
+    - master
   script:
-    - set RUST_BACKTRACE=1
-    - echo cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p ethcore-dapps -p ethcore-rpc -p ethcore-signer -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity %CARGOFLAGS% --verbose --release
+    - scripts/gitlab-test.sh test-coverage
   tags:
-    - rust-windows
+    - kcov
   allow_failure: true
 test-rust-stable:
   stage: test
-  image: ethcore/rust:stable
-  before_script:
-    - git submodule update --init --recursive
-    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
+  image: parity/rust:gitlab-ci
   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
+    - scripts/gitlab-test.sh stable
   tags:
-    - rust
-    - rust-stable
-js-test:
-  stage: test
-  image: ethcore/rust:stable
-  before_script:
-    - git submodule update --init --recursive
-    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
-    - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS deps install since no JS files modified."; else ./js/scripts/install-deps.sh;fi
-  script:
-    - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS lint since no JS files modified."; else ./js/scripts/lint.sh && ./js/scripts/test.sh && ./js/scripts/build.sh; fi
-  tags:
-    - rust
     - rust-stable
 test-rust-beta:
   stage: test
   only:
     - triggers
-  image: ethcore/rust:beta
-  before_script:
-    - git submodule update --init --recursive
-    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
+    - master
+  image: parity/rust:gitlab-ci
   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
+    - scripts/gitlab-test.sh beta
   tags:
-    - rust
     - rust-beta
   allow_failure: true
 test-rust-nightly:
   stage: test
   only:
     - triggers
-  image: ethcore/rust:nightly
-  before_script:
-    - git submodule update --init --recursive
-    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
+    - master
+  image: parity/rust:gitlab-ci
   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
+    - scripts/gitlab-test.sh nightly
   tags:
     - rust
     - rust-nightly
   allow_failure: true
+js-test:
+  stage: test
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-test.sh js-test
+  tags:
+    - rust-stable
 js-release:
   stage: js-build
   only:
     - master
-    - beta
     - stable
-  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
+    - beta
+    - tags
+    - triggers
+  image: parity/rust:gitlab-ci
   script:
-    - echo $JS_FILES_MODIFIED
-    - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS rebuild since no JS files modified."; else ./js/scripts/build.sh && ./js/scripts/release.sh; fi
+    - scripts/gitlab-test.sh js-release
   tags:
     - javascript
 push-release:
   stage: push-release
   only:
-    - beta
     - tags
-    - stable
     - triggers
-  image: ethcore/rust:stable
+  image: parity/rust:gitlab-ci
   script:
-#    - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1337/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
-    - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1338/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
+    - scripts/gitlab-push-release.sh
   tags:
     - curl

.gitmodules

@@ -2,3 +2,6 @@
 	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

.travis.yml

@@ -1,85 +0,0 @@
-sudo: required
-dist: trusty
-language: rust
-
-branches:
-  only:
-  - master
-  - /^beta-.*$/
-  - /^stable-.*$/
-  - /^beta$/
-  - /^stable$/
-
-git:
-  depth: 3
-
-matrix:
-  include:
-  - rust: stable
-    env: RUN_TESTS="true" TEST_OPTIONS=""
-  - rust: stable
-    env: RUN_COVERAGE="true"
-  - rust: stable
-    env: RUN_DOCS="true"
-
-env:
-  global:
-  - CXX="g++-4.8"
-  - CC="gcc-4.8"
-  - RUST_BACKTRACE="1"
-  - RUN_TESTS="false"
-  - RUN_COVERAGE="false"
-  - RUN_DOCS="false"
-  - TEST_OPTIONS=""
-  - RUSTFLAGS="-D warnings"
-  - TRAVIS_NODE_VERSION="6"
-  # GH_TOKEN for documentation
-  - secure: bumJASbZSU8bxJ0EyPUJmu16AiV9EXOpyOj86Jlq/Ty9CfwGqsSXt96uDyE+OUJf34RUFQMsw0nk37/zC4lcn6kqk2wpuH3N/o85Zo/cVZY/NusBWLQqtT5VbYWsV+u2Ua4Tmmsw8yVYQhYwU2ZOejNpflL+Cs9XGgORp1L+/gMRMC2y5Se6ZhwnKPQlRJ8LGsG1dzjQULxzADIt3/zuspNBS8a2urJwlHfGMkvHDoUWCviP/GXoSqw3TZR7FmKyxE19I8n9+iSvm9+oZZquvcgfUxMHn8Gq/b44UbPvjtFOg2yam4xdWXF/RyWCHdc/R9EHorSABeCbefIsm+zcUF3/YQxwpSxM4IZEeH2rTiC7dcrsKw3XsO16xFQz5YI5Bay+CT/wTdMmJd7DdYz7Dyf+pOvcM9WOf/zorxYWSBOMYy0uzbusU2iyIghQ82s7E/Ahg+WARtPgkuTLSB5aL1oCTBKHqQscMr7lo5Ti6RpWLxEdTQMBznc+bMr+6dEtkEcG9zqc6cE9XX+ox3wTU6+HVMfQ1ltCntJ4UKcw3A6INEbw9wgocQa812CIASQ2fE+SCAbz6JxBjIAlFUnD1lUB7S8PdMPwn9plfQgKQ2A5YZqg6FnBdf0rQXIJYxQWKHXj/rBHSUCT0tHACDlzTA+EwWggvkP5AGIxRxm8jhw=
-  - KCOV_CMD="./kcov-master/tmp/usr/local/bin/kcov"
-
-cache:
-  apt: true
-  directories:
-  - $TRAVIS_BUILD_DIR/target
-  - $TRAVIS_BUILD_DIR/kcov-master
-  - $TRAVIS_BUILD_DIR/js/node_modules
-  - $HOME/.cargo
-
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - libcurl4-openssl-dev
-    - libelf-dev
-    - libdw-dev
-    - gcc-4.8
-    - g++-4.8
-
-install:
-  - ([ "$RUN_COVERAGE" = "false" ]) || (test -x $KCOV_CMD) || (
-      wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
-      tar xzf master.tar.gz &&
-      mkdir -p kcov-master/build &&
-      cd kcov-master/build &&
-      cmake .. &&
-      make && make install DESTDIR=../tmp &&
-      cd
-    )
-  - nvm install $TRAVIS_NODE_VERSION && nvm use $TRAVIS_NODE_VERSION && ./js/scripts/install-deps.sh
-
-script:
-  - if [ "$RUN_TESTS" = "true" ]; then
-      ./js/scripts/lint.sh &&
-      travis_wait 40 ./test.sh $TEST_OPTIONS;
-    fi
-  - if [ "$RUN_COVERAGE" = "true" ]; then ./scripts/cov.sh "$KCOV_CMD"; fi
-
-after_success: |
-  [ $TRAVIS_BRANCH = master ] &&
-  [ $TRAVIS_PULL_REQUEST = false ] &&
-  [ "$RUN_DOCS" = "true" ] &&
-  ./scripts/doc.sh &&
-  pip install --user ghp-import &&
-  /home/travis/.local/bin/ghp-import -n target/doc &&
-  git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages

CHANGELOG.md

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

Cargo.toml

@@ -1,58 +1,85 @@
 [package]
 description = "Parity Ethereum client"
 name = "parity"
-version = "1.5.0"
+# NOTE Make sure to update util/version/Cargo.toml as well
+version = "1.8.10"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
-[build-dependencies]
-rustc_version = "0.1"
-ethcore-ipc-codegen = { path = "ipc/codegen" }
-ethcore-ipc-tests = { path = "ipc/tests" }
-
 [dependencies]
 log = "0.3"
-env_logger = "0.3"
-rustc-serialize = "0.3"
-docopt = "0.6"
+env_logger = "0.4"
+rustc-hex = "1.0"
+docopt = "0.8"
+clap = "2"
+term_size = "0.3"
+textwrap = "0.9"
 time = "0.1"
-num_cpus = "0.2"
+num_cpus = "1.2"
 number_prefix = "0.2"
 rpassword = "0.2.1"
-semver = "0.5"
-ansi_term = "0.7"
-lazy_static = "0.2"
-regex = "0.1"
+semver = "0.6"
+ansi_term = "0.9"
+parking_lot = "0.4"
+regex = "0.2"
 isatty = "0.1"
-toml = "0.2"
-serde = "0.8.0"
-serde_json = "0.8.0"
+toml = "0.4"
+serde = "1.0"
+serde_json = "1.0"
+serde_derive = "1.0"
 app_dirs = "1.1.1"
-hyper = { version = "0.9", default-features = false }
-ctrlc = { git = "https://github.com/ethcore/rust-ctrlc.git" }
+futures = "0.1"
+futures-cpupool = "0.1"
 fdlimit = "0.1"
-clippy = { version = "0.0.103", optional = true}
-rlp = { path = "util/rlp" }
+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.8" }
 ethsync = { path = "sync" }
 ethcore = { path = "ethcore" }
 ethcore-util = { path = "util" }
+ethcore-bytes = { path = "util/bytes" }
+ethcore-bigint = { path = "util/bigint" }
 ethcore-io = { path = "util/io" }
 ethcore-devtools = { path = "devtools" }
-ethcore-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" }
-ethcore-dapps = { path = "dapps", optional = true }
+ethcore-network = { path = "util/network" }
+node-filter = { path = "ethcore/node_filter" }
+ethkey = { path = "ethkey" }
+node-health = { path = "dapps/node-health" }
+rlp = { path = "util/rlp" }
 rpc-cli = { path = "rpc_cli" }
-parity-rpc-client = { path = "rpc_client" }
-ethcore-light = { path = "ethcore/light" }
 parity-hash-fetch = { path = "hash-fetch" }
-parity-updater = { path = "updater" }
+parity-ipfs-api = { path = "ipfs" }
+parity-local-store = { path = "local-store" }
 parity-reactor = { path = "util/reactor" }
+parity-rpc = { path = "rpc" }
+parity-rpc-client = { path = "rpc_client" }
+parity-updater = { path = "updater" }
+parity-version = { path = "util/version" }
+parity-whisper = { path = "whisper" }
+path = { path = "util/path" }
+panic_hook = { path = "panic_hook" }
+hash = { path = "util/hash" }
+migration = { path = "util/migration" }
+kvdb-rocksdb = { path = "util/kvdb-rocksdb" }
+
+parity-dapps = { path = "dapps", optional = true }
+clippy = { version = "0.0.103", optional = true}
+ethcore-secretstore = { path = "secret_store", optional = true }
+
+[build-dependencies]
+rustc_version = "0.2"
+
+[dev-dependencies]
+ethcore-ipc-tests = { path = "ipc/tests" }
+pretty_assertions = "0.1"
+ipnetwork = "0.12.6"
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.2"
@@ -63,34 +90,37 @@ daemonize = "0.2"
 [features]
 default = ["ui-precompiled"]
 ui = [
-	"dapps",
-	"ethcore-dapps/ui",
-	"ethcore-signer/ui",
+	"ui-enabled",
+	"parity-dapps/ui",
 ]
 ui-precompiled = [
-	"dapps",
-	"ethcore-signer/ui-precompiled",
-	"ethcore-dapps/ui-precompiled",
+	"ui-enabled",
+	"parity-dapps/ui-precompiled",
 ]
-dapps = ["ethcore-dapps"]
+ui-enabled = ["dapps"]
+dapps = ["parity-dapps"]
 ipc = ["ethcore/ipc", "ethsync/ipc"]
 jit = ["ethcore/jit"]
-dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "ethcore-rpc/dev", "ethcore-dapps/dev", "ethcore-signer/dev"]
+dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "parity-rpc/dev", "parity-dapps/dev"]
 json-tests = ["ethcore/json-tests"]
 test-heavy = ["ethcore/test-heavy"]
-stratum = ["ipc"]
-ethkey-cli = ["ethcore/ethkey-cli"]
-ethstore-cli = ["ethcore/ethstore-cli"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
 final = ["ethcore-util/final"]
+secretstore = ["ethcore-secretstore"]
 
 [[bin]]
 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", "whisper", "chainspec", "dapps/js-glue"]

README.md

@@ -1,60 +1,47 @@
-# [Parity](https://ethcore.io/parity.html)
-### Fast, light, and robust Ethereum implementation
+# [Parity](https://parity.io/) - fast, light, and robust Ethereum client
 
-[![Build Status][travis-image]][travis-url] [![build status](https://gitlab.ethcore.io/Mirrors/ethcore-parity/badges/master/build.svg)](https://gitlab.ethcore.io/Mirrors/ethcore-parity/commits/master) [![Coverage Status][coveralls-image]][coveralls-url]  [![GPLv3][license-image]][license-url]
+[![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)
 
 ### Join the chat!
 
-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)
+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)
 
-[Internal Documentation][doc-url]
-
-
-Be sure to check out [our wiki][wiki-url] for more information.
-
-[travis-image]: https://travis-ci.org/ethcore/parity.svg?branch=master
-[travis-url]: https://travis-ci.org/ethcore/parity
-[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.12.0 to build**
+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.
 
 ----
 
-
 ## 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'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 comes with a built-in wallet. To access [Parity Wallet](http://127.0.0.1:8080/) this 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][gitter-url] 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](https://gitter.im/paritytech/parity) to ask a question. We are glad to help!
 
-Parity's current release is 1.3. You can download it at https://ethcore.io/parity.html or follow the instructions
-below to build from source.
+**For security-critical issues**, please refer to the security policy outlined in `SECURITY.MD`.
+
+Parity's current release is 1.7. You can download it at https://github.com/paritytech/parity/releases or follow the instructions below to build from source.
 
 ----
 
 ## Build dependencies
 
-Parity is fully compatible with Stable Rust.
+**Parity requires Rust version 1.19.0 to build**
 
 We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have rustup, you can install it like this:
 
@@ -62,8 +49,8 @@ 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` and `pkg-config` packages to be installed.
+
+	Parity also requires `gcc`, `g++`, `libssl-dev`/`openssl`, `libudev-dev` and `pkg-config` packages to be installed.
 - OSX:
 	```bash
 	$ curl https://sh.rustup.rs -sSf | sh
@@ -82,19 +69,23 @@ Once you have rustup, install parity or download and build from source
 
 ----
 
-## Quick install
+## Install from the snap store
+
+In any of the [supported Linux distros](https://snapcraft.io/docs/core/install):
 
 ```bash
-cargo install --git https://github.com/ethcore/parity.git parity
+sudo snap install parity --edge
 ```
 
+(Note that this is an experimental and unstable release, at the moment)
+
 ----
 
 ## Build from source
 
 ```bash
 # download Parity code
-$ git clone https://github.com/ethcore/parity
+$ git clone https://github.com/paritytech/parity
 $ cd parity
 
 # build in release mode
@@ -102,7 +93,11 @@ $ cargo build --release
 ```
 
 This will produce an executable in the `./target/release` subdirectory.
+Note: if cargo fails to parse manifest try:
 
+```bash
+$ ~/.cargo/bin/cargo build --release
+```
 ----
 
 ## Simple one-line installer for Mac and Ubuntu
@@ -128,4 +123,4 @@ systemd user directory (usually `~/.config/systemd/user`).
 2. To pass any argument to Parity, write a `~/.parity/parity.conf` file this way:
 `ARGS="ARG1 ARG2 ARG3"`.
 
-	Example: `ARGS="ui --geth --identity MyMachine"`.
+	Example: `ARGS="ui --identity MyMachine"`.

SECURITY.md

@@ -0,0 +1,54 @@
+# Security Policy
+
+For security inquiries or vulnerability reports, please send a message to security@parity.io.
+
+Please use a descriptive subject line so we can identify the report as such.
+
+If you send a report, we will respond to the e-mail within 48 hours, and provide regular updates from that time onwards.
+
+If you would like to encrypt your report, please use the PGP key provided below.
+It is also reproduced [on MIT's key server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73)
+
+```
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFlyIAwBCACe0keNPjgYzZ1Oy/8t3zj/Qw9bHHqrzx7FWy8NbXnYBM19NqOZ
+DIP7Oe0DvCaf/uruBskCS0iVstHlEFQ2AYe0Ei0REt9lQdy61GylU/DEB3879IG+
+6FO0SnFeYeerv1/hFI2K6uv8v7PyyVDiiJSW0I1KIs2OBwJicTKmWxLAeQsRgx9G
+yRGalrVk4KP+6pWTA7k3DxmDZKZyfYV/Ej10NtuzmsemwDbv98HKeomp/kgFOfSy
+3AZjeCpctlsNqpjUuXa0/HudmH2WLxZ0fz8XeoRh8XM9UudNIecjrDqmAFrt/btQ
+/3guvlzhFCdhYPVGsUusKMECk/JG+Xx1/1ZjABEBAAG0LFBhcml0eSBTZWN1cml0
+eSBDb250YWN0IDxzZWN1cml0eUBwYXJpdHkuaW8+iQFUBBMBCAA+FiEE2uUVYCjP
+N6B8aTiDXQ8DAY0H3nMFAllyIAwCGwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwEC
+HgECF4AACgkQXQ8DAY0H3nM60wgAkS3A36Zc+upiaxU7tumcGv+an17j7gin0sif
++0ELSjVfrXInM6ovai+NhUdcLkJ7tCrKS90fvlaELK5Sg9CXBWCTFccKN4A/B7ey
+rOg2NPXUecnyBB/XqQgKYH7ujYlOlqBDXMfz6z8Hj6WToxg9PPMGGomyMGh8AWxM
+3yRPFs5RKt0VKgN++5N00oly5Y8ri5pgCidDvCLYMGTVDHFKwkuc9w6BlWlu1R1e
+/hXFWUFAP1ffTAul3QwyKhjPn2iotCdxXjvt48KaU8DN4iL7aMBN/ZBKqGS7yRdF
+D/JbJyaaJ0ZRvFSTSXy/sWY3z1B5mtCPBxco8hqqNfRkCwuZ6LkBDQRZciAMAQgA
+8BP8xrwe12TOUTqL/Vrbxv/FLdhKh53J6TrPKvC2TEEKOrTNo5ahRq+XOS5E7G2N
+x3b+fq8gR9BzFcldAx0XWUtGs/Wv++ulaSNqTBxj13J3G3WGsUfMKxRgj//piCUD
+bCFLQfGZdKk0M1o9QkPVARwwmvCNiNB/l++xGqPtfc44H5jWj3GoGvL2MkShPzrN
+yN/bJ+m+R5gtFGdInqa5KXBuxxuW25eDKJ+LzjbgUgeC76wNcfOiQHTdMkcupjdO
+bbGFwo10hcbRAOcZEv6//Zrlmk/6nPxEd2hN20St2bSN0+FqfZ267mWEu3ejsgF8
+ArdCpv5h4fBvJyNwiTZwIQARAQABiQE8BBgBCAAmFiEE2uUVYCjPN6B8aTiDXQ8D
+AY0H3nMFAllyIAwCGwwFCQPCZwAACgkQXQ8DAY0H3nNisggAl4fqhRlA34wIb190
+sqXHVxiCuzPaqS6krE9xAa1+gncX485OtcJNqnjugHm2rFE48lv7oasviuPXuInE
+/OgVFnXYv9d/Xx2JUeDs+bFTLouCDRY2Unh7KJZasfqnMcCHWcxHx5FvRNZRssaB
+WTZVo6sizPurGUtbpYe4/OLFhadBqAE0EUmVRFEUMc1YTnu4eLaRBzoWN4d2UWwi
+LN25RSrVSke7LTSFbgn9ntQrQ2smXSR+cdNkkfRCjFcpUaecvFl9HwIqoyVbT4Ym
+0hbpbbX/cJdc91tKa+psa29uMeGL/cgL9fAu19yNFRyOTMxjZnvql1X/WE1pLmoP
+ETBD1Q==
+=K9Qw
+-----END PGP PUBLIC KEY BLOCK-----
+```
+
+Important Legal Information:
+
+Your submission might be eligible for a bug bounty. The bug bounty program is an experimental and discretionary rewards program for the Parity community to reward those who are helping to improve the Parity software. Rewards are at the sole discretion of Parity Technologies Ltd.. 
+
+We are not able to issue rewards to individuals who are on sanctions lists or who are in countries on sanctions lists (e.g. North Korea, Iran, etc). 
+
+You are responsible for all taxes. All rewards are subject to applicable law. 
+
+Finally, your testing must not violate any law or compromise any data that is not yours.

appveyor.yml

@@ -1,52 +0,0 @@
-environment:
-  matrix:
-  - TARGET: x86_64-pc-windows-msvc
-  cert:
-    secure: ESPpYVVAMG1fbJx6kq4ct/g9SQTXac4Hs6xXr6Oh4Zrk2dwYglNjxmzErdPnvu7gs/gekzrJ6KEQHYRc+5+4dKg6rRADQ681NLVx9vOggBs=
-  certpass:
-    secure: 0BgXJqxq9Ei34/hZ7121FQ==
-  keyfile: C:\users\appveyor\Certificates.p12
-  RUSTFLAGS: -D warnings
-
-branches:
-  only:
-    - master
-    - /^beta-.*$/
-    - /^stable-.*$/
-    - /^beta$/
-    - /^stable$/
-
-install:
-  - git submodule update --init --recursive
-  - ps: Install-Product node 6
-  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.13.0-x86_64-pc-windows-msvc.exe"
-  - ps: Start-FileDownload "https://github.com/ethcore/win-build/raw/master/SimpleFC.dll" -FileName nsis\SimpleFC.dll
-  - ps: Start-FileDownload "https://github.com/ethcore/win-build/raw/master/vc_redist.x64.exe" -FileName nsis\vc_redist.x64.exe
-  - rust-1.13.0-x86_64-pc-windows-msvc.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
-  - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin;C:\Program Files (x86)\NSIS;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin
-  - rustc -V
-  - cargo -V
-  - node -v
-  - npm -v
-
-build: off
-
-test_script:
-  - cargo test --verbose --release
-
-after_test:
-  - cargo build --verbose --release
-  - ps: if($env:cert) { Start-FileDownload $env:cert -FileName $env:keyfile }
-  - ps: if($env:cert) { signtool sign /f $env:keyfile /p $env:certpass target\release\parity.exe }
-  - msbuild windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release
-  - ps: if($env:cert) { signtool sign /f $env:keyfile /p $env:certpass windows\ptray\x64\release\ptray.exe }
-  - makensis.exe nsis\installer.nsi
-  - ps: if($env:cert) { signtool sign /f $env:keyfile /p $env:certpass nsis\installer.exe }
-
-artifacts:
-  - path: nsis\installer.exe
-    name: Windows Installer (x86_64)
-
-cache:
-  - target
-  - C:\users\appveyor\.cargo -> appveyor.yml

build.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,10 +16,20 @@
 
 extern crate rustc_version;
 
-use rustc_version::{version_meta, Channel};
+const MIN_RUSTC_VERSION: &'static str = "1.15.1";
 
 fn main() {
-	if let Channel::Nightly = version_meta().channel {
-		println!("cargo:rustc-cfg=nightly");
-	}
+	let is = rustc_version::version().unwrap();
+	let required = MIN_RUSTC_VERSION.parse().unwrap();
+	assert!(is >= required, format!("
+
+It looks like you are compiling Parity with an old rustc compiler {}.
+Parity requires version {}. Please update your compiler.
+If you use rustup, try this:
+
+    rustup update stable
+
+and try building Parity again.
+
+", is, required));
 }

chainspec/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "chainspec"
+version = "0.1.0"
+authors = ["debris <marek.kotewicz@gmail.com>"]
+
+[dependencies]
+ethjson = { path = "../json" }
+serde_json = "1.0"
+serde_ignored = "0.0.4"

chainspec/src/main.rs

@@ -0,0 +1,48 @@
+extern crate serde_json;
+extern crate serde_ignored;
+extern crate ethjson;
+
+use std::collections::BTreeSet;
+use std::{fs, env, process};
+use ethjson::spec::Spec;
+
+fn quit(s: &str) -> ! {
+	println!("{}", s);
+	process::exit(1);
+}
+
+fn main() {
+	let mut args = env::args();
+	if args.len() != 2 {
+		quit("You need to specify chainspec.json\n\
+		\n\
+		./chainspec <chainspec.json>");
+	}
+
+	let path = args.nth(1).expect("args.len() == 2; qed");
+	let file = match fs::File::open(&path) {
+		Ok(file) => file,
+		Err(_) => quit(&format!("{} could not be opened", path)),
+	};
+
+	let mut unused = BTreeSet::new();
+	let mut deserializer = serde_json::Deserializer::from_reader(file);
+
+	let spec: Result<Spec, _> = serde_ignored::deserialize(&mut deserializer, |field| {
+		unused.insert(field.to_string());
+	});
+
+	if let Err(err) = spec {
+		quit(&format!("{} {}", path, err.to_string()));
+	}
+
+	if !unused.is_empty() {
+		let err = unused.into_iter()
+			.map(|field| format!("{} unexpected field `{}`", path, field))
+			.collect::<Vec<_>>()
+			.join("\n");
+		quit(&err);
+	}
+
+	println!("{} is valid", path);
+}

dapps/Cargo.toml

@@ -1,50 +1,52 @@
 [package]
 description = "Parity Dapps crate"
-name = "ethcore-dapps"
-version = "1.5.0"
+name = "parity-dapps"
+version = "1.8.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
 
 [lib]
 
 [dependencies]
-rand = "0.3"
-log = "0.3"
-env_logger = "0.3"
+base32 = "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.8"
-serde_json = "0.8"
-linked-hash-map = "0.3"
-parity-dapps-glue = "1.4"
-mime = "0.2"
-mime_guess = "1.6.1"
-time = "0.1.35"
-serde_macros = { version = "0.8", optional = true }
+futures-cpupool = "0.1"
+linked-hash-map = "0.5"
+log = "0.3"
+parity-dapps-glue = "1.8"
+parking_lot = "0.4"
+mime_guess = "2.0.0-alpha.2"
+rand = "0.3"
+rustc-hex = "1.0"
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = "1.0"
+unicase = "1.4"
 zip = { version = "0.1", default-features = false }
-ethcore-devtools = { path = "../devtools" }
-ethcore-rpc = { path = "../rpc" }
+itertools = "0.5"
+
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.8" }
+jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.8" }
+
 ethcore-util = { path = "../util" }
+ethcore-bigint = { path = "../util/bigint" }
+ethcore-bytes = { path = "../util/bytes" }
 fetch = { path = "../util/fetch" }
-parity-ui = { path = "./ui" }
+node-health = { path = "./node-health" }
 parity-hash-fetch = { path = "../hash-fetch" }
 parity-reactor = { path = "../util/reactor" }
+parity-ui = { path = "./ui" }
+hash = { path = "../util/hash" }
+parity-version = { path = "../util/version" }
 
 clippy = { version = "0.0.103", optional = true}
 
-[build-dependencies]
-serde_codegen = { version = "0.8", optional = true }
+[dev-dependencies]
+env_logger = "0.4"
+ethcore-devtools = { path = "../devtools" }
 
 [features]
-default = ["serde_codegen"]
-nightly = ["serde_macros"]
-dev = ["clippy", "ethcore-rpc/dev", "ethcore-util/dev"]
+dev = ["clippy", "ethcore-util/dev"]
 
 ui = ["parity-ui/no-precompiled-js"]
 ui-precompiled = ["parity-ui/use-precompiled-js"]

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.5.0"
+version = "1.8.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [build-dependencies]
-quasi_codegen = { version = "0.11", optional = true }
-syntex = { version = "0.33", optional = true }
+quasi_codegen = { version = "0.32", optional = true }
+syntex = { version = "0.58", optional = true }
 
 [dependencies]
 glob = { version = "0.2.11" }
-mime_guess = { version = "1.6.1" }
-aster = { version = "0.17", default-features = false }
-quasi = { version = "0.11", default-features = false }
-quasi_macros = { version = "0.11", optional = true }
-syntex = { version = "0.33", optional = true }
-syntex_syntax = { version = "0.33", optional = true }
+mime_guess = { version = "2.0.0-alpha.2" }
+aster = { version = "0.41", default-features = false }
+quasi = { version = "0.32", default-features = false }
+quasi_macros = { version = "0.32", optional = true }
+syntex = { version = "0.58", optional = true }
+syntex_syntax = { version = "0.58", optional = true }
 clippy = { version = "0.0.90", optional = true }
 
 [features]

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/ethcore/parity.git
+   $ git clone https://github.com/paritytech/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/ethcore/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/paritytech/parity-ui/blob/master/status/Cargo.toml).
 
    ```bash
-   $ git clone https://github.com/ethcore/parity-ui.git
+   $ git clone https://github.com/paritytech/parity-ui.git
    $ cd ./parity-ui/
    $ cp ./home/Cargo.toml ../parity/dapps/myapp/Cargo.toml
    $ cp ./home/build.rs ../parity/dapps/myapp/build.rs

dapps/js-glue/build.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -25,13 +25,11 @@ 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");
 
-		registry.expand("", &src, &dst).unwrap();
+		quasi_codegen::expand(&src, &dst).unwrap();
 	}
 }
 

dapps/js-glue/src/build.rs

@@ -13,9 +13,8 @@ pub mod inner {
 
 		impl fold::Folder for StripAttributeFolder {
 			fn fold_attribute(&mut self, attr: ast::Attribute) -> Option<ast::Attribute> {
-				match attr.node.value.node {
-					ast::MetaItemKind::List(ref n, _) if n == &"webapp" => { return None; }
-					_ => {}
+				if &*attr.value.name.as_str() == "webapp" {
+					return None;
 				}
 
 				Some(attr)

dapps/js-glue/src/codegen.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -22,16 +22,12 @@ 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::ptr::P;
-use syntax::print::pprust::{lit_to_string};
-use syntax::parse::token::{InternedString};
-
+use syntax::print::pprust::lit_to_string;
+use syntax::symbol::InternedString;
 
 pub fn expand_webapp_implementation(
 	cx: &mut ExtCtxt,
@@ -48,7 +44,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)) {
@@ -105,6 +101,7 @@ fn implement_webapp(cx: &ExtCtxt, builder: &aster::AstBuilder, item: &Item, push
 
 	let files_impl = quote_item!(cx,
 		impl $type_name {
+			#[allow(unused_mut)]
 			fn files() -> ::std::collections::HashMap<&'static str, File> {
 				let mut files = ::std::collections::HashMap::new();
 				$statements
@@ -117,11 +114,12 @@ 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 name, ref lit) if name == &"path" => {
-					if let Some(s) = get_str_from_lit(cx, name, lit) {
+				ast::MetaItemKind::NameValue(ref lit) if is_path => {
+					if let Some(s) = get_str_from_lit(cx, lit) {
 						return s.deref().to_owned();
 					}
 				},
@@ -134,14 +132,32 @@ fn extract_path(cx: &ExtCtxt, item: &Item) -> String {
 	"web".to_owned()
 }
 
-fn get_str_from_lit(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Option<InternedString> {
+fn webapp_meta_items(attr: &ast::Attribute) -> Option<Vec<ast::MetaItem>> {
+	let is_webapp = &*attr.value.name.as_str() == "webapp";
+	match attr.value.node {
+		ast::MetaItemKind::List(ref items) if is_webapp => {
+			attr::mark_used(&attr);
+			Some(
+				items.iter()
+				.map(|item| item.node.clone())
+				.filter_map(|item| match item {
+					ast::NestedMetaItemKind::MetaItem(item) => Some(item),
+					_ => None,
+				})
+				.collect()
+			)
+		}
+		_ => None
+	}
+}
+
+fn get_str_from_lit(cx: &ExtCtxt, lit: &ast::Lit) -> Option<InternedString> {
 	match lit.node {
-		ast::LitKind::Str(ref s, _) => Some(s.clone()),
+		ast::LitKind::Str(ref s, _) => Some(s.clone().as_str()),
 		_ => {
 			cx.span_err(
 				lit.span,
-				&format!("webapp annotation `{}` must be a string, not `{}`",
-					name,
+				&format!("webapp annotation path must be a string, not `{}`",
 					lit_to_string(lit)
 				)
 			);
@@ -150,16 +166,6 @@ fn get_str_from_lit(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Option<Interned
 	}
 }
 
-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() {
@@ -169,7 +175,6 @@ fn as_uri(path: &Path) -> String {
 	s[0..s.len()-1].into()
 }
 
-
 #[test]
 fn should_convert_path_separators_on_all_platforms() {
 	// given

dapps/js-glue/src/js.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify

dapps/js-glue/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 extern crate syntex;
 
 #[cfg(feature = "with-syntex")]
-#[macro_use]
 extern crate syntex_syntax as syntax;
 
 #[cfg(feature = "with-syntex")]

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

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify

dapps/node-health/Cargo.toml

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

dapps/node-health/src/health.rs

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

dapps/node-health/src/lib.rs

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

dapps/node-health/src/time.rs

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

dapps/node-health/src/types.rs

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

dapps/src/api/api.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -15,156 +15,83 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::sync::Arc;
-use unicase::UniCase;
-use hyper::{server, net, Decoder, Encoder, Next, Control};
-use hyper::header;
-use hyper::method::Method;
-use hyper::header::AccessControlAllowOrigin;
 
-use api::types::{App, ApiError};
+use hyper::{Method, StatusCode};
+
 use api::response;
 use apps::fetcher::Fetcher;
-
-use handlers::extract_url;
-use endpoint::{Endpoint, Endpoints, Handler, EndpointPath};
-use jsonrpc_http_server::cors;
+use endpoint::{Endpoint, Request, Response, EndpointPath};
+use futures::{future, Future};
+use node_health::{NodeHealth, HealthStatus};
 
 #[derive(Clone)]
 pub struct RestApi {
-	cors_domains: Option<Vec<AccessControlAllowOrigin>>,
-	endpoints: Arc<Endpoints>,
 	fetcher: Arc<Fetcher>,
-}
-
-impl RestApi {
-	pub fn new(cors_domains: Vec<String>, endpoints: Arc<Endpoints>, fetcher: Arc<Fetcher>) -> Box<Endpoint> {
-		Box::new(RestApi {
-			cors_domains: Some(cors_domains.into_iter().map(AccessControlAllowOrigin::Value).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()
-	}
+	health: NodeHealth,
 }
 
 impl Endpoint for RestApi {
-	fn to_async_handler(&self, path: EndpointPath, control: Control) -> Box<Handler> {
-		Box::new(RestApiRouter::new(self.clone(), path, control))
-	}
-}
-
-struct RestApiRouter {
-	api: RestApi,
-	origin: Option<String>,
-	path: Option<EndpointPath>,
-	control: Option<Control>,
-	handler: Box<Handler>,
-}
-
-impl RestApiRouter {
-	fn new(api: RestApi, path: EndpointPath, control: Control) -> Self {
-		RestApiRouter {
-			path: Some(path),
-			origin: None,
-			control: Some(control),
-			api: api,
-			handler: response::as_json_error(&ApiError {
-				code: "404".into(),
-				title: "Not Found".into(),
-				detail: "Resource you requested has not been found.".into(),
-			}),
-		}
-	}
-
-	fn resolve_content(&self, hash: Option<&str>, path: EndpointPath, control: Control) -> Option<Box<Handler>> {
-		match hash {
-			Some(hash) if self.api.fetcher.contains(hash) => {
-				Some(self.api.fetcher.to_async_handler(path, control))
-			},
-			_ => None
-		}
-	}
-
-	/// Returns basic headers for a response (it may be overwritten by the handler)
-	fn response_headers(&self) -> header::Headers {
-		let mut headers = header::Headers::new();
-		headers.set(header::AccessControlAllowCredentials);
-		headers.set(header::AccessControlAllowMethods(vec![
-			Method::Options,
-			Method::Post,
-			Method::Get,
-		]));
-		headers.set(header::AccessControlAllowHeaders(vec![
-			UniCase("origin".to_owned()),
-			UniCase("content-type".to_owned()),
-			UniCase("accept".to_owned()),
-		]));
-
-		if let Some(cors_header) = cors::get_cors_header(&self.api.cors_domains, &self.origin) {
-			headers.set(cors_header);
+	fn respond(&self, mut path: EndpointPath, req: Request) -> Response {
+		if let Method::Options = *req.method() {
+			return Box::new(future::ok(response::empty()));
 		}
 
-		headers
-	}
-}
+		let endpoint = path.app_params.get(0).map(String::to_owned);
+		let hash = path.app_params.get(1).map(String::to_owned);
 
-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();
-		}
-
-		let url = extract_url(&request);
-		if url.is_none() {
-			// Just return 404 if we can't parse URL
-			return Next::write();
-		}
-
-		let url = url.expect("Check for None early-exists above; qed");
-		let mut path = self.path.take().expect("on_request called only once, and path is always defined in new; qed");
-		let control = self.control.take().expect("on_request called only once, and control is always defined in new; qed");
-
-		let endpoint = url.path.get(1).map(|v| v.as_str());
-		let hash = url.path.get(2).map(|v| v.as_str());
 		// at this point path.app_id contains 'api', adjust it to the hash properly, otherwise
 		// we will try and retrieve 'api' as the hash when doing the /api/content route
-		if let Some(ref hash) = hash { path.app_id = hash.clone().to_owned() }
-
-		let handler = endpoint.and_then(|v| match v {
-			"apps" => Some(response::as_json(&self.api.list_apps())),
-			"ping" => Some(response::ping()),
-			"content" => self.resolve_content(hash, path, control),
-			_ => None
-		});
-
-		// Overwrite default
-		if let Some(h) = handler {
-			self.handler = h;
+		if let Some(ref hash) = hash {
+			path.app_id = hash.to_owned();
 		}
 
-		self.handler.on_request(request)
+		trace!(target: "dapps", "Handling /api request: {:?}/{:?}", endpoint, hash);
+		match endpoint.as_ref().map(String::as_str) {
+			Some("ping") => Box::new(future::ok(response::ping(req))),
+			Some("health") => self.health(),
+			Some("content") => self.resolve_content(hash.as_ref().map(String::as_str), path, req),
+			_ => Box::new(future::ok(response::not_found())),
+		}
+	}
+}
+
+impl RestApi {
+	pub fn new(
+		fetcher: Arc<Fetcher>,
+		health: NodeHealth,
+	) -> Box<Endpoint> {
+		Box::new(RestApi {
+			fetcher,
+			health,
+		})
+	}
+
+	fn resolve_content(&self, hash: Option<&str>, path: EndpointPath, req: Request) -> Response {
+		trace!(target: "dapps", "Resolving content: {:?} from path: {:?}", hash, path);
+		match hash {
+			Some(hash) if self.fetcher.contains(hash) => {
+				self.fetcher.respond(path, req)
+			},
+			_ => Box::new(future::ok(response::not_found())),
+		}
+	}
+
+	fn health(&self) -> Response {
+		Box::new(self.health.health()
+			.then(|health| {
+				let status = match health {
+					Ok(ref health) => {
+						if [&health.peers.status, &health.sync.status].iter().any(|x| *x != &HealthStatus::Ok) {
+							StatusCode::PreconditionFailed // HTTP 412
+						} else {
+							StatusCode::Ok // HTTP 200
+						}
+					},
+					_ => StatusCode::ServiceUnavailable, // HTTP 503
+				};
+
+				Ok(response::as_json(status, &health).into())
+			})
+		)
 	}
-
-	fn on_request_readable(&mut self, decoder: &mut Decoder<net::HttpStream>) -> Next {
-		self.handler.on_request_readable(decoder)
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		*res.headers_mut() = self.response_headers();
-		self.handler.on_response(res)
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<net::HttpStream>) -> Next {
-		self.handler.on_response_writable(encoder)
-	}
-
 }

dapps/src/api/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,12 +16,8 @@
 
 //! REST API
 
-#![cfg_attr(feature="nightly", feature(custom_derive, custom_attribute, plugin))]
-#![cfg_attr(feature="nightly", plugin(serde_macros, clippy))]
-
 mod api;
 mod response;
 mod types;
 
 pub use self::api::RestApi;
-pub use self::types::App;

dapps/src/api/response.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,25 +16,28 @@
 
 use serde::Serialize;
 use serde_json;
-use endpoint::Handler;
+use hyper::{self, mime, StatusCode};
+
 use handlers::{ContentHandler, EchoHandler};
 
-pub fn empty() -> Box<Handler> {
-	Box::new(ContentHandler::ok("".into(), mime!(Text/Plain)))
+pub fn empty() -> hyper::Response {
+	ContentHandler::ok("".into(), mime::TEXT_PLAIN).into()
 }
 
-pub fn as_json<T: Serialize>(val: &T) -> Box<Handler> {
+pub fn as_json<T: Serialize>(status: StatusCode, val: &T) -> hyper::Response {
 	let json = serde_json::to_string(val)
 		.expect("serialization to string is infallible; qed");
-	Box::new(ContentHandler::ok(json, mime!(Application/Json)))
+	ContentHandler::new(status, json, mime::APPLICATION_JSON).into()
 }
 
-pub fn as_json_error<T: Serialize>(val: &T) -> Box<Handler> {
-	let json = serde_json::to_string(val)
-		.expect("serialization to string is infallible; qed");
-	Box::new(ContentHandler::not_found(json, mime!(Application/Json)))
+pub fn ping(req: hyper::Request) -> hyper::Response {
+	EchoHandler::new(req).into()
 }
 
-pub fn ping() -> Box<Handler> {
-	Box::new(EchoHandler::default())
+pub fn not_found() -> hyper::Response {
+	as_json(StatusCode::NotFound, &::api::types::ApiError {
+		code: "404".into(),
+		title: "Not Found".into(),
+		detail: "Resource you requested has not been found.".into(),
+	})
 }

dapps/src/api/types.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -14,8 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-#[cfg(feature = "serde_macros")]
-include!("types.rs.in");
-
-#[cfg(not(feature = "serde_macros"))]
-include!(concat!(env!("OUT_DIR"), "/types.rs"));
+/// A structure representing any error in REST API.
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct ApiError {
+	/// Error code.
+	pub code: String,
+	/// Human-readable error summary.
+	pub title: String,
+	/// More technical error details.
+	pub detail: String,
+}

dapps/src/apps/app.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -53,12 +53,3 @@ impl Into<EndpointInfo> for App {
 		}
 	}
 }
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct ApiError {
-	pub code: String,
-	pub title: String,
-	pub detail: String,
-}
-

dapps/src/apps/cache.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -19,12 +19,12 @@
 use std::fs;
 
 use linked_hash_map::LinkedHashMap;
-use page::LocalPageEndpoint;
+use page::local;
 use handlers::FetchControl;
 
 pub enum ContentStatus {
 	Fetching(FetchControl),
-	Ready(LocalPageEndpoint),
+	Ready(local::Dapp),
 }
 
 #[derive(Default)]

dapps/src/apps/fetcher/installers.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -18,15 +18,17 @@ use zip;
 use std::{fs, fmt};
 use std::io::{self, Read, Write};
 use std::path::PathBuf;
+use bigint::hash::H256;
 use fetch::{self, Mime};
-use util::H256;
+use futures_cpupool::CpuPool;
+use hash::keccak_buffer;
 
-use util::sha3::sha3;
-use page::{LocalPageEndpoint, PageCache};
-use handlers::{ContentValidator, ValidatorResponse};
 use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest, serialize_manifest, Manifest};
+use handlers::{ContentValidator, ValidatorResponse};
+use page::{local, PageCache};
+use Embeddable;
 
-type OnDone = Box<Fn(Option<LocalPageEndpoint>) + Send>;
+type OnDone = Box<Fn(Option<local::Dapp>) + Send>;
 
 fn write_response_and_check_hash(
 	id: &str,
@@ -56,9 +58,9 @@ fn write_response_and_check_hash(
 	file.flush()?;
 
 	// Validate hash
-	// TODO [ToDr] calculate sha3 in-flight while reading the response
+	// TODO [ToDr] calculate keccak in-flight while reading the response
 	let mut file = io::BufReader::new(fs::File::open(&content_path)?);
-	let hash = sha3(&mut file)?;
+	let hash = keccak_buffer(&mut file)?;
 	if id == hash {
 		Ok((file.into_inner(), content_path))
 	} else {
@@ -74,15 +76,17 @@ pub struct Content {
 	mime: Mime,
 	content_path: PathBuf,
 	on_done: OnDone,
+	pool: CpuPool,
 }
 
 impl Content {
-	pub fn new(id: String, mime: Mime, content_path: PathBuf, on_done: OnDone) -> Self {
+	pub fn new(id: String, mime: Mime, content_path: PathBuf, on_done: OnDone, pool: CpuPool) -> Self {
 		Content {
-			id: id,
-			mime: mime,
-			content_path: content_path,
-			on_done: on_done,
+			id,
+			mime,
+			content_path,
+			on_done,
+			pool,
 		}
 	}
 }
@@ -90,12 +94,15 @@ impl Content {
 impl ContentValidator for Content {
 	type Error = ValidationError;
 
-	fn validate_and_install(&self, response: fetch::Response) -> Result<ValidatorResponse, ValidationError> {
-		let validate = |content_path: PathBuf| {
+	fn validate_and_install(self, response: fetch::Response) -> Result<ValidatorResponse, ValidationError> {
+		let pool = self.pool;
+		let id = self.id.clone();
+		let mime = self.mime;
+		let validate = move |content_path: PathBuf| {
 			// Create dir
-			let (_, content_path) = write_response_and_check_hash(self.id.as_str(), content_path.clone(), self.id.as_str(), response)?;
+			let (_, content_path) = write_response_and_check_hash(&id, content_path, &id, response)?;
 
-			Ok(LocalPageEndpoint::single_file(content_path, self.mime.clone(), PageCache::Enabled))
+			Ok(local::Dapp::single_file(pool, content_path, mime, PageCache::Enabled))
 		};
 
 		// Prepare path for a file
@@ -116,16 +123,18 @@ pub struct Dapp {
 	id: String,
 	dapps_path: PathBuf,
 	on_done: OnDone,
-	embeddable_on: Option<(String, u16)>,
+	embeddable_on: Embeddable,
+	pool: CpuPool,
 }
 
 impl Dapp {
-	pub fn new(id: String, dapps_path: PathBuf, on_done: OnDone, embeddable_on: Option<(String, u16)>) -> Self {
+	pub fn new(id: String, dapps_path: PathBuf, on_done: OnDone, embeddable_on: Embeddable, pool: CpuPool) -> Self {
 		Dapp {
-			id: id,
-			dapps_path: dapps_path,
-			on_done: on_done,
-			embeddable_on: embeddable_on,
+			id,
+			dapps_path,
+			on_done,
+			embeddable_on,
+			pool,
 		}
 	}
 
@@ -157,16 +166,19 @@ impl Dapp {
 impl ContentValidator for Dapp {
 	type Error = ValidationError;
 
-	fn validate_and_install(&self, response: fetch::Response) -> Result<ValidatorResponse, ValidationError> {
-		let validate = |dapp_path: PathBuf| {
-			let (file, zip_path) = write_response_and_check_hash(self.id.as_str(), dapp_path.clone(), &format!("{}.zip", self.id), response)?;
+	fn validate_and_install(self, response: fetch::Response) -> Result<ValidatorResponse, ValidationError> {
+		let id = self.id.clone();
+		let pool = self.pool;
+		let embeddable_on = self.embeddable_on;
+		let validate = move |dapp_path: PathBuf| {
+			let (file, zip_path) = write_response_and_check_hash(&id, dapp_path.clone(), &format!("{}.zip", id), response)?;
 			trace!(target: "dapps", "Opening dapp bundle at {:?}", zip_path);
 			// Unpack archive
 			let mut zip = zip::ZipArchive::new(file)?;
 			// First find manifest file
 			let (mut manifest, manifest_dir) = Self::find_manifest(&mut zip)?;
 			// Overwrite id to match hash
-			manifest.id = self.id.clone();
+			manifest.id = id;
 
 			// Unpack zip
 			for i in 0..zip.len() {
@@ -197,7 +209,7 @@ impl ContentValidator for Dapp {
 			let mut manifest_file = fs::File::create(manifest_path)?;
 			manifest_file.write_all(manifest_str.as_bytes())?;
 			// Create endpoint
-			let endpoint = LocalPageEndpoint::new(dapp_path, manifest.clone().into(), PageCache::Enabled, self.embeddable_on.clone());
+			let endpoint = local::Dapp::new(pool, dapp_path, manifest.into(), PageCache::Enabled, embeddable_on);
 			Ok(endpoint)
 		};
 

dapps/src/apps/fetcher/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -23,81 +23,123 @@ mod installers;
 use std::{fs, env};
 use std::path::PathBuf;
 use std::sync::Arc;
-use rustc_serialize::hex::FromHex;
+use rustc_hex::FromHex;
+use futures::{future, Future};
+use futures_cpupool::CpuPool;
 use fetch::{Client as FetchClient, Fetch};
 use hash_fetch::urlhint::{URLHintContract, URLHint, URLHintResult};
-use parity_reactor::Remote;
 
-use hyper;
-use hyper::status::StatusCode;
+use hyper::StatusCode;
 
-use {SyncStatus, random_filename};
-use util::Mutex;
-use page::LocalPageEndpoint;
+use {Embeddable, SyncStatus, random_filename};
+use parking_lot::Mutex;
+use page::local;
 use handlers::{ContentHandler, ContentFetcherHandler};
-use endpoint::{Endpoint, EndpointPath, Handler};
+use endpoint::{self, Endpoint, EndpointPath};
 use apps::cache::{ContentCache, ContentStatus};
 
 /// Limit of cached dapps/content
 const MAX_CACHED_DAPPS: usize = 20;
 
-pub trait Fetcher: Send + Sync + 'static {
+pub trait Fetcher: Endpoint + 'static {
 	fn contains(&self, content_id: &str) -> bool;
-
-	fn to_async_handler(&self, path: EndpointPath, control: hyper::Control) -> Box<Handler>;
 }
 
-pub struct ContentFetcher<F: Fetch = FetchClient, R: URLHint + Send + Sync + 'static = URLHintContract> {
-	dapps_path: PathBuf,
+pub struct ContentFetcher<F: Fetch = FetchClient, R: URLHint + 'static = URLHintContract> {
+	cache_path: PathBuf,
 	resolver: R,
 	cache: Arc<Mutex<ContentCache>>,
 	sync: Arc<SyncStatus>,
-	embeddable_on: Option<(String, u16)>,
-	remote: Remote,
+	embeddable_on: Embeddable,
 	fetch: F,
+	pool: CpuPool,
+	only_content: bool,
 }
 
-impl<R: URLHint + Send + Sync + 'static, F: Fetch> Drop for ContentFetcher<F, R> {
+impl<R: URLHint + 'static, F: Fetch> Drop for ContentFetcher<F, R> {
 	fn drop(&mut self) {
 		// Clear cache path
-		let _ = fs::remove_dir_all(&self.dapps_path);
+		let _ = fs::remove_dir_all(&self.cache_path);
 	}
 }
 
-impl<R: URLHint + Send + Sync + 'static, F: Fetch> ContentFetcher<F, R> {
-
-	pub fn new(resolver: R, sync_status: Arc<SyncStatus>, embeddable_on: Option<(String, u16)>, remote: Remote, fetch: F) -> Self {
-		let mut dapps_path = env::temp_dir();
-		dapps_path.push(random_filename());
+impl<R: URLHint + 'static, F: Fetch> ContentFetcher<F, R> {
+	pub fn new(
+		resolver: R,
+		sync: Arc<SyncStatus>,
+		fetch: F,
+		pool: CpuPool,
+	) -> Self {
+		let mut cache_path = env::temp_dir();
+		cache_path.push(random_filename());
 
 		ContentFetcher {
-			dapps_path: dapps_path,
-			resolver: resolver,
-			sync: sync_status,
+			cache_path,
+			resolver,
+			sync,
 			cache: Arc::new(Mutex::new(ContentCache::default())),
-			embeddable_on: embeddable_on,
-			remote: remote,
-			fetch: fetch,
+			embeddable_on: None,
+			fetch,
+			pool,
+			only_content: true,
 		}
 	}
 
-	fn still_syncing(address: Option<(String, u16)>) -> Box<Handler> {
-		Box::new(ContentHandler::error(
+	pub fn allow_dapps(mut self, dapps: bool) -> Self {
+		self.only_content = !dapps;
+		self
+	}
+
+	pub fn embeddable_on(mut self, embeddable_on: Embeddable) -> Self {
+		self.embeddable_on = embeddable_on;
+		self
+	}
+
+	fn not_found(embeddable: Embeddable) -> endpoint::Response {
+		Box::new(future::ok(ContentHandler::error(
+			StatusCode::NotFound,
+			"Resource Not Found",
+			"Requested resource was not found.",
+			None,
+			embeddable,
+		).into()))
+	}
+
+	fn still_syncing(embeddable: Embeddable) -> endpoint::Response {
+		Box::new(future::ok(ContentHandler::error(
 			StatusCode::ServiceUnavailable,
 			"Sync In Progress",
 			"Your node is still syncing. We cannot resolve any content before it's fully synced.",
 			Some("<a href=\"javascript:window.location.reload()\">Refresh</a>"),
+			embeddable,
+		).into()))
+	}
+
+	fn dapps_disabled(address: Embeddable) -> endpoint::Response {
+		Box::new(future::ok(ContentHandler::error(
+			StatusCode::ServiceUnavailable,
+			"Network Dapps Not Available",
+			"This interface doesn't support network dapps for security reasons.",
+			None,
 			address,
-		))
+		).into()))
 	}
 
 	#[cfg(test)]
 	fn set_status(&self, content_id: &str, status: ContentStatus) {
 		self.cache.lock().insert(content_id.to_owned(), status);
 	}
+
+	// resolve contract call synchronously.
+	// TODO: port to futures-based hyper and make it all async.
+	fn resolve(&self, content_id: Vec<u8>) -> Option<URLHintResult> {
+		self.resolver.resolve(content_id)
+			.wait()
+			.unwrap_or_else(|e| { warn!("Error resolving content-id: {}", e); None })
+	}
 }
 
-impl<R: URLHint + Send + Sync + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
+impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
 	fn contains(&self, content_id: &str) -> bool {
 		{
 			let mut cache = self.cache.lock();
@@ -108,16 +150,16 @@ impl<R: URLHint + Send + Sync + 'static, F: Fetch> Fetcher for ContentFetcher<F,
 		}
 		// fallback to resolver
 		if let Ok(content_id) = content_id.from_hex() {
-			// else try to resolve the app_id
-			let has_content = self.resolver.resolve(content_id).is_some();
 			// if there is content or we are syncing return true
-			has_content || self.sync.is_major_importing()
+			self.sync.is_major_importing() || self.resolve(content_id).is_some()
 		} else {
 			false
 		}
 	}
+}
 
-	fn to_async_handler(&self, path: EndpointPath, control: hyper::Control) -> Box<Handler> {
+impl<R: URLHint + 'static, F: Fetch> Endpoint for ContentFetcher<F, R> {
+	fn respond(&self, path: EndpointPath, req: endpoint::Request) -> endpoint::Response {
 		let mut cache = self.cache.lock();
 		let content_id = path.app_id.clone();
 
@@ -126,22 +168,22 @@ impl<R: URLHint + Send + Sync + 'static, F: Fetch> Fetcher for ContentFetcher<F,
 			match status {
 				// Just serve the content
 				Some(&mut ContentStatus::Ready(ref endpoint)) => {
-					(None, endpoint.to_async_handler(path, control))
+					(None, endpoint.to_response(&path))
 				},
 				// Content is already being fetched
 				Some(&mut ContentStatus::Fetching(ref fetch_control)) if !fetch_control.is_deadline_reached() => {
 					trace!(target: "dapps", "Content fetching in progress. Waiting...");
-					(None, fetch_control.to_async_handler(path, control))
+					(None, fetch_control.to_response(path))
 				},
 				// We need to start fetching the content
 				_ => {
 					trace!(target: "dapps", "Content unavailable. Fetching... {:?}", content_id);
 					let content_hex = content_id.from_hex().expect("to_handler is called only when `contains` returns true.");
-					let content = self.resolver.resolve(content_hex);
+					let content = self.resolve(content_hex);
 
 					let cache = self.cache.clone();
 					let id = content_id.clone();
-					let on_done = move |result: Option<LocalPageEndpoint>| {
+					let on_done = move |result: Option<local::Dapp>| {
 						let mut cache = cache.lock();
 						match result {
 							Some(endpoint) => cache.insert(id.clone(), ContentStatus::Ready(endpoint)),
@@ -155,41 +197,44 @@ impl<R: URLHint + Send + Sync + 'static, F: Fetch> Fetcher for ContentFetcher<F,
 						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(),
+								req.method(),
+								&dapp.url(),
 								path,
-								control,
 								installers::Dapp::new(
 									content_id.clone(),
-									self.dapps_path.clone(),
+									self.cache_path.clone(),
 									Box::new(on_done),
 									self.embeddable_on.clone(),
+									self.pool.clone(),
 								),
 								self.embeddable_on.clone(),
-								self.remote.clone(),
 								self.fetch.clone(),
 							);
 
-							(Some(ContentStatus::Fetching(handler.fetch_control())), Box::new(handler) as Box<Handler>)
+							(Some(ContentStatus::Fetching(handler.fetch_control())), Box::new(handler) as endpoint::Response)
 						},
 						Some(URLHintResult::Content(content)) => {
 							let handler = ContentFetcherHandler::new(
-								content.url,
+								req.method(),
+								&content.url,
 								path,
-								control,
 								installers::Content::new(
 									content_id.clone(),
 									content.mime,
-									self.dapps_path.clone(),
+									self.cache_path.clone(),
 									Box::new(on_done),
+									self.pool.clone(),
 								),
 								self.embeddable_on.clone(),
-								self.remote.clone(),
 								self.fetch.clone(),
 							);
 
-							(Some(ContentStatus::Fetching(handler.fetch_control())), Box::new(handler) as Box<Handler>)
+							(Some(ContentStatus::Fetching(handler.fetch_control())), Box::new(handler) as endpoint::Response)
 						},
 						None if self.sync.is_major_importing() => {
 							(None, Self::still_syncing(self.embeddable_on.clone()))
@@ -197,13 +242,7 @@ impl<R: URLHint + Send + Sync + 'static, F: Fetch> Fetcher for ContentFetcher<F,
 						None => {
 							// This may happen when sync status changes in between
 							// `contains` and `to_handler`
-							(None, Box::new(ContentHandler::error(
-								StatusCode::NotFound,
-								"Resource Not Found",
-								"Requested resource was not found.",
-								None,
-								self.embeddable_on.clone(),
-							)) as Box<Handler>)
+							(None, Self::not_found(self.embeddable_on.clone()))
 						},
 					}
 				},
@@ -223,29 +262,45 @@ impl<R: URLHint + Send + Sync + 'static, F: Fetch> Fetcher for ContentFetcher<F,
 mod tests {
 	use std::env;
 	use std::sync::Arc;
-	use util::Bytes;
+	use bytes::Bytes;
 	use fetch::{Fetch, Client};
-	use hash_fetch::urlhint::{URLHint, URLHintResult};
-	use parity_reactor::Remote;
+	use futures::future;
+	use hash_fetch::urlhint::{URLHint, URLHintResult, BoxFuture};
 
 	use apps::cache::ContentStatus;
 	use endpoint::EndpointInfo;
-	use page::LocalPageEndpoint;
+	use page::local;
 	use super::{ContentFetcher, Fetcher};
+	use {SyncStatus};
 
+	#[derive(Clone)]
 	struct FakeResolver;
 	impl URLHint for FakeResolver {
-		fn resolve(&self, _id: Bytes) -> Option<URLHintResult> {
-			None
+		fn resolve(&self, _id: Bytes) -> BoxFuture<Option<URLHintResult>, String> {
+			Box::new(future::ok(None))
 		}
 	}
 
+	#[derive(Debug)]
+	struct FakeSync(bool);
+	impl SyncStatus for FakeSync {
+		fn is_major_importing(&self) -> bool { self.0 }
+		fn peers(&self) -> (usize, usize) { (0, 5) }
+	}
+
 	#[test]
 	fn should_true_if_contains_the_app() {
 		// given
+		let pool = ::futures_cpupool::CpuPool::new(1);
 		let path = env::temp_dir();
-		let fetcher = ContentFetcher::new(FakeResolver, Arc::new(|| false), None, Remote::new_sync(), Client::new().unwrap());
-		let handler = LocalPageEndpoint::new(path, EndpointInfo {
+		let fetcher = ContentFetcher::new(
+			FakeResolver,
+			Arc::new(FakeSync(false)),
+			Client::new().unwrap(),
+			pool.clone(),
+		).allow_dapps(true);
+
+		let handler = local::Dapp::new(pool, path, EndpointInfo {
 			name: "fake".into(),
 			description: "".into(),
 			version: "".into(),

dapps/src/apps/fs.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -14,13 +14,17 @@
 // 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::{Endpoints, EndpointInfo};
+use futures_cpupool::CpuPool;
+
 use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest};
+use endpoint::{Endpoint, EndpointInfo};
+use page::{local, PageCache};
+use Embeddable;
 
 struct LocalDapp {
 	id: String,
@@ -59,14 +63,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, signer_address: Option<(String, u16)>) -> Option<(String, Box<LocalPageEndpoint>)> {
+pub fn local_endpoint<P: AsRef<Path>>(path: P, embeddable: Embeddable, pool: CpuPool) -> Option<(String, Box<local::Dapp>)> {
 	let path = path.as_ref().to_owned();
 	path.canonicalize().ok().and_then(|path| {
 		let name = path.file_name().and_then(|name| name.to_str());
 		name.map(|name| {
 			let dapp = local_dapp(name.into(), path.clone());
-			(dapp.id, Box::new(LocalPageEndpoint::new(
-				dapp.path, dapp.info, PageCache::Disabled, signer_address.clone())
+			(dapp.id, Box::new(local::Dapp::new(
+				pool.clone(), dapp.path, dapp.info, PageCache::Disabled, embeddable.clone())
 			))
 		})
 	})
@@ -84,13 +88,13 @@ 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, signer_address: Option<(String, u16)>) -> Endpoints {
-	let mut pages = Endpoints::new();
+/// Scans the directory and collects `local::Dapp`.
+pub fn local_endpoints<P: AsRef<Path>>(dapps_path: P, embeddable: Embeddable, pool: CpuPool) -> BTreeMap<String, Box<Endpoint>> {
+	let mut pages = BTreeMap::<String, Box<Endpoint>>::new();
 	for dapp in local_dapps(dapps_path.as_ref()) {
 		pages.insert(
 			dapp.id,
-			Box::new(LocalPageEndpoint::new(dapp.path, dapp.info, PageCache::Disabled, signer_address.clone()))
+			Box::new(local::Dapp::new(pool.clone(), dapp.path, dapp.info, PageCache::Disabled, embeddable.clone()))
 		);
 	}
 	pages

dapps/src/apps/manifest.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use serde_json;
-pub use api::App as Manifest;
+pub use apps::App as Manifest;
 
 pub const MANIFEST_FILENAME: &'static str = "manifest.json";
 

dapps/src/apps/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,45 +16,59 @@
 
 use std::path::PathBuf;
 use std::sync::Arc;
+
 use endpoint::{Endpoints, Endpoint};
-use page::PageEndpoint;
+use futures_cpupool::CpuPool;
+use page;
 use proxypac::ProxyPac;
 use web::Web;
 use fetch::Fetch;
 use parity_dapps::WebApp;
-use parity_reactor::Remote;
-use {WebProxyTokens};
+use parity_ui;
+use {WebProxyTokens, ParentFrameSettings};
 
+mod app;
 mod cache;
-mod fs;
+mod ui;
+pub mod fs;
 pub mod fetcher;
 pub mod manifest;
 
-extern crate parity_ui;
+pub use self::app::App;
 
 pub const HOME_PAGE: &'static str = "home";
-pub const DAPPS_DOMAIN: &'static str = ".parity";
 pub const RPC_PATH: &'static str =  "rpc";
 pub const API_PATH: &'static str =  "api";
 pub const UTILS_PATH: &'static str =  "parity-utils";
 pub const WEB_PATH: &'static str = "web";
+pub const URL_REFERER: &'static str = "__referer=";
 
-pub fn utils() -> Box<Endpoint> {
-	Box::new(PageEndpoint::with_prefix(parity_ui::App::default(), UTILS_PATH.to_owned()))
+pub fn utils(pool: CpuPool) -> Box<Endpoint> {
+	Box::new(page::builtin::Dapp::new(pool, parity_ui::App::default()))
+}
+
+pub fn ui(pool: CpuPool) -> Box<Endpoint> {
+	Box::new(page::builtin::Dapp::with_fallback_to_index(pool, parity_ui::App::default()))
+}
+
+pub fn ui_redirection(embeddable: Option<ParentFrameSettings>) -> Box<Endpoint> {
+	Box::new(ui::Redirection::new(embeddable))
 }
 
 pub fn all_endpoints<F: Fetch>(
 	dapps_path: PathBuf,
 	extra_dapps: Vec<PathBuf>,
-	signer_address: Option<(String, u16)>,
+	dapps_domain: &str,
+	embeddable: Option<ParentFrameSettings>,
 	web_proxy_tokens: Arc<WebProxyTokens>,
-	remote: Remote,
 	fetch: F,
-) -> Endpoints {
+	pool: CpuPool,
+) -> (Vec<String>, Endpoints) {
 	// fetch fs dapps at first to avoid overwriting builtins
-	let mut pages = fs::local_endpoints(dapps_path, signer_address.clone());
+	let mut pages = fs::local_endpoints(dapps_path.clone(), embeddable.clone(), pool.clone());
+	let local_endpoints: Vec<String> = pages.keys().cloned().collect();
 	for path in extra_dapps {
-		if let Some((id, endpoint)) = fs::local_endpoint(path.clone(), signer_address.clone()) {
+		if let Some((id, endpoint)) = fs::local_endpoint(path.clone(), embeddable.clone(), pool.clone()) {
 			pages.insert(id, endpoint);
 		} else {
 			warn!(target: "dapps", "Ignoring invalid dapp at {}", path.display());
@@ -62,22 +76,22 @@ pub fn all_endpoints<F: Fetch>(
 	}
 
 	// NOTE [ToDr] Dapps will be currently embeded on 8180
-	insert::<parity_ui::App>(&mut pages, "ui", Embeddable::Yes(signer_address.clone()));
-	pages.insert("proxy".into(), ProxyPac::boxed(signer_address.clone()));
-	pages.insert(WEB_PATH.into(), Web::boxed(signer_address.clone(), web_proxy_tokens.clone(), remote.clone(), fetch.clone()));
+	insert::<parity_ui::App>(&mut pages, "ui", Embeddable::Yes(embeddable.clone()), pool.clone());
+	pages.insert("proxy".into(), ProxyPac::boxed(embeddable.clone(), dapps_domain.to_owned()));
+	pages.insert(WEB_PATH.into(), Web::boxed(embeddable.clone(), web_proxy_tokens.clone(), fetch.clone()));
 
-	pages
+	(local_endpoints, pages)
 }
 
-fn insert<T : WebApp + Default + 'static>(pages: &mut Endpoints, id: &str, embed_at: Embeddable) {
+fn insert<T : WebApp + Default + 'static>(pages: &mut Endpoints, id: &str, embed_at: Embeddable, pool: CpuPool) {
 	pages.insert(id.to_owned(), Box::new(match embed_at {
-		Embeddable::Yes(address) => PageEndpoint::new_safe_to_embed(T::default(), address),
-		Embeddable::No => PageEndpoint::new(T::default()),
+		Embeddable::Yes(address) => page::builtin::Dapp::new_safe_to_embed(pool, T::default(), address),
+		Embeddable::No => page::builtin::Dapp::new(pool, T::default()),
 	}));
 }
 
 enum Embeddable {
-	Yes(Option<(String, u16)>),
+	Yes(Option<ParentFrameSettings>),
 	#[allow(dead_code)]
 	No,
 }

dapps/src/apps/ui.rs

@@ -0,0 +1,57 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! UI redirections
+
+use hyper::StatusCode;
+use futures::future;
+
+use endpoint::{Endpoint, Request, Response, EndpointPath};
+use {handlers, Embeddable};
+
+/// Redirection to UI server.
+pub struct Redirection {
+	embeddable_on: Embeddable,
+}
+
+impl Redirection {
+	pub fn new(
+		embeddable_on: Embeddable,
+	) -> Self {
+		Redirection {
+			embeddable_on,
+		}
+	}
+}
+
+impl Endpoint for Redirection {
+	fn respond(&self, _path: EndpointPath, req: Request) -> Response {
+		Box::new(future::ok(if let Some(ref frame) = self.embeddable_on {
+			trace!(target: "dapps", "Redirecting to signer interface.");
+			let protocol = req.uri().scheme().unwrap_or("http");
+			handlers::Redirection::new(format!("{}://{}:{}", protocol, &frame.host, frame.port)).into()
+		} else {
+			trace!(target: "dapps", "Signer disabled, returning 404.");
+			handlers::ContentHandler::error(
+				StatusCode::NotFound,
+				"404 Not Found",
+				"Your homepage is not available when Trusted Signer is disabled.",
+				Some("You can still access dapps by writing a correct address, though. Re-enable Signer to get your homepage back."),
+				None,
+			).into()
+		}))
+	}
+}

dapps/src/endpoint.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,17 +16,27 @@
 
 //! URL Endpoint traits
 
-use hyper::{self, server, net};
 use std::collections::BTreeMap;
 
+use jsonrpc_core::BoxFuture;
+use hyper;
+
 #[derive(Debug, PartialEq, Default, Clone)]
 pub struct EndpointPath {
 	pub app_id: String,
+	pub app_params: Vec<String>,
+	pub query: Option<String>,
 	pub host: String,
 	pub port: u16,
 	pub using_dapps_domains: bool,
 }
 
+impl EndpointPath {
+	pub fn has_no_params(&self) -> bool {
+		self.app_params.is_empty() || self.app_params.iter().all(|x| x.is_empty())
+	}
+}
+
 #[derive(Debug, PartialEq, Clone)]
 pub struct EndpointInfo {
 	pub name: String,
@@ -37,16 +47,11 @@ pub struct EndpointInfo {
 }
 
 pub type Endpoints = BTreeMap<String, Box<Endpoint>>;
-pub type Handler = server::Handler<net::HttpStream> + Send;
+pub type Response = BoxFuture<hyper::Response, hyper::Error>;
+pub type Request = hyper::Request;
 
 pub trait Endpoint : Send + Sync {
 	fn info(&self) -> Option<&EndpointInfo> { None }
 
-	fn to_handler(&self, _path: EndpointPath) -> Box<Handler> {
-		panic!("This Endpoint is asynchronous and requires Control object.");
-	}
-
-	fn to_async_handler(&self, path: EndpointPath, _control: hyper::Control) -> Box<Handler> {
-		self.to_handler(path)
-	}
+	fn respond(&self, path: EndpointPath, req: Request) -> Response;
 }

dapps/src/handlers/auth.rs

@@ -1,44 +0,0 @@
-// Copyright 2015, 2016 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()
-	}
-}
-

dapps/src/handlers/content.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,38 +16,38 @@
 
 //! Simple Content Handler
 
-use hyper::{header, server, Decoder, Encoder, Next};
-use hyper::net::HttpStream;
-use hyper::mime::Mime;
-use hyper::status::StatusCode;
+use hyper::{self, mime, header};
+use hyper::StatusCode;
 
-use util::version;
+use parity_version::version;
 
 use handlers::add_security_headers;
+use Embeddable;
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct ContentHandler {
 	code: StatusCode,
 	content: String,
-	mimetype: Mime,
-	write_pos: usize,
-	safe_to_embed_on: Option<(String, u16)>,
+	mimetype: mime::Mime,
+	safe_to_embed_on: Embeddable,
 }
 
 impl ContentHandler {
-	pub fn ok(content: String, mimetype: Mime) -> Self {
+	pub fn ok(content: String, mimetype: mime::Mime) -> Self {
 		Self::new(StatusCode::Ok, content, mimetype)
 	}
 
-	pub fn not_found(content: String, mimetype: Mime) -> Self {
-		Self::new(StatusCode::NotFound, content, mimetype)
+	pub fn html(code: StatusCode, content: String, embeddable_on: Embeddable) -> Self {
+		Self::new_embeddable(code, content, mime::TEXT_HTML, embeddable_on)
 	}
 
-	pub fn 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: Option<(String, u16)>) -> Self {
+	pub fn error(
+		code: StatusCode,
+		title: &str,
+		message: &str,
+		details: Option<&str>,
+		embeddable_on: Embeddable,
+	) -> Self {
 		Self::html(code, format!(
 			include_str!("../error_tpl.html"),
 			title=title,
@@ -57,52 +57,32 @@ impl ContentHandler {
 		), embeddable_on)
 	}
 
-	pub fn new(code: StatusCode, content: String, mimetype: Mime) -> Self {
+	pub fn new(code: StatusCode, content: String, mimetype: mime::Mime) -> Self {
 		Self::new_embeddable(code, content, mimetype, None)
 	}
 
-	pub fn new_embeddable(code: StatusCode, content: String, mimetype: Mime, embeddable_on: Option<(String, u16)>) -> Self {
+	pub fn new_embeddable(
+		code: StatusCode,
+		content: String,
+		mimetype: mime::Mime,
+		safe_to_embed_on: Embeddable,
+	) -> Self {
 		ContentHandler {
-			code: code,
-			content: content,
-			mimetype: mimetype,
-			write_pos: 0,
-			safe_to_embed_on: embeddable_on,
+			code,
+			content,
+			mimetype,
+			safe_to_embed_on,
 		}
 	}
 }
 
-impl server::Handler<HttpStream> for ContentHandler {
-	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(self.code);
-		res.headers_mut().set(header::ContentType(self.mimetype.clone()));
-		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on.clone());
-		Next::write()
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		let bytes = self.content.as_bytes();
-		if self.write_pos == bytes.len() {
-			return Next::end();
-		}
-
-		match encoder.write(&bytes[self.write_pos..]) {
-			Ok(bytes) => {
-				self.write_pos += bytes;
-				Next::write()
-			},
-			Err(e) => match e.kind() {
-				::std::io::ErrorKind::WouldBlock => Next::write(),
-				_ => Next::end()
-			},
-		}
+impl Into<hyper::Response> for ContentHandler {
+	fn into(self) -> hyper::Response {
+		let mut res = hyper::Response::new()
+			.with_status(self.code)
+			.with_header(header::ContentType(self.mimetype))
+			.with_body(self.content);
+		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on);
+		res
 	}
 }

dapps/src/handlers/echo.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,45 +16,31 @@
 
 //! Echo Handler
 
-use std::io::Read;
-use hyper::{server, Decoder, Encoder, Next};
-use hyper::net::HttpStream;
-use super::ContentHandler;
+use hyper::{self, header};
 
-#[derive(Default)]
+use handlers::add_security_headers;
+
+#[derive(Debug)]
 pub struct EchoHandler {
-	content: String,
-	handler: Option<ContentHandler>,
+	request: hyper::Request,
 }
 
-impl server::Handler<HttpStream> for EchoHandler {
-	fn on_request(&mut self, _: server::Request<HttpStream>) -> Next {
-		Next::read()
-	}
-
-	fn on_request_readable(&mut self, decoder: &mut Decoder<HttpStream>) -> Next {
-		match decoder.read_to_string(&mut self.content) {
-			Ok(0) => {
-				self.handler = Some(ContentHandler::ok(self.content.clone(), mime!(Application/Json)));
-				Next::write()
-			},
-			Ok(_) => Next::read(),
-			Err(e) => match e.kind() {
-				::std::io::ErrorKind::WouldBlock => Next::read(),
-				_ => Next::end(),
-			}
+impl EchoHandler {
+	pub fn new(request: hyper::Request) -> Self {
+		EchoHandler {
+			request,
 		}
 	}
+}
 
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		self.handler.as_mut()
-			.expect("handler always set in on_request, which is before now; qed")
-			.on_response(res)
-	}
+impl Into<hyper::Response> for EchoHandler {
+	fn into(self) -> hyper::Response {
+		let content_type = self.request.headers().get().cloned();
+		let mut res = hyper::Response::new()
+			.with_header(content_type.unwrap_or(header::ContentType::json()))
+			.with_body(self.request.body());
 
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		self.handler.as_mut()
-			.expect("handler always set in on_request, which is before now; qed")
-			.on_response_writable(encoder)
+		add_security_headers(res.headers_mut(), None);
+		res
 	}
 }

dapps/src/handlers/fetch.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,56 +16,39 @@
 
 //! Hyper Server Handler that fetches a file during a request (proxy).
 
-use std::fmt;
-use std::sync::{mpsc, Arc};
+use std::{fmt, mem};
+use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::{Instant, Duration};
 use fetch::{self, Fetch};
-use futures::Future;
-use parity_reactor::Remote;
-use util::Mutex;
+use futures::sync::oneshot;
+use futures::{self, Future};
+use hyper::{self, Method, StatusCode};
+use jsonrpc_core::BoxFuture;
+use parking_lot::Mutex;
 
-use hyper::{server, Decoder, Encoder, Next, Method, Control};
-use hyper::net::HttpStream;
-use hyper::uri::RequestUri;
-use hyper::status::StatusCode;
-
-use endpoint::EndpointPath;
+use endpoint::{self, EndpointPath};
 use handlers::{ContentHandler, StreamingHandler};
-use page::{LocalPageEndpoint, PageHandlerWaiting};
+use page::local;
+use {Embeddable};
 
-const FETCH_TIMEOUT: u64 = 30;
+const FETCH_TIMEOUT: u64 = 300;
 
 pub enum ValidatorResponse {
-	Local(LocalPageEndpoint),
+	Local(local::Dapp),
 	Streaming(StreamingHandler<fetch::Response>),
 }
 
-pub trait ContentValidator: Send + 'static {
+pub trait ContentValidator: Sized + Send + 'static {
 	type Error: fmt::Debug + fmt::Display;
 
-	fn validate_and_install(&self, fetch::Response) -> Result<ValidatorResponse, Self::Error>;
+	fn validate_and_install(self, fetch::Response) -> Result<ValidatorResponse, Self::Error>;
 }
 
-enum FetchState {
-	Waiting,
-	NotStarted(String),
-	Error(ContentHandler),
-	InProgress(mpsc::Receiver<FetchState>),
-	Streaming(StreamingHandler<fetch::Response>),
-	Done(LocalPageEndpoint, Box<PageHandlerWaiting>),
-}
-
-enum WaitResult {
-	Error(ContentHandler),
-	Done(LocalPageEndpoint),
-	NonAwaitable,
-}
-
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct FetchControl {
 	abort: Arc<AtomicBool>,
-	listeners: Arc<Mutex<Vec<(Control, mpsc::Sender<WaitResult>)>>>,
+	listeners: Arc<Mutex<Vec<oneshot::Sender<WaitResult>>>>,
 	deadline: Instant,
 }
 
@@ -80,14 +63,30 @@ impl Default for FetchControl {
 }
 
 impl FetchControl {
+	pub fn is_deadline_reached(&self) -> bool {
+		self.deadline < Instant::now()
+	}
+
+	pub fn abort(&self) {
+		self.abort.store(true, Ordering::SeqCst);
+	}
+
+	pub fn to_response(&self, path: EndpointPath) -> endpoint::Response {
+		let (tx, receiver) = oneshot::channel();
+		self.listeners.lock().push(tx);
+
+		Box::new(WaitingHandler {
+			path,
+			state: WaitState::Waiting(receiver),
+		})
+	}
+
 	fn notify<F: Fn() -> WaitResult>(&self, status: F) {
 		let mut listeners = self.listeners.lock();
-		for (control, sender) in listeners.drain(..) {
+		for sender in listeners.drain(..) {
 			trace!(target: "dapps", "Resuming request waiting for content...");
-			if let Err(e) = sender.send(status()) {
-				trace!(target: "dapps", "Waiting listener notification failed: {:?}", e);
-			} else {
-				let _ = control.ready(Next::read());
+			if let Err(_) = sender.send(status()) {
+				trace!(target: "dapps", "Waiting listener notification failed.");
 			}
 		}
 	}
@@ -97,92 +96,79 @@ impl FetchControl {
 			FetchState::Error(ref handler) => self.notify(|| WaitResult::Error(handler.clone())),
 			FetchState::Done(ref endpoint, _) => self.notify(|| WaitResult::Done(endpoint.clone())),
 			FetchState::Streaming(_) => self.notify(|| WaitResult::NonAwaitable),
-			FetchState::NotStarted(_) | FetchState::InProgress(_) | FetchState::Waiting => {},
+			FetchState::InProgress(_) => {},
+			FetchState::Empty => {},
 		}
 	}
+}
 
-	pub fn is_deadline_reached(&self) -> bool {
-		self.deadline < Instant::now()
-	}
 
-	pub fn abort(&self) {
-		self.abort.store(true, Ordering::SeqCst);
-	}
+enum WaitState {
+	Waiting(oneshot::Receiver<WaitResult>),
+	Done(endpoint::Response),
+}
 
-	pub fn to_async_handler(&self, path: EndpointPath, control: Control) -> Box<server::Handler<HttpStream> + Send> {
-		let (tx, rx) = mpsc::channel();
-		self.listeners.lock().push((control, tx));
-
-		Box::new(WaitingHandler {
-			receiver: rx,
-			state: FetchState::Waiting,
-			uri: RequestUri::default(),
-			path: path,
-		})
-	}
+#[derive(Debug)]
+enum WaitResult {
+	Error(ContentHandler),
+	Done(local::Dapp),
+	NonAwaitable,
 }
 
 pub struct WaitingHandler {
-	receiver: mpsc::Receiver<WaitResult>,
-	state: FetchState,
-	uri: RequestUri,
 	path: EndpointPath,
+	state: WaitState,
 }
 
-impl server::Handler<HttpStream> for WaitingHandler {
-	fn on_request(&mut self, request: server::Request<HttpStream>) -> Next {
-		self.uri = request.uri().clone();
-		Next::wait()
-	}
+impl Future for WaitingHandler {
+	type Item = hyper::Response;
+	type Error = hyper::Error;
 
-	fn on_request_readable(&mut self, decoder: &mut Decoder<HttpStream>) -> Next {
-		let result = self.receiver.try_recv().ok();
-		self.state = match result {
-			Some(WaitResult::Error(handler)) => FetchState::Error(handler),
-			Some(WaitResult::Done(endpoint)) => {
-				let mut page_handler = endpoint.to_page_handler(self.path.clone());
-				page_handler.set_uri(&self.uri);
-				FetchState::Done(endpoint, page_handler)
-			},
-			_ => {
-				warn!("A result for waiting request was not received.");
-				FetchState::Waiting
-			},
-		};
+	fn poll(&mut self) -> futures::Poll<Self::Item, Self::Error> {
+		loop {
+			let new_state = match self.state {
+				WaitState::Waiting(ref mut receiver) => {
+					let result = try_ready!(receiver.poll().map_err(|_| hyper::Error::Timeout));
 
-		match self.state {
-			FetchState::Done(_, ref mut handler) => handler.on_request_readable(decoder),
-			FetchState::Streaming(ref mut handler) => handler.on_request_readable(decoder),
-			FetchState::Error(ref mut handler) => handler.on_request_readable(decoder),
-			_ => Next::write(),
-		}
-	}
+					match result {
+						WaitResult::Error(handler) => {
+							return Ok(futures::Async::Ready(handler.into()));
+						},
+						WaitResult::NonAwaitable => {
+							let errors = Errors { embeddable_on: None };
+							return Ok(futures::Async::Ready(errors.streaming().into()));
+						},
+						WaitResult::Done(endpoint) => {
+							WaitState::Done(endpoint.to_response(&self.path).into())
+						},
+					}
+				},
+				WaitState::Done(ref mut response) => {
+					return response.poll()
+				},
+			};
 
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		match self.state {
-			FetchState::Done(_, ref mut handler) => handler.on_response(res),
-			FetchState::Streaming(ref mut handler) => handler.on_response(res),
-			FetchState::Error(ref mut handler) => handler.on_response(res),
-			_ => Next::end(),
-		}
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		match self.state {
-			FetchState::Done(_, ref mut handler) => handler.on_response_writable(encoder),
-			FetchState::Streaming(ref mut handler) => handler.on_response_writable(encoder),
-			FetchState::Error(ref mut handler) => handler.on_response_writable(encoder),
-			_ => Next::end(),
+			self.state = new_state;
 		}
 	}
 }
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 struct Errors {
-	embeddable_on: Option<(String, u16)>,
+	embeddable_on: Embeddable,
 }
 
 impl Errors {
+	fn streaming(&self) -> ContentHandler {
+		ContentHandler::error(
+			StatusCode::BadGateway,
+			"Streaming Error",
+			"This content is being streamed in other place.",
+			None,
+			self.embeddable_on.clone(),
+		)
+	}
+
 	fn download_error<E: fmt::Debug>(&self, e: E) -> ContentHandler {
 		ContentHandler::error(
 			StatusCode::BadGateway,
@@ -224,67 +210,102 @@ impl Errors {
 	}
 }
 
-pub struct ContentFetcherHandler<H: ContentValidator, F: Fetch> {
+enum FetchState {
+	Error(ContentHandler),
+	InProgress(BoxFuture<FetchState, ()>),
+	Streaming(hyper::Response),
+	Done(local::Dapp, endpoint::Response),
+	Empty,
+}
+
+impl fmt::Debug for FetchState {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		use self::FetchState::*;
+
+		write!(fmt, "FetchState(")?;
+		match *self {
+			Error(ref error) => write!(fmt, "error: {:?}", error),
+			InProgress(_) => write!(fmt, "in progress"),
+			Streaming(ref res) => write!(fmt, "streaming: {:?}", res),
+			Done(ref endpoint, _) => write!(fmt, "done: {:?}", endpoint),
+			Empty => write!(fmt, "?"),
+		}?;
+		write!(fmt, ")")
+	}
+}
+
+#[derive(Debug)]
+pub struct ContentFetcherHandler {
 	fetch_control: FetchControl,
-	control: Control,
-	remote: Remote,
 	status: FetchState,
-	fetch: F,
-	installer: Option<H>,
-	path: EndpointPath,
 	errors: Errors,
 }
 
-impl<H: ContentValidator, F: Fetch> ContentFetcherHandler<H, F> {
-	pub fn new(
-		url: String,
-		path: EndpointPath,
-		control: Control,
-		installer: H,
-		embeddable_on: Option<(String, u16)>,
-		remote: Remote,
-		fetch: F,
-	) -> Self {
-		ContentFetcherHandler {
-			fetch_control: FetchControl::default(),
-			control: control,
-			remote: remote,
-			fetch: fetch,
-			status: FetchState::NotStarted(url),
-			installer: Some(installer),
-			path: path,
-			errors: Errors {
-				embeddable_on: embeddable_on,
-			},
-		}
-	}
-
+impl ContentFetcherHandler {
 	pub fn fetch_control(&self) -> FetchControl {
 		self.fetch_control.clone()
 	}
 
-	fn fetch_content(&self, uri: RequestUri, url: &str, installer: H) -> mpsc::Receiver<FetchState> {
-		let (tx, rx) = mpsc::channel();
-		let abort = self.fetch_control.abort.clone();
+	pub fn new<H: ContentValidator, F: Fetch>(
+		method: &hyper::Method,
+		url: &str,
+		path: EndpointPath,
+		installer: H,
+		embeddable_on: Embeddable,
+		fetch: F,
+	) -> Self {
+		let fetch_control = FetchControl::default();
+		let errors = Errors { embeddable_on };
 
-		let path = self.path.clone();
-		let tx2 = tx.clone();
-		let control = self.control.clone();
-		let errors = self.errors.clone();
+		// Validation of method
+		let status = match *method {
+			// Start fetching content
+			Method::Get => {
+				trace!(target: "dapps", "Fetching content from: {:?}", url);
+				FetchState::InProgress(Self::fetch_content(
+						fetch,
+						url,
+						fetch_control.abort.clone(),
+						path,
+						errors.clone(),
+						installer,
+				))
+			},
+			// or return error
+			_ => FetchState::Error(errors.method_not_allowed()),
+		};
 
-		let future = self.fetch.fetch_with_abort(url, abort.into()).then(move |result| {
+		ContentFetcherHandler {
+			fetch_control,
+			status,
+			errors,
+		}
+	}
+
+	fn fetch_content<H: ContentValidator, F: Fetch>(
+		fetch: F,
+		url: &str,
+		abort: Arc<AtomicBool>,
+		path: EndpointPath,
+		errors: Errors,
+		installer: H,
+	) -> BoxFuture<FetchState, ()> {
+		// Start fetching the content
+		let fetch2 = fetch.clone();
+		let future = fetch.fetch_with_abort(url, abort.into()).then(move |result| {
 			trace!(target: "dapps", "Fetching content finished. Starting validation: {:?}", result);
-			let new_state = match result {
+			Ok(match result {
 				Ok(response) => match installer.validate_and_install(response) {
 					Ok(ValidatorResponse::Local(endpoint)) => {
 						trace!(target: "dapps", "Validation OK. Returning response.");
-						let mut handler = endpoint.to_page_handler(path);
-						handler.set_uri(&uri);
-						FetchState::Done(endpoint, handler)
+						let response = endpoint.to_response(&path);
+						FetchState::Done(endpoint, response)
 					},
-					Ok(ValidatorResponse::Streaming(handler)) => {
+					Ok(ValidatorResponse::Streaming(stream)) => {
 						trace!(target: "dapps", "Validation OK. Streaming response.");
-						FetchState::Streaming(handler)
+						let (reading, response) = stream.into_response();
+						fetch2.process_and_forget(reading);
+						FetchState::Streaming(response)
 					},
 					Err(e) => {
 						trace!(target: "dapps", "Error while validating content: {:?}", e);
@@ -295,100 +316,55 @@ impl<H: ContentValidator, F: Fetch> ContentFetcherHandler<H, F> {
 					warn!(target: "dapps", "Unable to fetch content: {:?}", e);
 					FetchState::Error(errors.download_error(e))
 				},
-			};
-			// Content may be resolved when the connection is already dropped.
-			let _ = tx2.send(new_state);
-			// Ignoring control errors
-			let _ = control.ready(Next::read());
-			Ok(()) as Result<(), ()>
+			})
 		});
 
 		// make sure to run within fetch thread pool.
-		let future = self.fetch.process(future);
-		// spawn to event loop
-		let control = self.control.clone();
-		let errors = self.errors.clone();
-		self.remote.spawn_with_timeout(|| future, Duration::from_secs(FETCH_TIMEOUT), move || {
-			// Notify about the timeout
-			let _ = tx.send(FetchState::Error(errors.timeout_error()));
-			// Ignoring control errors
-			let _ = control.ready(Next::read());
-		});
-
-		rx
+		fetch.process(future)
 	}
 }
 
-impl<H: ContentValidator, F: Fetch> server::Handler<HttpStream> for ContentFetcherHandler<H, F> {
-	fn on_request(&mut self, request: server::Request<HttpStream>) -> Next {
-		let status = if let FetchState::NotStarted(ref url) = self.status {
-			let uri = request.uri().clone();
-			let installer = self.installer.take().expect("Installer always set initialy; installer used only in on_request; on_request invoked only once; qed");
+impl Future for ContentFetcherHandler {
+	type Item = hyper::Response;
+	type Error = hyper::Error;
 
-			Some(match *request.method() {
-				// Start fetching content
-				Method::Get => {
-					trace!(target: "dapps", "Fetching content from: {:?}", url);
-					let receiver = self.fetch_content(uri, url, installer);
-					FetchState::InProgress(receiver)
+	fn poll(&mut self) -> futures::Poll<Self::Item, Self::Error> {
+		loop {
+			trace!(target: "dapps", "Polling status: {:?}", self.status);
+			self.status = match mem::replace(&mut self.status, FetchState::Empty) {
+				FetchState::Error(error) => {
+					return Ok(futures::Async::Ready(error.into()));
 				},
-				// or return error
-				_ => FetchState::Error(self.errors.method_not_allowed()),
-			})
-		} else { None };
+				FetchState::Streaming(response) => {
+					return Ok(futures::Async::Ready(response));
+				},
+				any => any,
+			};
 
-		if let Some(status) = status {
+			let status = match self.status {
+				// Request may time out
+				FetchState::InProgress(_) if self.fetch_control.is_deadline_reached() => {
+					trace!(target: "dapps", "Fetching dapp failed because of timeout.");
+					FetchState::Error(self.errors.timeout_error())
+				},
+				FetchState::InProgress(ref mut receiver) => {
+					// Check if there is a response
+					trace!(target: "dapps", "Polling streaming response.");
+					try_ready!(receiver.poll().map_err(|err| {
+						warn!(target: "dapps", "Error while fetching response: {:?}", err);
+						hyper::Error::Timeout
+					}))
+				},
+				FetchState::Done(_, ref mut response) => {
+					return response.poll()
+				},
+				FetchState::Empty => panic!("Future polled twice."),
+				_ => unreachable!(),
+			};
+
+			trace!(target: "dapps", "New status: {:?}", status);
 			self.fetch_control.set_status(&status);
 			self.status = status;
 		}
-
-		Next::read()
-	}
-
-	fn on_request_readable(&mut self, decoder: &mut Decoder<HttpStream>) -> Next {
-		let (status, next) = match self.status {
-			// Request may time out
-			FetchState::InProgress(_) if self.fetch_control.is_deadline_reached() => {
-				trace!(target: "dapps", "Fetching dapp failed because of timeout.");
-				(Some(FetchState::Error(self.errors.timeout_error())), Next::write())
-			},
-			FetchState::InProgress(ref receiver) => {
-				// Check if there is an answer
-				let rec = receiver.try_recv();
-				match rec {
-					// just return the new state
-					Ok(state) => (Some(state), Next::write()),
-					// wait some more
-					_ => (None, Next::wait())
-				}
-			},
-			FetchState::Error(ref mut handler) => (None, handler.on_request_readable(decoder)),
-			_ => (None, Next::write()),
-		};
-
-		if let Some(status) = status {
-			self.fetch_control.set_status(&status);
-			self.status = status;
-		}
-
-		next
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		match self.status {
-			FetchState::Done(_, ref mut handler) => handler.on_response(res),
-			FetchState::Streaming(ref mut handler) => handler.on_response(res),
-			FetchState::Error(ref mut handler) => handler.on_response(res),
-			_ => Next::end(),
-		}
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		match self.status {
-			FetchState::Done(_, ref mut handler) => handler.on_response_writable(encoder),
-			FetchState::Streaming(ref mut handler) => handler.on_response_writable(encoder),
-			FetchState::Error(ref mut handler) => handler.on_response_writable(encoder),
-			_ => Next::end(),
-		}
 	}
 }

dapps/src/handlers/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,75 +16,101 @@
 
 //! Hyper handlers implementations.
 
-mod auth;
 mod content;
 mod echo;
 mod fetch;
+mod reader;
 mod redirect;
 mod streaming;
 
-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::reader::Reader;
 pub use self::redirect::Redirection;
 pub use self::streaming::StreamingHandler;
 
-use url::Url;
-use hyper::{server, header, net, uri};
-use address;
+use std::iter;
+use itertools::Itertools;
+use hyper::header;
+use {apps, address, Embeddable};
 
 /// Adds security-related headers to the Response.
-pub fn add_security_headers(headers: &mut header::Headers, embeddable_on: 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()]);
+pub fn add_security_headers(headers: &mut header::Headers, embeddable_on: Embeddable) {
+	headers.set_raw("X-XSS-Protection", "1; mode=block");
+	headers.set_raw("X-Content-Type-Options", "nosniff");
 
 	// Embedding header:
-	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()]);
+	if let None = embeddable_on {
+		headers.set_raw("X-Frame-Options",  "SAMEORIGIN");
 	}
+
+	// Content Security Policy headers
+	headers.set_raw("Content-Security-Policy", String::new()
+		// Allow connecting to WS servers and HTTP(S) servers.
+		// We could be more restrictive and allow only RPC server URL.
+		+ "connect-src http: https: ws: wss:;"
+		// Allow framing any content from HTTP(S).
+		// Again we could only allow embedding from RPC server URL.
+		// (deprecated)
+		+ "frame-src 'self' http: https:;"
+		// Allow framing and web workers from HTTP(S).
+		+ "child-src 'self' http: https:;"
+		// We allow data: blob: and HTTP(s) images.
+		// We could get rid of wildcarding HTTP and only allow RPC server URL.
+		// (http required for local dapps icons)
+		+ "img-src 'self' 'unsafe-inline' data: blob: http: https:;"
+		// Allow style from data: blob: and HTTPS.
+		+ "style-src 'self' 'unsafe-inline' data: blob: https:;"
+		// Allow fonts from data: and HTTPS.
+		+ "font-src 'self' data: https:;"
+		// 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
+			)
+		}
+		// Same restrictions as script-src with additional
+		// blob: that is required for camera access (worker)
+		+ "worker-src 'self' 'unsafe-inline' 'unsafe-eval' https: blob:;"
+		// Restrict everything else to the same origin.
+		+ "default-src 'self';"
+		// Run in sandbox mode (although it's not fully safe since we allow same-origin and script)
+		+ "sandbox allow-same-origin allow-forms allow-modals allow-popups allow-presentation allow-scripts;"
+		// Disallow subitting forms from any dapps
+		+ "form-action 'none';"
+		// Never allow mixed content
+		+ "block-all-mixed-content;"
+		// Specify if the site can be embedded.
+		+ &match embeddable_on {
+			Some(ref embed) => {
+				let std = address(&embed.host, embed.port);
+				let proxy = format!("{}.{}", apps::HOME_PAGE, embed.dapps_domain);
+				let domain = format!("*.{}:{}", embed.dapps_domain, embed.port);
+
+				let mut ancestors = vec![std, domain, proxy]
+					.into_iter()
+					.chain(embed.extra_embed_on
+						.iter()
+						.map(|&(ref host, port)| address(host, port))
+					);
+
+				let ancestors = if embed.host == "127.0.0.1" {
+					let localhost = address("localhost", embed.port);
+					ancestors.chain(iter::once(localhost)).join(" ")
+				} else {
+					ancestors.join(" ")
+				};
+
+				format!("frame-ancestors {};", ancestors)
+			},
+			None => format!("frame-ancestors 'self';"),
+		}
+	);
 }
-
-
-/// Extracts URL part from the Request.
-pub fn extract_url(req: &server::Request<net::HttpStream>) -> Option<Url> {
-	convert_uri_to_url(req.uri(), req.headers().get::<header::Host>())
-}
-
-/// Extracts URL given URI and Host header.
-pub fn convert_uri_to_url(uri: &uri::RequestUri, host: Option<&header::Host>) -> Option<Url> {
-	match *uri {
-		uri::RequestUri::AbsoluteUri(ref url) => {
-			match Url::from_generic_url(url.clone()) {
-				Ok(url) => Some(url),
-				_ => None,
-			}
-		},
-		uri::RequestUri::AbsolutePath { ref path, ref query } => {
-			let query = match *query {
-				Some(ref query) => format!("?{}", query),
-				None => "".into(),
-			};
-			// Attempt to prepend the Host header (mandatory in HTTP/1.1)
-			let url_string = match host {
-				Some(ref host) => {
-					format!("http://{}:{}{}{}", host.hostname, host.port.unwrap_or(80), path, query)
-				},
-				None => return None,
-			};
-
-			match Url::parse(&url_string) {
-				Ok(url) => Some(url),
-				_ => None,
-			}
-		},
-		_ => None,
-	}
-}
-

dapps/src/handlers/reader.rs

@@ -0,0 +1,73 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! A chunk-producing io::Read wrapper.
+
+use std::io::{self, Read};
+
+use futures::{self, sink, Sink, Future};
+use futures::sync::mpsc;
+use hyper;
+
+type Sender = mpsc::Sender<Result<hyper::Chunk, hyper::Error>>;
+
+const MAX_CHUNK_SIZE: usize = 32 * 1024;
+
+/// A Reader is essentially a stream of `hyper::Chunks`.
+/// The chunks are read from given `io::Read` instance.
+///
+/// Unfortunately `hyper` doesn't allow you to pass `Stream`
+/// directly to the response, so you need to create
+/// a `Body::pair()` and send over chunks using `sink::Send`.
+/// Also `Chunks` need to take `Vec` by value, so we need
+/// to allocate it for each chunk being sent.
+pub struct Reader<R: io::Read> {
+	buffer: [u8; MAX_CHUNK_SIZE],
+	content: io::BufReader<R>,
+	sending: sink::Send<Sender>,
+}
+
+impl<R: io::Read> Reader<R> {
+	pub fn pair(content: R, initial: Vec<u8>) -> (Self, hyper::Body) {
+		let (tx, rx) = hyper::Body::pair();
+		let reader = Reader {
+			buffer: [0; MAX_CHUNK_SIZE],
+			content: io::BufReader::new(content),
+			sending: tx.send(Ok(initial.into())),
+		};
+
+		(reader, rx)
+	}
+}
+
+impl<R: io::Read> Future for Reader<R> {
+	type Item = ();
+	type Error = ();
+
+	fn poll(&mut self) -> futures::Poll<Self::Item, Self::Error> {
+		loop {
+			let next = try_ready!(self.sending.poll().map_err(|err| {
+				warn!(target: "dapps", "Unable to send next chunk: {:?}", err);
+			}));
+
+			self.sending = match self.content.read(&mut self.buffer) {
+				Ok(0) => return Ok(futures::Async::Ready(())),
+				Ok(read) => next.send(Ok(self.buffer[..read].to_vec().into())),
+				Err(err) => next.send(Err(hyper::Error::Io(err))),
+			}
+		}
+	}
+}

dapps/src/handlers/redirect.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,9 +16,7 @@
 
 //! HTTP Redirection hyper handler
 
-use hyper::{header, server, Decoder, Encoder, Next};
-use hyper::net::HttpStream;
-use hyper::status::StatusCode;
+use hyper::{self, header, StatusCode};
 
 #[derive(Clone)]
 pub struct Redirection {
@@ -26,36 +24,18 @@ pub struct Redirection {
 }
 
 impl Redirection {
-	pub fn new(url: &str) -> Self {
+	pub fn new<T: Into<String>>(url: T) -> Self {
 		Redirection {
-			to_url: url.to_owned()
+			to_url: url.into()
 		}
 	}
-
-	pub fn boxed(url: &str) -> Box<Self> {
-		Box::new(Self::new(url))
-	}
 }
 
-impl server::Handler<HttpStream> for Redirection {
-	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 {
+impl Into<hyper::Response> for Redirection {
+	fn into(self) -> hyper::Response {
 		// Don't use `MovedPermanently` here to prevent browser from caching the redirections.
-		res.set_status(StatusCode::Found);
-		res.headers_mut().set(header::Location(self.to_url.to_owned()));
-		Next::write()
-	}
-	fn on_response_writable(&mut self, _encoder: &mut Encoder<HttpStream>) -> Next {
-		Next::end()
+		hyper::Response::new()
+			.with_status(StatusCode::Found)
+			.with_header(header::Location::new(self.to_url))
 	}
 }
-
-
-

dapps/src/handlers/streaming.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,86 +16,43 @@
 
 //! Content Stream Response
 
-use std::io::{self, Read};
+use std::io;
+use hyper::{self, header, mime, StatusCode};
 
-use hyper::{header, server, Decoder, Encoder, Next};
-use hyper::net::HttpStream;
-use hyper::mime::Mime;
-use hyper::status::StatusCode;
+use handlers::{add_security_headers, Reader};
+use Embeddable;
 
-use handlers::add_security_headers;
-
-const BUFFER_SIZE: usize = 1024;
-
-pub struct StreamingHandler<R: io::Read> {
-	buffer: [u8; BUFFER_SIZE],
-	buffer_leftover: usize,
+pub struct StreamingHandler<R> {
+	initial: Vec<u8>,
+	content: R,
 	status: StatusCode,
-	content: io::BufReader<R>,
-	mimetype: Mime,
-	safe_to_embed_on: Option<(String, u16)>,
+	mimetype: mime::Mime,
+	safe_to_embed_on: Embeddable,
 }
 
 impl<R: io::Read> StreamingHandler<R> {
-	pub fn new(content: R, status: StatusCode, mimetype: Mime, embeddable_on: Option<(String, u16)>) -> Self {
+	pub fn new(content: R, status: StatusCode, mimetype: mime::Mime, safe_to_embed_on: Embeddable) -> Self {
 		StreamingHandler {
-			buffer: [0; BUFFER_SIZE],
-			buffer_leftover: 0,
-			status: status,
-			content: io::BufReader::new(content),
-			mimetype: mimetype,
-			safe_to_embed_on: embeddable_on,
+			initial: Vec::new(),
+			content,
+			status,
+			mimetype,
+			safe_to_embed_on,
 		}
 	}
 
 	pub fn set_initial_content(&mut self, content: &str) {
-		assert_eq!(self.buffer_leftover, 0);
-		let bytes = content.as_bytes();
-		self.buffer_leftover = bytes.len();
-		self.buffer[0..self.buffer_leftover].copy_from_slice(bytes);
-	}
-}
-
-impl<R: io::Read> server::Handler<HttpStream> for StreamingHandler<R> {
-	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(self.status);
-		res.headers_mut().set(header::ContentType(self.mimetype.clone()));
-		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on.clone());
-		Next::write()
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		fn handle_error(e: io::Error) -> Next {
-			match e.kind() {
-				::std::io::ErrorKind::WouldBlock => Next::write(),
-				_ => Next::end(),
-			}
-		}
-
-		let write_pos = self.buffer_leftover;
-		match self.content.read(&mut self.buffer[write_pos..]) {
-			Err(e) => handle_error(e),
-			Ok(read) => match encoder.write(&self.buffer[..write_pos + read]) {
-				Err(e) => handle_error(e),
-				Ok(0) => Next::end(),
-				Ok(wrote) => {
-					self.buffer_leftover = write_pos + read - wrote;
-					if self.buffer_leftover > 0 {
-						for i in self.buffer_leftover..write_pos + read {
-							self.buffer.swap(i, i - self.buffer_leftover);
-						}
-					}
-					Next::write()
-				},
-			},
-		}
+		self.initial = content.as_bytes().to_vec();
+	}
+
+	pub fn into_response(self) -> (Reader<R>, hyper::Response) {
+		let (reader, body) = Reader::pair(self.content, self.initial);
+		let mut res = hyper::Response::new()
+			.with_status(self.status)
+			.with_header(header::ContentType(self.mimetype))
+			.with_body(body);
+		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on);
+
+		(reader, res)
 	}
 }

dapps/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -15,379 +15,288 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Ethcore Webapplications for Parity
-//! ```
-//! extern crate jsonrpc_core;
-//! extern crate ethcore_dapps;
-//!
-//! use std::sync::Arc;
-//! use jsonrpc_core::IoHandler;
-//! use ethcore_dapps::*;
-//!
-//! struct SayHello;
-//! impl MethodCommand for SayHello {
-//! 	fn execute(&self, _params: Params) -> Result<Value, Error> {
-//! 		Ok(Value::String("hello".to_string()))
-//! 	}
-//! }
-//!
-//! fn main() {
-//! 	let io = IoHandler::new();
-//! 	io.add_method("say_hello", SayHello);
-//! 	let _server = Server::start_unsecure_http(
-//! 		&"127.0.0.1:3030".parse().unwrap(),
-//! 		Arc::new(io)
-//! 	);
-//! }
-//! ```
-//!
 #![warn(missing_docs)]
+#![cfg_attr(feature="nightly", feature(plugin))]
 #![cfg_attr(feature="nightly", plugin(clippy))]
 
-extern crate hyper;
-extern crate time;
-extern crate url as url_lib;
-extern crate unicase;
+extern crate base32;
+extern crate futures_cpupool;
+extern crate itertools;
+extern crate linked_hash_map;
+extern crate mime_guess;
+extern crate parking_lot;
+extern crate rand;
+extern crate rustc_hex;
 extern crate serde;
 extern crate serde_json;
+extern crate unicase;
 extern crate zip;
-extern crate 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 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 ethcore_util as util;
+extern crate ethcore_bigint as bigint;
+extern crate ethcore_bytes as bytes;
+extern crate fetch;
+extern crate node_health;
+extern crate parity_dapps_glue as parity_dapps;
+extern crate parity_hash_fetch as hash_fetch;
+extern crate parity_ui;
+extern crate hash;
+extern crate parity_version;
+
+#[macro_use]
+extern crate futures;
 #[macro_use]
 extern crate log;
 #[macro_use]
-extern crate mime;
+extern crate serde_derive;
 
 #[cfg(test)]
 extern crate ethcore_devtools as devtools;
 #[cfg(test)]
 extern crate env_logger;
-
+#[cfg(test)]
+extern crate parity_reactor;
 
 mod endpoint;
 mod apps;
 mod page;
 mod router;
 mod handlers;
-mod rpc;
 mod api;
 mod proxypac;
-mod url;
 mod web;
 #[cfg(test)]
 mod tests;
 
-use std::path::{Path, PathBuf};
-use std::sync::{Arc, Mutex};
-use std::net::SocketAddr;
 use std::collections::HashMap;
+use std::mem;
+use std::path::PathBuf;
+use std::sync::Arc;
+use futures_cpupool::CpuPool;
+use jsonrpc_http_server::{self as http, hyper, Origin};
+use parking_lot::RwLock;
 
-use hash_fetch::urlhint::ContractClient;
-use fetch::{Fetch, Client as FetchClient};
-use jsonrpc_core::{IoHandler, IoDelegate};
-use router::auth::{Authorization, NoAuth, HttpBasicAuth};
-use ethcore_rpc::Extendable;
-use parity_reactor::Remote;
+use fetch::Fetch;
+use node_health::NodeHealth;
 
-use self::apps::{HOME_PAGE, DAPPS_DOMAIN};
+pub use hash_fetch::urlhint::ContractClient;
+pub use node_health::SyncStatus;
 
-/// 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 true if token is a valid web proxy access token.
-	fn is_web_proxy_token_valid(&self, token: &String) -> bool;
+	/// Should return a domain allowed to be accessed by this token or `None` if the token is not valid
+	fn domain(&self, token: &str) -> Option<Origin>;
 }
 
-impl<F> WebProxyTokens for F where F: Fn(String) -> bool + Send + Sync {
-	fn is_web_proxy_token_valid(&self, token: &String) -> bool { self(token.to_owned()) }
+impl<F> WebProxyTokens for F where F: Fn(String) -> Option<Origin> + Send + Sync {
+	fn domain(&self, token: &str) -> Option<Origin> { self(token.to_owned()) }
 }
 
-/// Webapps HTTP+RPC server build.
-pub struct ServerBuilder<T: Fetch = FetchClient> {
+/// Current supported endpoints.
+#[derive(Default, Clone)]
+pub struct Endpoints {
+	local_endpoints: Arc<RwLock<Vec<String>>>,
+	endpoints: Arc<RwLock<endpoint::Endpoints>>,
 	dapps_path: PathBuf,
-	extra_dapps: Vec<PathBuf>,
-	handler: Arc<IoHandler>,
-	registrar: Arc<ContractClient>,
-	sync_status: Arc<SyncStatus>,
-	web_proxy_tokens: Arc<WebProxyTokens>,
-	signer_address: Option<(String, u16)>,
-	remote: Remote,
-	fetch: Option<T>,
+	embeddable: Option<ParentFrameSettings>,
+	pool: Option<CpuPool>,
 }
 
-impl<T: Fetch> Extendable for ServerBuilder<T> {
-	fn add_delegate<D: Send + Sync + 'static>(&self, delegate: IoDelegate<D>) {
-		self.handler.add_delegate(delegate);
+impl Endpoints {
+	/// Returns a current list of app endpoints.
+	pub fn list(&self) -> Vec<apps::App> {
+		self.endpoints.read().iter().filter_map(|(ref k, ref e)| {
+			e.info().map(|ref info| 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![],
-			handler: Arc::new(IoHandler::new()),
-			registrar: registrar,
-			sync_status: Arc::new(|| false),
-			web_proxy_tokens: Arc::new(|_| false),
-			signer_address: None,
-			remote: remote,
-			fetch: None,
+	/// Check for any changes in the local dapps folder and update.
+	pub fn refresh_local_dapps(&self) {
+		let pool = match self.pool.as_ref() {
+			None => return,
+			Some(pool) => pool,
+		};
+		let new_local = apps::fs::local_endpoints(&self.dapps_path, self.embeddable.clone(), pool.clone());
+		let old_local = mem::replace(&mut *self.local_endpoints.write(), new_local.keys().cloned().collect());
+		let (_, to_remove): (_, Vec<_>) = old_local
+			.into_iter()
+			.partition(|k| new_local.contains_key(&k.clone()));
+
+		let mut endpoints = self.endpoints.write();
+		// remove the dead dapps
+		for k in to_remove {
+			endpoints.remove(&k);
+		}
+		// new dapps to be added
+		for (k, v) in new_local {
+			if !endpoints.contains_key(&k) {
+				endpoints.insert(k, v);
+			}
 		}
 	}
 }
 
-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![],
-			handler: self.handler,
-			registrar: self.registrar,
-			sync_status: self.sync_status,
-			web_proxy_tokens: self.web_proxy_tokens,
-			signer_address: self.signer_address,
-			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 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(self, addr: &SocketAddr, hosts: Option<Vec<String>>) -> Result<Server, ServerError> {
-		Server::start_http(
-			addr,
-			hosts,
-			NoAuth,
-			self.handler.clone(),
-			self.dapps_path.clone(),
-			self.extra_dapps.clone(),
-			self.signer_address.clone(),
-			self.registrar.clone(),
-			self.sync_status.clone(),
-			self.web_proxy_tokens.clone(),
-			self.remote.clone(),
-			self.fetch_client()?,
-		)
-	}
-
-	/// Asynchronously start server with `HTTP Basic Authentication`,
-	/// return result with `Server` handle on success or an error.
-	pub fn start_basic_auth_http(self, addr: &SocketAddr, hosts: Option<Vec<String>>, username: &str, password: &str) -> Result<Server, ServerError> {
-		Server::start_http(
-			addr,
-			hosts,
-			HttpBasicAuth::single_user(username, password),
-			self.handler.clone(),
-			self.dapps_path.clone(),
-			self.extra_dapps.clone(),
-			self.signer_address.clone(),
-			self.registrar.clone(),
-			self.sync_status.clone(),
-			self.web_proxy_tokens.clone(),
-			self.remote.clone(),
-			self.fetch_client()?,
-		)
-	}
-
-	fn fetch_client(&self) -> Result<T, ServerError> {
-		match self.fetch.clone() {
-			Some(fetch) => Ok(fetch),
-			None => T::new().map_err(|_| ServerError::FetchInitialization),
-		}
-	}
+/// Dapps server as `jsonrpc-http-server` request middleware.
+pub struct Middleware {
+	endpoints: Endpoints,
+	router: router::Router,
 }
 
-/// 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)
+impl Middleware {
+	/// Get local endpoints handle.
+	pub fn endpoints(&self) -> &Endpoints {
+		&self.endpoints
 	}
 
-	/// Returns a list of CORS domains for API endpoint.
-	fn cors_domains(signer_address: Option<(String, u16)>) -> Vec<String> {
-		match signer_address {
-			Some(signer_address) => vec![
-				format!("http://{}{}", HOME_PAGE, DAPPS_DOMAIN),
-				format!("http://{}", address(signer_address)),
-			],
-			None => vec![],
+	/// Creates new middleware for UI server.
+	pub fn ui<F: Fetch>(
+		pool: CpuPool,
+		health: NodeHealth,
+		dapps_domain: &str,
+		registrar: Arc<ContractClient>,
+		sync_status: Arc<SyncStatus>,
+		fetch: F,
+	) -> Self {
+		let content_fetcher = Arc::new(apps::fetcher::ContentFetcher::new(
+			hash_fetch::urlhint::URLHintContract::new(registrar),
+			sync_status.clone(),
+			fetch.clone(),
+			pool.clone(),
+		).embeddable_on(None).allow_dapps(false));
+		let special = {
+			let mut special = special_endpoints(
+				pool.clone(),
+				health,
+				content_fetcher.clone(),
+			);
+			special.insert(router::SpecialEndpoint::Home, Some(apps::ui(pool.clone())));
+			special
+		};
+		let router = router::Router::new(
+			content_fetcher,
+			None,
+			special,
+			None,
+			dapps_domain.to_owned(),
+		);
+
+		Middleware {
+			endpoints: Default::default(),
+			router: router,
 		}
 	}
 
-	fn start_http<A: Authorization + 'static, F: Fetch>(
-		addr: &SocketAddr,
-		hosts: Option<Vec<String>>,
-		authorization: A,
-		handler: Arc<IoHandler>,
+	/// Creates new Dapps server middleware.
+	pub fn dapps<F: Fetch>(
+		pool: CpuPool,
+		health: NodeHealth,
+		ui_address: Option<(String, u16)>,
+		extra_embed_on: Vec<(String, u16)>,
+		extra_script_src: Vec<(String, u16)>,
 		dapps_path: PathBuf,
 		extra_dapps: Vec<PathBuf>,
-		signer_address: Option<(String, u16)>,
+		dapps_domain: &str,
 		registrar: Arc<ContractClient>,
 		sync_status: Arc<SyncStatus>,
 		web_proxy_tokens: Arc<WebProxyTokens>,
-		remote: Remote,
 		fetch: F,
-	) -> Result<Server, ServerError> {
-		let panic_handler = Arc::new(Mutex::new(None));
-		let authorization = Arc::new(authorization);
+	) -> Self {
+		let embeddable = as_embeddable(ui_address, extra_embed_on, extra_script_src, dapps_domain);
 		let content_fetcher = Arc::new(apps::fetcher::ContentFetcher::new(
 			hash_fetch::urlhint::URLHintContract::new(registrar),
-			sync_status,
-			signer_address.clone(),
-			remote.clone(),
+			sync_status.clone(),
 			fetch.clone(),
-		));
-		let endpoints = Arc::new(apps::all_endpoints(
-			dapps_path,
+			pool.clone(),
+		).embeddable_on(embeddable.clone()).allow_dapps(true));
+		let (local_endpoints, endpoints) = apps::all_endpoints(
+			dapps_path.clone(),
 			extra_dapps,
-			signer_address.clone(),
+			dapps_domain,
+			embeddable.clone(),
 			web_proxy_tokens,
-			remote.clone(),
 			fetch.clone(),
-		));
-		let cors_domains = Self::cors_domains(signer_address.clone());
+			pool.clone(),
+		);
+		let endpoints = Endpoints {
+			endpoints: Arc::new(RwLock::new(endpoints)),
+			dapps_path,
+			local_endpoints: Arc::new(RwLock::new(local_endpoints)),
+			embeddable: embeddable.clone(),
+			pool: Some(pool.clone()),
+		};
 
-		let special = Arc::new({
-			let mut special = HashMap::new();
-			special.insert(router::SpecialEndpoint::Rpc, rpc::rpc(handler, panic_handler.clone()));
-			special.insert(router::SpecialEndpoint::Utils, apps::utils());
+		let special = {
+			let mut special = special_endpoints(
+				pool.clone(),
+				health,
+				content_fetcher.clone(),
+			);
 			special.insert(
-				router::SpecialEndpoint::Api,
-				api::RestApi::new(cors_domains, endpoints.clone(), content_fetcher.clone())
+				router::SpecialEndpoint::Home,
+				Some(apps::ui_redirection(embeddable.clone())),
 			);
 			special
-		});
-		let hosts = Self::allowed_hosts(hosts, format!("{}", addr));
+		};
 
-		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)| {
+		let router = router::Router::new(
+			content_fetcher,
+			Some(endpoints.clone()),
+			special,
+			embeddable,
+			dapps_domain.to_owned(),
+		);
 
-				::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),
+		Middleware {
+			endpoints,
+			router,
 		}
 	}
 }
 
+impl http::RequestMiddleware for Middleware {
+	fn on_request(&self, req: hyper::Request) -> http::RequestMiddlewareAction {
+		self.router.on_request(req)
+	}
+}
+
+fn special_endpoints(
+	pool: CpuPool,
+	health: NodeHealth,
+	content_fetcher: Arc<apps::fetcher::Fetcher>,
+) -> HashMap<router::SpecialEndpoint, Option<Box<endpoint::Endpoint>>> {
+	let mut special = HashMap::new();
+	special.insert(router::SpecialEndpoint::Rpc, None);
+	special.insert(router::SpecialEndpoint::Utils, Some(apps::utils(pool)));
+	special.insert(router::SpecialEndpoint::Api, Some(api::RestApi::new(
+		content_fetcher,
+		health,
+	)));
+	special
+}
+
+fn address(host: &str, port: u16) -> String {
+	format!("{}:{}", host, port)
+}
+
+fn as_embeddable(
+	ui_address: Option<(String, u16)>,
+	extra_embed_on: Vec<(String, u16)>,
+	extra_script_src: Vec<(String, u16)>,
+	dapps_domain: &str,
+) -> Option<ParentFrameSettings> {
+	ui_address.map(|(host, port)| ParentFrameSettings {
+		host,
+		port,
+		extra_embed_on,
+		extra_script_src,
+		dapps_domain: dapps_domain.to_owned(),
+	})
+}
+
 /// Random filename
 fn random_filename() -> String {
 	use ::rand::Rng;
@@ -395,40 +304,19 @@ fn random_filename() -> String {
 	rng.gen_ascii_chars().take(12).collect()
 }
 
-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);
-		let some = Server::cors_domains(Some(("127.0.0.1".into(), 18180)));
-
-		// then
-		assert_eq!(none, Vec::<String>::new());
-		assert_eq!(some, vec!["http://home.parity".to_owned(), "http://127.0.0.1:18180".into()]);
-	}
+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,
 }

dapps/src/page/builtin.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -14,75 +14,114 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use page::{handler, PageCache};
-use std::sync::Arc;
-use endpoint::{Endpoint, EndpointInfo, EndpointPath, Handler};
-use parity_dapps::{WebApp, File, Info};
+use std::io;
+use futures::future;
+use futures_cpupool::CpuPool;
+use hyper::mime::{self, Mime};
+use itertools::Itertools;
+use parity_dapps::{WebApp, Info};
 
-pub struct PageEndpoint<T : WebApp + 'static> {
+use endpoint::{Endpoint, EndpointInfo, EndpointPath, Request, Response};
+use page::{handler, PageCache};
+use Embeddable;
+
+pub struct Dapp<T: WebApp + 'static> {
+	/// futures cpu pool
+	pool: CpuPool,
 	/// Content of the files
-	pub app: Arc<T>,
-	/// Prefix to strip from the path (when `None` deducted from `app_id`)
-	pub prefix: Option<String>,
+	app: T,
 	/// Safe to be loaded in frame by other origin. (use wisely!)
-	safe_to_embed_on: Option<(String, u16)>,
+	safe_to_embed_on: Embeddable,
 	info: EndpointInfo,
+	fallback_to_index_html: bool,
 }
 
-impl<T: WebApp + 'static> PageEndpoint<T> {
-	/// Creates new `PageEndpoint` for builtin (compile time) Dapp.
-	pub fn new(app: T) -> Self {
+impl<T: WebApp + 'static> Dapp<T> {
+	/// Creates new `Dapp` for builtin (compile time) Dapp.
+	pub fn new(pool: CpuPool, app: T) -> Self {
 		let info = app.info();
-		PageEndpoint {
-			app: Arc::new(app),
-			prefix: None,
+		Dapp {
+			pool,
+			app,
 			safe_to_embed_on: None,
 			info: EndpointInfo::from(info),
+			fallback_to_index_html: false,
 		}
 	}
 
-	/// Create new `PageEndpoint` and specify prefix that should be removed before looking for a file.
-	/// It's used only for special endpoints (i.e. `/parity-utils/`)
-	/// So `/parity-utils/inject.js` will be resolved to `/inject.js` is prefix is set.
-	pub fn with_prefix(app: T, prefix: String) -> Self {
+	/// Creates a new `Dapp` for builtin (compile time) Dapp.
+	/// Instead of returning 404 this endpoint will always server index.html.
+	pub fn with_fallback_to_index(pool: CpuPool, app: T) -> Self {
 		let info = app.info();
-		PageEndpoint {
-			app: Arc::new(app),
-			prefix: Some(prefix),
+		Dapp {
+			pool,
+			app,
 			safe_to_embed_on: None,
 			info: EndpointInfo::from(info),
+			fallback_to_index_html: true,
 		}
 	}
 
-	/// Creates new `PageEndpoint` which can be safely used in iframe
+	/// Creates new `Dapp` which can be safely used in iframe
 	/// even from different origin. It might be dangerous (clickjacking).
 	/// Use wisely!
-	pub fn new_safe_to_embed(app: T, address: Option<(String, u16)>) -> Self {
+	pub fn new_safe_to_embed(pool: CpuPool, app: T, address: Embeddable) -> Self {
 		let info = app.info();
-		PageEndpoint {
-			app: Arc::new(app),
-			prefix: None,
+		Dapp {
+			pool,
+			app,
 			safe_to_embed_on: address,
 			info: EndpointInfo::from(info),
+			fallback_to_index_html: false,
 		}
 	}
 }
 
-impl<T: WebApp> Endpoint for PageEndpoint<T> {
-
+impl<T: WebApp> Endpoint for Dapp<T> {
 	fn info(&self) -> Option<&EndpointInfo> {
 		Some(&self.info)
 	}
 
-	fn to_handler(&self, path: EndpointPath) -> Box<Handler> {
-		Box::new(handler::PageHandler {
-			app: BuiltinDapp::new(self.app.clone()),
-			prefix: self.prefix.clone(),
-			path: path,
-			file: handler::ServedFile::new(self.safe_to_embed_on.clone()),
+	fn respond(&self, path: EndpointPath, _req: Request) -> Response {
+		trace!(target: "dapps", "Builtin file path: {:?}", path);
+		let file_path = if path.has_no_params() {
+			"index.html".to_owned()
+		} else {
+			path.app_params.into_iter().filter(|x| !x.is_empty()).join("/")
+		};
+		trace!(target: "dapps", "Builtin file: {:?}", file_path);
+
+		let file = {
+			let file = |path| self.app.file(path).map(|file| {
+				let content_type = match file.content_type.parse() {
+					Ok(mime) => mime,
+					Err(_) => {
+						warn!(target: "dapps", "invalid MIME type: {}", file.content_type);
+						mime::TEXT_HTML
+					},
+				};
+				BuiltinFile {
+					content_type,
+					content: io::Cursor::new(file.content),
+				}
+			});
+			let res = file(&file_path);
+			if self.fallback_to_index_html {
+				res.or_else(|| file("index.html"))
+			} else {
+				res
+			}
+		};
+
+		let (reader, response) = handler::PageHandler {
+			file,
 			cache: PageCache::Disabled,
 			safe_to_embed_on: self.safe_to_embed_on.clone(),
-		})
+		}.into_response();
+
+		self.pool.spawn(reader).forget();
+
+		Box::new(future::ok(response))
 	}
 }
 
@@ -98,58 +137,20 @@ impl From<Info> for EndpointInfo {
 	}
 }
 
-struct BuiltinDapp<T: WebApp + 'static> {
-	app: Arc<T>,
+
+struct BuiltinFile {
+	content_type: Mime,
+	content: io::Cursor<&'static [u8]>,
 }
 
-impl<T: WebApp + 'static> BuiltinDapp<T> {
-	fn new(app: Arc<T>) -> Self {
-		BuiltinDapp {
-			app: app,
-		}
-	}
-}
-
-impl<T: WebApp + 'static> handler::Dapp for BuiltinDapp<T> {
-	type DappFile = BuiltinDappFile<T>;
-
-	fn file(&self, path: &str) -> Option<Self::DappFile> {
-		self.app.file(path).map(|_| {
-			BuiltinDappFile {
-				app: self.app.clone(),
-				path: path.into(),
-				write_pos: 0,
-			}
-		})
-	}
-}
-
-struct BuiltinDappFile<T: WebApp + 'static> {
-	app: Arc<T>,
-	path: String,
-	write_pos: usize,
-}
-
-impl<T: WebApp + 'static> BuiltinDappFile<T> {
-	fn file(&self) -> &File {
-		self.app.file(&self.path).expect("Check is done when structure is created.")
-	}
-}
-
-impl<T: WebApp + 'static> handler::DappFile for BuiltinDappFile<T> {
-	fn content_type(&self) -> &str {
-		self.file().content_type
-	}
-
-	fn is_drained(&self) -> bool {
-		self.write_pos == self.file().content.len()
-	}
-
-	fn next_chunk(&mut self) -> &[u8] {
-		&self.file().content[self.write_pos..]
-	}
-
-	fn bytes_written(&mut self, bytes: usize) {
-		self.write_pos += bytes;
+impl handler::DappFile for BuiltinFile {
+	type Reader = io::Cursor<&'static [u8]>;
+
+	fn content_type(&self) -> &Mime {
+		&self.content_type
+	}
+
+	fn into_reader(self) -> Self::Reader {
+		self.content
 	}
 }

dapps/src/page/handler.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -14,60 +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/>.
 
-use time::{self, Duration};
+use std::io;
+use std::time::{Duration, SystemTime};
+use hyper::{self, header, StatusCode};
+use hyper::mime::Mime;
 
-use hyper::header;
-use hyper::server;
-use hyper::uri::RequestUri;
-use hyper::net::HttpStream;
-use hyper::status::StatusCode;
-use hyper::{Decoder, Encoder, Next};
-use endpoint::EndpointPath;
-use handlers::{ContentHandler, add_security_headers};
+use handlers::{Reader, ContentHandler, add_security_headers};
+use {Embeddable};
 
 /// Represents a file that can be sent to client.
 /// Implementation should keep track of bytes already sent internally.
-pub trait DappFile: Send {
+pub trait DappFile {
+	/// A reader type returned by this file.
+	type Reader: io::Read;
+
 	/// Returns a content-type of this file.
-	fn content_type(&self) -> &str;
+	fn content_type(&self) -> &Mime;
 
-	/// Checks if all bytes from that file were written.
-	fn is_drained(&self) -> bool;
-
-	/// Fetch next chunk to write to the client.
-	fn next_chunk(&mut self) -> &[u8];
-
-	/// How many files have been written to the client.
-	fn bytes_written(&mut self, bytes: usize);
-}
-
-/// Dapp as a (dynamic) set of files.
-pub trait Dapp: Send + 'static {
-	/// File type
-	type DappFile: DappFile;
-
-	/// Returns file under given path.
-	fn file(&self, path: &str) -> Option<Self::DappFile>;
-}
-
-/// Currently served by `PageHandler` file
-pub enum ServedFile<T: Dapp> {
-	/// File from dapp
-	File(T::DappFile),
-	/// Error (404)
-	Error(ContentHandler),
-}
-
-impl<T: Dapp> ServedFile<T> {
-	pub fn new(embeddable_on: Option<(String, u16)>) -> Self {
-		ServedFile::Error(ContentHandler::error(
-			StatusCode::NotFound,
-			"404 Not Found",
-			"Requested dapp resource was not found.",
-			None,
-			embeddable_on,
-		))
-	}
+	/// Convert this file into io::Read instance.
+	fn into_reader(self) -> Self::Reader where Self: Sized;
 }
 
 /// Defines what cache headers should be appended to returned resources.
@@ -83,193 +48,55 @@ impl Default for PageCache {
 	}
 }
 
-/// A generic type for `PageHandler` allowing to set the URL.
-/// Used by dapps fetching to set the URL after the content was downloaded.
-pub trait PageHandlerWaiting: server::Handler<HttpStream> + Send {
-	fn set_uri(&mut self, uri: &RequestUri);
-}
-
 /// A handler for a single webapp.
 /// Resolves correct paths and serves as a plumbing code between
 /// hyper server and dapp.
-pub struct PageHandler<T: Dapp> {
-	/// A Dapp.
-	pub app: T,
+pub struct PageHandler<T: DappFile> {
 	/// File currently being served
-	pub file: ServedFile<T>,
-	/// Optional prefix to strip from path.
-	pub prefix: Option<String>,
-	/// Requested path.
-	pub path: EndpointPath,
+	pub file: Option<T>,
 	/// Flag indicating if the file can be safely embeded (put in iframe).
-	pub safe_to_embed_on: Option<(String, u16)>,
+	pub safe_to_embed_on: Embeddable,
 	/// Cache settings for this page.
 	pub cache: PageCache,
 }
 
-impl<T: Dapp> PageHandlerWaiting for PageHandler<T> {
-	fn set_uri(&mut self, uri: &RequestUri) {
-		trace!(target: "dapps", "Setting URI: {:?}", uri);
-		self.file = match *uri {
-			RequestUri::AbsolutePath { ref path, .. } => {
-				self.app.file(&self.extract_path(path))
-			},
-			RequestUri::AbsoluteUri(ref url) => {
-				self.app.file(&self.extract_path(url.path()))
-			},
-			_ => None,
-		}.map_or_else(|| ServedFile::new(self.safe_to_embed_on.clone()), |f| ServedFile::File(f));
-	}
-}
+impl<T: DappFile> PageHandler<T> {
+	pub fn into_response(self) -> (Option<Reader<T::Reader>>, hyper::Response) {
+		let file = match self.file {
+			None => return (None, ContentHandler::error(
+				StatusCode::NotFound,
+				"File not found",
+				"Requested file has not been found.",
+				None,
+				self.safe_to_embed_on,
+			).into()),
+			Some(file) => file,
+		};
 
-impl<T: Dapp> PageHandler<T> {
-	fn extract_path(&self, path: &str) -> String {
-		let app_id = &self.path.app_id;
-		let prefix = "/".to_owned() + self.prefix.as_ref().unwrap_or(app_id);
-		let prefix_with_slash = prefix.clone() + "/";
-		let query_pos = path.find('?').unwrap_or_else(|| path.len());
+		let mut res = hyper::Response::new()
+			.with_status(StatusCode::Ok);
 
-		// Index file support
-		match path == "/" || path == &prefix || path == &prefix_with_slash {
-			true => "index.html".to_owned(),
-			false => if path.starts_with(&prefix_with_slash) {
-				path[prefix_with_slash.len()..query_pos].to_owned()
-			} else if path.starts_with("/") {
-				path[1..query_pos].to_owned()
-			} else {
-				path[0..query_pos].to_owned()
+		// headers
+		{
+			let mut headers = res.headers_mut();
+
+			if let PageCache::Enabled = self.cache {
+				let validity_secs = 365u32 * 24 * 3600;
+				let validity = Duration::from_secs(validity_secs as u64);
+				headers.set(header::CacheControl(vec![
+					header::CacheDirective::Public,
+					header::CacheDirective::MaxAge(validity_secs),
+				]));
+				headers.set(header::Expires(header::HttpDate::from(SystemTime::now() + validity)));
 			}
+
+			headers.set(header::ContentType(file.content_type().to_owned()));
+
+			add_security_headers(&mut headers, self.safe_to_embed_on);
 		}
+
+		let (reader, body) = Reader::pair(file.into_reader(), Vec::new());
+		res.set_body(body);
+		(Some(reader), res)
 	}
 }
-
-impl<T: Dapp> server::Handler<HttpStream> for PageHandler<T> {
-	fn on_request(&mut self, req: server::Request<HttpStream>) -> Next {
-		self.set_uri(req.uri());
-		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 {
-		match self.file {
-			ServedFile::File(ref f) => {
-				res.set_status(StatusCode::Ok);
-
-				if let PageCache::Enabled = self.cache {
-					let mut headers = res.headers_mut();
-					let validity = Duration::days(365);
-					headers.set(header::CacheControl(vec![
-						header::CacheDirective::Public,
-						header::CacheDirective::MaxAge(validity.num_seconds() as u32),
-					]));
-					headers.set(header::Expires(header::HttpDate(time::now() + validity)));
-				}
-
-				match f.content_type().parse() {
-					Ok(mime) => res.headers_mut().set(header::ContentType(mime)),
-					Err(()) => debug!(target: "dapps", "invalid MIME type: {}", f.content_type()),
-				}
-
-				// Security headers:
-				add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on.clone());
-				Next::write()
-			},
-			ServedFile::Error(ref mut handler) => {
-				handler.on_response(res)
-			}
-		}
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		match self.file {
-			ServedFile::Error(ref mut handler) => handler.on_response_writable(encoder),
-			ServedFile::File(ref f) if f.is_drained() => Next::end(),
-			ServedFile::File(ref mut f) => match encoder.write(f.next_chunk()) {
-				Ok(bytes) => {
-					f.bytes_written(bytes);
-					Next::write()
-				},
-				Err(e) => match e.kind() {
-					::std::io::ErrorKind::WouldBlock => Next::write(),
-					_ => Next::end(),
-				},
-			}
-		}
-	}
-}
-
-
-
-#[cfg(test)]
-mod test {
-	use super::*;
-
-	pub struct TestWebAppFile;
-
-	impl DappFile for TestWebAppFile {
-		fn content_type(&self) -> &str {
-			unimplemented!()
-		}
-
-		fn is_drained(&self) -> bool {
-			unimplemented!()
-		}
-
-		fn next_chunk(&mut self) -> &[u8] {
-			unimplemented!()
-		}
-
-		fn bytes_written(&mut self, _bytes: usize) {
-			unimplemented!()
-		}
-	}
-
-	#[derive(Default)]
-	pub struct TestWebapp;
-
-	impl Dapp for TestWebapp {
-		type DappFile = TestWebAppFile;
-
-		fn file(&self, _path: &str) -> Option<Self::DappFile> {
-			None
-		}
-	}
-}
-
-#[test]
-fn should_extract_path_with_appid() {
-
-	// given
-	let path1 = "/";
-	let path2= "/test.css";
-	let path3 = "/app/myfile.txt";
-	let path4 = "/app/myfile.txt?query=123";
-	let page_handler = PageHandler {
-		app: test::TestWebapp,
-		prefix: None,
-		path: EndpointPath {
-			app_id: "app".to_owned(),
-			host: "".to_owned(),
-			port: 8080,
-			using_dapps_domains: true,
-		},
-		file: ServedFile::new(None),
-		cache: Default::default(),
-		safe_to_embed_on: None,
-	};
-
-	// when
-	let res1 = page_handler.extract_path(path1);
-	let res2 = page_handler.extract_path(path2);
-	let res3 = page_handler.extract_path(path3);
-	let res4 = page_handler.extract_path(path4);
-
-	// then
-	assert_eq!(&res1, "index.html");
-	assert_eq!(&res2, "test.css");
-	assert_eq!(&res3, "myfile.txt");
-	assert_eq!(&res4, "myfile.txt");
-}

dapps/src/page/local.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -15,39 +15,56 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use mime_guess;
-use std::io::{Seek, Read, SeekFrom};
-use std::fs;
+use std::{fs, fmt};
 use std::path::{Path, PathBuf};
-use page::handler::{self, PageCache, PageHandlerWaiting};
-use endpoint::{Endpoint, EndpointInfo, EndpointPath, Handler};
-use mime::Mime;
+use futures::{future};
+use futures_cpupool::CpuPool;
+use page::handler::{self, PageCache};
+use endpoint::{Endpoint, EndpointInfo, EndpointPath, Request, Response};
+use hyper::mime::Mime;
+use Embeddable;
 
-#[derive(Debug, Clone)]
-pub struct LocalPageEndpoint {
+#[derive(Clone)]
+pub struct Dapp {
+	pool: CpuPool,
 	path: PathBuf,
 	mime: Option<Mime>,
 	info: Option<EndpointInfo>,
 	cache: PageCache,
-	embeddable_on: Option<(String, u16)>,
+	embeddable_on: Embeddable,
 }
 
-impl LocalPageEndpoint {
-	pub fn new(path: PathBuf, info: EndpointInfo, cache: PageCache, embeddable_on: Option<(String, u16)>) -> Self {
-		LocalPageEndpoint {
-			path: path,
+impl fmt::Debug for Dapp {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		fmt.debug_struct("Dapp")
+			.field("path", &self.path)
+			.field("mime", &self.mime)
+			.field("info", &self.info)
+			.field("cache", &self.cache)
+			.field("embeddable_on", &self.embeddable_on)
+			.finish()
+	}
+}
+
+impl Dapp {
+	pub fn new(pool: CpuPool, path: PathBuf, info: EndpointInfo, cache: PageCache, embeddable_on: Embeddable) -> Self {
+		Dapp {
+			pool,
+			path,
 			mime: None,
 			info: Some(info),
-			cache: cache,
-			embeddable_on: embeddable_on,
+			cache,
+			embeddable_on,
 		}
 	}
 
-	pub fn single_file(path: PathBuf, mime: Mime, cache: PageCache) -> Self {
-		LocalPageEndpoint {
-			path: path,
+	pub fn single_file(pool: CpuPool, path: PathBuf, mime: Mime, cache: PageCache) -> Self {
+		Dapp {
+			pool,
+			path,
 			mime: Some(mime),
 			info: None,
-			cache: cache,
+			cache,
 			embeddable_on: None,
 		}
 	}
@@ -56,125 +73,75 @@ impl LocalPageEndpoint {
 		self.path.clone()
 	}
 
-	fn page_handler_with_mime(&self, path: EndpointPath, mime: &Mime) -> handler::PageHandler<LocalSingleFile> {
-		handler::PageHandler {
-			app: LocalSingleFile { path: self.path.clone(), mime: format!("{}", mime) },
-			prefix: None,
-			path: path,
-			file: handler::ServedFile::new(None),
-			safe_to_embed_on: self.embeddable_on.clone(),
-			cache: self.cache,
-		}
-	}
-
-	fn page_handler(&self, path: EndpointPath) -> handler::PageHandler<LocalDapp> {
-		handler::PageHandler {
-			app: LocalDapp { path: self.path.clone() },
-			prefix: None,
-			path: path,
-			file: handler::ServedFile::new(None),
-			safe_to_embed_on: self.embeddable_on.clone(),
-			cache: self.cache,
-		}
-	}
-
-	pub fn to_page_handler(&self, path: EndpointPath) -> Box<PageHandlerWaiting> {
+	fn get_file(&self, path: &EndpointPath) -> Option<LocalFile> {
 		if let Some(ref mime) = self.mime {
-			Box::new(self.page_handler_with_mime(path, mime))
-		} else {
-			Box::new(self.page_handler(path))
+			return LocalFile::from_path(&self.path, mime.to_owned());
 		}
+
+		let mut file_path = self.path.to_owned();
+
+		if path.has_no_params() {
+			file_path.push("index.html");
+		} else {
+			for part in &path.app_params {
+				file_path.push(part);
+			}
+		}
+
+		let mime = mime_guess::guess_mime_type(&file_path);
+		LocalFile::from_path(&file_path, mime)
+	}
+
+
+	pub fn to_response(&self, path: &EndpointPath) -> Response {
+		let (reader, response) = handler::PageHandler {
+			file: self.get_file(path),
+			cache: self.cache,
+			safe_to_embed_on: self.embeddable_on.clone(),
+		}.into_response();
+
+		self.pool.spawn(reader).forget();
+
+		Box::new(future::ok(response))
 	}
 }
 
-impl Endpoint for LocalPageEndpoint {
+impl Endpoint for Dapp {
 	fn info(&self) -> Option<&EndpointInfo> {
 		self.info.as_ref()
 	}
 
-	fn to_handler(&self, path: EndpointPath) -> Box<Handler> {
-		if let Some(ref mime) = self.mime {
-			Box::new(self.page_handler_with_mime(path, mime))
-		} else {
-			Box::new(self.page_handler(path))
-		}
-	}
-}
-
-struct LocalSingleFile {
-	path: PathBuf,
-	mime: String,
-}
-
-impl handler::Dapp for LocalSingleFile {
-	type DappFile = LocalFile;
-
-	fn file(&self, _path: &str) -> Option<Self::DappFile> {
-		LocalFile::from_path(&self.path, Some(&self.mime))
-	}
-}
-
-struct LocalDapp {
-	path: PathBuf,
-}
-
-impl handler::Dapp for LocalDapp {
-	type DappFile = LocalFile;
-
-	fn file(&self, file_path: &str) -> Option<Self::DappFile> {
-		let mut path = self.path.clone();
-		for part in file_path.split('/') {
-			path.push(part);
-		}
-		LocalFile::from_path(&path, None)
+	fn respond(&self, path: EndpointPath, _req: Request) -> Response {
+		self.to_response(&path)
 	}
 }
 
 struct LocalFile {
-	content_type: String,
-	buffer: [u8; 4096],
+	content_type: Mime,
 	file: fs::File,
-	len: u64,
-	pos: u64,
 }
 
 impl LocalFile {
-	fn from_path<P: AsRef<Path>>(path: P, mime: Option<&str>) -> Option<Self> {
+	fn from_path<P: AsRef<Path>>(path: P, content_type: Mime) -> Option<Self> {
+		trace!(target: "dapps", "Local file: {:?}", path.as_ref());
 		// Check if file exists
 		fs::File::open(&path).ok().map(|file| {
-			let content_type = mime.map(|mime| mime.to_owned())
-				.unwrap_or_else(|| mime_guess::guess_mime_type(path).to_string());
-			let len = file.metadata().ok().map_or(0, |meta| meta.len());
 			LocalFile {
-				content_type: content_type,
-				buffer: [0; 4096],
-				file: file,
-				pos: 0,
-				len: len,
+				content_type,
+				file,
 			}
 		})
 	}
 }
 
 impl handler::DappFile for LocalFile {
-	fn content_type(&self) -> &str {
+	type Reader = fs::File;
+
+	fn content_type(&self) -> &Mime {
 		&self.content_type
 	}
 
-	fn is_drained(&self) -> bool {
-		self.pos == self.len
-	}
-
-	fn next_chunk(&mut self) -> &[u8] {
-		let _ = self.file.seek(SeekFrom::Start(self.pos));
-		if let Ok(n) = self.file.read(&mut self.buffer) {
-			&self.buffer[0..n]
-		} else {
-			&self.buffer[0..0]
-		}
-	}
-
-	fn bytes_written(&mut self, bytes: usize) {
-		self.pos += bytes as u64;
+	fn into_reader(self) -> Self::Reader {
+		self.file
 	}
 }

dapps/src/page/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -15,11 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 
-mod builtin;
-mod local;
+pub mod builtin;
+pub mod local;
 mod handler;
 
-pub use self::local::LocalPageEndpoint;
-pub use self::builtin::PageEndpoint;
-pub use self::handler::{PageCache, PageHandlerWaiting};
+pub use self::handler::PageCache;
 

dapps/src/proxypac.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,38 +16,40 @@
 
 //! Serving ProxyPac file
 
-use endpoint::{Endpoint, Handler, EndpointPath};
+use apps::HOME_PAGE;
+use endpoint::{Endpoint, Request, Response, EndpointPath};
+use futures::future;
 use handlers::ContentHandler;
-use apps::{HOME_PAGE, DAPPS_DOMAIN};
-use address;
+use hyper::mime;
+use {address, Embeddable};
 
 pub struct ProxyPac {
-	signer_address: Option<(String, u16)>,
+	embeddable: Embeddable,
+	dapps_domain: String,
 }
 
 impl ProxyPac {
-	pub fn boxed(signer_address: Option<(String, u16)>) -> Box<Endpoint> {
-		Box::new(ProxyPac {
-			signer_address: signer_address
-		})
+	pub fn boxed(embeddable: Embeddable, dapps_domain: String) -> Box<Endpoint> {
+		Box::new(ProxyPac { embeddable, dapps_domain })
 	}
 }
 
 impl Endpoint for ProxyPac {
-	fn to_handler(&self, path: EndpointPath) -> Box<Handler> {
-		let signer = self.signer_address.clone()
-			.map(address)
+	fn respond(&self, path: EndpointPath, _req: Request) -> Response {
+		let ui = self.embeddable
+			.as_ref()
+			.map(|ref parent| address(&parent.host, parent.port))
 			.unwrap_or_else(|| format!("{}:{}", path.host, path.port));
 
 		let content = format!(
 r#"
 function FindProxyForURL(url, host) {{
-	if (shExpMatch(host, "{0}{1}"))
+	if (shExpMatch(host, "{0}.{1}"))
 	{{
 		return "PROXY {4}";
 	}}
 
-	if (shExpMatch(host, "*{1}"))
+	if (shExpMatch(host, "*.{1}"))
 	{{
 		return "PROXY {2}:{3}";
 	}}
@@ -55,9 +57,11 @@ function FindProxyForURL(url, host) {{
 	return "DIRECT";
 }}
 "#,
-		HOME_PAGE, DAPPS_DOMAIN, path.host, path.port, signer);
+		HOME_PAGE, self.dapps_domain, path.host, path.port, ui);
 
-		Box::new(ContentHandler::ok(content, mime!(Application/Javascript)))
+		Box::new(future::ok(
+			ContentHandler::ok(content, mime::TEXT_JAVASCRIPT).into()
+		))
 	}
 }
 

dapps/src/router.rs

@@ -0,0 +1,406 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Router implementation
+//! Dispatch requests to proper application.
+
+use std::sync::Arc;
+use std::collections::HashMap;
+
+use futures::future;
+use hyper::{self, header, Uri};
+use jsonrpc_http_server as http;
+
+use apps;
+use apps::fetcher::Fetcher;
+use endpoint::{self, Endpoint, EndpointPath};
+use Endpoints;
+use handlers;
+use Embeddable;
+
+/// Special endpoints are accessible on every domain (every dapp)
+#[derive(Debug, PartialEq, Hash, Eq)]
+pub enum SpecialEndpoint {
+	Rpc,
+	Api,
+	Utils,
+	Home,
+	None,
+}
+
+enum Response {
+	Some(endpoint::Response),
+	None(hyper::Request),
+}
+
+/// An endpoint router.
+/// Dispatches the request to particular Endpoint by requested uri/path.
+pub struct Router {
+	endpoints: Option<Endpoints>,
+	fetch: Arc<Fetcher>,
+	special: HashMap<SpecialEndpoint, Option<Box<Endpoint>>>,
+	embeddable_on: Embeddable,
+	dapps_domain: String,
+}
+
+impl Router {
+	fn resolve_request(&self, req: hyper::Request, refresh_dapps: bool) -> (bool, Response) {
+		// Choose proper handler depending on path / domain
+		let endpoint = extract_endpoint(req.uri(), req.headers().get(), &self.dapps_domain);
+		let referer = extract_referer_endpoint(&req, &self.dapps_domain);
+		let is_utils = endpoint.1 == SpecialEndpoint::Utils;
+		let is_get_request = *req.method() == hyper::Method::Get;
+		let is_head_request = *req.method() == hyper::Method::Head;
+		let has_dapp = |dapp: &str| self.endpoints
+			.as_ref()
+			.map_or(false, |endpoints| endpoints.endpoints.read().contains_key(dapp));
+
+		trace!(target: "dapps", "Routing request to {:?}. Details: {:?}", req.uri(), req);
+		debug!(target: "dapps", "Handling endpoint request: {:?}, referer: {:?}", endpoint, referer);
+
+		(is_utils, match (endpoint.0, endpoint.1, referer) {
+			// Handle invalid web requests that we can recover from
+			(ref path, SpecialEndpoint::None, Some(ref referer))
+				if referer.app_id == apps::WEB_PATH
+					&& has_dapp(apps::WEB_PATH)
+					&& !is_web_endpoint(path)
+				=>
+			{
+				let token = referer.app_params.get(0).map(String::as_str).unwrap_or("");
+				let requested = req.uri().path();
+				let query = req.uri().query().map_or_else(String::new, |query| format!("?{}", query));
+				let redirect_url = format!("/{}/{}{}{}", apps::WEB_PATH, token, requested, query);
+				trace!(target: "dapps", "Redirecting to correct web request: {:?}", redirect_url);
+				Response::Some(Box::new(future::ok(
+					handlers::Redirection::new(redirect_url).into()
+				)))
+			},
+			// First check special endpoints
+			(ref path, ref endpoint, _) if self.special.contains_key(endpoint) => {
+				trace!(target: "dapps", "Resolving to special endpoint.");
+				let special = self.special.get(endpoint).expect("special known to contain key; qed");
+				match *special {
+					Some(ref special) => Response::Some(special.respond(path.clone().unwrap_or_default(), req)),
+					None => Response::None(req),
+				}
+			},
+			// Then delegate to dapp
+			(Some(ref path), _, _) if has_dapp(&path.app_id) => {
+				trace!(target: "dapps", "Resolving to local/builtin dapp.");
+				Response::Some(self.endpoints
+					.as_ref()
+					.expect("endpoints known to be set; qed")
+					.endpoints
+					.read()
+					.get(&path.app_id)
+					.expect("endpoints known to contain key; qed")
+					.respond(path.clone(), req))
+			},
+			// Try to resolve and fetch the dapp
+			(Some(ref path), _, _) if self.fetch.contains(&path.app_id) => {
+				trace!(target: "dapps", "Resolving to fetchable content.");
+				Response::Some(self.fetch.respond(path.clone(), req))
+			},
+			// 404 for non-existent content (only if serving endpoints and not homepage)
+			(Some(ref path), _, _)
+				if (is_get_request || is_head_request)
+					&& self.endpoints.is_some()
+					&& path.app_id != apps::HOME_PAGE
+				=>
+			{
+				trace!(target: "dapps", "Resolving to 404.");
+				if refresh_dapps {
+					debug!(target: "dapps", "Refreshing dapps and re-trying.");
+					self.endpoints.as_ref().map(|endpoints| endpoints.refresh_local_dapps());
+					return self.resolve_request(req, false);
+				} else {
+					Response::Some(Box::new(future::ok(handlers::ContentHandler::error(
+						hyper::StatusCode::NotFound,
+						"404 Not Found",
+						"Requested content was not found.",
+						None,
+						self.embeddable_on.clone(),
+					).into())))
+				}
+			},
+			// Any other GET|HEAD requests to home page.
+			_ if (is_get_request || is_head_request) && self.special.contains_key(&SpecialEndpoint::Home) => {
+				let special = self.special.get(&SpecialEndpoint::Home).expect("special known to contain key; qed");
+				match *special {
+					Some(ref special) => {
+						let mut endpoint = EndpointPath::default();
+						endpoint.app_params = req.uri().path().split('/').map(str::to_owned).collect();
+						Response::Some(special.respond(endpoint, req))
+					},
+					None => Response::None(req),
+				}
+			},
+			// RPC by default
+			_ => {
+				trace!(target: "dapps", "Resolving to RPC call.");
+				Response::None(req)
+			}
+		})
+	}
+}
+
+impl http::RequestMiddleware for Router {
+	fn on_request(&self, req: hyper::Request) -> http::RequestMiddlewareAction {
+		let is_origin_set = req.headers().get::<header::Origin>().is_some();
+		let (is_utils, response) = self.resolve_request(req, self.endpoints.is_some());
+		match response {
+			Response::Some(response) => http::RequestMiddlewareAction::Respond {
+				should_validate_hosts: !is_utils,
+				response,
+			},
+			Response::None(request) => http::RequestMiddlewareAction::Proceed {
+				should_continue_on_invalid_cors: !is_origin_set,
+				request,
+			},
+		}
+	}
+}
+
+impl Router {
+	pub fn new(
+		content_fetcher: Arc<Fetcher>,
+		endpoints: Option<Endpoints>,
+		special: HashMap<SpecialEndpoint, Option<Box<Endpoint>>>,
+		embeddable_on: Embeddable,
+		dapps_domain: String,
+	) -> Self {
+		Router {
+			endpoints: endpoints,
+			fetch: content_fetcher,
+			special: special,
+			embeddable_on: embeddable_on,
+			dapps_domain: format!(".{}", dapps_domain),
+		}
+	}
+}
+
+fn is_web_endpoint(path: &Option<EndpointPath>) -> bool {
+	match *path {
+		Some(ref path) if path.app_id == apps::WEB_PATH => true,
+		_ => false,
+	}
+}
+
+fn extract_referer_endpoint(req: &hyper::Request, dapps_domain: &str) -> Option<EndpointPath> {
+	let referer = req.headers().get::<header::Referer>();
+
+	let url = referer.and_then(|referer| referer.parse().ok());
+	url.and_then(|url| {
+		extract_url_referer_endpoint(&url, dapps_domain).or_else(|| {
+			extract_endpoint(&url, None, dapps_domain).0
+		})
+	})
+}
+
+fn extract_url_referer_endpoint(url: &Uri, dapps_domain: &str) -> Option<EndpointPath> {
+	let query = url.query();
+	match query {
+		Some(query) if query.starts_with(apps::URL_REFERER) => {
+			let scheme = url.scheme().unwrap_or("http");
+			let host = url.host().unwrap_or("unknown");
+			let port = default_port(url, None);
+			let referer_url = format!("{}://{}:{}/{}", scheme, host, port, &query[apps::URL_REFERER.len()..]);
+			debug!(target: "dapps", "Recovering referer from query parameter: {}", referer_url);
+
+			if let Some(referer_url) = referer_url.parse().ok() {
+				extract_endpoint(&referer_url, None, dapps_domain).0
+			} else {
+				None
+			}
+		},
+		_ => None,
+	}
+}
+
+fn extract_endpoint(url: &Uri, extra_host: Option<&header::Host>, dapps_domain: &str) -> (Option<EndpointPath>, SpecialEndpoint) {
+	fn special_endpoint(path: &[&str]) -> SpecialEndpoint {
+		if path.len() <= 1 {
+			return SpecialEndpoint::None;
+		}
+
+		match path[0].as_ref() {
+			apps::RPC_PATH => SpecialEndpoint::Rpc,
+			apps::API_PATH => SpecialEndpoint::Api,
+			apps::UTILS_PATH => SpecialEndpoint::Utils,
+			apps::HOME_PAGE => SpecialEndpoint::Home,
+			_ => SpecialEndpoint::None,
+		}
+	}
+
+	let port = default_port(url, extra_host.as_ref().and_then(|h| h.port()));
+	let host = url.host().or_else(|| extra_host.as_ref().map(|h| h.hostname()));
+	let query = url.query().map(str::to_owned);
+	let mut path_segments = url.path().split('/').skip(1).collect::<Vec<_>>();
+	trace!(
+		target: "dapps",
+		"Extracting endpoint from: {:?} (dapps: {}). Got host {:?}:{} with path {:?}",
+		url, dapps_domain, host, port, path_segments
+	);
+	match host {
+		Some(host) if host.ends_with(dapps_domain) => {
+			let id = &host[0..(host.len() - dapps_domain.len())];
+			let special = special_endpoint(&path_segments);
+
+			// remove special endpoint id from params
+			if special != SpecialEndpoint::None {
+				path_segments.remove(0);
+			}
+
+			let (app_id, app_params) = if let Some(split) = id.rfind('.') {
+				let (params, id) = id.split_at(split);
+				path_segments.insert(0, params);
+				(id[1..].to_owned(), path_segments)
+			} else {
+				(id.to_owned(), path_segments)
+			};
+
+			(Some(EndpointPath {
+				app_id,
+				app_params: app_params.into_iter().map(Into::into).collect(),
+				query,
+				host: host.to_owned(),
+				port,
+				using_dapps_domains: true,
+			}), special)
+		},
+		Some(host) if path_segments.len() > 1 => {
+			let special = special_endpoint(&path_segments);
+			let id = path_segments.remove(0);
+			(Some(EndpointPath {
+				app_id: id.to_owned(),
+				app_params: path_segments.into_iter().map(Into::into).collect(),
+				query,
+				host: host.to_owned(),
+				port,
+				using_dapps_domains: false,
+			}), special)
+		},
+		_ => (None, special_endpoint(&path_segments)),
+	}
+}
+
+fn default_port(url: &Uri, extra_port: Option<u16>) -> u16 {
+	let scheme = url.scheme().unwrap_or("http");
+	url.port().or(extra_port).unwrap_or_else(|| match scheme {
+		"http" => 80,
+		"https" => 443,
+		_ => 80,
+	})
+}
+
+#[cfg(test)]
+mod tests {
+	use super::{SpecialEndpoint, EndpointPath, extract_endpoint};
+
+	#[test]
+	fn should_extract_endpoint() {
+		let dapps_domain = ".web3.site";
+
+		// With path prefix
+		assert_eq!(
+			extract_endpoint(&"http://localhost:8080/status/index.html?q=1".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["index.html".to_owned()],
+				query: Some("q=1".into()),
+				host: "localhost".to_owned(),
+				port: 8080,
+				using_dapps_domains: false,
+			}), SpecialEndpoint::None)
+		);
+
+		// With path prefix
+		assert_eq!(
+			extract_endpoint(&"http://localhost:8080/rpc/".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "rpc".to_owned(),
+				app_params: vec!["".to_owned()],
+				query: None,
+				host: "localhost".to_owned(),
+				port: 8080,
+				using_dapps_domains: false,
+			}), SpecialEndpoint::Rpc)
+		);
+
+		assert_eq!(
+			extract_endpoint(&"http://my.status.web3.site/parity-utils/inject.js".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["my".into(), "inject.js".into()],
+				query: None,
+				host: "my.status.web3.site".to_owned(),
+				port: 80,
+				using_dapps_domains: true,
+			}), SpecialEndpoint::Utils)
+		);
+
+		assert_eq!(
+			extract_endpoint(&"http://my.status.web3.site/inject.js".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["my".into(), "inject.js".into()],
+				query: None,
+				host: "my.status.web3.site".to_owned(),
+				port: 80,
+				using_dapps_domains: true,
+			}), SpecialEndpoint::None)
+		);
+
+		// By Subdomain
+		assert_eq!(
+			extract_endpoint(&"http://status.web3.site/test.html".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["test.html".to_owned()],
+				query: None,
+				host: "status.web3.site".to_owned(),
+				port: 80,
+				using_dapps_domains: true,
+			}), SpecialEndpoint::None)
+		);
+
+		// RPC by subdomain
+		assert_eq!(
+			extract_endpoint(&"http://my.status.web3.site/rpc/".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["my".into(), "".into()],
+				query: None,
+				host: "my.status.web3.site".to_owned(),
+				port: 80,
+				using_dapps_domains: true,
+			}), SpecialEndpoint::Rpc)
+		);
+
+		// API by subdomain
+		assert_eq!(
+			extract_endpoint(&"http://my.status.web3.site/api/".parse().unwrap(), None, dapps_domain),
+			(Some(EndpointPath {
+				app_id: "status".to_owned(),
+				app_params: vec!["my".into(), "".into()],
+				query: None,
+				host: "my.status.web3.site".to_owned(),
+				port: 80,
+				using_dapps_domains: true,
+			}), SpecialEndpoint::Api)
+		);
+	}
+}

dapps/src/router/auth.rs

@@ -1,106 +0,0 @@
-// Copyright 2015, 2016 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,
-		}
-	}
-}

dapps/src/router/host_validation.rs

@@ -1,47 +0,0 @@
-// Copyright 2015, 2016 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,
-	))
-}

dapps/src/router/mod.rs

@@ -1,342 +0,0 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Router implementation
-//! 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, Next, Encoder, Decoder, Control, StatusCode};
-use hyper::net::HttpStream;
-use apps::{self, DAPPS_DOMAIN};
-use apps::fetcher::Fetcher;
-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)]
-pub enum SpecialEndpoint {
-	Rpc,
-	Api,
-	Utils,
-	None,
-}
-
-pub struct Router<A: Authorization + 'static> {
-	control: Option<Control>,
-	signer_address: Option<(String, u16)>,
-	endpoints: Arc<Endpoints>,
-	fetch: Arc<Fetcher>,
-	special: Arc<HashMap<SpecialEndpoint, Box<Endpoint>>>,
-	authorization: Arc<A>,
-	allowed_hosts: Option<Vec<String>>,
-	handler: Box<server::Handler<HttpStream> + Send>,
-}
-
-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);
-		let referer = extract_referer_endpoint(&req);
-		let is_utils = endpoint.1 == SpecialEndpoint::Utils;
-		let is_get_request = *req.method() == hyper::Method::Get;
-
-		trace!(target: "dapps", "Routing request to {:?}. Details: {:?}", url, req);
-
-		// 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);
-		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 is_get_request
-					&& referer.app_id == apps::WEB_PATH
-					&& self.endpoints.contains_key(apps::WEB_PATH)
-					&& !is_web_endpoint(path)
-				=>
-			{
-				trace!(target: "dapps", "Redirecting to correct web request: {:?}", referer_url);
-				// TODO [ToDr] Some nice util for this!
-				let using_domain = if referer.using_dapps_domains { 0 } else { 1 };
-				let len = cmp::min(referer_url.path.len(), using_domain + 3); // token + protocol + hostname
-				let base = referer_url.path[..len].join("/");
-				let requested = url.map(|u| u.path.join("/")).unwrap_or_default();
-				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")
-					.to_async_handler(path.clone().unwrap_or_default(), control)
-			},
-			// Then delegate to dapp
-			(Some(ref path), _, _) if self.endpoints.contains_key(&path.app_id) => {
-				trace!(target: "dapps", "Resolving to local/builtin dapp.");
-				self.endpoints.get(&path.app_id)
-					.expect("endpoints known to contain key; qed")
-					.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.");
-				self.fetch.to_async_handler(path.clone(), control)
-			},
-			// 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.");
-				Box::new(ContentHandler::error(
-					StatusCode::NotFound,
-					"404 Not Found",
-					"Requested content was not found.",
-					None,
-					self.signer_address.clone(),
-				))
-			},
-			// Redirect any other GET request to signer.
-			_ if is_get_request => {
-				if let Some(signer_address) = self.signer_address.clone() {
-					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.");
-				self.special.get(&SpecialEndpoint::Rpc)
-					.expect("RPC endpoint always stored; qed")
-					.to_async_handler(EndpointPath::default(), control)
-			}
-		};
-
-		// 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<A: Authorization> Router<A> {
-	pub fn new(
-		control: Control,
-		signer_address: Option<(String, u16)>,
-		content_fetcher: Arc<Fetcher>,
-		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,
-			authorization: authorization,
-			allowed_hosts: allowed_hosts,
-			handler: handler,
-		}
-	}
-}
-
-fn is_web_endpoint(path: &Option<EndpointPath>) -> bool {
-	match *path {
-		Some(ref path) if path.app_id == apps::WEB_PATH => true,
-		_ => false,
-	}
-}
-
-fn extract_referer_endpoint(req: &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_endpoint(&option).0.map(|endpoint| (endpoint, option.expect("Just wrapped; qed")))
-	})
-}
-
-fn extract_endpoint(url: &Option<Url>) -> (Option<EndpointPath>, SpecialEndpoint) {
-	fn special_endpoint(url: &Url) -> SpecialEndpoint {
-		if url.path.len() <= 1 {
-			return SpecialEndpoint::None;
-		}
-
-		match url.path[0].as_ref() {
-			apps::RPC_PATH => SpecialEndpoint::Rpc,
-			apps::API_PATH => SpecialEndpoint::Api,
-			apps::UTILS_PATH => SpecialEndpoint::Utils,
-			_ => SpecialEndpoint::None,
-		}
-	}
-
-	match *url {
-		Some(ref url) => match url.host {
-			Host::Domain(ref domain) if domain.ends_with(DAPPS_DOMAIN) => {
-				let len = domain.len() - DAPPS_DOMAIN.len();
-				let id = domain[0..len].to_owned();
-
-				(Some(EndpointPath {
-					app_id: id,
-					host: domain.clone(),
-					port: url.port,
-					using_dapps_domains: true,
-				}), special_endpoint(url))
-			},
-			_ if url.path.len() > 1 => {
-				let id = url.path[0].clone();
-				(Some(EndpointPath {
-					app_id: id.clone(),
-					host: format!("{}", url.host),
-					port: url.port,
-					using_dapps_domains: false,
-				}), special_endpoint(url))
-			},
-			_ => (None, special_endpoint(url)),
-		},
-		_ => (None, SpecialEndpoint::None)
-	}
-}
-
-#[test]
-fn should_extract_endpoint() {
-	assert_eq!(extract_endpoint(&None), (None, SpecialEndpoint::None));
-
-	// With path prefix
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://localhost:8080/status/index.html").ok()),
-		(Some(EndpointPath {
-			app_id: "status".to_owned(),
-			host: "localhost".to_owned(),
-			port: 8080,
-			using_dapps_domains: false,
-		}), SpecialEndpoint::None)
-	);
-
-	// With path prefix
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://localhost:8080/rpc/").ok()),
-		(Some(EndpointPath {
-			app_id: "rpc".to_owned(),
-			host: "localhost".to_owned(),
-			port: 8080,
-			using_dapps_domains: false,
-		}), SpecialEndpoint::Rpc)
-	);
-
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://my.status.parity/parity-utils/inject.js").ok()),
-		(Some(EndpointPath {
-			app_id: "my.status".to_owned(),
-			host: "my.status.parity".to_owned(),
-			port: 80,
-			using_dapps_domains: true,
-		}), SpecialEndpoint::Utils)
-	);
-
-	// By Subdomain
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://my.status.parity/test.html").ok()),
-		(Some(EndpointPath {
-			app_id: "my.status".to_owned(),
-			host: "my.status.parity".to_owned(),
-			port: 80,
-			using_dapps_domains: true,
-		}), SpecialEndpoint::None)
-	);
-
-	// RPC by subdomain
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://my.status.parity/rpc/").ok()),
-		(Some(EndpointPath {
-			app_id: "my.status".to_owned(),
-			host: "my.status.parity".to_owned(),
-			port: 80,
-			using_dapps_domains: true,
-		}), SpecialEndpoint::Rpc)
-	);
-
-	// API by subdomain
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://my.status.parity/api/").ok()),
-		(Some(EndpointPath {
-			app_id: "my.status".to_owned(),
-			host: "my.status.parity".to_owned(),
-			port: 80,
-			using_dapps_domains: true,
-		}), SpecialEndpoint::Api)
-	);
-}

dapps/src/rpc.rs

@@ -1,135 +0,0 @@
-// Copyright 2015, 2016 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 jsonrpc_core::{IoHandler, ResponseHandler, Request, Response};
-use jsonrpc_http_server::{ServerHandler, PanicHandler, AccessControlAllowOrigin, RpcHandler};
-use endpoint::{Endpoint, EndpointPath, Handler};
-
-pub fn rpc(handler: Arc<IoHandler>, panic_handler: Arc<Mutex<Option<Box<Fn() -> () + Send>>>>) -> Box<Endpoint> {
-	Box::new(RpcEndpoint {
-		handler: Arc::new(RpcMiddleware::new(handler)),
-		panic_handler: panic_handler,
-		cors_domain: None,
-		// NOTE [ToDr] We don't need to do any hosts validation here. It's already done in router.
-		allowed_hosts: None,
-	})
-}
-
-struct RpcEndpoint {
-	handler: Arc<RpcMiddleware>,
-	panic_handler: Arc<Mutex<Option<Box<Fn() -> () + Send>>>>,
-	cors_domain: Option<Vec<AccessControlAllowOrigin>>,
-	allowed_hosts: Option<Vec<String>>,
-}
-
-impl Endpoint for RpcEndpoint {
-	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(
-				self.handler.clone(),
-				self.cors_domain.clone(),
-				self.allowed_hosts.clone(),
-				panic_handler,
-				control,
-		))
-	}
-}
-
-struct RpcMiddleware {
-	handler: Arc<IoHandler>,
-	methods: Vec<String>,
-}
-
-impl RpcMiddleware {
-	fn new(handler: Arc<IoHandler>) -> Self {
-		RpcMiddleware {
-			handler: handler,
-			methods: vec!["eth_accounts".into(), "parity_accountsInfo".into()],
-		}
-	}
-
-	/// Appends additional parameter for specific calls.
-	fn augment_request(&self, request: &mut Request, meta: Option<Meta>) {
-		use jsonrpc_core::{Call, Params, to_value};
-
-		fn augment_call(call: &mut Call, meta: Option<&Meta>, methods: &Vec<String>) {
-			match (call, meta) {
-				(&mut Call::MethodCall(ref mut method_call), Some(meta)) if methods.contains(&method_call.method) => {
-					let session = to_value(&meta.app_id);
-
-					let params = match method_call.params {
-						Some(Params::Array(ref vec)) if vec.len() == 0 => Some(Params::Array(vec![session])),
-						// invalid params otherwise
-						_ => None,
-					};
-
-					method_call.params = params;
-				},
-				_ => {}
-			}
-		}
-
-		match *request {
-			Request::Single(ref mut call) => augment_call(call, meta.as_ref(), &self.methods),
-			Request::Batch(ref mut vec) => {
-				for mut call in vec {
-					augment_call(call, meta.as_ref(), &self.methods)
-				}
-			},
-		}
-	}
-}
-
-#[derive(Debug)]
-struct Meta {
-	app_id: String,
-}
-
-impl RpcHandler for RpcMiddleware {
-	type Metadata = Meta;
-
-	fn read_metadata(&self, request: &hyper::server::Request<hyper::net::HttpStream>) -> Option<Self::Metadata> {
-		request.headers().get::<hyper::header::Referer>()
-			.and_then(|referer| hyper::Url::parse(referer).ok())
-			.and_then(|url| {
-				url.path_segments()
-					.and_then(|mut split| split.next())
-					.map(|app_id| Meta {
-						app_id: app_id.to_owned(),
-					})
-			})
-	}
-
-	fn handle_request<H>(&self, request_str: &str, response_handler: H, meta: Option<Self::Metadata>) where
-		H: ResponseHandler<Option<String>, Option<String>> + 'static
-	{
-		let handler = IoHandler::convert_handler(response_handler);
-		let request = IoHandler::read_request(request_str);
-		trace!(target: "rpc", "Request metadata: {:?}", meta);
-
-		match request {
-			Ok(mut request) => {
-				self.augment_request(&mut request, meta);
-				self.handler.request_handler().handle_request(request, handler, None)
-			},
-			Err(error) => handler.send(Some(Response::from(error))),
-		}
-	}
-}
-

dapps/src/tests/api.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -33,35 +33,12 @@ fn should_return_error() {
 	);
 
 	// then
-	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
-	assert_eq!(response.headers.get(3).unwrap(), "Content-Type: application/json");
+	response.assert_status("HTTP/1.1 404 Not Found");
+	response.assert_header("Content-Type", "application/json");
 	assert_eq!(response.body, format!("58\n{}\n0\n\n", r#"{"code":"404","title":"Not Found","detail":"Resource you requested has not been found."}"#));
 	assert_security_headers(&response.headers);
 }
 
-#[test]
-fn should_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
@@ -72,6 +49,7 @@ fn should_handle_ping() {
 		"\
 			POST /api/ping HTTP/1.1\r\n\
 			Host: home.parity\r\n\
+			Content-Type: application/json\r\n\
 			Connection: close\r\n\
 			\r\n\
 			{}
@@ -79,8 +57,8 @@ fn should_handle_ping() {
 	);
 
 	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-	assert_eq!(response.headers.get(3).unwrap(), "Content-Type: application/json");
+	response.assert_status("HTTP/1.1 200 OK");
+	response.assert_header("Content-Type", "application/json");
 	assert_eq!(response.body, "0\n\n".to_owned());
 	assert_security_headers(&response.headers);
 }
@@ -102,59 +80,7 @@ fn should_try_to_resolve_dapp() {
 	);
 
 	// then
-	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
+	response.assert_status("HTTP/1.1 404 Not Found");
 	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://home.parity\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://home.parity"),
-		"CORS header for home.parity missing: {:?}",
-		response.headers
-	);
-}

dapps/src/tests/authorization.rs

@@ -1,80 +0,0 @@
-// Copyright 2015, 2016 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);
-}

dapps/src/tests/fetch.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -15,10 +15,10 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use devtools::http_client;
-use rustc_serialize::hex::FromHex;
+use rustc_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,
+	serve_with_registrar_and_fetch,
 	request, assert_security_headers_for_embed,
 };
 
@@ -31,7 +31,7 @@ fn should_resolve_dapp() {
 	let response = request(server,
 		"\
 			GET / HTTP/1.1\r\n\
-			Host: 1472a9e190620cdf6b31f383373e45efcfe869a820c91f9ccd7eb9fb45e4985d.parity\r\n\
+			Host: 1472a9e190620cdf6b31f383373e45efcfe869a820c91f9ccd7eb9fb45e4985d.web3.site\r\n\
 			Connection: close\r\n\
 			\r\n\
 		"
@@ -39,7 +39,7 @@ fn should_resolve_dapp() {
 
 	// then
 	response.assert_status("HTTP/1.1 404 Not Found");
-	assert_eq!(registrar.calls.lock().len(), 2);
+	assert_eq!(registrar.calls.lock().len(), 4);
 	assert_security_headers_for_embed(&response.headers);
 }
 
@@ -52,7 +52,7 @@ fn should_return_503_when_syncing_but_should_make_the_calls() {
 	let response = request(server,
 		"\
 			GET / HTTP/1.1\r\n\
-			Host: 1472a9e190620cdf6b31f383373e45efcfe869a820c91f9ccd7eb9fb45e4985d.parity\r\n\
+			Host: 1472a9e190620cdf6b31f383373e45efcfe869a820c91f9ccd7eb9fb45e4985d.web3.site\r\n\
 			Connection: close\r\n\
 			\r\n\
 		"
@@ -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(), 4);
+	assert_eq!(registrar.calls.lock().len(), 2);
 	assert_security_headers_for_embed(&response.headers);
 }
 
@@ -81,7 +81,7 @@ fn should_return_502_on_hash_mismatch() {
 	let response = request(server,
 		"\
 			GET / HTTP/1.1\r\n\
-			Host: 94f093625c06887d94d9fee0d5f9cc4aaa46f33d24d1c7e4b5237e7c37d547dd.parity\r\n\
+			Host: 94f093625c06887d94d9fee0d5f9cc4aaa46f33d24d1c7e4b5237e7c37d547dd.web3.site\r\n\
 			Connection: close\r\n\
 			\r\n\
 		"
@@ -112,7 +112,7 @@ fn should_return_error_for_invalid_dapp_zip() {
 	let response = request(server,
 		"\
 			GET / HTTP/1.1\r\n\
-			Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.parity\r\n\
+			Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.web3.site\r\n\
 			Connection: close\r\n\
 			\r\n\
 		"
@@ -144,7 +144,7 @@ fn should_return_fetched_dapp_content() {
 	let response1 = http_client::request(server.addr(),
 		"\
 			GET /index.html HTTP/1.1\r\n\
-			Host: 9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a.parity\r\n\
+			Host: 9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a.web3.site\r\n\
 			Connection: close\r\n\
 			\r\n\
 		"
@@ -152,7 +152,7 @@ fn should_return_fetched_dapp_content() {
 	let response2 = http_client::request(server.addr(),
 		"\
 			GET /manifest.json HTTP/1.1\r\n\
-			Host: 9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a.parity\r\n\
+			Host: 9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a.web3.site\r\n\
 			Connection: close\r\n\
 			\r\n\
 		"
@@ -171,6 +171,8 @@ fn should_return_fetched_dapp_content() {
 		r#"18
 <h1>Hello Gavcoin!</h1>
 
+0
+
 "#
 	);
 
@@ -207,7 +209,7 @@ fn should_return_fetched_content() {
 	let response = request(server,
 		"\
 			GET / HTTP/1.1\r\n\
-			Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.parity\r\n\
+			Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.web3.site\r\n\
 			Connection: close\r\n\
 			\r\n\
 		"
@@ -234,7 +236,7 @@ fn should_cache_content() {
 	);
 	let request_str = "\
 		GET / HTTP/1.1\r\n\
-		Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.parity\r\n\
+		Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.web3.site\r\n\
 		Connection: close\r\n\
 		\r\n\
 	";
@@ -257,7 +259,7 @@ fn should_not_request_content_twice() {
 	use std::thread;
 
 	// given
-	let (server, fetch, registrar) = serve_with_registrar_and_fetch_and_threads(true);
+	let (server, fetch, registrar) = serve_with_registrar_and_fetch();
 	let gavcoin = GAVCOIN_ICON.from_hex().unwrap();
 	registrar.set_result(
 		"2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e".parse().unwrap(),
@@ -265,7 +267,7 @@ fn should_not_request_content_twice() {
 	);
 	let request_str = "\
 		GET / HTTP/1.1\r\n\
-		Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.parity\r\n\
+		Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.web3.site\r\n\
 		Connection: close\r\n\
 		\r\n\
 	";
@@ -298,16 +300,27 @@ fn should_not_request_content_twice() {
 	response2.assert_status("HTTP/1.1 200 OK");
 }
 
+#[test]
+fn should_encode_and_decode_base32() {
+	use base32;
+
+	let encoded = base32::encode(base32::Alphabet::Crockford, "token+https://parity.io".as_bytes());
+	assert_eq!("EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY", &encoded);
+
+	let data = base32::decode(base32::Alphabet::Crockford, "EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY").unwrap();
+	assert_eq!("token+https://parity.io", &String::from_utf8(data).unwrap());
+}
+
 #[test]
 fn should_stream_web_content() {
 	// given
-	let (server, fetch) = serve_with_fetch("token");
+	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
 
 	// when
 	let response = request(server,
 		"\
-			GET /web/token/https/parity.io/ HTTP/1.1\r\n\
-			Host: localhost:8080\r\n\
+			GET / HTTP/1.1\r\n\
+			Host: EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY.web.web3.site\r\n\
 			Connection: close\r\n\
 			\r\n\
 		"
@@ -322,20 +335,112 @@ fn should_stream_web_content() {
 }
 
 #[test]
-fn should_return_error_on_invalid_token() {
+fn should_support_base32_encoded_web_urls() {
 	// given
-	let (server, fetch) = serve_with_fetch("token");
+	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
 
 	// when
 	let response = request(server,
 		"\
-			GET /web/invalidtoken/https/parity.io/ HTTP/1.1\r\n\
+			GET /styles.css?test=123 HTTP/1.1\r\n\
+			Host: EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY.web.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	assert_security_headers_for_embed(&response.headers);
+
+	fetch.assert_requested("https://parity.io/styles.css?test=123");
+	fetch.assert_no_more_requests();
+}
+
+#[test]
+fn should_correctly_handle_long_label_when_splitted() {
+	// given
+	let (server, fetch) = serve_with_fetch("xolrg9fePeQyKLnL", "https://contribution.melonport.com");
+
+	// when
+	let response = request(server,
+		"\
+			GET /styles.css?test=123 HTTP/1.1\r\n\
+			Host: f1qprwk775k6am35a5wmpk3e9gnpgx3me1sk.mbsfcdqpwx3jd5h7ax39dxq2wvb5dhqpww3fe9t2wrvfdm.web.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	assert_security_headers_for_embed(&response.headers);
+
+	fetch.assert_requested("https://contribution.melonport.com/styles.css?test=123");
+	fetch.assert_no_more_requests();
+}
+
+
+#[test]
+fn should_support_base32_encoded_web_urls_as_path() {
+	// given
+	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
+
+	// when
+	let response = request(server,
+		"\
+			GET /web/EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY/styles.css?test=123 HTTP/1.1\r\n\
 			Host: localhost:8080\r\n\
 			Connection: close\r\n\
 			\r\n\
 		"
 	);
 
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	assert_security_headers_for_embed(&response.headers);
+
+	fetch.assert_requested("https://parity.io/styles.css?test=123");
+	fetch.assert_no_more_requests();
+}
+
+#[test]
+fn should_return_error_on_non_whitelisted_domain() {
+	// given
+	let (server, fetch) = serve_with_fetch("token", "https://ethcore.io");
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY.web.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 400 Bad Request");
+	assert_security_headers_for_embed(&response.headers);
+
+	fetch.assert_no_more_requests();
+}
+
+#[test]
+fn should_return_error_on_invalid_token() {
+	// given
+	let (server, fetch) = serve_with_fetch("test", "https://parity.io");
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY.web.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
 	// then
 	response.assert_status("HTTP/1.1 400 Bad Request");
 	assert_security_headers_for_embed(&response.headers);
@@ -346,7 +451,7 @@ fn should_return_error_on_invalid_token() {
 #[test]
 fn should_return_error_on_invalid_protocol() {
 	// given
-	let (server, fetch) = serve_with_fetch("token");
+	let (server, fetch) = serve_with_fetch("token", "ftp://parity.io");
 
 	// when
 	let response = request(server,
@@ -365,38 +470,16 @@ fn should_return_error_on_invalid_protocol() {
 	fetch.assert_no_more_requests();
 }
 
-#[test]
-fn should_redirect_if_trailing_slash_is_missing() {
-	// given
-	let (server, fetch) = serve_with_fetch("token");
-
-	// when
-	let response = request(server,
-		"\
-			GET /web/token/https/parity.io HTTP/1.1\r\n\
-			Host: localhost:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 302 Found");
-	response.assert_header("Location", "/web/token/https/parity.io/");
-
-	fetch.assert_no_more_requests();
-}
-
 #[test]
 fn should_disallow_non_get_requests() {
 	// given
-	let (server, fetch) = serve_with_fetch("token");
+	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
 
 	// when
 	let response = request(server,
 		"\
-			POST /token/https/parity.io/ HTTP/1.1\r\n\
-			Host: web.parity\r\n\
+			POST / HTTP/1.1\r\n\
+			Host: EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY.web.web3.site\r\n\
 			Content-Type: application/json\r\n\
 			Connection: close\r\n\
 			\r\n\
@@ -415,7 +498,7 @@ fn should_disallow_non_get_requests() {
 #[test]
 fn should_fix_absolute_requests_based_on_referer() {
 	// given
-	let (server, fetch) = serve_with_fetch("token");
+	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
 
 	// when
 	let response = request(server,
@@ -423,14 +506,37 @@ fn should_fix_absolute_requests_based_on_referer() {
 			GET /styles.css HTTP/1.1\r\n\
 			Host: localhost:8080\r\n\
 			Connection: close\r\n\
-			Referer: http://localhost:8080/web/token/https/parity.io/\r\n\
+			Referer: http://localhost:8080/web/EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY/\r\n\
 			\r\n\
 		"
 	);
 
 	// then
 	response.assert_status("HTTP/1.1 302 Found");
-	response.assert_header("Location", "/web/token/https/parity.io/styles.css");
+	response.assert_header("Location", "/web/EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY/styles.css");
+
+	fetch.assert_no_more_requests();
+}
+
+#[test]
+fn should_fix_absolute_requests_based_on_referer_in_url() {
+	// given
+	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
+
+	// when
+	let response = request(server,
+		"\
+			GET /styles.css HTTP/1.1\r\n\
+			Host: localhost:8080\r\n\
+			Connection: close\r\n\
+			Referer: http://localhost:8080/?__referer=web/EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY/\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 302 Found");
+	response.assert_header("Location", "/web/EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY/styles.css");
 
 	fetch.assert_no_more_requests();
 }

dapps/src/tests/helpers/fetch.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,7 +16,7 @@
 
 use std::{io, thread, time};
 use std::sync::{atomic, mpsc, Arc};
-use util::Mutex;
+use parking_lot::Mutex;
 
 use futures::{self, Future};
 use fetch::{self, Fetch};
@@ -94,7 +94,7 @@ impl FakeFetch {
 }
 
 impl Fetch for FakeFetch {
-	type Result = futures::BoxFuture<fetch::Response, fetch::Error>;
+	type Result = Box<Future<Item = fetch::Response, Error = fetch::Error> + Send>;
 
 	fn new() -> Result<Self, fetch::Error> where Self: Sized {
 		Ok(FakeFetch::default())
@@ -114,9 +114,20 @@ impl Fetch for FakeFetch {
 
 			let data = response.lock().take().unwrap_or(b"Some content");
 			let cursor = io::Cursor::new(data);
-			tx.complete(fetch::Response::from_reader(cursor));
+			tx.send(fetch::Response::from_reader(cursor)).unwrap();
 		});
 
-		rx.map_err(|_| fetch::Error::Aborted).boxed()
+		Box::new(rx.map_err(|_| fetch::Error::Aborted))
+	}
+
+	fn process_and_forget<F, I, E>(&self, f: F) where
+		F: Future<Item=I, Error=E> + Send + 'static,
+		I: Send + 'static,
+		E: Send + 'static,
+	{
+		// Spawn the task in a separate thread.
+		thread::spawn(|| {
+			let _ = f.wait();
+		});
 	}
 }

dapps/src/tests/helpers/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,15 +16,21 @@
 
 use std::env;
 use std::str;
+use std::net::SocketAddr;
+use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use env_logger::LogBuilder;
-
-use ServerBuilder;
-use Server;
-use fetch::Fetch;
-use devtools::http_client;
+use jsonrpc_core::IoHandler;
+use jsonrpc_http_server::{self as http, Host, DomainsValidation};
 use parity_reactor::Remote;
 
+use devtools::http_client;
+use hash_fetch::urlhint::ContractClient;
+use fetch::{Fetch, Client as FetchClient};
+use node_health::{NodeHealth, TimeChecker, CpuPool};
+
+use {Middleware, SyncStatus, WebProxyTokens};
+
 mod registrar;
 mod fetch;
 
@@ -33,6 +39,13 @@ 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") {
@@ -42,7 +55,7 @@ fn init_logger() {
 	}
 }
 
-pub fn init_server<F, B>(hosts: Option<Vec<String>>, process: F, remote: Remote) -> (Server, Arc<FakeRegistrar>) where
+pub fn init_server<F, B>(process: F, io: IoHandler) -> (Server, Arc<FakeRegistrar>) where
 	F: FnOnce(ServerBuilder) -> ServerBuilder<B>,
 	B: Fetch,
 {
@@ -50,69 +63,71 @@ pub fn init_server<F, B>(hosts: Option<Vec<String>>, process: F, remote: Remote)
 	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 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(), hosts).unwrap();
+
+	let mut builder = ServerBuilder::new(&dapps_path, registrar.clone());
+	builder.signer_address = Some(("127.0.0.1".into(), SIGNER_PORT));
+	let server = process(builder).start_unsecured_http(&"127.0.0.1:0".parse().unwrap(), io).unwrap();
 	(
 		server,
 		registrar,
 	)
 }
 
-pub fn serve_with_auth(user: &str, pass: &str) -> Server {
-	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");
-	ServerBuilder::new(&dapps_path, registrar.clone(), Remote::new_sync())
-		.signer_address(Some(("127.0.0.1".into(), SIGNER_PORT)))
-		.start_basic_auth_http(&"127.0.0.1:0".parse().unwrap(), None, user, pass).unwrap()
+pub fn serve_with_rpc(io: IoHandler) -> Server {
+	init_server(|builder| builder, io).0
 }
 
 pub fn serve_hosts(hosts: Option<Vec<String>>) -> Server {
-	init_server(hosts, |builder| builder, Remote::new_sync()).0
+	let hosts = hosts.map(|hosts| hosts.into_iter().map(Into::into).collect());
+	init_server(|mut builder| {
+		builder.allowed_hosts = hosts.into();
+		builder
+	}, Default::default()).0
 }
 
 pub fn serve_with_registrar() -> (Server, Arc<FakeRegistrar>) {
-	init_server(None, |builder| builder, Remote::new_sync())
+	init_server(|builder| builder, Default::default())
 }
 
 pub fn serve_with_registrar_and_sync() -> (Server, Arc<FakeRegistrar>) {
-	init_server(None, |builder| {
-		builder.sync_status(Arc::new(|| true))
-	}, Remote::new_sync())
+	init_server(|mut builder| {
+		builder.sync_status = Arc::new(FakeSync(true));
+		builder
+	}, Default::default())
 }
 
 pub fn serve_with_registrar_and_fetch() -> (Server, FakeFetch, Arc<FakeRegistrar>) {
-	serve_with_registrar_and_fetch_and_threads(false)
-}
-
-pub fn serve_with_registrar_and_fetch_and_threads(multi_threaded: bool) -> (Server, FakeFetch, Arc<FakeRegistrar>) {
 	let fetch = FakeFetch::default();
 	let f = fetch.clone();
-	let (server, reg) = init_server(None, move |builder| {
+	let (server, reg) = init_server(move |builder| {
 		builder.fetch(f.clone())
-	}, if multi_threaded { Remote::new_thread_per_future() } else { Remote::new_sync() });
+	}, Default::default());
 
 	(server, fetch, reg)
 }
 
-pub fn serve_with_fetch(web_token: &'static str) -> (Server, FakeFetch) {
+pub fn serve_with_fetch(web_token: &'static str, domain: &'static str) -> (Server, FakeFetch) {
 	let fetch = FakeFetch::default();
 	let f = fetch.clone();
-	let (server, _) = init_server(None, move |builder| {
-		builder
-			.fetch(f.clone())
-			.web_proxy_tokens(Arc::new(move |token| &token == web_token))
-	}, Remote::new_sync());
+	let (server, _) = init_server(move |mut builder| {
+		builder.web_proxy_tokens = Arc::new(move |token| {
+			if &token == web_token { Some(domain.into()) } else { None }
+		});
+		builder.fetch(f.clone())
+	}, Default::default());
 
 	(server, fetch)
 }
 
 pub fn serve() -> Server {
-	init_server(None, |builder| builder, Remote::new_sync()).0
+	init_server(|builder| builder, Default::default()).0
+}
+
+pub fn serve_ui() -> Server {
+	init_server(|mut builder| {
+		builder.serve_ui = true;
+		builder
+	}, Default::default()).0
 }
 
 pub fn request(server: Server, request: &str) -> http_client::Response {
@@ -125,3 +140,159 @@ 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>,
+	fetch: Option<T>,
+	serve_ui: bool,
+}
+
+impl ServerBuilder {
+	/// Construct new dapps server
+	pub fn new<P: AsRef<Path>>(dapps_path: P, registrar: Arc<ContractClient>) -> Self {
+		ServerBuilder {
+			dapps_path: dapps_path.as_ref().to_owned(),
+			registrar: registrar,
+			sync_status: Arc::new(FakeSync(false)),
+			web_proxy_tokens: Arc::new(|_| None),
+			signer_address: None,
+			allowed_hosts: DomainsValidation::Disabled,
+			fetch: None,
+			serve_ui: false,
+		}
+	}
+}
+
+impl<T: Fetch> ServerBuilder<T> {
+	/// Set a fetch client to use.
+	pub fn fetch<X: Fetch>(self, fetch: X) -> ServerBuilder<X> {
+		ServerBuilder {
+			dapps_path: self.dapps_path,
+			registrar: self.registrar,
+			sync_status: self.sync_status,
+			web_proxy_tokens: self.web_proxy_tokens,
+			signer_address: self.signer_address,
+			allowed_hosts: self.allowed_hosts,
+			fetch: Some(fetch),
+			serve_ui: self.serve_ui,
+		}
+	}
+
+	/// Asynchronously start server with no authentication,
+	/// returns result with `Server` handle on success or an error.
+	pub fn start_unsecured_http(self, addr: &SocketAddr, io: IoHandler) -> 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,
+			Remote::new_sync(),
+			fetch,
+			self.serve_ui,
+		)
+	}
+
+	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,
+		serve_ui: bool,
+	) -> Result<Server, http::Error> {
+		let health = NodeHealth::new(
+			sync_status.clone(),
+			TimeChecker::new::<String>(&[], CpuPool::new(1)),
+			remote.clone(),
+		);
+		let pool = ::futures_cpupool::CpuPool::new(1);
+		let middleware = if serve_ui {
+			Middleware::ui(
+				pool,
+				health,
+				DAPPS_DOMAIN.into(),
+				registrar,
+				sync_status,
+				fetch,
+			)
+		} else {
+			Middleware::dapps(
+				pool,
+				health,
+				signer_address,
+				vec![],
+				vec![],
+				dapps_path,
+				extra_dapps,
+				DAPPS_DOMAIN.into(),
+				registrar,
+				sync_status,
+				web_proxy_tokens,
+				fetch,
+			)
+		};
+
+		let mut allowed_hosts: Option<Vec<Host>> = allowed_hosts.into();
+		allowed_hosts.as_mut().map(|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")
+			.address()
+	}
+}
+
+impl Drop for Server {
+	fn drop(&mut self) {
+		self.server.take().unwrap().close()
+	}
+}

dapps/src/tests/helpers/registrar.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -17,10 +17,13 @@
 use std::str;
 use std::sync::Arc;
 use std::collections::HashMap;
-use rustc_serialize::hex::FromHex;
 
-use hash_fetch::urlhint::ContractClient;
-use util::{Bytes, Address, Mutex, H256, ToPretty};
+use bigint::hash::H256;
+use bytes::{Bytes, ToPretty};
+use hash_fetch::urlhint::{ContractClient, BoxFuture};
+use parking_lot::Mutex;
+use rustc_hex::FromHex;
+use util::Address;
 
 const REGISTRAR: &'static str = "8e4e9b13d4b45cb0befc93c3061b1408f67316b2";
 const URLHINT: &'static str = "deadbeefcafe0000000000000000000000000000";
@@ -64,9 +67,10 @@ impl ContractClient for FakeRegistrar {
 		Ok(REGISTRAR.parse().unwrap())
 	}
 
-	fn call(&self, address: Address, data: Bytes) -> Result<Bytes, String> {
+	fn call(&self, address: Address, data: Bytes) -> BoxFuture<Bytes, String> {
 		let call = (address.to_hex(), data.to_hex());
 		self.calls.lock().push(call.clone());
-		self.responses.lock().get(&call).cloned().expect(&format!("No response for call: {:?}", call))
+		let res = self.responses.lock().get(&call).cloned().expect(&format!("No response for call: {:?}", call));
+		Box::new(::futures::future::done(res))
 	}
 }

dapps/src/tests/home.rs

@@ -0,0 +1,62 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use tests::helpers::{serve_ui, request, assert_security_headers};
+
+#[test]
+fn should_serve_home_js() {
+	// given
+	let server = serve_ui();
+
+	// when
+	let response = request(server,
+		"\
+			GET /inject.js HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	response.assert_header("Content-Type", "application/javascript");
+	assert_eq!(response.body.contains("function(){"), true, "Expected function in: {}", response.body);
+	assert_security_headers(&response.headers);
+}
+
+#[test]
+fn should_serve_home() {
+	// given
+	let server = serve_ui();
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	response.assert_header("Content-Type", "text/html");
+	assert_security_headers(&response.headers);
+}

dapps/src/tests/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -19,8 +19,9 @@
 mod helpers;
 
 mod api;
-mod authorization;
 mod fetch;
+mod home;
 mod redirection;
+mod rpc;
 mod validation;
 

dapps/src/tests/redirection.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -32,7 +32,27 @@ fn should_redirect_to_home() {
 	);
 
 	// then
-	assert_eq!(response.status, "HTTP/1.1 302 Found".to_owned());
+	response.assert_status("HTTP/1.1 302 Found");
+	assert_eq!(response.headers.get(0).unwrap(), "Location: http://127.0.0.1:18180");
+}
+
+#[test]
+fn should_redirect_to_home_with_domain() {
+	// given
+	let server = serve();
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: home.web3.site\r\n\
+			Connection: close\r\n\
+			\r\n\
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 302 Found");
 	assert_eq!(response.headers.get(0).unwrap(), "Location: http://127.0.0.1:18180");
 }
 
@@ -52,27 +72,7 @@ fn should_redirect_to_home_when_trailing_slash_is_missing() {
 	);
 
 	// 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");
-}
-
-#[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());
+	response.assert_status("HTTP/1.1 302 Found");
 	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
-	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
+	response.assert_status("HTTP/1.1 404 Not Found");
 	assert_security_headers_for_embed(&response.headers);
 }
 
@@ -105,14 +105,14 @@ fn should_display_404_on_invalid_dapp_with_domain() {
 	let response = request(server,
 		"\
 			GET / HTTP/1.1\r\n\
-			Host: invaliddapp.parity\r\n\
+			Host: invaliddapp.web3.site\r\n\
 			Connection: close\r\n\
 			\r\n\
 		"
 	);
 
 	// then
-	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
+	response.assert_status("HTTP/1.1 404 Not Found");
 	assert_security_headers_for_embed(&response.headers);
 }
 
@@ -134,8 +134,8 @@ fn should_serve_rpc() {
 	);
 
 	// then
-	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}"#));
+	response.assert_status("HTTP/1.1 200 OK");
+	assert_eq!(response.body, format!("4C\n{}\n\n0\n\n", r#"{"jsonrpc":"2.0","error":{"code":-32700,"message":"Parse error"},"id":null}"#));
 }
 
 #[test]
@@ -156,8 +156,8 @@ fn should_serve_rpc_at_slash_rpc() {
 	);
 
 	// then
-	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}"#));
+	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}"#));
 }
 
 
@@ -178,8 +178,8 @@ fn should_serve_proxy_pac() {
 	);
 
 	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-	assert_eq!(response.body, "D5\n\nfunction FindProxyForURL(url, host) {\n\tif (shExpMatch(host, \"home.parity\"))\n\t{\n\t\treturn \"PROXY 127.0.0.1:18180\";\n\t}\n\n\tif (shExpMatch(host, \"*.parity\"))\n\t{\n\t\treturn \"PROXY 127.0.0.1:8080\";\n\t}\n\n\treturn \"DIRECT\";\n}\n\n0\n\n".to_owned());
+	response.assert_status("HTTP/1.1 200 OK");
+	assert_eq!(response.body, "DB\n\nfunction FindProxyForURL(url, host) {\n\tif (shExpMatch(host, \"home.web3.site\"))\n\t{\n\t\treturn \"PROXY 127.0.0.1:18180\";\n\t}\n\n\tif (shExpMatch(host, \"*.web3.site\"))\n\t{\n\t\treturn \"PROXY 127.0.0.1:8080\";\n\t}\n\n\treturn \"DIRECT\";\n}\n\n0\n\n".to_owned());
 	assert_security_headers(&response.headers);
 }
 
@@ -200,8 +200,8 @@ fn should_serve_utils() {
 	);
 
 	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
-	assert_eq!(response.body.contains("function(){"), true);
+	response.assert_status("HTTP/1.1 200 OK");
+	response.assert_header("Content-Type", "application/javascript");
+	assert_eq!(response.body.contains("function(){"), true, "Expected function in: {}", response.body);
 	assert_security_headers(&response.headers);
 }
-

dapps/src/tests/rpc.rs

@@ -0,0 +1,49 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use jsonrpc_core::{IoHandler, Value};
+
+use tests::helpers::{serve_with_rpc, request};
+
+#[test]
+fn should_serve_rpc() {
+	// given
+	let mut io = IoHandler::default();
+	io.add_method("rpc_test", |_| {
+		Ok(Value::String("Hello World!".into()))
+	});
+	let server = serve_with_rpc(io);
+
+	// when
+	let req = r#"{"jsonrpc":"2.0","id":1,"method":"rpc_test","params":[]}"#;
+	let response = request(server, &format!(
+		"\
+			POST /rpc/ HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			Content-Type: application/json\r\n\
+			Content-Length: {}\r\n\
+			\r\n\
+			{}\r\n\
+		",
+		req.as_bytes().len(),
+		req,
+	));
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	assert_eq!(response.body, "31\n{\"jsonrpc\":\"2.0\",\"result\":\"Hello World!\",\"id\":1}\n\n0\n\n".to_owned());
+}

dapps/src/tests/validation.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -33,8 +33,8 @@ fn should_reject_invalid_host() {
 	);
 
 	// then
-	assert_eq!(response.status, "HTTP/1.1 403 Forbidden".to_owned());
-	assert!(response.body.contains("Current Host Is Disallowed"), response.body);
+	response.assert_status("HTTP/1.1 403 Forbidden");
+	assert!(response.body.contains("Provided Host header is not whitelisted."), response.body);
 }
 
 #[test]
@@ -54,7 +54,7 @@ fn should_allow_valid_host() {
 	);
 
 	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	response.assert_status("HTTP/1.1 200 OK");
 }
 
 #[test]
@@ -66,7 +66,7 @@ fn should_serve_dapps_domains() {
 	let response = request(server,
 		"\
 			GET / HTTP/1.1\r\n\
-			Host: ui.parity\r\n\
+			Host: ui.web3.site\r\n\
 			Connection: close\r\n\
 			\r\n\
 			{}
@@ -74,7 +74,7 @@ fn should_serve_dapps_domains() {
 	);
 
 	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	response.assert_status("HTTP/1.1 200 OK");
 }
 
 #[test]
@@ -95,33 +95,5 @@ fn should_allow_parity_utils_even_on_invalid_domain() {
 	);
 
 	// then
-	assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
+	response.assert_status("HTTP/1.1 200 OK");
 }
-
-#[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
-	);
-}
-

dapps/src/url.rs

@@ -1,150 +0,0 @@
-// Copyright 2015, 2016 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/HTTPS URL type. Based on URL type from Iron library.
-
-use url_lib::{self};
-pub use url_lib::Host;
-
-/// HTTP/HTTPS URL type for Iron.
-#[derive(PartialEq, Eq, Clone, Debug)]
-pub struct Url {
-	/// Raw url of url
-	pub raw: url_lib::Url,
-
-	/// The host field of the URL, probably a domain.
-	pub host: Host,
-
-	/// The connection port.
-	pub port: u16,
-
-	/// The URL path, the resource to be accessed.
-	///
-	/// A *non-empty* vector encoding the parts of the URL path.
-	/// Empty entries of `""` correspond to trailing slashes.
-	pub path: Vec<String>,
-
-	/// The URL query.
-	pub query: Option<String>,
-
-	/// The URL username field, from the userinfo section of the URL.
-	///
-	/// `None` if the `@` character was not part of the input OR
-	/// if a blank username was provided.
-	/// Otherwise, a non-empty string.
-	pub username: Option<String>,
-
-	/// The URL password field, from the userinfo section of the URL.
-	///
-	/// `None` if the `@` character was not part of the input OR
-	/// if a blank password was provided.
-	/// Otherwise, a non-empty string.
-	pub password: Option<String>,
-}
-
-impl Url {
-	/// Create a URL from a string.
-	///
-	/// The input must be a valid URL with a special scheme for this to succeed.
-	///
-	/// HTTP and HTTPS are special schemes.
-	///
-	/// See: http://url.spec.whatwg.org/#special-scheme
-	pub fn parse(input: &str) -> Result<Url, String> {
-		// Parse the string using rust-url, then convert.
-		match url_lib::Url::parse(input) {
-			Ok(raw_url) => Url::from_generic_url(raw_url),
-			Err(e) => Err(format!("{}", e))
-		}
-	}
-
-	/// Create a `Url` from a `rust-url` `Url`.
-	pub fn from_generic_url(raw_url: url_lib::Url) -> Result<Url, String> {
-		// Map empty usernames to None.
-		let username = match raw_url.username() {
-			"" => None,
-			username => Some(username.to_owned())
-		};
-
-		// Map empty passwords to None.
-		let password = match raw_url.password() {
-			Some(password) if !password.is_empty() => Some(password.to_owned()),
-			_ => None,
-		};
-
-		let port = raw_url.port_or_known_default().ok_or_else(|| format!("Unknown port for scheme: `{}`", raw_url.scheme()))?;
-		let host = raw_url.host().ok_or_else(|| "Valid host, because only data:, mailto: protocols does not have host.".to_owned())?.to_owned();
-		let path = raw_url.path_segments().ok_or_else(|| "Valid path segments. In HTTP we won't get cannot-be-a-base URLs".to_owned())?
-					.map(|part| part.to_owned()).collect();
-		let query = raw_url.query().map(|x| x.to_owned());
-
-		Ok(Url {
-			port: port,
-			host: host,
-			path: path,
-			query: query,
-			raw: raw_url,
-			username: username,
-			password: password,
-		})
-	}
-}
-
-#[cfg(test)]
-mod test {
-    use super::Url;
-
-    #[test]
-    fn test_default_port() {
-        assert_eq!(Url::parse("http://example.com/wow").unwrap().port, 80u16);
-        assert_eq!(Url::parse("https://example.com/wow").unwrap().port, 443u16);
-    }
-
-    #[test]
-    fn test_explicit_port() {
-        assert_eq!(Url::parse("http://localhost:3097").unwrap().port, 3097u16);
-    }
-
-    #[test]
-    fn test_empty_username() {
-        assert!(Url::parse("http://@example.com").unwrap().username.is_none());
-        assert!(Url::parse("http://:password@example.com").unwrap().username.is_none());
-    }
-
-    #[test]
-    fn test_not_empty_username() {
-        let user = Url::parse("http://john:pass@example.com").unwrap().username;
-        assert_eq!(user.unwrap(), "john");
-
-        let user = Url::parse("http://john:@example.com").unwrap().username;
-        assert_eq!(user.unwrap(), "john");
-    }
-
-    #[test]
-    fn test_empty_password() {
-        assert!(Url::parse("http://michael@example.com").unwrap().password.is_none());
-        assert!(Url::parse("http://:@example.com").unwrap().password.is_none());
-    }
-
-    #[test]
-    fn test_not_empty_password() {
-        let pass = Url::parse("http://michael:pass@example.com").unwrap().password;
-        assert_eq!(pass.unwrap(), "pass");
-
-        let pass = Url::parse("http://:pass@example.com").unwrap().password;
-        assert_eq!(pass.unwrap(), "pass");
-    }
-}

dapps/src/web.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -17,206 +17,150 @@
 //! Serving web-based content (proxying)
 
 use std::sync::Arc;
-use fetch::{self, Fetch};
-use parity_reactor::Remote;
 
-use hyper::{self, server, net, Next, Encoder, Decoder};
-use hyper::status::StatusCode;
+use base32;
+use fetch::{self, Fetch};
+use hyper::{mime, StatusCode};
 
 use apps;
-use endpoint::{Endpoint, Handler, EndpointPath};
+use endpoint::{Endpoint, EndpointPath, Request, Response};
+use futures::future;
 use handlers::{
 	ContentFetcherHandler, ContentHandler, ContentValidator, ValidatorResponse,
-	StreamingHandler, Redirection, extract_url,
+	StreamingHandler,
 };
-use url::Url;
-use WebProxyTokens;
-
-pub type Embeddable = Option<(String, u16)>;
+use {Embeddable, WebProxyTokens};
 
 pub struct Web<F> {
 	embeddable_on: Embeddable,
 	web_proxy_tokens: Arc<WebProxyTokens>,
-	remote: Remote,
 	fetch: 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>,
+		fetch: F,
+	) -> Box<Endpoint> {
 		Box::new(Web {
-			embeddable_on: embeddable_on,
-			web_proxy_tokens: web_proxy_tokens,
-			remote: remote,
-			fetch: fetch,
+			embeddable_on,
+			web_proxy_tokens,
+			fetch,
 		})
 	}
+
+	fn extract_target_url(&self, path: &EndpointPath) -> Result<String, ContentHandler> {
+		let token_and_url = path.app_params.get(0)
+			.map(|encoded| encoded.replace('.', ""))
+			.and_then(|encoded| base32::decode(base32::Alphabet::Crockford, &encoded.to_uppercase()))
+			.and_then(|data| String::from_utf8(data).ok())
+			.ok_or_else(|| ContentHandler::error(
+				StatusCode::BadRequest,
+				"Invalid parameter",
+				"Couldn't parse given parameter:",
+				path.app_params.get(0).map(String::as_str),
+				self.embeddable_on.clone()
+			))?;
+
+		let mut token_it = token_and_url.split('+');
+		let token = token_it.next();
+		let target_url = token_it.next();
+
+		// Check if token supplied in URL is correct.
+		let domain = match token.and_then(|token| self.web_proxy_tokens.domain(token)) {
+			Some(domain) => domain,
+			_ => {
+				return Err(ContentHandler::error(
+					StatusCode::BadRequest, "Invalid Access Token", "Invalid or old web proxy access token supplied.", Some("Try refreshing the page."), self.embeddable_on.clone()
+				));
+			}
+		};
+
+		// Validate protocol
+		let mut target_url = match target_url {
+			Some(url) if url.starts_with("http://") || url.starts_with("https://") => url.to_owned(),
+			_ => {
+				return Err(ContentHandler::error(
+					StatusCode::BadRequest, "Invalid Protocol", "Invalid protocol used.", None, self.embeddable_on.clone()
+				));
+			}
+		};
+
+		if !target_url.starts_with(&*domain) {
+			return Err(ContentHandler::error(
+				StatusCode::BadRequest, "Invalid Domain", "Dapp attempted to access invalid domain.", Some(&target_url), self.embeddable_on.clone(),
+			));
+		}
+
+		if !target_url.ends_with("/") {
+			target_url = format!("{}/", target_url);
+		}
+
+		// Skip the token
+		let query = path.query.as_ref().map_or_else(String::new, |query| format!("?{}", query));
+		let path = path.app_params[1..].join("/");
+
+		Ok(format!("{}{}{}", target_url, path, query))
+	}
 }
 
 impl<F: Fetch> Endpoint for Web<F> {
-	fn to_async_handler(&self, path: EndpointPath, control: hyper::Control) -> Box<Handler> {
-		Box::new(WebHandler {
-			control: control,
-			state: State::Initial,
-			path: path,
-			remote: self.remote.clone(),
-			fetch: self.fetch.clone(),
-			web_proxy_tokens: self.web_proxy_tokens.clone(),
-			embeddable_on: self.embeddable_on.clone(),
-		})
+	fn respond(&self, path: EndpointPath, req: Request) -> Response {
+		// First extract the URL (reject invalid URLs)
+		let target_url = match self.extract_target_url(&path) {
+			Ok(url) => url,
+			Err(response) => {
+				return Box::new(future::ok(response.into()));
+			}
+		};
+
+		let token = path.app_params.get(0)
+			.expect("`target_url` is valid; app_params is not empty;qed")
+			.to_owned();
+
+		Box::new(ContentFetcherHandler::new(
+			req.method(),
+			&target_url,
+			path,
+			WebInstaller {
+				embeddable_on: self.embeddable_on.clone(),
+				token,
+			},
+			self.embeddable_on.clone(),
+			self.fetch.clone(),
+		))
 	}
 }
 
 struct WebInstaller {
 	embeddable_on: Embeddable,
+	token: String,
 }
 
 impl ContentValidator for WebInstaller {
 	type Error = String;
 
-	fn validate_and_install(&self, response: fetch::Response) -> Result<ValidatorResponse, String> {
-		let status = StatusCode::from_u16(response.status().to_u16());
+	fn validate_and_install(self, response: fetch::Response) -> Result<ValidatorResponse, String> {
+		let status = response.status();
 		let is_html = response.is_html();
-		let mime = response.content_type().unwrap_or(mime!(Text/Html));
+		let mime = response.content_type().unwrap_or(mime::TEXT_HTML);
 		let mut handler = StreamingHandler::new(
 			response,
 			status,
 			mime,
-			self.embeddable_on.clone(),
+			self.embeddable_on,
 		);
 		if is_html {
-			handler.set_initial_content(&format!(r#"<script src="/{}/inject.js"></script>"#, apps::UTILS_PATH));
+			handler.set_initial_content(&format!(
+				r#"<script src="/{}/inject.js"></script><script>history.replaceState({{}}, "", "/?{}{}/{}")</script>"#,
+				apps::UTILS_PATH,
+				apps::URL_REFERER,
+				apps::WEB_PATH,
+				&self.token,
+			));
 		}
 		Ok(ValidatorResponse::Streaming(handler))
 	}
 }
 
-enum State<F: Fetch> {
-	Initial,
-	Error(ContentHandler),
-	Redirecting(Redirection),
-	Fetching(ContentFetcherHandler<WebInstaller, F>),
-}
-
-struct WebHandler<F: Fetch> {
-	control: hyper::Control,
-	state: State<F>,
-	path: EndpointPath,
-	remote: Remote,
-	fetch: F,
-	web_proxy_tokens: Arc<WebProxyTokens>,
-	embeddable_on: Embeddable,
-}
-
-impl<F: Fetch> WebHandler<F> {
-	fn extract_target_url(&self, url: Option<Url>) -> Result<String, State<F>> {
-		let (path, query) = match url {
-			Some(url) => (url.path, url.query),
-			None => {
-				return Err(State::Error(ContentHandler::error(
-					StatusCode::BadRequest, "Invalid URL", "Couldn't parse URL", None, self.embeddable_on.clone()
-				)));
-			}
-		};
-
-		// Support domain based routing.
-		let idx = match path.get(0).map(|m| m.as_ref()) {
-			Some(apps::WEB_PATH) => 1,
-			_ => 0,
-		};
-
-		// Check if token supplied in URL is correct.
-		match path.get(idx) {
-			Some(ref 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 protocol = match path.get(idx + 1).map(|a| a.as_str()) {
-			Some("http") => "http",
-			Some("https") => "https",
-			_ => {
-				return Err(State::Error(ContentHandler::error(
-					StatusCode::BadRequest, "Invalid Protocol", "Invalid protocol used.", None, self.embeddable_on.clone()
-				)));
-			}
-		};
-
-		// Redirect if address to main page does not end with /
-		if let None = path.get(idx + 3) {
-			return Err(State::Redirecting(
-				Redirection::new(&format!("/{}/", path.join("/")))
-			));
-		}
-
-		let query = match query {
-			Some(query) => format!("?{}", query),
-			None => "".into(),
-		};
-
-		Ok(format!("{}://{}{}", protocol, path[idx + 2..].join("/"), query))
-	}
-}
-
-impl<F: Fetch> server::Handler<net::HttpStream> for WebHandler<F> {
-	fn on_request(&mut self, request: server::Request<net::HttpStream>) -> Next {
-		let url = extract_url(&request);
-
-		// First extract the URL (reject invalid URLs)
-		let target_url = match self.extract_target_url(url) {
-			Ok(url) => url,
-			Err(error) => {
-				self.state = error;
-				return Next::write();
-			}
-		};
-
-		let mut handler = ContentFetcherHandler::new(
-			target_url,
-			self.path.clone(),
-			self.control.clone(),
-			WebInstaller {
-				embeddable_on: self.embeddable_on.clone(),
-			},
-			self.embeddable_on.clone(),
-			self.remote.clone(),
-			self.fetch.clone(),
-		);
-		let res = handler.on_request(request);
-		self.state = State::Fetching(handler);
-
-		res
-	}
-
-	fn on_request_readable(&mut self, decoder: &mut Decoder<net::HttpStream>) -> Next {
-		match self.state {
-			State::Initial => Next::end(),
-			State::Error(ref mut handler) => handler.on_request_readable(decoder),
-			State::Redirecting(ref mut handler) => handler.on_request_readable(decoder),
-			State::Fetching(ref mut handler) => handler.on_request_readable(decoder),
-		}
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		match self.state {
-			State::Initial => Next::end(),
-			State::Error(ref mut handler) => handler.on_response(res),
-			State::Redirecting(ref mut handler) => handler.on_response(res),
-			State::Fetching(ref mut handler) => handler.on_response(res),
-		}
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<net::HttpStream>) -> Next {
-		match self.state {
-			State::Initial => Next::end(),
-			State::Error(ref mut handler) => handler.on_response_writable(encoder),
-			State::Redirecting(ref mut handler) => handler.on_response_writable(encoder),
-			State::Fetching(ref mut handler) => handler.on_response_writable(encoder),
-		}
-	}
-}
-
-

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.5.0"
+version = "1.8.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [build-dependencies]
@@ -11,7 +11,8 @@ rustc_version = "0.1"
 
 [dependencies]
 parity-ui-dev = { path = "../../js", optional = true }
-parity-ui-precompiled = { git = "https://github.com/ethcore/js-precompiled.git", 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 = "stable" }
 
 [features]
 no-precompiled-js = ["parity-ui-dev"]

dapps/ui/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify

db/Cargo.toml

@@ -1,25 +0,0 @@
-[package]
-description = "Ethcore Database"
-homepage = "http://parity.io"
-license = "GPL-3.0"
-name = "ethcore-db"
-version = "1.5.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"]

db/src/database.rs

@@ -1,565 +0,0 @@
-// Copyright 2015, 2016 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());
-			}
-		});
-	}
-}

db/src/lib.rs.in

@@ -1,89 +0,0 @@
-// Copyright 2015, 2016 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();
-		}
-	});
-}

db/src/traits.rs

@@ -1,135 +0,0 @@
-// Copyright 2015, 2016 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());
-	}
-}

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.5.0"
+version = "1.8.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]

devtools/src/http_client.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -87,7 +87,7 @@ pub fn request(address: &SocketAddr, request: &str) -> Response {
 	let _ = req.read_to_string(&mut response);
 
 	let mut lines = response.lines();
-	let status = lines.next().unwrap().to_owned();
+	let status = lines.next().expect("Expected a response").to_owned();
 	let headers_raw = read_block(&mut lines, false);
 	let headers = headers_raw.split('\n').map(|v| v.to_owned()).collect();
 	let body = read_block(&mut lines, true);
@@ -102,12 +102,7 @@ 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 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 {
+	if let None = port {
 		assert!(
 			headers.iter().find(|header| header.as_str() == "X-Frame-Options: SAMEORIGIN").is_some(),
 			"X-Frame-Options: SAMEORIGIN missing: {:?}", headers
@@ -121,4 +116,8 @@ 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
+	)
 }

devtools/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify

devtools/src/random_path.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -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> {

devtools/src/stop_guard.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify

devtools/src/test_socket.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify

docker/README.md

@@ -0,0 +1,3 @@
+Usage
+
+```docker build -f docker/ubuntu/Dockerfile --tag ethcore/parity:branch_or_tag_name .```

docker/centos/Dockerfile

@@ -1,29 +1,32 @@
 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 -s -- --disable-sudo
+ sh rustup.sh --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
-RUN git clone https://github.com/ethcore/parity && \
-	cd parity&&\
-	git checkout beta && \
-        git pull && \
-        ls -a&&\
-        cargo build --release --verbose && \
+ADD . /build/parity
+RUN cd parity&&\
+    cargo build --release --verbose && \
 	ls /build/parity/target/release/parity &&	\
 	strip /build/parity/target/release/parity
 

docker/hub/Dockerfile

@@ -0,0 +1,83 @@
+FROM ubuntu:14.04
+MAINTAINER Parity Technologies <devops@parity.io>
+WORKDIR /build
+#ENV for build TAG
+ARG BUILD_TAG
+ENV BUILD_TAG ${BUILD_TAG:-master}
+RUN echo "Build tag:" $BUILD_TAG
+# install tools and dependencies
+RUN apt-get update && \
+        apt-get install -y --force-yes --no-install-recommends \
+        # make
+        build-essential \
+        # add-apt-repository
+        software-properties-common \
+        make \
+        curl \
+        wget \
+        git \
+        g++ \
+        gcc \
+        libc6 \
+        libc6-dev \
+        binutils \
+        file \
+        openssl \
+        libssl-dev \
+        libudev-dev \
+        pkg-config \
+        dpkg-dev \
+        # evmjit dependencies
+        zlib1g-dev \
+        libedit-dev \
+	libudev-dev &&\
+# cmake and llvm ppa's. then update ppa's
+ 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
+ git clone https://github.com/debris/evmjit && \
+        cd evmjit && \
+        mkdir build && cd build && \
+        cmake .. && make && make install && cd && \
+# install rustup
+ curl https://sh.rustup.rs -sSf | sh -s -- -y && \
+# rustup directory
+ PATH=/root/.cargo/bin:$PATH && \
+# show backtraces
+ RUST_BACKTRACE=1 && \
+# build parity
+cd /build&&git clone https://github.com/paritytech/parity && \
+        cd parity && \
+	git pull&& \
+	git checkout $BUILD_TAG && \
+        cargo build --verbose --release --features final && \
+        #ls /build/parity/target/release/parity && \
+        strip /build/parity/target/release/parity && \
+ file /build/parity/target/release/parity&&mkdir -p /parity&& cp /build/parity/target/release/parity /parity&&\
+#cleanup Docker image
+ rm -rf /root/.cargo&&rm -rf /root/.multirust&&rm -rf /root/.rustup&&rm -rf /build&&\
+ apt-get purge -y  \
+        # make
+        build-essential \
+        # add-apt-repository
+        software-properties-common \
+        make \
+        curl \
+        wget \
+        git \
+        g++ \
+        gcc \
+        binutils \
+        file \
+        pkg-config \
+        dpkg-dev \
+        # evmjit dependencies
+        zlib1g-dev \
+        libedit-dev \
+        cmake llvm-3.7-dev&&\
+ rm -rf /var/lib/apt/lists/*
+# setup ENTRYPOINT
+EXPOSE 8080 8545 8180
+ENTRYPOINT ["/parity/parity"]

docker/ubuntu-aarch64/Dockerfile

@@ -1,5 +1,6 @@
 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,14 +25,11 @@ 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
-RUN git clone https://github.com/ethcore/parity && \
-        cd parity && \
-        git checkout beta && \
-        git pull && \
+ADD . /build/parity
+RUN cd parity && \
         mkdir -p .cargo && \
         echo '[target.aarch64-unknown-linux-gnu]\n\
         linker = "aarch64-linux-gnu-gcc"\n'\

docker/ubuntu-arm/Dockerfile

@@ -1,5 +1,6 @@
 FROM ubuntu:14.04
 WORKDIR /build
+
 # install tools and dependencies
 RUN apt-get -y update && \
         apt-get install -y --force-yes --no-install-recommends \
@@ -23,16 +24,12 @@ 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
-RUN git clone https://github.com/ethcore/parity && \
-        cd parity && \
-        git checkout beta && \
-        git pull && \
+ADD . /build/parity
+RUN cd parity && \
         mkdir -p .cargo && \
         echo '[target.armv7-unknown-linux-gnueabihf]\n\
         linker = "arm-linux-gnueabihf-gcc"\n'\

docker/ubuntu-dev/Dockerfile

@@ -1,37 +0,0 @@
-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

docker/ubuntu-jit/Dockerfile

@@ -1,5 +1,6 @@
 FROM ubuntu:14.04
 WORKDIR /build
+
 # install tools and dependencies
 RUN apt-get update && \
         apt-get install -y \
@@ -45,10 +46,8 @@ gcc -v &&\
 g++ -v
 
 # build parity
-RUN git clone https://github.com/ethcore/parity && \
-        cd parity && \
-        git checkout beta && \
-        git pull && \
+ADD . /build/parity
+RUN cd parity && \
         cargo build --release --features ethcore/jit --verbose && \
         ls /build/parity/target/release/parity &&       \
         strip /build/parity/target/release/parity

docker/ubuntu-stable/Dockerfile

@@ -1,40 +0,0 @@
-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"]

docker/ubuntu/Dockerfile

@@ -1,5 +1,6 @@
 FROM ubuntu:14.04
 WORKDIR /build
+
 # install tools and dependencies
 RUN apt-get update && \
         apt-get install -y \
@@ -8,7 +9,10 @@ RUN apt-get update && \
         curl \
         git \
         file \
-        binutils
+        binutils \
+        libssl-dev \
+        pkg-config \
+        libudev-dev
 
 # install rustup
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
@@ -26,10 +30,8 @@ gcc -v &&\
 g++ -v
 
 # build parity
-RUN git clone https://github.com/ethcore/parity && \
-        cd parity && \
-        git checkout beta && \
-        git pull && \
+ADD . /build/parity
+RUN cd parity && \
         cargo build --release --verbose && \
         ls /build/parity/target/release/parity && \
         strip /build/parity/target/release/parity

docs/CHANGELOG-0.9.md

@@ -0,0 +1,227 @@
+
+## Parity [beta-0.9.1](https://github.com/paritytech/parity/releases/tag/beta-0.9.1) (2016-02-16)
+
+Homestead transition block changed to 1100000.
+
+- Beta patch to 0.9.1 [#445](https://github.com/paritytech/parity/pull/445)
+- Delay homestead transition [#430](https://github.com/paritytech/parity/pull/430)
+- (BETA) https link in the installer (?) [#392](https://github.com/paritytech/parity/pull/392)
+- beta: Check for handshake expiration before attempting replace [#377](https://github.com/paritytech/parity/pull/377)
+
+## Parity [beta-0.9](https://github.com/paritytech/parity/releases/tag/beta-0.9) (2016-02-08)
+
+First Parity Beta 0.9 released.
+
+- Panic on missing counters; Client cleanup [#368](https://github.com/paritytech/parity/pull/368)
+- Update README for new PPAs. [#369](https://github.com/paritytech/parity/pull/369)
+- block_queue::clear should be more thorough [#365](https://github.com/paritytech/parity/pull/365)
+- Fixed an issue with forked counters [#363](https://github.com/paritytech/parity/pull/363)
+- Install parity [#362](https://github.com/paritytech/parity/pull/362)
+- DB directory versioning [#358](https://github.com/paritytech/parity/pull/358)
+- Raise FD limit for MacOS [#357](https://github.com/paritytech/parity/pull/357)
+- Travis slack integration. [#356](https://github.com/paritytech/parity/pull/356)
+- SignedTransaction structure [#350](https://github.com/paritytech/parity/pull/350)
+- License [#354](https://github.com/paritytech/parity/pull/354)
+- Performance optimizations [#353](https://github.com/paritytech/parity/pull/353)
+- Gitter in README. [#355](https://github.com/paritytech/parity/pull/355)
+- test efforts, receipt requests [#352](https://github.com/paritytech/parity/pull/352)
+- sync tests setup & local module coverage [#348](https://github.com/paritytech/parity/pull/348)
+- install parity script [#347](https://github.com/paritytech/parity/pull/347)
+- evmjit homestead merge [#342](https://github.com/paritytech/parity/pull/342)
+- Fixed sync stalling on fork [#343](https://github.com/paritytech/parity/pull/343)
+- Remerge 264 [#334](https://github.com/paritytech/parity/pull/334)
+- Ethsync tests bfix [#339](https://github.com/paritytech/parity/pull/339)
+- Fix default options. [#335](https://github.com/paritytech/parity/pull/335)
+- sync queue limit hotfix [#338](https://github.com/paritytech/parity/pull/338)
+- Network tests, separate local coverage for utils [#333](https://github.com/paritytech/parity/pull/333)
+- fix parity version so netstats can parse it [#332](https://github.com/paritytech/parity/pull/332)
+- reveal surprise [#331](https://github.com/paritytech/parity/pull/331)
+- Revert removal of `new_code`. [#330](https://github.com/paritytech/parity/pull/330)
+- Network mod tests first part [#329](https://github.com/paritytech/parity/pull/329)
+- Look ma no `dead_code` [#323](https://github.com/paritytech/parity/pull/323)
+- Fixing JIT, Updating hook to run `ethcore` tests. [#326](https://github.com/paritytech/parity/pull/326)
+- Final docs [#327](https://github.com/paritytech/parity/pull/327)
+- update install-deps.sh [#316](https://github.com/paritytech/parity/pull/316)
+- Finish all my docs. Fix previous test compilation. [#320](https://github.com/paritytech/parity/pull/320)
+- Additional evm tests (extops, call, jumps) and some docs [#317](https://github.com/paritytech/parity/pull/317)
+- More documentation. [#318](https://github.com/paritytech/parity/pull/318)
+- Additional documentation. [#315](https://github.com/paritytech/parity/pull/315)
+- unused functions cleanup [#310](https://github.com/paritytech/parity/pull/310)
+- update ethcore.github.io documentation automatically [#311](https://github.com/paritytech/parity/pull/311)
+- Another try with travis ci credentials [#314](https://github.com/paritytech/parity/pull/314)
+- Document some stuff. [#309](https://github.com/paritytech/parity/pull/309)
+- Check block parent on import; Peer timeouts [#303](https://github.com/paritytech/parity/pull/303)
+- Increasing coverage for evm. [#306](https://github.com/paritytech/parity/pull/306)
+- ethcore docs [#301](https://github.com/paritytech/parity/pull/301)
+- Replacing secure token for deployment [#305](https://github.com/paritytech/parity/pull/305)
+- doc.sh [#299](https://github.com/paritytech/parity/pull/299)
+- Building beta-* and stable-* tags [#302](https://github.com/paritytech/parity/pull/302)
+- Deploying artifacts for tags (release/beta) [#300](https://github.com/paritytech/parity/pull/300)
+- cov.sh to show coverage locally [#298](https://github.com/paritytech/parity/pull/298)
+- benchmark fixes [#297](https://github.com/paritytech/parity/pull/297)
+- Include JSONRPC CLI options. [#296](https://github.com/paritytech/parity/pull/296)
+- travis.yml fixes [#293](https://github.com/paritytech/parity/pull/293)
+- Improve version string. [#295](https://github.com/paritytech/parity/pull/295)
+- Fixed block queue test [#294](https://github.com/paritytech/parity/pull/294)
+- Util docs [#292](https://github.com/paritytech/parity/pull/292)
+- fixed building docs [#289](https://github.com/paritytech/parity/pull/289)
+- update travis to build PRs only against master [#290](https://github.com/paritytech/parity/pull/290)
+- Coverage effort [#272](https://github.com/paritytech/parity/pull/272)
+- updated docker containers [#288](https://github.com/paritytech/parity/pull/288)
+- rpc module fixes [#287](https://github.com/paritytech/parity/pull/287)
+- Test for Receipt RLP. [#282](https://github.com/paritytech/parity/pull/282)
+- Building from source guide [#284](https://github.com/paritytech/parity/pull/284)
+- Fixed neted empty list RLP encoding [#283](https://github.com/paritytech/parity/pull/283)
+- Fix CALLDATACOPY (and bonus CODECOPY, too!). [#279](https://github.com/paritytech/parity/pull/279)
+- added travis && coveralls badge to README.md [#280](https://github.com/paritytech/parity/pull/280)
+- coveralls coverage [#277](https://github.com/paritytech/parity/pull/277)
+- Travis [in progress] [#257](https://github.com/paritytech/parity/pull/257)
+- Travis on reorganized repo [#276](https://github.com/paritytech/parity/pull/276)
+- umbrella project [#275](https://github.com/paritytech/parity/pull/275)
+- Ethash disk cache [#273](https://github.com/paritytech/parity/pull/273)
+- Parity executable name and version [#274](https://github.com/paritytech/parity/pull/274)
+- Dockerfile [#195](https://github.com/paritytech/parity/pull/195)
+- Garbage collection test fix [#267](https://github.com/paritytech/parity/pull/267)
+- Fix stCallCreateCallCodeTest, add more tests [#271](https://github.com/paritytech/parity/pull/271)
+- Moved sync out of ethcore crate; Added block validation [#265](https://github.com/paritytech/parity/pull/265)
+- RLP encoder refactoring [#252](https://github.com/paritytech/parity/pull/252)
+- Chain sync tests and minor refactoring [#264](https://github.com/paritytech/parity/pull/264)
+- Common log init function [#263](https://github.com/paritytech/parity/pull/263)
+- changed max vm depth from 128 to 64, change homestead block to 1_000_000 [#262](https://github.com/paritytech/parity/pull/262)
+- fixed blockchain tests crash on log init [#261](https://github.com/paritytech/parity/pull/261)
+- Blockchain tests and some helpers for guarding temp directory [#256](https://github.com/paritytech/parity/pull/256)
+- Fix logging and random tests. [#260](https://github.com/paritytech/parity/pull/260)
+- Fix difficulty calculation algo. [#259](https://github.com/paritytech/parity/pull/259)
+- fix submodule version [#258](https://github.com/paritytech/parity/pull/258)
+- temp dir spawn refactoring [#246](https://github.com/paritytech/parity/pull/246)
+- fixed tests submodule branch [#254](https://github.com/paritytech/parity/pull/254)
+- rpc net methods returns real peer count && protocol version [#253](https://github.com/paritytech/parity/pull/253)
+- Add homestead & random tests. [#245](https://github.com/paritytech/parity/pull/245)
+- Fixing suicide with self-refund to be consistent with CPP. [#247](https://github.com/paritytech/parity/pull/247)
+- stubs for rpc methods [#251](https://github.com/paritytech/parity/pull/251)
+- clippy, missing docs, renaming etc. [#244](https://github.com/paritytech/parity/pull/244)
+- impl missing methods in tests [#243](https://github.com/paritytech/parity/pull/243)
+- General tests and some helpers [#239](https://github.com/paritytech/parity/pull/239)
+- Note additional tests are fixed, fix doc test. [#242](https://github.com/paritytech/parity/pull/242)
+- jsonrpc http server [#193](https://github.com/paritytech/parity/pull/193)
+- Ethash nonce is H64 not a u64 [#240](https://github.com/paritytech/parity/pull/240)
+- Fix import for bcMultiChainTest [#236](https://github.com/paritytech/parity/pull/236)
+- Client basic tests [#232](https://github.com/paritytech/parity/pull/232)
+- Fix ensure_db_good() and flush_queue(), block refactoring, check block format, be strict. [#231](https://github.com/paritytech/parity/pull/231)
+- Rlp [#207](https://github.com/paritytech/parity/pull/207)
+- Schedule documentation [#219](https://github.com/paritytech/parity/pull/219)
+- U256<->H256 Conversion [#206](https://github.com/paritytech/parity/pull/206)
+- Spawning new thread when we are reaching stack limit [#217](https://github.com/paritytech/parity/pull/217)
+- Blockchain tests [#211](https://github.com/paritytech/parity/pull/211)
+- fixed failing sync test [#218](https://github.com/paritytech/parity/pull/218)
+- Removing println [#216](https://github.com/paritytech/parity/pull/216)
+- Cleaning readme [#212](https://github.com/paritytech/parity/pull/212)
+- Fixing delegatecall [#196](https://github.com/paritytech/parity/pull/196)
+- Autogenerate the Args from the docopt macro. [#205](https://github.com/paritytech/parity/pull/205)
+- Networking fixes [#202](https://github.com/paritytech/parity/pull/202)
+- Argument parsing from CLI [#204](https://github.com/paritytech/parity/pull/204)
+- Removed wildcard from clippy version [#203](https://github.com/paritytech/parity/pull/203)
+- Fixed tests and tweaked sync progress report [#201](https://github.com/paritytech/parity/pull/201)
+- Heavy tests [#199](https://github.com/paritytech/parity/pull/199)
+- Mutithreaded IO [#198](https://github.com/paritytech/parity/pull/198)
+- Populating last_hashes [#197](https://github.com/paritytech/parity/pull/197)
+- Fixing clippy stuff [#170](https://github.com/paritytech/parity/pull/170)
+- basic .travis.yml [#194](https://github.com/paritytech/parity/pull/194)
+- Generating coverage reports. [#190](https://github.com/paritytech/parity/pull/190)
+- Adding doc requests comments [#192](https://github.com/paritytech/parity/pull/192)
+- moved src/bin/client.rs -> src/bin/client/main.rs [#185](https://github.com/paritytech/parity/pull/185)
+- removed overflowing_shr [#188](https://github.com/paritytech/parity/pull/188)
+- fixed wrapping ops on latest nightly [#187](https://github.com/paritytech/parity/pull/187)
+- Pruned state DB [#176](https://github.com/paritytech/parity/pull/176)
+- Memory management for cache [#180](https://github.com/paritytech/parity/pull/180)
+- Implement signs having low-s. [#183](https://github.com/paritytech/parity/pull/183)
+- Introduce sha3 crate and use it in ethash [#178](https://github.com/paritytech/parity/pull/178)
+- Multithreaded block queue [#173](https://github.com/paritytech/parity/pull/173)
+- Iterator for NibbleSlice and TrieDB. [#171](https://github.com/paritytech/parity/pull/171)
+- Handling all possible overflows [#145](https://github.com/paritytech/parity/pull/145)
+- Global secp256k1 context [#164](https://github.com/paritytech/parity/pull/164)
+- Ethash [#152](https://github.com/paritytech/parity/pull/152)
+- Move util into here [#153](https://github.com/paritytech/parity/pull/153)
+- EVM Interpreter [#103](https://github.com/paritytech/parity/pull/103)
+- Homestead transition support, maybe. [#141](https://github.com/paritytech/parity/pull/141)
+- externalities refactor [#131](https://github.com/paritytech/parity/pull/131)
+- More open files. [#140](https://github.com/paritytech/parity/pull/140)
+- Single array for logs output. [#133](https://github.com/paritytech/parity/pull/133)
+- Client app event handler [#132](https://github.com/paritytech/parity/pull/132)
+- Various consensus fixes. [#130](https://github.com/paritytech/parity/pull/130)
+- callcode builtins tests pass [#127](https://github.com/paritytech/parity/pull/127)
+- Client state syncing [#119](https://github.com/paritytech/parity/pull/119)
+- Split externalities from executive. [#126](https://github.com/paritytech/parity/pull/126)
+- executive error on not enoguh base gas [#124](https://github.com/paritytech/parity/pull/124)
+- Gav [#125](https://github.com/paritytech/parity/pull/125)
+- builtin sets excepted to true [#123](https://github.com/paritytech/parity/pull/123)
+- More state tests. [#122](https://github.com/paritytech/parity/pull/122)
+- updated to rocksdb wrapper version 0.3 [#121](https://github.com/paritytech/parity/pull/121)
+- out_of_gas -> excepted [#120](https://github.com/paritytech/parity/pull/120)
+- Parametrizing evm::Factory [#111](https://github.com/paritytech/parity/pull/111)
+- stLogs tests passing [#118](https://github.com/paritytech/parity/pull/118)
+- Fix executive. [#117](https://github.com/paritytech/parity/pull/117)
+- Fixes for marek's shooting from the hip. [#116](https://github.com/paritytech/parity/pull/116)
+- Executive revert fix [#115](https://github.com/paritytech/parity/pull/115)
+- Fix storage/account and add butress test. [#114](https://github.com/paritytech/parity/pull/114)
+- Refactored Pod & Diff types into separate files, JSON infrastructure revamp. [#113](https://github.com/paritytech/parity/pull/113)
+- Fix storage stuff and introduce per-item dirty-tracking. [#112](https://github.com/paritytech/parity/pull/112)
+- Check logs in state tests. [#109](https://github.com/paritytech/parity/pull/109)
+- executive gas calculation fixes [#108](https://github.com/paritytech/parity/pull/108)
+- proper gas calculation in executive [#107](https://github.com/paritytech/parity/pull/107)
+- Fixing MaxDepth param for executive [#105](https://github.com/paritytech/parity/pull/105)
+- Fix determination of state roots. [#106](https://github.com/paritytech/parity/pull/106)
+- transact substracts tx_gas [#104](https://github.com/paritytech/parity/pull/104)
+- Pretty-print and fix for state. [#102](https://github.com/paritytech/parity/pull/102)
+- Tier step price. [#101](https://github.com/paritytech/parity/pull/101)
+- Refactor Diff datastructures. [#100](https://github.com/paritytech/parity/pull/100)
+- externalities use u256 instead of u64 for gas calculation [#99](https://github.com/paritytech/parity/pull/99)
+- Executive tests [#97](https://github.com/paritytech/parity/pull/97)
+- State conensus tests now print mismatching diff on fail. [#98](https://github.com/paritytech/parity/pull/98)
+- State testing framework. First test is failing. [#96](https://github.com/paritytech/parity/pull/96)
+- executive tests [#95](https://github.com/paritytech/parity/pull/95)
+- Use U512s for ether cost calculation, complete transaction API [#94](https://github.com/paritytech/parity/pull/94)
+- Utils for consensus test decoding and better layout. [#93](https://github.com/paritytech/parity/pull/93)
+- executive fixes + tests [#89](https://github.com/paritytech/parity/pull/89)
+- All transaction tests pass. Nicer testing framework. [#92](https://github.com/paritytech/parity/pull/92)
+- Block verification tests; BlockProvider blockchain trait for testing [#88](https://github.com/paritytech/parity/pull/88)
+- State::exists, docs and tests. [#87](https://github.com/paritytech/parity/pull/87)
+- Add tests module, add two more transaction tests. [#86](https://github.com/paritytech/parity/pull/86)
+- bring back removed tests, removed build warnings [#82](https://github.com/paritytech/parity/pull/82)
+- Nicer transaction validation API. Nicer OutOfBounds API in general. [#85](https://github.com/paritytech/parity/pull/85)
+- Transaction fixes and consensus tests (all passing) [#84](https://github.com/paritytech/parity/pull/84)
+- fixed getting block info in evmjit + tests [#81](https://github.com/paritytech/parity/pull/81)
+- evm tests cleanup [#80](https://github.com/paritytech/parity/pull/80)
+- renamed VmFactory -> Factory [#77](https://github.com/paritytech/parity/pull/77)
+- fixed rust-evmjit description of improper_ctypes usage [#76](https://github.com/paritytech/parity/pull/76)
+- jit feature enabled by default [#75](https://github.com/paritytech/parity/pull/75)
+- evm [#52](https://github.com/paritytech/parity/pull/52)
+- state clone [#74](https://github.com/paritytech/parity/pull/74)
+- Block Verification (no tests yet) [#72](https://github.com/paritytech/parity/pull/72)
+- Improvements to LogEntry and Transaction [#73](https://github.com/paritytech/parity/pull/73)
+- Use getter in header in preparation for a Header trait; additional testing in enact_block(). [#64](https://github.com/paritytech/parity/pull/64)
+- BlockChain sync and Client app [#55](https://github.com/paritytech/parity/pull/55)
+- Block enactment (including test) [#63](https://github.com/paritytech/parity/pull/63)
+- Block complete. Needs tests. [#62](https://github.com/paritytech/parity/pull/62)
+- More on OpenBlock::close; State::kill_account added [#61](https://github.com/paritytech/parity/pull/61)
+- Remove genesis module, add more chain specs and separate out ethereum-specific stuff [#60](https://github.com/paritytech/parity/pull/60)
+- State::new_contract, camelCase engine params, missing param [#59](https://github.com/paritytech/parity/pull/59)
+- Use reorganisation [#58](https://github.com/paritytech/parity/pull/58)
+- Initial Ethash/Block skeleton implementations. [#57](https://github.com/paritytech/parity/pull/57)
+- Spec with tested Morden genesis decoder and builtins. [#54](https://github.com/paritytech/parity/pull/54)
+- Move all chain parameters into `engine_params` [#50](https://github.com/paritytech/parity/pull/50)
+- jit ffi improvements [please review] [#51](https://github.com/paritytech/parity/pull/51)
+- blockchain [please review] [#34](https://github.com/paritytech/parity/pull/34)
+- Move information from networkparams.rs into spec.rs [#48](https://github.com/paritytech/parity/pull/48)
+- Move bulking out in Engine/Params. [#47](https://github.com/paritytech/parity/pull/47)
+- Removed need for mutation in State. [#46](https://github.com/paritytech/parity/pull/46)
+- State::code and State::storage_at + tests. [#45](https://github.com/paritytech/parity/pull/45)
+- State functions for balance and nonce operations [#44](https://github.com/paritytech/parity/pull/44)
+- Account::storage_at, Account::ensure_cached and tests. [#43](https://github.com/paritytech/parity/pull/43)
+- Additional tests. [#42](https://github.com/paritytech/parity/pull/42)
+- seal todo done [#41](https://github.com/paritytech/parity/pull/41)
+- missing rustc_serialize crate && rlp `as_list` function [#40](https://github.com/paritytech/parity/pull/40)
+- More methods in Account, documentation and tests. [#39](https://github.com/paritytech/parity/pull/39)
+- Minor reworking of Account. [#38](https://github.com/paritytech/parity/pull/38)
+- Add Account and State classes. [#37](https://github.com/paritytech/parity/pull/37)
+- Revert regressions [#36](https://github.com/paritytech/parity/pull/36)

docs/CHANGELOG-1.0.md

@@ -0,0 +1,315 @@
+## Parity [v1.0.2](https://github.com/paritytech/parity/releases/tag/v1.0.2) (2016-04-11)
+
+Parity 1.0.2 release improves Json RPC compatibility and fixes a number of stability issues.
+
+- Flush password prompt [#1031](https://github.com/paritytech/parity/pull/1031)
+- [beta] dependencies update [#949](https://github.com/paritytech/parity/pull/949)
+- Master to beta v1.0.2 [#922](https://github.com/paritytech/parity/pull/922)
+- Master to beta 1.0.2 [#908](https://github.com/paritytech/parity/pull/908)
+
+## Parity [v1.0.1](https://github.com/paritytech/parity/releases/tag/v1.0.1) (2016-03-28)
+
+Parity 1.0.1 update fixes a number of issues with Json RPC, transaction propagation and syncing.
+
+- Imporved sync error handling [#905](https://github.com/paritytech/parity/pull/905)
+- Publish locally-made transactions to peers. [#851](https://github.com/paritytech/parity/pull/851)
+- Merge fixes from master to beta [#845](https://github.com/paritytech/parity/pull/845)
+- Full sync restart on bad block [#844](https://github.com/paritytech/parity/pull/844)
+- Make BlockNumber optional, fix eth_call [#828](https://github.com/paritytech/parity/pull/828)
+- Web3sha3 beta [#826](https://github.com/paritytech/parity/pull/826)
+- Use network id for the web3_net_version return. [#821](https://github.com/paritytech/parity/pull/821)
+- Fix mining from spinning [#806](https://github.com/paritytech/parity/pull/806)
+- Merge master to beta [#796](https://github.com/paritytech/parity/pull/796)
+
+## Parity [v1.0.0](https://github.com/paritytech/parity/releases/tag/v1.0.0) (2016-03-24)
+
+Parity 1.0.0 release adds the following features:
+
+- Standard JsonRPC interface.
+- Full Homestead compatibility.
+- Transaction management.
+- Mining with external miner.
+- Account management.
+- Geth key chain compatibility.
+- Additional command line options.
+- State trie pruning.
+- Cache and queue footprint.
+- Network discovery & NAT traversal.
+- Custom chain specification files.
+
+Note that in this release the state database is in archive (full) mode by default. Run with one of the `--pruning` options to enable pruning.
+
+- First part of multi-mining support [#804](https://github.com/paritytech/parity/pull/804)
+- Fixing future-current transactions clash [#802](https://github.com/paritytech/parity/pull/802)
+- Increase threads to num_cpus & fix author reporting [#800](https://github.com/paritytech/parity/pull/800)
+- another batch of rpc improvements [#798](https://github.com/paritytech/parity/pull/798)
+- Avoid tracing DELEGATECALL and CALLCODE. Plus tests for it. [#794](https://github.com/paritytech/parity/pull/794)
+- complete getting started steps for OS X [#793](https://github.com/paritytech/parity/pull/793)
+- Auto detect available port (with fixed test) [#788](https://github.com/paritytech/parity/pull/788)
+- eth_getTransactionReceipt [#792](https://github.com/paritytech/parity/pull/792)
+- Comprehensive tests for tracing transactions [#791](https://github.com/paritytech/parity/pull/791)
+- Disable preparing work package if miners don't ask for it. [#771](https://github.com/paritytech/parity/pull/771)
+- Listen on all interfaces for JSONRPC by default. [#786](https://github.com/paritytech/parity/pull/786)
+- eth_call [#783](https://github.com/paritytech/parity/pull/783)
+- Revert "Auto detect available port" [#789](https://github.com/paritytech/parity/pull/789)
+- added output to execution result [#777](https://github.com/paritytech/parity/pull/777)
+- Auto detect available port [#782](https://github.com/paritytech/parity/pull/782)
+- Allow 0x prefix for --author. [#785](https://github.com/paritytech/parity/pull/785)
+- updated dependencies, moved rpctest to its own submodule [#784](https://github.com/paritytech/parity/pull/784)
+- use ethjson module to load chain json tests [#778](https://github.com/paritytech/parity/pull/778)
+- Tracing implemented. [#772](https://github.com/paritytech/parity/pull/772)
+- test ethjson module on travis [#780](https://github.com/paritytech/parity/pull/780)
+- batch of rpc fixes [#775](https://github.com/paritytech/parity/pull/775)
+- rpctest executable [#757](https://github.com/paritytech/parity/pull/757)
+- Refactoring error transaction_queue error handling and `update_sealing` method. [#753](https://github.com/paritytech/parity/pull/753)
+- Avoid importing transactions with gas above 1.1*block_gas_limit to transaction queue [#760](https://github.com/paritytech/parity/pull/760)
+- Removing transactions that failed to be pushed to block. [#752](https://github.com/paritytech/parity/pull/752)
+- Updating clippy [#766](https://github.com/paritytech/parity/pull/766)
+- Attempting to add all transactions to mined block [#754](https://github.com/paritytech/parity/pull/754)
+- Prettier version w/o git dir; Use rustc compile time version [#761](https://github.com/paritytech/parity/pull/761)
+- Stop adding transactions to queue while not fully synced [#751](https://github.com/paritytech/parity/pull/751)
+- Verify sender's balance before importing transaction to queue [#746](https://github.com/paritytech/parity/pull/746)
+- Returning number of transactions pending in block not queue [#750](https://github.com/paritytech/parity/pull/750)
+- Speeding up build [#733](https://github.com/paritytech/parity/pull/733)
+- adding check for a sync when giving work to miner [#742](https://github.com/paritytech/parity/pull/742)
+- json deserialization module [#745](https://github.com/paritytech/parity/pull/745)
+- Update install-parity.sh [#749](https://github.com/paritytech/parity/pull/749)
+- Restart sync on getting old unknown header [#747](https://github.com/paritytech/parity/pull/747)
+- Missing return for #737 [#744](https://github.com/paritytech/parity/pull/744)
+- Enact block with uncles test [#741](https://github.com/paritytech/parity/pull/741)
+- Fix outdated libc version on dependency [#740](https://github.com/paritytech/parity/pull/740)
+- Fixing possible race in transaction queue [#735](https://github.com/paritytech/parity/pull/735)
+- Sync fixed again [#737](https://github.com/paritytech/parity/pull/737)
+- Don't change best block until extras is committed. [#734](https://github.com/paritytech/parity/pull/734)
+- stable only until travis speedup [#736](https://github.com/paritytech/parity/pull/736)
+- Optimizing uint operations (architecture independent) [#629](https://github.com/paritytech/parity/pull/629)
+- Add RLP, not a data item. [#725](https://github.com/paritytech/parity/pull/725)
+- PV63 receipts response [#687](https://github.com/paritytech/parity/pull/687)
+- another batch of rpc tests [#723](https://github.com/paritytech/parity/pull/723)
+- dockerfiles update [#726](https://github.com/paritytech/parity/pull/726)
+- Lock reports to avoid out of order badness. [#721](https://github.com/paritytech/parity/pull/721)
+- Fixed handshake leak [#722](https://github.com/paritytech/parity/pull/722)
+- Allow configuration of target gas limit. [#719](https://github.com/paritytech/parity/pull/719)
+- Version 1.1 in master [#714](https://github.com/paritytech/parity/pull/714)
+- Silence UDP warnings [#720](https://github.com/paritytech/parity/pull/720)
+- Rpc personal tests [#715](https://github.com/paritytech/parity/pull/715)
+- Fixing warnings [#704](https://github.com/paritytech/parity/pull/704)
+- docopts cleanups [#713](https://github.com/paritytech/parity/pull/713)
+- Removed rocksdb build dependency [#717](https://github.com/paritytech/parity/pull/717)
+- Fixed splitting Neighbours packet [#710](https://github.com/paritytech/parity/pull/710)
+- management of account expiration & memory [#701](https://github.com/paritytech/parity/pull/701)
+- Remove EarlyMerge from user docs. [#708](https://github.com/paritytech/parity/pull/708)
+- Fixes and traces for refcountdb. [#705](https://github.com/paritytech/parity/pull/705)
+- Check for NULL_RLP in AccountDB [#706](https://github.com/paritytech/parity/pull/706)
+- ethminer as crate [#700](https://github.com/paritytech/parity/pull/700)
+- Old ref-counted DB code [#692](https://github.com/paritytech/parity/pull/692)
+- next batch of rpc tests and fixes [#699](https://github.com/paritytech/parity/pull/699)
+- implemented eth_geStorageAt rpc method, added more tests for rpc [#695](https://github.com/paritytech/parity/pull/695)
+- Fix JournalDB era marker [#690](https://github.com/paritytech/parity/pull/690)
+- More sync fixes [#685](https://github.com/paritytech/parity/pull/685)
+- mark some key tests as heavy [#694](https://github.com/paritytech/parity/pull/694)
+- Limit incoming connections [#693](https://github.com/paritytech/parity/pull/693)
+- Updating clippy [#688](https://github.com/paritytech/parity/pull/688)
+- eth_accounts, eth_getBalance rpc functions && tests [#691](https://github.com/paritytech/parity/pull/691)
+- state query for archive jdb [#683](https://github.com/paritytech/parity/pull/683)
+- Fix for option 1 of JournalDB [#658](https://github.com/paritytech/parity/pull/658)
+- Rename into something that is a little more descriptive. [#689](https://github.com/paritytech/parity/pull/689)
+- JournalDB with in-memory overlay (option2) [#634](https://github.com/paritytech/parity/pull/634)
+- additional (failing) SecretStore test [#682](https://github.com/paritytech/parity/pull/682)
+- Updating clippy & fixing warnings. [#670](https://github.com/paritytech/parity/pull/670)
+- rpc web3 tests [#681](https://github.com/paritytech/parity/pull/681)
+- Making personal json-rpc configurable via cli [#677](https://github.com/paritytech/parity/pull/677)
+- RPC Pending Transactions Filter [#661](https://github.com/paritytech/parity/pull/661)
+- Rearrange journaldb infrastructure to make more extensible [#678](https://github.com/paritytech/parity/pull/678)
+- JournalDB -> Box<JournalDB>, and it's a trait. [#673](https://github.com/paritytech/parity/pull/673)
+- fix warning for transaction_queue.add usage [#676](https://github.com/paritytech/parity/pull/676)
+- Adding std::mem back (only for asm) [#680](https://github.com/paritytech/parity/pull/680)
+- update readme to exclude beta step (stable is ok) [#679](https://github.com/paritytech/parity/pull/679)
+- fixed U256 and transaction request deserialization [#675](https://github.com/paritytech/parity/pull/675)
+- More geth compatibility. [#666](https://github.com/paritytech/parity/pull/666)
+- Removing running clippy by default on nightly. [#671](https://github.com/paritytech/parity/pull/671)
+- rpc net submodule tests [#667](https://github.com/paritytech/parity/pull/667)
+- Client module overhaul [#665](https://github.com/paritytech/parity/pull/665)
+- Rpc transaction signing [#587](https://github.com/paritytech/parity/pull/587)
+- Transaction queue exposed via JSON rpc. [#652](https://github.com/paritytech/parity/pull/652)
+- Remove unneeded locking [#499](https://github.com/paritytech/parity/pull/499)
+- extend sync status interface to sync provider [#664](https://github.com/paritytech/parity/pull/664)
+- --archive is default. --pruning is option. [#663](https://github.com/paritytech/parity/pull/663)
+- jsonrpc uses client and sync interfaces [#641](https://github.com/paritytech/parity/pull/641)
+- Expose transaction insertion in sync lib [#609](https://github.com/paritytech/parity/pull/609)
+- Removing get prefix from poll_info [#660](https://github.com/paritytech/parity/pull/660)
+- Tx queue update height bug [#657](https://github.com/paritytech/parity/pull/657)
+- Tx_queue_docs -> To master [#651](https://github.com/paritytech/parity/pull/651)
+- blockchain import_route [#645](https://github.com/paritytech/parity/pull/645)
+- Stop workers before stopping event loop [#655](https://github.com/paritytech/parity/pull/655)
+- Validate sender before importing to queue [#650](https://github.com/paritytech/parity/pull/650)
+- Gas price threshold for transactions [#640](https://github.com/paritytech/parity/pull/640)
+- `dev` feature enabled when compiling without `--release` [#627](https://github.com/paritytech/parity/pull/627)
+- Don't call mark_as_bad needlessly [#648](https://github.com/paritytech/parity/pull/648)
+- Fixed sync handling large forks [#647](https://github.com/paritytech/parity/pull/647)
+- Additional documentation for transaction queue [#631](https://github.com/paritytech/parity/pull/631)
+- Transaction Queue Integration [#607](https://github.com/paritytech/parity/pull/607)
+- Keys cli [#639](https://github.com/paritytech/parity/pull/639)
+- fix build warning [#643](https://github.com/paritytech/parity/pull/643)
+- updated jsonrpc-core and http-server libs [#642](https://github.com/paritytech/parity/pull/642)
+- jsonrpc panics gracefully shutdown client [#638](https://github.com/paritytech/parity/pull/638)
+- Fixing CLI parameters [#633](https://github.com/paritytech/parity/pull/633)
+- Normal CLI options with geth. [#628](https://github.com/paritytech/parity/pull/628)
+- Do not remove the peer immediatelly on send error [#626](https://github.com/paritytech/parity/pull/626)
+- Jsonrpc block behind [#622](https://github.com/paritytech/parity/pull/622)
+- Remove println!s. [#624](https://github.com/paritytech/parity/pull/624)
+- JournalDB option 1 fix [#613](https://github.com/paritytech/parity/pull/613)
+- Network tracing cleanup [#611](https://github.com/paritytech/parity/pull/611)
+- Revert "Transaction Queue integration" [#602](https://github.com/paritytech/parity/pull/602)
+- fix benches compilation [#601](https://github.com/paritytech/parity/pull/601)
+- Transaction Queue integration [#595](https://github.com/paritytech/parity/pull/595)
+- verifier trait improvements [#597](https://github.com/paritytech/parity/pull/597)
+- build on rust stable [#600](https://github.com/paritytech/parity/pull/600)
+- Geth import silent if no geth [#599](https://github.com/paritytech/parity/pull/599)
+- Additional journaldb logging and assert [#593](https://github.com/paritytech/parity/pull/593)
+- Uncle inclusion in block authoring. [#578](https://github.com/paritytech/parity/pull/578)
+- Fixed potential deadlock on startup [#592](https://github.com/paritytech/parity/pull/592)
+- Fixing an overflow panic [#591](https://github.com/paritytech/parity/pull/591)
+- Fixed one more case of sync stalling [#590](https://github.com/paritytech/parity/pull/590)
+- JournalDB can now operate in "archive" mode [#589](https://github.com/paritytech/parity/pull/589)
+- Secret store integration with client [#586](https://github.com/paritytech/parity/pull/586)
+- fix build on nightly rust [#588](https://github.com/paritytech/parity/pull/588)
+- deserialization for uint generic [#585](https://github.com/paritytech/parity/pull/585)
+- TransactionsQueue implementation [#559](https://github.com/paritytech/parity/pull/559)
+- JSON-RPC personal service (follows #582) [#583](https://github.com/paritytech/parity/pull/583)
+- making key directory thread-safe [#582](https://github.com/paritytech/parity/pull/582)
+- verifier trait [#581](https://github.com/paritytech/parity/pull/581)
+- shrink_to_fit after removing hashes. [#580](https://github.com/paritytech/parity/pull/580)
+- support for rpc polling [#504](https://github.com/paritytech/parity/pull/504)
+- limit serde codegen only to rpc types submodule [#569](https://github.com/paritytech/parity/pull/569)
+- fork test for Issue test/568 [#573](https://github.com/paritytech/parity/pull/573)
+- Fixing clippy warnings = small refactoring of `request_blocks` [#560](https://github.com/paritytech/parity/pull/560)
+- Improved journaldb logging [#571](https://github.com/paritytech/parity/pull/571)
+- Additional check to ancient enactments. [#570](https://github.com/paritytech/parity/pull/570)
+- chainfilter shouldnt exclude to_block from results [#564](https://github.com/paritytech/parity/pull/564)
+- Fix coverage test run [#567](https://github.com/paritytech/parity/pull/567)
+- Mining [#547](https://github.com/paritytech/parity/pull/547)
+- fix uint warnings [#565](https://github.com/paritytech/parity/pull/565)
+- Finished blockchain generator. [#562](https://github.com/paritytech/parity/pull/562)
+- fixed broken master [#563](https://github.com/paritytech/parity/pull/563)
+- uint to separate crate [#544](https://github.com/paritytech/parity/pull/544)
+- improved test chain generator [#554](https://github.com/paritytech/parity/pull/554)
+- Fixing spelling in propagade->propagate [#558](https://github.com/paritytech/parity/pull/558)
+- Changing RefCell to Cell in transaction. [#557](https://github.com/paritytech/parity/pull/557)
+- Fix for morden consensus. [#556](https://github.com/paritytech/parity/pull/556)
+- blockchain generator [#550](https://github.com/paritytech/parity/pull/550)
+- Sparse Table Implementation (Row, Col) -> Val [#545](https://github.com/paritytech/parity/pull/545)
+- fixup install script [#548](https://github.com/paritytech/parity/pull/548)
+- Fixing clippy warnings [#546](https://github.com/paritytech/parity/pull/546)
+- ignore out directory [#543](https://github.com/paritytech/parity/pull/543)
+- u256 full multiplication [#539](https://github.com/paritytech/parity/pull/539)
+- Fix panic when downloading stales, update homestead transition [#537](https://github.com/paritytech/parity/pull/537)
+- changing x64 asm config [#534](https://github.com/paritytech/parity/pull/534)
+- uncomment state transition tests [#533](https://github.com/paritytech/parity/pull/533)
+- jsonrpc uses weak pointers to client [#532](https://github.com/paritytech/parity/pull/532)
+- Morden switch to Homestead rules at #494,000. [#531](https://github.com/paritytech/parity/pull/531)
+- Blockchain module cleanup [#524](https://github.com/paritytech/parity/pull/524)
+- Multiplication issue + very exhaustive tests for it [#528](https://github.com/paritytech/parity/pull/528)
+- EIP-8 [#498](https://github.com/paritytech/parity/pull/498)
+- Make "random" trie tests fully deterministic. [#527](https://github.com/paritytech/parity/pull/527)
+- udpated serde to version 0.7.0 [#526](https://github.com/paritytech/parity/pull/526)
+- Better memory management [#516](https://github.com/paritytech/parity/pull/516)
+- Typo [#523](https://github.com/paritytech/parity/pull/523)
+- U512 add/sub optimize [#521](https://github.com/paritytech/parity/pull/521)
+- Account management + geth keystore import (no utility crate added) [#509](https://github.com/paritytech/parity/pull/509)
+- Delayed UPnP initialization [#505](https://github.com/paritytech/parity/pull/505)
+- Fixing marking blocks as bad & SyncMessage bugs + small client refactoring. [#503](https://github.com/paritytech/parity/pull/503)
+- optimization of U256 [#515](https://github.com/paritytech/parity/pull/515)
+- Removed rocksdb from build scripts and instructions [#520](https://github.com/paritytech/parity/pull/520)
+- RocksDB abstraction layer + Hash index for state DB [#464](https://github.com/paritytech/parity/pull/464)
+- bloomfilter [#418](https://github.com/paritytech/parity/pull/418)
+- Fixed a race condition when connecting peer disconnects immediately [#519](https://github.com/paritytech/parity/pull/519)
+- ignore intellij idea project files as well [#518](https://github.com/paritytech/parity/pull/518)
+- updated version of unicase [#517](https://github.com/paritytech/parity/pull/517)
+- jsonrpc security, cors headers, fixed #359 [#493](https://github.com/paritytech/parity/pull/493)
+- Rust implementations to replace data tables (#161) [#482](https://github.com/paritytech/parity/pull/482)
+- fix issue with starting requested block number was not included itself [#512](https://github.com/paritytech/parity/pull/512)
+- fixed travis --org GH_TOKEN [#510](https://github.com/paritytech/parity/pull/510)
+- Improved log format [#506](https://github.com/paritytech/parity/pull/506)
+- Log address on failed connection attempt [#502](https://github.com/paritytech/parity/pull/502)
+- Bumping clippy and fixing warnings. [#501](https://github.com/paritytech/parity/pull/501)
+- Bumping versions. Fixes #496 [#500](https://github.com/paritytech/parity/pull/500)
+- Manage final user-input errors. [#494](https://github.com/paritytech/parity/pull/494)
+- Remove unneeded code, fix minor potential issue with length. [#495](https://github.com/paritytech/parity/pull/495)
+- Remove "unknown" from version string. [#488](https://github.com/paritytech/parity/pull/488)
+- Include git commit date & hash. [#486](https://github.com/paritytech/parity/pull/486)
+- Use proper version string. [#485](https://github.com/paritytech/parity/pull/485)
+- Networking fixes [#480](https://github.com/paritytech/parity/pull/480)
+- Fix potential deadlock on node table update [#484](https://github.com/paritytech/parity/pull/484)
+- Squash more warnings [#481](https://github.com/paritytech/parity/pull/481)
+- dev/test/build tools to separate crate [#477](https://github.com/paritytech/parity/pull/477)
+- Back to original slab crate [#479](https://github.com/paritytech/parity/pull/479)
+- Better user errors. [#476](https://github.com/paritytech/parity/pull/476)
+- UDP Discovery [#440](https://github.com/paritytech/parity/pull/440)
+- update readme with rust override [#475](https://github.com/paritytech/parity/pull/475)
+- fixed warnings on rust beta [#474](https://github.com/paritytech/parity/pull/474)
+- Secret store (part2 - encrypted key/value svc) [#449](https://github.com/paritytech/parity/pull/449)
+- Kill bad test. [#473](https://github.com/paritytech/parity/pull/473)
+- Make clippy an optional dependency [#422](https://github.com/paritytech/parity/pull/422)
+- parity compiling fine [#469](https://github.com/paritytech/parity/pull/469)
+- compiling ethcore on beta [#468](https://github.com/paritytech/parity/pull/468)
+- Utils compiling in beta [#467](https://github.com/paritytech/parity/pull/467)
+- Get rid of lru_cache dependency [#466](https://github.com/paritytech/parity/pull/466)
+- Add daemonization. [#459](https://github.com/paritytech/parity/pull/459)
+- Master upgrade [#448](https://github.com/paritytech/parity/pull/448)
+- Remove contributing stuff now that we have CLA bot. [#447](https://github.com/paritytech/parity/pull/447)
+- Add Morden bootnode. [#446](https://github.com/paritytech/parity/pull/446)
+- beta fixes to master [#441](https://github.com/paritytech/parity/pull/441)
+- Secret store (part1 - key management) [#423](https://github.com/paritytech/parity/pull/423)
+- Use 1100000 as the homestead transition, fix build instructions. [#438](https://github.com/paritytech/parity/pull/438)
+- More sync and propagation fixes [#420](https://github.com/paritytech/parity/pull/420)
+- back to cargo crates [#436](https://github.com/paritytech/parity/pull/436)
+- Fixing clippy warnings [#435](https://github.com/paritytech/parity/pull/435)
+- preserving root cargo lock [#434](https://github.com/paritytech/parity/pull/434)
+- Nightly fix [#432](https://github.com/paritytech/parity/pull/432)
+- nightly fixes [#431](https://github.com/paritytech/parity/pull/431)
+- Delay Homestead transition from 1,000,000. [#429](https://github.com/paritytech/parity/pull/429)
+- Nightly fix effort (still should fail) [#428](https://github.com/paritytech/parity/pull/428)
+- clippy version update, docopt-macro moving to fork [#425](https://github.com/paritytech/parity/pull/425)
+- Network/Sync fixes and optimizations [#416](https://github.com/paritytech/parity/pull/416)
+- Use latest era instead of end era as journal marker [#414](https://github.com/paritytech/parity/pull/414)
+- api changes [#402](https://github.com/paritytech/parity/pull/402)
+- Option for no init nodes. [#408](https://github.com/paritytech/parity/pull/408)
+- Fixed block_bodies not returning a list [#406](https://github.com/paritytech/parity/pull/406)
+- Fix test. [#405](https://github.com/paritytech/parity/pull/405)
+- Allow path to be configured. [#404](https://github.com/paritytech/parity/pull/404)
+- Upnp [#400](https://github.com/paritytech/parity/pull/400)
+- eth_syncing, fixed #397 [#398](https://github.com/paritytech/parity/pull/398)
+- Using modified version of ctrlc that catches SIGTERM [#399](https://github.com/paritytech/parity/pull/399)
+- Catching panics. [#396](https://github.com/paritytech/parity/pull/396)
+- jsonrpc [#391](https://github.com/paritytech/parity/pull/391)
+- Externalities tests (still clumsy) [#394](https://github.com/paritytech/parity/pull/394)
+- excluding test code itself from coverage [#395](https://github.com/paritytech/parity/pull/395)
+- Additional tweaks to options. [#390](https://github.com/paritytech/parity/pull/390)
+- --chain option for setting which network to go on. [#388](https://github.com/paritytech/parity/pull/388)
+- Ethash unit tests final [#387](https://github.com/paritytech/parity/pull/387)
+- jsonrpc [#374](https://github.com/paritytech/parity/pull/374)
+- Editorconfig file. [#384](https://github.com/paritytech/parity/pull/384)
+- Coverage effort [in progress] [#382](https://github.com/paritytech/parity/pull/382)
+- making root kcov runner simular to the one running on CI [#380](https://github.com/paritytech/parity/pull/380)
+- add gcc as a dependency to dockerfiles [#381](https://github.com/paritytech/parity/pull/381)
+- Check for handshake expiration before attempting connection replace [#375](https://github.com/paritytech/parity/pull/375)
+- Blocks propagation [#364](https://github.com/paritytech/parity/pull/364)
+- Network params. [#376](https://github.com/paritytech/parity/pull/376)
+- Add parity-node-zero to bootnodes. [#373](https://github.com/paritytech/parity/pull/373)
+- kcov uses travis_job_id instead of coveralls token [#370](https://github.com/paritytech/parity/pull/370)
+- Add parity-node-zero.ethcore.io to boot nodes. [#371](https://github.com/paritytech/parity/pull/371)
+
+## Parity [v1.0.0-rc1](https://github.com/paritytech/parity/releases/tag/v1.0.0-rc1) (2016-03-15)
+
+First Parity 1.0.0 release candidate.
+
+- Version 1.0 in beta [#712](https://github.com/paritytech/parity/pull/712)
+- Fix test for beta [#617](https://github.com/paritytech/parity/pull/617)
+- JournalDB fix option 1 for beta [#614](https://github.com/paritytech/parity/pull/614)
+- Failing test. [#606](https://github.com/paritytech/parity/pull/606)
+- Fix transition points [#604](https://github.com/paritytech/parity/pull/604)
+- (BETA) Update README.md [#549](https://github.com/paritytech/parity/pull/549)
+- (BETA) instructions for beta release channel [#456](https://github.com/paritytech/parity/pull/456)
+- (BETA) fix nightly - remerge [#454](https://github.com/paritytech/parity/pull/454)
+- (BETA) fixing nightly version for beta [#452](https://github.com/paritytech/parity/pull/452)

docs/CHANGELOG-1.1.md

@@ -0,0 +1,152 @@
+## Parity [v1.1.0](https://github.com/paritytech/parity/releases/tag/v1.1.0) (2016-05-02)
+
+Parity 1.1.0 introduces:
+
+- Transaction tracing. Parity now optionally indexes & stores message-call/"internal transaction" information and provides additional RPC for querying.
+- Web interface for logs, status & JSON RPC.
+- Improved JSON RPC compatibility.
+- Reduced memory footprint.
+- Optimized EVM interpreter performance.
+
+Full Changes:
+
+- Exposing default extra data via ethcore RPC [#1032](https://github.com/paritytech/parity/pull/1032)
+- Net etiquette [#1028](https://github.com/paritytech/parity/pull/1028)
+- Bumping clippy & fixing warnings [#1024](https://github.com/paritytech/parity/pull/1024)
+- Tracedb interface && cli [#997](https://github.com/paritytech/parity/pull/997)
+- Switching to geth-attach supporting version of rpc core and server [#1022](https://github.com/paritytech/parity/pull/1022)
+- Fixing status page displaying homestead  [#1020](https://github.com/paritytech/parity/pull/1020)
+- Core tracedb functionality. [#996](https://github.com/paritytech/parity/pull/996)
+- RPC method for supported modules [#1019](https://github.com/paritytech/parity/pull/1019)
+- Updating status page [#1015](https://github.com/paritytech/parity/pull/1015)
+- Disabling wallet [#1017](https://github.com/paritytech/parity/pull/1017)
+- More detailed fatal error reporting [#1016](https://github.com/paritytech/parity/pull/1016)
+- Support 'pending' block in RPC [#1007](https://github.com/paritytech/parity/pull/1007)
+- Enable pending block when there is local transaction pending. [#1005](https://github.com/paritytech/parity/pull/1005)
+- updating key files permissions on save [#1010](https://github.com/paritytech/parity/pull/1010)
+- IPC JSON RPC (for external interface) [#1009](https://github.com/paritytech/parity/pull/1009)
+- Fixing Firefox authorization issues [#1013](https://github.com/paritytech/parity/pull/1013)
+- cargo update [#1012](https://github.com/paritytech/parity/pull/1012)
+- Switching to rust-url@1.0.0 [#1011](https://github.com/paritytech/parity/pull/1011)
+- Exception handling in RPC & WebApps [#988](https://github.com/paritytech/parity/pull/988)
+- Fixed uint deserialization from hex [#1008](https://github.com/paritytech/parity/pull/1008)
+- Tweak timeout and packet size to handle slow networks better [#1004](https://github.com/paritytech/parity/pull/1004)
+- db key is generic and can be made smaller [#1006](https://github.com/paritytech/parity/pull/1006)
+- IPC with new serialization [#998](https://github.com/paritytech/parity/pull/998)
+- make jsonrpc api engine agnostic [#1001](https://github.com/paritytech/parity/pull/1001)
+- updated cargo.lock [#1002](https://github.com/paritytech/parity/pull/1002)
+- updated parity dependencies [#993](https://github.com/paritytech/parity/pull/993)
+- Auto (with codegen) binary serializer  [#980](https://github.com/paritytech/parity/pull/980)
+- Fixing transaction queue last_nonces update [#995](https://github.com/paritytech/parity/pull/995)
+- import route contains ommited blocks [#994](https://github.com/paritytech/parity/pull/994)
+- fixed encoding 0u8 [#992](https://github.com/paritytech/parity/pull/992)
+- Use latest netstats [#989](https://github.com/paritytech/parity/pull/989)
+- RPC shared external miner [#984](https://github.com/paritytech/parity/pull/984)
+- Additional RPC methods for settings [#983](https://github.com/paritytech/parity/pull/983)
+- Fixing transaction_queue deadlock [#985](https://github.com/paritytech/parity/pull/985)
+- Refactoring of `parity/main.rs` [#981](https://github.com/paritytech/parity/pull/981)
+- Fixing clippy warnings. [#982](https://github.com/paritytech/parity/pull/982)
+- Bumping status page [#977](https://github.com/paritytech/parity/pull/977)
+- querying extras separated to its own module [#972](https://github.com/paritytech/parity/pull/972)
+- Exposing application logs via RPC. [#976](https://github.com/paritytech/parity/pull/976)
+- Addressing binary serialization for db types [#966](https://github.com/paritytech/parity/pull/966)
+- removed redundant unwraps [#935](https://github.com/paritytech/parity/pull/935)
+- fixed transaction queue merge conflict [#975](https://github.com/paritytech/parity/pull/975)
+- Configurable limit for transaction queue (CLI & Ethcore-RPC) [#974](https://github.com/paritytech/parity/pull/974)
+- Enforce limit caused `last_nonce` to return incorrect values. [#973](https://github.com/paritytech/parity/pull/973)
+- Even more detailed errors for transaction queue [#969](https://github.com/paritytech/parity/pull/969)
+- temporary fix of panic in blockchain garbage collection [#970](https://github.com/paritytech/parity/pull/970)
+- IPC codegen - some minor fixes & enhancements [#967](https://github.com/paritytech/parity/pull/967)
+- Additional logging for transactions [#968](https://github.com/paritytech/parity/pull/968)
+- refactored blockchain extras keys building [#963](https://github.com/paritytech/parity/pull/963)
+- Using hyper-mio branch in webapps. [#957](https://github.com/paritytech/parity/pull/957)
+- Remove nanomsg from build-dependencies [#965](https://github.com/paritytech/parity/pull/965)
+- Fix build for --target=armv7-unknown-linux-gnueabihf [#964](https://github.com/paritytech/parity/pull/964)
+- IPC RPC codegen extra feature [#962](https://github.com/paritytech/parity/pull/962)
+- IPC RPC codegen for generic implementation [#961](https://github.com/paritytech/parity/pull/961)
+- using db_path directory when upgrading [#960](https://github.com/paritytech/parity/pull/960)
+- IPC hypervisor [#958](https://github.com/paritytech/parity/pull/958)
+- Removing a transaction from queue now removes all from this sender with lower nonces. [#950](https://github.com/paritytech/parity/pull/950)
+- bump status page version 0.1.7 [#955](https://github.com/paritytech/parity/pull/955)
+- Changing cors header to be optional [#956](https://github.com/paritytech/parity/pull/956)
+- Update ARM Dockerfile [#959](https://github.com/paritytech/parity/pull/959)
+- Sensible gas limits for eth_sendTransaction [#953](https://github.com/paritytech/parity/pull/953)
+- Fix upgrade script and make parity run when no .parity dir. [#954](https://github.com/paritytech/parity/pull/954)
+- Tracing and docs for --pruning=auto. [#952](https://github.com/paritytech/parity/pull/952)
+- IPC serialization for custom parameters [#946](https://github.com/paritytech/parity/pull/946)
+- default filter from block should be Latest, not Earliest [#948](https://github.com/paritytech/parity/pull/948)
+- README.md: removes sudo from multirust installation [#943](https://github.com/paritytech/parity/pull/943)
+- Disable long lines formatting + ethash example. [#939](https://github.com/paritytech/parity/pull/939)
+- Ethcore-specific RPC methods for altering miner parameters. [#934](https://github.com/paritytech/parity/pull/934)
+- Use ethcore nanomsg bindings [#941](https://github.com/paritytech/parity/pull/941)
+- Update IPC codegen to latest syntax libs [#938](https://github.com/paritytech/parity/pull/938)
+- IPC documentation [#937](https://github.com/paritytech/parity/pull/937)
+- Bumping clippy and fixing warnings. [#936](https://github.com/paritytech/parity/pull/936)
+- Pruning auto [#927](https://github.com/paritytech/parity/pull/927)
+- IPC persistent client link [#933](https://github.com/paritytech/parity/pull/933)
+- IPC persistent client link [#930](https://github.com/paritytech/parity/pull/930)
+- IPC handshake (negotiating protocol/api version) [#928](https://github.com/paritytech/parity/pull/928)
+- Upgrade logic between versions [#914](https://github.com/paritytech/parity/pull/914)
+- executive tracing cleanup [#903](https://github.com/paritytech/parity/pull/903)
+- Ethcore-specific RPC methods [#923](https://github.com/paritytech/parity/pull/923)
+- Parameter to allow user to force the sealing mechanism [#918](https://github.com/paritytech/parity/pull/918)
+- updated dependencies [#921](https://github.com/paritytech/parity/pull/921)
+- Fixed send transaction deadlock [#920](https://github.com/paritytech/parity/pull/920)
+- --unlock is comma-delimited. [#916](https://github.com/paritytech/parity/pull/916)
+- fixed eth_getLogs [#915](https://github.com/paritytech/parity/pull/915)
+- create provided custom dir for keys if none [#912](https://github.com/paritytech/parity/pull/912)
+- spec loading cleanup [#858](https://github.com/paritytech/parity/pull/858)
+- WebApps HTTP Basic Auth Support [#906](https://github.com/paritytech/parity/pull/906)
+- Removing match on constant [#888](https://github.com/paritytech/parity/pull/888)
+- Update auth.rs [#907](https://github.com/paritytech/parity/pull/907)
+- Enabling webapps compilation by default [#904](https://github.com/paritytech/parity/pull/904)
+- fixed #895 [#898](https://github.com/paritytech/parity/pull/898)
+- Support for compile-time included WebApplications. [#899](https://github.com/paritytech/parity/pull/899)
+- Propagate transaction queue [#894](https://github.com/paritytech/parity/pull/894)
+- Use new json RPC server [#901](https://github.com/paritytech/parity/pull/901)
+- Gracefully dying when trying to enable RPC and app is compiled without it. [#900](https://github.com/paritytech/parity/pull/900)
+- Additional logging and friendlier error messages [#893](https://github.com/paritytech/parity/pull/893)
+- Avoid signalling readiness when app is about to be closed. [#897](https://github.com/paritytech/parity/pull/897)
+- fixed #875 and added tests for eth_sendTransaction [#890](https://github.com/paritytech/parity/pull/890)
+- passing key path to all invocations [#891](https://github.com/paritytech/parity/pull/891)
+- Fixed eth_call nonce and gas handling [#892](https://github.com/paritytech/parity/pull/892)
+- ipc rpc with nano transport (simple duplex) [#886](https://github.com/paritytech/parity/pull/886)
+- Bumping clippy and fixing warnings [#889](https://github.com/paritytech/parity/pull/889)
+- More descriptive expectations to transaction queue consistency. [#878](https://github.com/paritytech/parity/pull/878)
+- uint bug - replace add with or [#879](https://github.com/paritytech/parity/pull/879)
+- Fixing typo in bigint [#877](https://github.com/paritytech/parity/pull/877)
+- update misleading cli help msg for author [#874](https://github.com/paritytech/parity/pull/874)
+- Find geth data store cross-platform. [#871](https://github.com/paritytech/parity/pull/871)
+- Import geth 1.4.0 keys [#872](https://github.com/paritytech/parity/pull/872)
+- Syntax helpers for IPC RPC (part 2) [#854](https://github.com/paritytech/parity/pull/854)
+- Fixed bootnode URL and error message [#870](https://github.com/paritytech/parity/pull/870)
+- replace popcnt with mov (861) [#867](https://github.com/paritytech/parity/pull/867)
+- weekly dependencies update [#865](https://github.com/paritytech/parity/pull/865)
+- Remove unused mut [#866](https://github.com/paritytech/parity/pull/866)
+- fixed #855 [#864](https://github.com/paritytech/parity/pull/864)
+- simplified trace from functions, removed clippy warnings [#862](https://github.com/paritytech/parity/pull/862)
+- Update deprecated HashDB methods in docs. [#857](https://github.com/paritytech/parity/pull/857)
+- refactored loading transaction json tests [#853](https://github.com/paritytech/parity/pull/853)
+- reorganised price info lookup [#852](https://github.com/paritytech/parity/pull/852)
+- Publish locally-made transactions to peers. [#850](https://github.com/paritytech/parity/pull/850)
+- Add generalbeck's token [#847](https://github.com/paritytech/parity/pull/847)
+- Fix response for mining. [#846](https://github.com/paritytech/parity/pull/846)
+- USD-based pricing of gas. [#843](https://github.com/paritytech/parity/pull/843)
+- Parity can accept older work packages [#811](https://github.com/paritytech/parity/pull/811)
+- Caching for computing seed hashes (#541) [#841](https://github.com/paritytech/parity/pull/841)
+- checking transaction queue for pending transaction [#838](https://github.com/paritytech/parity/pull/838)
+- refactored loading of state tests [#817](https://github.com/paritytech/parity/pull/817)
+- tests for deserialization of transaction from issue #835 [#837](https://github.com/paritytech/parity/pull/837)
+- unlocks with no expiration [on top of 833] [#834](https://github.com/paritytech/parity/pull/834)
+- Unlock accounts on CLI. [#833](https://github.com/paritytech/parity/pull/833)
+- Make BlockNumber optional, fix eth_call [#829](https://github.com/paritytech/parity/pull/829)
+- Test socket to common test code (ethcore-devtools) [#831](https://github.com/paritytech/parity/pull/831)
+- Use network id for the web3_net_version return. [#822](https://github.com/paritytech/parity/pull/822)
+- json-rpc web3_sha3 [#824](https://github.com/paritytech/parity/pull/824)
+- remove some unused files [#819](https://github.com/paritytech/parity/pull/819)
+- debug symbols for master/beta [#818](https://github.com/paritytech/parity/pull/818)
+- Syntax helpers for IPC RPC [#809](https://github.com/paritytech/parity/pull/809)
+- refactored loading of execution tests [#803](https://github.com/paritytech/parity/pull/803)
+- Rustfmt.toml [#805](https://github.com/paritytech/parity/pull/805)
+- install-partiy runs brew reinstall parity on osx [#810](https://github.com/paritytech/parity/pull/810)
+- Fix mining from spinning [#807](https://github.com/paritytech/parity/pull/807)

docs/CHANGELOG-1.2.md

@@ -0,0 +1,374 @@
+## Parity [v1.2.4](https://github.com/paritytech/parity/releases/tag/v1.2.4) (2016-08-09)
+
+Parity 1.2.4 Is a maintenance release that fixes a [few](https://github.com/paritytech/parity/pull/1888/commits) issues related to mining and peer synchronization.
+This release is marked as stable.
+
+- Backports for beta [#1888](https://github.com/paritytech/parity/pull/1888)
+- BETA: fixed trace_transaction crash when block contained suicide [#1782](https://github.com/paritytech/parity/pull/1782)
+
+## Parity [v1.2.3](https://github.com/paritytech/parity/releases/tag/v1.2.3) (2016-07-31)
+
+Parity 1.2.3 is a patch release that addresses network stability issues for both Ethereum HF and Ethereum classic chains and brings a few changes to the transaction tracing API.
+
+#### Tracing API changes
+- Added tracing for `CALLCODE`, `DELEGATECALL` and `SUICIDE`
+- `trace_call` returns traces in flat format
+- Added 2 new methods: `trace_rawTransaction` and `trace_replayTransaction`
+
+Note that to continue using tracing features in this version you need to re-sync the blockchain. This can be done by using `parity export $HOME/ethereum-chain-backup.rlp` , deleting the database usually located at `~/.parity/906a34e69aec8c0d` followed by `parity import $HOME/ethereum-chain-backup.rlp`.
+
+- [beta] Updating UI [#1778](https://github.com/paritytech/parity/pull/1778)
+- tracing backport [#1770](https://github.com/paritytech/parity/pull/1770)
+- Backport commits to beta [#1763](https://github.com/paritytech/parity/pull/1763)
+- Deadlock on incoming connection (#1672) [#1675](https://github.com/paritytech/parity/pull/1675)
+- [BETA] Removed DAO soft fork traces [#1640](https://github.com/paritytech/parity/pull/1640)
+
+
+## Parity [v1.2.2](https://github.com/paritytech/parity/releases/tag/v1.2.2) (2016-07-16)
+
+#### New
+- DAO hard-fork.
+
+DAO hard-fork implementation conforms to the [specification](https://blog.slock.it/hard-fork-specification-24b889e70703) and is enabled by default.
+
+#### Changed
+- `--reseal-on-txs` defaults to `own`.
+- DAO soft-fork support has been removed along with related command line options.
+
+#### Resolved issues
+- `--db-cache-size` consuming too much memory.
+  `eth_getWork` RPC response additionally includes the block number.
+- Skipping transactions with invalid nonces when pushing to block.
+- Update sealing just once when externally importing many blocks (#1541).
+- Transaction tracing skipping simple transactions (#1606).
+- Other small fixes and improvements.
+
+Full changelog
+
+- DAO hard-fork (#1483) [#1636](https://github.com/paritytech/parity/pull/1636)
+- Backports for beta [#1628](https://github.com/paritytech/parity/pull/1628)
+- don't batch best block for branches (#1623) [#1626](https://github.com/paritytech/parity/pull/1626)
+- Merge bugfixes from master to beta [#1605](https://github.com/paritytech/parity/pull/1605)
+- (BETA) using block options cache instead of general cache for rocksdb [#1613](https://github.com/paritytech/parity/pull/1613)
+- Backport sealing fixes to beta [#1583](https://github.com/paritytech/parity/pull/1583)
+- v1.2.2 in beta [#1581](https://github.com/paritytech/parity/pull/1581)
+- Skipping transactions with invalid nonces when pushing to block. (#1545) [#1547](https://github.com/paritytech/parity/pull/1547)
+
+
+## Parity [v1.2.1](https://github.com/paritytech/parity/releases/tag/v1.2.1) (2016-07-01)
+
+#### New
+- Options for more precise mining tuning (see below).
+- Informative notification when block mined.
+- HTTP signal on new work-package.
+- Optimised database insertion for self-mined blocks.
+- Short-circuit for local transaction gas-price approval.
+- A number of issues related to mining have been fixed.
+
+##### Mining options
+- `--author` is now required for mining.
+- `--reseal-on-txs` Specify which transactions should force the node to reseal a block. By default parity updates the seal on incoming transactions to reduce transaction latency. Set this option to `none` to force updates on new blocks only.
+- `--reseal-min-period` Can be used to control how often a new pending block is generated if `none` is not selected on prior option.
+- `--work-queue-size` Controls how many pending blocks to keep in memory.
+- `--relay-set`  Can be used to enable more strict transaction verification.
+- `--remove-solved` Move solved blocks from the work package queue instead of cloning them. This gives a slightly faster import speed, but means that extra solutions submitted for the same work package will go unused.
+- `--notify-work` Accepts a list of URLs that will receive a POST request when new work package is available. The body of the POST message is JSON encoded and has the same format as `eth_getWork` RPC response.
+
+##### RPC
+
+`eth_getWork` RPC response additionally includes the block number.
+
+##### DAO soft-fork
+
+DAO soft-fork control options have been replaced by the single `--fork` option which disables the soft-fork by default.
+
+#### Changes
+
+- v1.2.1 in beta [#1492](https://github.com/paritytech/parity/pull/1492)
+- (BETA) add artifacts [#1420](https://github.com/paritytech/parity/pull/1420)
+
+## Parity [v1.2.0: "Security"](https://github.com/paritytech/parity/releases/tag/v1.2.0) (2016-06-24)
+
+[Blog post](https://blog.parity.io/announcing-parity-1-2/)
+
+#### New
+
+- Transaction signing UI.
+- IPC/RPC module.
+- Optimised mining support.
+- Windows build.
+- DAO soft-fork support.
+
+##### Transaction signing UI
+
+This is a new framework for signing transactions. It fulfills three requirements:
+- You should never have to type your passwords into a Dapp.
+- No Javascript code should ever hold a secret.
+- No transaction should ever be signed without the consent of the user.
+
+The feature is enabled through the `--signer` flag. When enabled, the user must ensure at least one "Signer UI" is set-up for managing transaction confirmation. There are two such UIs available; one through a Google Chrome Extension, separately installable and the second through a special web page hosted locally. Set-up must be done once for each such UI, through copying and pasting a token from the output console of Parity into the UI. Specific instructions are given in the UI.
+
+From this point on, no transaction may ever be signed by Parity except through one of these allowed Signer UIs, and no password should ever be entered anywhere else.
+
+##### IPC/RPC module and Mist/Geth compatibility
+
+Should be started with `--geth` to ensure Mist compatibility.
+
+##### Optimised mining support
+
+Numerous improvements and optimisations have been added to our mining implementation. A large "active queue" ensures that late-included transactions are included in the mined block without sacrificing older results from latent-reported `ethminer` results.
+
+##### Windows build
+
+We're happy to announce full Windows support with 1.2!
+
+##### Soft-fork
+
+This release includes support for the proposed [DAO soft-fork](https://docs.google.com/document/d/10RktunzjKNfp6Y8Cu4EhR5V9IqxEZq42LU126EYhWY4/pub). Upon upgrade, all mining nodes can vote for or against the soft fork (this is done through altering the block gas limit; a gas limit of at most 4M results in the soft-fork being triggered).
+
+By default, nodes vote "for" the DAO soft-fork (and try to reduce the gas limit to 3.1M). To vote against the soft-fork (keeping it at 4.7M), run with `--dont-help-rescue-dao`. Not upgrading is not recommended; if the majority votes with a soft-fork, an upgrade will be necessary to mine on the correct chain.
+
+#### Changed
+- Fast pruning method is now default for a fresh sync.
+- Web UI renamed to Dapps UI.
+- JSONRPC and Dapps UI enabled by default.
+- CLI options ending `-off` renamed to GNU-consistent prefix `--no-`.
+- Dynamic gas-pricing (data feed and statistical techniques used to determine optimum gas prices).
+
+Full changes:
+
+- Signer enabled by default for UI [#1417](https://github.com/paritytech/parity/pull/1417)
+- Remove experimental pruning options. [#1415](https://github.com/paritytech/parity/pull/1415)
+- Fixing interface and port for parity ui [#1414](https://github.com/paritytech/parity/pull/1414)
+- Configurable gas limit cap. [#1405](https://github.com/paritytech/parity/pull/1405)
+- Bumping TopBar, Minimal SignerUI and wallet [#1413](https://github.com/paritytech/parity/pull/1413)
+- Sync: Update highest block for progress reporting [#1411](https://github.com/paritytech/parity/pull/1411)
+- Tweaked CLI options for the release [#1407](https://github.com/paritytech/parity/pull/1407)
+- Further rocksdb tuning [#1409](https://github.com/paritytech/parity/pull/1409)
+- Fixing jit compilation [#1406](https://github.com/paritytech/parity/pull/1406)
+- Bump clippy [#1403](https://github.com/paritytech/parity/pull/1403)
+- Shortcut SF condition when canon known [#1401](https://github.com/paritytech/parity/pull/1401)
+- Additional assertions for internal state of queue [#1402](https://github.com/paritytech/parity/pull/1402)
+- Replace deprecated hashdb trait names [#1394](https://github.com/paritytech/parity/pull/1394)
+- rpc api by default for ipc [#1400](https://github.com/paritytech/parity/pull/1400)
+- Ensure judging the SF trigger by relative branch [#1399](https://github.com/paritytech/parity/pull/1399)
+- Signer with unlocked account working as expected. [#1398](https://github.com/paritytech/parity/pull/1398)
+- Make --signer default. [#1392](https://github.com/paritytech/parity/pull/1392)
+- Presale wallet [#1376](https://github.com/paritytech/parity/pull/1376)
+- Removing signer connection limit [#1396](https://github.com/paritytech/parity/pull/1396)
+- Optional gas price in transactions come from statistics [#1388](https://github.com/paritytech/parity/pull/1388)
+- Update README.md with cargo install [ci-skip] [#1389](https://github.com/paritytech/parity/pull/1389)
+- Fixing possible overflow during multiplication [#1381](https://github.com/paritytech/parity/pull/1381)
+- Update SF to latest spec [#1386](https://github.com/paritytech/parity/pull/1386)
+- Sync optimization [#1385](https://github.com/paritytech/parity/pull/1385)
+- Fixing order of if statements to avoid overflows. [#1384](https://github.com/paritytech/parity/pull/1384)
+- New topbar & signer UI [#1383](https://github.com/paritytech/parity/pull/1383)
+- Install trigger for DAO-rescue soft-fork. [#1329](https://github.com/paritytech/parity/pull/1329)
+- Rocksdb flush/compact limit [#1375](https://github.com/paritytech/parity/pull/1375)
+- CentOS Dockerfile [#1377](https://github.com/paritytech/parity/pull/1377)
+- RPC method to return number of unconfirmed transactions... [#1371](https://github.com/paritytech/parity/pull/1371)
+- bump jsonrpc-http-server [#1369](https://github.com/paritytech/parity/pull/1369)
+- Fix lock order when updating sealing [#1364](https://github.com/paritytech/parity/pull/1364)
+- Update sealing on new transactions [#1365](https://github.com/paritytech/parity/pull/1365)
+- Fixed panic on aborted connection [#1370](https://github.com/paritytech/parity/pull/1370)
+- importing presale wallet [#1368](https://github.com/paritytech/parity/pull/1368)
+- Set default database file size large enough [#1363](https://github.com/paritytech/parity/pull/1363)
+- Reserved peers rpc API [#1360](https://github.com/paritytech/parity/pull/1360)
+- Fixing replacing transaction with lower gas_price result. [#1343](https://github.com/paritytech/parity/pull/1343)
+- fixed migration of empty pruning dir [#1362](https://github.com/paritytech/parity/pull/1362)
+- Transaction processing queue [#1335](https://github.com/paritytech/parity/pull/1335)
+- Fixing last nonce values in case transaction is replaced [#1359](https://github.com/paritytech/parity/pull/1359)
+- docopt is an optional dependency of ethkey and ethstore [#1358](https://github.com/paritytech/parity/pull/1358)
+- Fixing clippy warnings [#1354](https://github.com/paritytech/parity/pull/1354)
+- Reduce locking when syncing [#1357](https://github.com/paritytech/parity/pull/1357)
+- removed unnecessary logs [#1356](https://github.com/paritytech/parity/pull/1356)
+- Updating parity-dapps [#1353](https://github.com/paritytech/parity/pull/1353)
+- moved keystore tests files from util to ethstore [#1352](https://github.com/paritytech/parity/pull/1352)
+- removed redundant bigint deps [#1351](https://github.com/paritytech/parity/pull/1351)
+- Reopen "reserved peers and reserved-only flag" [#1350](https://github.com/paritytech/parity/pull/1350)
+- Configurable rocksdb cache size [#1348](https://github.com/paritytech/parity/pull/1348)
+- Fixing future order and errors when reaching limit. [#1346](https://github.com/paritytech/parity/pull/1346)
+- Removing priority on local transactions [#1342](https://github.com/paritytech/parity/pull/1342)
+- Revert "Reserved peers, reserved-only flag" [#1349](https://github.com/paritytech/parity/pull/1349)
+- Sync attack defense: Deactivate peers on invalid block bodies [#1345](https://github.com/paritytech/parity/pull/1345)
+- Reserved peers, reserved-only flag [#1347](https://github.com/paritytech/parity/pull/1347)
+- CI for ethkey and ethstore [#1341](https://github.com/paritytech/parity/pull/1341)
+- Fixed empty block body composition [#1340](https://github.com/paritytech/parity/pull/1340)
+- Provide a signer UI token by default. [#1334](https://github.com/paritytech/parity/pull/1334)
+- docker uses rustup, fixes #1337 [#1344](https://github.com/paritytech/parity/pull/1344)
+- Fixed network service dispose [#1339](https://github.com/paritytech/parity/pull/1339)
+- Sync: Cache last sync round block parents [#1331](https://github.com/paritytech/parity/pull/1331)
+- secret store separated from util [#1304](https://github.com/paritytech/parity/pull/1304)
+- --geth prevent getTransactionReceipt from using pending. [#1325](https://github.com/paritytech/parity/pull/1325)
+- Fixing locks order in miner. [#1328](https://github.com/paritytech/parity/pull/1328)
+- Update default gas limit, rename field [#1324](https://github.com/paritytech/parity/pull/1324)
+- Use constants for DatabaseConfig [#1318](https://github.com/paritytech/parity/pull/1318)
+- Fixing clippy warnings [#1321](https://github.com/paritytech/parity/pull/1321)
+- Bumping topbar. Fixing ws server closing when suspending [#1312](https://github.com/paritytech/parity/pull/1312)
+- Syncing fix [#1320](https://github.com/paritytech/parity/pull/1320)
+- Filling-in optional fields of TransactionRequest... [#1305](https://github.com/paritytech/parity/pull/1305)
+- Removing MakerOTC and DAO dapps  [#1319](https://github.com/paritytech/parity/pull/1319)
+- Disabling ethcore_set* APIs by default (+ Status page update) [#1315](https://github.com/paritytech/parity/pull/1315)
+- fixed #1180 [#1282](https://github.com/paritytech/parity/pull/1282)
+- Network start/stop [#1313](https://github.com/paritytech/parity/pull/1313)
+- Additional logging for own transactions in queue [#1311](https://github.com/paritytech/parity/pull/1311)
+- DAO Rescue soft fork [#1309](https://github.com/paritytech/parity/pull/1309)
+- Appveyor config for windows build+installer [#1302](https://github.com/paritytech/parity/pull/1302)
+- Key load avoid warning [#1303](https://github.com/paritytech/parity/pull/1303)
+- More meaningful errors when sending transaction [#1290](https://github.com/paritytech/parity/pull/1290)
+- Gas price statistics. [#1291](https://github.com/paritytech/parity/pull/1291)
+- Fix read-ahead bug. [#1298](https://github.com/paritytech/parity/pull/1298)
+- firewall rules for windows installer [#1297](https://github.com/paritytech/parity/pull/1297)
+- x64 program files path for installer [#1296](https://github.com/paritytech/parity/pull/1296)
+- Fixed loosing peers on incoming connections. [#1293](https://github.com/paritytech/parity/pull/1293)
+- fixed #1261, overflow when calculating work [#1283](https://github.com/paritytech/parity/pull/1283)
+- snappy and minor block compression [#1286](https://github.com/paritytech/parity/pull/1286)
+- clarify build instructions [#1287](https://github.com/paritytech/parity/pull/1287)
+- fixed #1255 [#1280](https://github.com/paritytech/parity/pull/1280)
+- bump rust-crypto [#1289](https://github.com/paritytech/parity/pull/1289)
+- Security audit issues fixed [#1279](https://github.com/paritytech/parity/pull/1279)
+- Fixing origin/host validation [#1273](https://github.com/paritytech/parity/pull/1273)
+- windows installer + parity start ui cli option [#1284](https://github.com/paritytech/parity/pull/1284)
+- ipc lib version bump [#1285](https://github.com/paritytech/parity/pull/1285)
+- Syncing improvements [#1274](https://github.com/paritytech/parity/pull/1274)
+- removed redundant if condition [#1270](https://github.com/paritytech/parity/pull/1270)
+- Naive chunk creation, snapshotting [#1263](https://github.com/paritytech/parity/pull/1263)
+- Fixing generating new token while another parity instance is running. [#1272](https://github.com/paritytech/parity/pull/1272)
+- README: rustup and windows instructions [#1266](https://github.com/paritytech/parity/pull/1266)
+- Windows build [#1253](https://github.com/paritytech/parity/pull/1253)
+- removed try_seal from MiningBlockChainClient [#1262](https://github.com/paritytech/parity/pull/1262)
+- simplified block opening [#1232](https://github.com/paritytech/parity/pull/1232)
+- Clippy bump [#1259](https://github.com/paritytech/parity/pull/1259)
+- Fixing uint ASM macros compilation [#1258](https://github.com/paritytech/parity/pull/1258)
+- Signer port returned from RPC + Topbar showing count of unconfirmed transactions. [#1252](https://github.com/paritytech/parity/pull/1252)
+- codegen - avoid unwraps leading to compilation crash [#1250](https://github.com/paritytech/parity/pull/1250)
+- Dapps bump [#1257](https://github.com/paritytech/parity/pull/1257)
+- Windows named pipes [#1254](https://github.com/paritytech/parity/pull/1254)
+- remove unsafety from util/hash.rs and util/bigint/uint.rs [#1236](https://github.com/paritytech/parity/pull/1236)
+- Fixing CORS settings for special values: * & null. [#1247](https://github.com/paritytech/parity/pull/1247)
+- JSONRPC test strings avoid using \ char [#1246](https://github.com/paritytech/parity/pull/1246)
+- Tests for JSON serialisation of statediff/vmtrace [#1241](https://github.com/paritytech/parity/pull/1241)
+- Bumping Dapps & TopBar to newest version. [#1245](https://github.com/paritytech/parity/pull/1245)
+- keys import [#1240](https://github.com/paritytech/parity/pull/1240)
+- Splitting RPC Apis into more fine-grained sets [#1234](https://github.com/paritytech/parity/pull/1234)
+- Refactor triedb constructors to error on invalid state root  [#1230](https://github.com/paritytech/parity/pull/1230)
+- Signer RPC method to check if signer is enabled [#1238](https://github.com/paritytech/parity/pull/1238)
+- Fixing signer behaviour when confirming transaction with wrong password. [#1237](https://github.com/paritytech/parity/pull/1237)
+- SystemUIs authorization [#1233](https://github.com/paritytech/parity/pull/1233)
+- IPC path for tesetnet with --geth compatibility [#1231](https://github.com/paritytech/parity/pull/1231)
+- Transaction tracing for eth_call [#1210](https://github.com/paritytech/parity/pull/1210)
+- Removing compilation warnings [#1227](https://github.com/paritytech/parity/pull/1227)
+- Allowing connections only from chrome-extension and self-hosted client [#1226](https://github.com/paritytech/parity/pull/1226)
+- Clippy bump & fixing warnings [#1219](https://github.com/paritytech/parity/pull/1219)
+- Bumping serde & syntex [#1216](https://github.com/paritytech/parity/pull/1216)
+- Minimal Signer UI (System UI) exposed over websockets. [#1211](https://github.com/paritytech/parity/pull/1211)
+- Switch RPC namespace form ethcore_ to trace_ [#1208](https://github.com/paritytech/parity/pull/1208)
+- Verify the state root exists before creating a State [#1217](https://github.com/paritytech/parity/pull/1217)
+- Integrate state diffing into the ethcore JSONRPC [#1206](https://github.com/paritytech/parity/pull/1206)
+- Updating topbar to latest version [#1220](https://github.com/paritytech/parity/pull/1220)
+- Loading local Dapps from FS. [#1214](https://github.com/paritytech/parity/pull/1214)
+- Ipc serialization & protocol fixes [#1188](https://github.com/paritytech/parity/pull/1188)
+- Have Ext::ret take self by value [#1187](https://github.com/paritytech/parity/pull/1187)
+- Simple WebSockets notification about new request [#1202](https://github.com/paritytech/parity/pull/1202)
+- Removing leftovers of ethminer [#1207](https://github.com/paritytech/parity/pull/1207)
+- fixed #1204 [#1205](https://github.com/paritytech/parity/pull/1205)
+- VM tracing and JSON RPC endpoint for it. [#1169](https://github.com/paritytech/parity/pull/1169)
+- devtools helpers extended [#1186](https://github.com/paritytech/parity/pull/1186)
+- Networking refactoring [#1172](https://github.com/paritytech/parity/pull/1172)
+- Client & Miner refactoring [#1195](https://github.com/paritytech/parity/pull/1195)
+- update readme [#1201](https://github.com/paritytech/parity/pull/1201)
+- Simple signing queue, confirmation APIs exposed in signer WebSockets. [#1182](https://github.com/paritytech/parity/pull/1182)
+- Using ordered hashmap to keep the order of dapps on home screen [#1199](https://github.com/paritytech/parity/pull/1199)
+- Disabling `ethcore` by default, adding x-frame-options header to dapps. [#1197](https://github.com/paritytech/parity/pull/1197)
+- transaction count verifier tests [#1196](https://github.com/paritytech/parity/pull/1196)
+- expunge x! and xx! from the codebase [#1192](https://github.com/paritytech/parity/pull/1192)
+- Database service upgrade (from the ipc branch) [#1185](https://github.com/paritytech/parity/pull/1185)
+- stop eth_syncing from returning true forever [#1181](https://github.com/paritytech/parity/pull/1181)
+- Sync fixes and tweaks [#1164](https://github.com/paritytech/parity/pull/1164)
+- Exposing RPC over Signer WebSockets [#1167](https://github.com/paritytech/parity/pull/1167)
+- implement missing rpc methods and tests [#1171](https://github.com/paritytech/parity/pull/1171)
+- json ipc server version bump [#1170](https://github.com/paritytech/parity/pull/1170)
+- Updated dependencies for windows build [#1173](https://github.com/paritytech/parity/pull/1173)
+- Framework for improved RPC unit tests [#1141](https://github.com/paritytech/parity/pull/1141)
+- remove all possible unsafe code in crypto [#1168](https://github.com/paritytech/parity/pull/1168)
+- Base for Signer Websockets server [#1158](https://github.com/paritytech/parity/pull/1158)
+- Write queue to speed-up db ipc [#1160](https://github.com/paritytech/parity/pull/1160)
+- Fixing few clippy warnings [#1163](https://github.com/paritytech/parity/pull/1163)
+- Change eth_signAndSendTransaction to personal_SignAndSendTransaction [#1154](https://github.com/paritytech/parity/pull/1154)
+- Support "earliest" and specific block parameters in RPC where possible [#1149](https://github.com/paritytech/parity/pull/1149)
+- migration fixes [#1155](https://github.com/paritytech/parity/pull/1155)
+- Empty trusted signer crate with it's general purpose described. [#1150](https://github.com/paritytech/parity/pull/1150)
+- More bootnodes for morden. [#1153](https://github.com/paritytech/parity/pull/1153)
+- move existing rpc tests into mocked module [#1151](https://github.com/paritytech/parity/pull/1151)
+- Bloomchain [#1014](https://github.com/paritytech/parity/pull/1014)
+- Renaming dapps repos. Updating dapps [#1142](https://github.com/paritytech/parity/pull/1142)
+- fixed pending transactions [#1147](https://github.com/paritytech/parity/pull/1147)
+- Basic benches to provide metrics for ipc optimizations [#1145](https://github.com/paritytech/parity/pull/1145)
+- Fixing clippy warnings [#1148](https://github.com/paritytech/parity/pull/1148)
+- correct signature of SecTrieDB::raw_mut [#1143](https://github.com/paritytech/parity/pull/1143)
+- Merge to master and start hypervisor for import/export [#1138](https://github.com/paritytech/parity/pull/1138)
+- Bumping clippy. Fixing warnings [#1139](https://github.com/paritytech/parity/pull/1139)
+- Display progress when importing [#1136](https://github.com/paritytech/parity/pull/1136)
+- foundation of simple db migration [#1128](https://github.com/paritytech/parity/pull/1128)
+- Fixpending [#1074](https://github.com/paritytech/parity/pull/1074)
+- Sync: Propagate uncles and fix status reporting [#1134](https://github.com/paritytech/parity/pull/1134)
+- Coloured, padding logging. [#1133](https://github.com/paritytech/parity/pull/1133)
+- Importing [#1132](https://github.com/paritytech/parity/pull/1132)
+- Have `die_with_error` use `fmt::Display` rather than Debug [#1116](https://github.com/paritytech/parity/pull/1116)
+- Exporting [#1129](https://github.com/paritytech/parity/pull/1129)
+- Sign and send transaction [#1124](https://github.com/paritytech/parity/pull/1124)
+- Fixing unused imports warnings [#1125](https://github.com/paritytech/parity/pull/1125)
+- Adding info messages on mined blocks [#1127](https://github.com/paritytech/parity/pull/1127)
+- Fix styling - don't mix spaces with tabs!!! [#1123](https://github.com/paritytech/parity/pull/1123)
+- Fix is_syncing so it's false as long as the update is trivial. [#1122](https://github.com/paritytech/parity/pull/1122)
+- Relock unlocked accounts after first use [#1120](https://github.com/paritytech/parity/pull/1120)
+- Avoid importing keys into wrong place. [#1119](https://github.com/paritytech/parity/pull/1119)
+- Implement receipt's gasUsed field [#1118](https://github.com/paritytech/parity/pull/1118)
+- New dapps & query parameter handling [#1113](https://github.com/paritytech/parity/pull/1113)
+- pretty print trace error [#1098](https://github.com/paritytech/parity/pull/1098)
+- New syncing strategy [#1095](https://github.com/paritytech/parity/pull/1095)
+- ethcore-db crate [#1097](https://github.com/paritytech/parity/pull/1097)
+- Fix the default for pruning. [#1107](https://github.com/paritytech/parity/pull/1107)
+- Make Id/ID and db/Db/DB usage consistent [#1105](https://github.com/paritytech/parity/pull/1105)
+- Miner holds it's own copy of spec/engine [#1091](https://github.com/paritytech/parity/pull/1091)
+- Apps listing API & Home webapp. [#1101](https://github.com/paritytech/parity/pull/1101)
+- CLI option for using JITEVM [#1103](https://github.com/paritytech/parity/pull/1103)
+- Fix up the seal fields in RPC output [#1096](https://github.com/paritytech/parity/pull/1096)
+- Fixing some warnings [#1102](https://github.com/paritytech/parity/pull/1102)
+- fixed incorrect decoding of header seal_fields. added tests. #1090 [#1094](https://github.com/paritytech/parity/pull/1094)
+- Bumping Clippy [#1093](https://github.com/paritytech/parity/pull/1093)
+- Injectable topbar support. [#1092](https://github.com/paritytech/parity/pull/1092)
+- New syncing part 1: Block collection [#1088](https://github.com/paritytech/parity/pull/1088)
+- Moving all Client public API types to separate mod & binary serialization codegen for that mod [#1051](https://github.com/paritytech/parity/pull/1051)
+- Subdomains support in content server (webapps server). [#1082](https://github.com/paritytech/parity/pull/1082)
+- Fix uncle getter [#1087](https://github.com/paritytech/parity/pull/1087)
+- Provide fallback for usd-per-eth option when offline. [#1085](https://github.com/paritytech/parity/pull/1085)
+- path centralized [#1083](https://github.com/paritytech/parity/pull/1083)
+- Limiting result of the execution to execution-specific errors [#1071](https://github.com/paritytech/parity/pull/1071)
+- Configurable keys security [#1080](https://github.com/paritytech/parity/pull/1080)
+- comma delimeting multiple cors headers [#1078](https://github.com/paritytech/parity/pull/1078)
+- Update error message [#1081](https://github.com/paritytech/parity/pull/1081)
+- Updating dapp-wallet [#1076](https://github.com/paritytech/parity/pull/1076)
+- Fixed connecting to local nodes on startup [#1070](https://github.com/paritytech/parity/pull/1070)
+- Validate signature in Tx queue [#1068](https://github.com/paritytech/parity/pull/1068)
+- moving deps to ethcore/hyper and bumping jsonrpc-http-server version [#1067](https://github.com/paritytech/parity/pull/1067)
+- Updating status page. Bringing back wallet [#1064](https://github.com/paritytech/parity/pull/1064)
+- Fix --geth IPC for MacOS. [#1062](https://github.com/paritytech/parity/pull/1062)
+- Fixing formatter for defaultExtraData [#1060](https://github.com/paritytech/parity/pull/1060)
+- --geth IPC compatibility [#1059](https://github.com/paritytech/parity/pull/1059)
+- Moving dependencies to ethcore & uniforming syntax libs through all crates [#1050](https://github.com/paritytech/parity/pull/1050)
+- update hyper branch mio [#1054](https://github.com/paritytech/parity/pull/1054)
+- IPC lib update [#1047](https://github.com/paritytech/parity/pull/1047)
+- Updating hyper-mio revision [#1048](https://github.com/paritytech/parity/pull/1048)
+- Bump ipc-lib version [#1046](https://github.com/paritytech/parity/pull/1046)
+- Tidy up CLI options and make JSONRPC & webapps on by default. [#1045](https://github.com/paritytech/parity/pull/1045)
+- Fixing clippy warnings [#1044](https://github.com/paritytech/parity/pull/1044)
+- Fixing RPC modules compatibility [#1041](https://github.com/paritytech/parity/pull/1041)
+- Fixing hyper-mio revision [#1043](https://github.com/paritytech/parity/pull/1043)
+- Updating locations of webapp stuff [#1040](https://github.com/paritytech/parity/pull/1040)
+- JSON-RPC over IPC [#1039](https://github.com/paritytech/parity/pull/1039)
+- Update nix/mio for ARM [#1036](https://github.com/paritytech/parity/pull/1036)
+- Basic Authority [#991](https://github.com/paritytech/parity/pull/991)
+- Prioritizing of local transaction [#1023](https://github.com/paritytech/parity/pull/1023)
+- Version 1.2 [#1030](https://github.com/paritytech/parity/pull/1030)
+- Bumping status page [#1033](https://github.com/paritytech/parity/pull/1033)