Backports: parity stable 2.0.9 (#9786)

* version: bump parity stable to 2.0.9

* ethcore: bump ropsten forkblock checkpoint (#9775)

* ethcore: handle vm exception when estimating gas (#9615)

* update jsonrpc-core to a1b2bb742ce16d1168669ffb13ffe856e8131228

* removed "rustup" & added new runner tag (#9731)

* removed "rustup" & added new runner tag

* exchanged tag "rust-windows" with "windows"

* revert windows tag change

* Allow zero chain id in EIP155 signing process (#9792)

* Allow zero chain id in EIP155 signing process

* Rename test

* Fix test failure

* Insert dev account before unlocking (#9813)

.gitignore

@@ -38,7 +38,8 @@ node_modules
 
 # Build artifacts
 out/
+parity-clib-examples/cpp/build/
 
 .vscode
-
+rls/
 /parity.*

.gitlab-ci.yml

@@ -1,245 +1,181 @@
 stages:
   - test
-  - push-release
   - build
+  - publish
+  - optional
+
+image:                             parity/rust:gitlab-ci
+
 variables:
-  RUST_BACKTRACE: "1"
-  RUSTFLAGS: ""
-  CARGOFLAGS: ""
-  CI_SERVER_NAME: "GitLab CI"
-  LIBSSL: "libssl1.0.0 (>=1.0.0)"
-  CARGO_HOME: $CI_PROJECT_DIR/cargo
+  CI_SERVER_NAME:                  "GitLab CI"
+  CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
+  BUILD_TARGET:                    ubuntu
+  BUILD_ARCH:                      amd64
+  CARGO_TARGET:                    x86_64-unknown-linux-gnu
+
 cache:
-  key: "$CI_BUILD_STAGE-$CI_BUILD_REF_NAME"
+  key:                             "${CI_JOB_NAME}"
   paths:
-    - target/
-    - cargo/
-  untracked: true
-linux-stable:
-  stage: build
-  image: parity/rust:gitlab-ci
-  only:
+    - ./target
+    - ./.cargo
+
+.releaseable_branches:             # list of git refs for building GitLab artifacts (think "pre-release binaries")
+  only:                            &releaseable_branches
+    - stable
     - beta
     - tags
-    - stable
-    - triggers
+    - schedules
+
+.collect_artifacts:                &collect_artifacts
+  artifacts:
+    name:                          "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
+    when:                          on_success
+    expire_in:                     1 mos
+    paths:
+    - artifacts/
+
+.determine_version:                &determine_version
+  - VERSION="$(sed -r -n '1,/^version/s/^version = "([^"]+)".*$/\1/p' Cargo.toml)"
+  - DATE_STR="$(date +%Y%m%d)"
+  - ID_SHORT="$(echo ${CI_COMMIT_SHA} | cut -c 1-7)"
+  - test "${CI_COMMIT_REF_NAME}" = "nightly" && VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"
+  - export VERSION
+  - echo "Version = ${VERSION}"
+
+test-linux:
+  stage:                           test
+  variables:
+    RUN_TESTS:                     cargo
   script:
-    - rustup default stable
-    # ARGUMENTS: 1. BUILD_PLATFORM (target for binaries) 2. PLATFORM (target for cargo) 3. ARC (architecture) 4. & 5. CC & CXX flags 6. binary identifier
-    - scripts/gitlab-build.sh x86_64-unknown-linux-gnu x86_64-unknown-linux-gnu amd64 gcc g++ ubuntu
+    - scripts/gitlab/test-all.sh stable
   tags:
     - rust-stable
-  artifacts:
-    paths:
-    - parity.zip
-    name: "stable-x86_64-unknown-linux-gnu_parity"
-linux-stable-debian:
-  stage: build
-  image: parity/rust-debian:gitlab-ci
-  only:
-    - beta
-    - tags
-    - stable
-    - triggers
+
+build-linux:
+  stage:                           build
+  only:                            *releaseable_branches
+  variables:
+    CARGO_TARGET:                  x86_64-unknown-linux-gnu
   script:
-    - export LIBSSL="libssl1.1 (>=1.1.0)"
-    - scripts/gitlab-build.sh x86_64-unknown-debian-gnu x86_64-unknown-linux-gnu amd64 gcc g++ debian
-  tags:
-    - rust-debian
-  artifacts:
-    paths:
-    - parity.zip
-    name: "stable-x86_64-unknown-debian-gnu_parity"
-linux-centos:
-  stage: build
-  image: parity/rust-centos:gitlab-ci
-  only:
-    - beta
-    - tags
-    - stable
-    - triggers
-  script:
-    - scripts/gitlab-build.sh x86_64-unknown-centos-gnu x86_64-unknown-linux-gnu x86_64 gcc g++ centos
-  tags:
-    - rust-centos
-  artifacts:
-    paths:
-    - parity.zip
-    name: "x86_64-unknown-centos-gnu_parity"
-linux-i686:
-  stage: build
-  image: parity/rust-i686:gitlab-ci
-  only:
-    - beta
-    - tags
-    - stable
-    - triggers
-  script:
-    - scripts/gitlab-build.sh i686-unknown-linux-gnu i686-unknown-linux-gnu i386 gcc g++ ubuntu
-  tags:
-    - rust-i686
-  artifacts:
-    paths:
-      - parity.zip
-    name: "i686-unknown-linux-gnu"
-linux-armv7:
-  stage: build
-  image: parity/rust-armv7:gitlab-ci
-  only:
-    - beta
-    - tags
-    - stable
-    - triggers
-  script:
-    - scripts/gitlab-build.sh armv7-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ ubuntu
-  tags:
-    - rust-arm
-  artifacts:
-    paths:
-    - parity.zip
-    name: "armv7_unknown_linux_gnueabihf_parity"
-linux-arm:
-  stage: build
-  image: parity/rust-arm:gitlab-ci
-  only:
-    - beta
-    - tags
-    - stable
-    - triggers
-  script:
-    - scripts/gitlab-build.sh arm-unknown-linux-gnueabihf arm-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ ubuntu
-  tags:
-    - rust-arm
-  artifacts:
-    paths:
-    - parity.zip
-    name: "arm-unknown-linux-gnueabihf_parity"
-linux-aarch64:
-  stage: build
-  image: parity/rust-arm64:gitlab-ci
-  only:
-    - beta
-    - tags
-    - stable
-    - triggers
-  script:
-    - scripts/gitlab-build.sh aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu arm64 aarch64-linux-gnu-gcc aarch64-linux-gnu-g++ ubuntu
-  tags:
-    - rust-arm
-  artifacts:
-    paths:
-    - parity.zip
-    name: "aarch64-unknown-linux-gnu_parity"
-linux-snap:
-  stage: build
-  image: 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
+    - scripts/gitlab/build-unix.sh
+  <<:                              *collect_artifacts
   tags:
     - rust-stable
-  artifacts:
-    paths:
-    - parity.zip
-    name: "stable-x86_64-unknown-snap-gnu_parity"
-darwin:
-  stage: build
-  only:
-    - beta
-    - tags
-    - stable
-    - triggers
+
+build-darwin:
+  stage:                           build
+  only:                            *releaseable_branches
+  variables:
+    CARGO_TARGET:                  x86_64-apple-darwin
+    CC:                            gcc
+    CXX:                           g++
   script:
-    - scripts/gitlab-build.sh x86_64-apple-darwin x86_64-apple-darwin macos gcc g++ macos
+    - scripts/gitlab/build-unix.sh
   tags:
-    - osx
-  artifacts:
-    paths:
-    - parity.zip
-    name: "x86_64-apple-darwin_parity"
-windows:
-  cache:
-    key: "%CI_BUILD_STAGE%-%CI_BUILD_REF_NAME%"
-    untracked: true
-  stage: build
-  only:
-    - beta
-    - tags
-    - stable
-    - triggers
+    - rust-osx
+  <<:                              *collect_artifacts
+
+build-windows:
+  stage:                           build
+  only:                            *releaseable_branches
+  variables:
+    CARGO_TARGET:                  x86_64-pc-windows-msvc
   script:
-    - sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc installer "" "" windows
+    - sh scripts/gitlab/build-windows.sh
   tags:
    - rust-windows
-  artifacts:
-    paths:
-    - parity.zip
-    name: "x86_64-pc-windows-msvc_parity"
-docker-build:
-  stage: build
+  <<:                              *collect_artifacts
+
+publish-docker:
+  stage:                           publish
+  only:                            *releaseable_branches
+  cache: {}
+  dependencies:
+    - build-linux
+  tags:
+    - shell
+  script:
+    - scripts/gitlab/publish-docker.sh parity
+
+publish-awss3:
+  stage:                           publish
+  only:                            *releaseable_branches
+  cache: {}
+  dependencies:
+    - build-linux
+    - build-darwin
+    - build-windows
+  before_script:                   *determine_version
+  script:
+    - scripts/gitlab/publish-awss3.sh
+  tags:
+    - shell
+
+docs-jsonrpc:
+  stage:                            optional
   only:
     - tags
-    - triggers
-  before_script:
-    - docker info
+  except:
+    - nightly
+  cache: {}
   script:
-    - if [ "$CI_BUILD_REF_NAME" == "beta-release" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
-    - echo "Tag:" $DOCKER_TAG
-    - docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
-    - scripts/docker-build.sh $DOCKER_TAG
-    - docker logout
+    - scripts/gitlab/docs-jsonrpc.sh
   tags:
-    - docker
-test-coverage:
-  stage: test
-  only:
-    - master
+    - shell
+
+cargo-audit:
+  stage:                           optional
   script:
-    - scripts/gitlab-test.sh test-coverage
-  tags:
-    - kcov
-  allow_failure: true
-test-rust-stable:
-  stage: test
-  image: parity/rust:gitlab-ci
-  script:
-    - scripts/gitlab-test.sh stable
+    - scripts/gitlab/cargo-audit.sh
   tags:
     - rust-stable
-test-rust-beta:
-  stage: test
-  only:
-    - triggers
-    - master
-  image: parity/rust:gitlab-ci
+
+test-android:
+  stage:                           optional
+  image:                           parity/rust-android:gitlab-ci
+  variables:
+    CARGO_TARGET:                  armv7-linux-androideabi
   script:
-    - scripts/gitlab-test.sh beta
+    - scripts/gitlab/test-all.sh stable
+  tags:
+    - rust-arm
+
+test-darwin:
+  stage:                           optional
+  variables:
+    CARGO_TARGET:                  x86_64-apple-darwin
+    CC:                            gcc
+    CXX:                           g++
+    RUN_TESTS:                     cargo
+  script:
+    - scripts/gitlab/test-all.sh stable
+  tags:
+    - rust-osx
+
+test-windows:
+  stage:                           optional
+  variables:
+    CARGO_TARGET:                  x86_64-pc-windows-msvc
+    RUN_TESTS:                     cargo
+  script:
+    - sh scripts/gitlab/test-all.sh stable
+  tags:
+   - rust-windows
+
+test-beta:
+  stage:                           optional
+  variables:
+    RUN_TESTS:                     cargo
+  script:
+    - scripts/gitlab/test-all.sh beta
   tags:
     - rust-beta
-  allow_failure: true
-test-rust-nightly:
-  stage: test
-  only:
-    - triggers
-    - master
-  image: parity/rust:gitlab-ci
+
+test-nightly:
+  stage:                           optional
+  variables:
+    RUN_TESTS:                     all
   script:
-    - scripts/gitlab-test.sh nightly
+    - scripts/gitlab/test-all.sh nightly
   tags:
-    - rust
     - rust-nightly
-  allow_failure: true
-push-release:
-  stage: push-release
-  only:
-    - tags
-    - triggers
-  image: parity/rust:gitlab-ci
-  script:
-    - scripts/gitlab-push-release.sh
-  tags:
-    - curl

Cargo.toml

@@ -1,12 +1,13 @@
 [package]
 description = "Parity Ethereum client"
-name = "parity"
+name = "parity-ethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "1.10.0"
+version = "2.0.9"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
+blooms-db = { path = "util/blooms-db" }
 log = "0.3"
 env_logger = "0.4"
 rustc-hex = "1.0"
@@ -14,42 +15,38 @@ docopt = "0.8"
 clap = "2"
 term_size = "0.3"
 textwrap = "0.9"
-time = "0.1"
 num_cpus = "1.2"
 number_prefix = "0.2"
 rpassword = "1.0"
-semver = "0.6"
+semver = "0.9"
 ansi_term = "0.10"
-parking_lot = "0.5"
+parking_lot = "0.6"
 regex = "0.2"
-isatty = "0.1"
+atty = "0.2.8"
 toml = "0.4"
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
-app_dirs = "1.1.1"
 futures = "0.1"
 futures-cpupool = "0.1"
 fdlimit = "0.1"
-ws2_32-sys = "0.2"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.10" }
-ethsync = { path = "sync" }
-ethcore = { path = "ethcore" }
-ethcore-bytes = { path = "util/bytes" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
+ethcore = { path = "ethcore", features = ["parity"] }
+parity-bytes = { git = "https://github.com/paritytech/parity-common" }
 ethcore-io = { path = "util/io" }
 ethcore-light = { path = "ethcore/light" }
 ethcore-logger = { path = "logger" }
-ethcore-migrations = { path = "ethcore/migrations" }
 ethcore-miner = { path = "miner" }
 ethcore-network = { path = "util/network" }
-ethcore-stratum = { path = "stratum" }
+ethcore-private-tx = { path = "ethcore/private-tx" }
+ethcore-service = { path = "ethcore/service" }
+ethcore-sync = { path = "ethcore/sync" }
 ethcore-transaction = { path = "ethcore/transaction" }
-ethereum-types = "0.2"
+ethereum-types = "0.3"
 node-filter = { path = "ethcore/node_filter" }
 ethkey = { path = "ethkey" }
-node-health = { path = "dapps/node-health" }
-rlp = { path = "util/rlp" }
+rlp = { git = "https://github.com/paritytech/parity-common" }
 rpc-cli = { path = "rpc_cli" }
 parity-hash-fetch = { path = "hash-fetch" }
 parity-ipfs-api = { path = "ipfs" }
@@ -60,18 +57,20 @@ parity-rpc-client = { path = "rpc_client" }
 parity-updater = { path = "updater" }
 parity-version = { path = "util/version" }
 parity-whisper = { path = "whisper" }
-path = { path = "util/path" }
+path = { git = "https://github.com/paritytech/parity-common" }
 dir = { path = "util/dir" }
 panic_hook = { path = "util/panic_hook" }
-keccak-hash = { path = "util/hash" }
-migration = { path = "util/migration" }
-kvdb = { path = "util/kvdb" }
-kvdb-rocksdb = { path = "util/kvdb-rocksdb" }
+keccak-hash = { git = "https://github.com/paritytech/parity-common" }
+migration-rocksdb = { path = "util/migration-rocksdb" }
+kvdb = { git = "https://github.com/paritytech/parity-common" }
+kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" }
 journaldb = { path = "util/journaldb" }
+mem = { path = "util/mem" }
 
-parity-dapps = { path = "dapps", optional = true }
 ethcore-secretstore = { path = "secret_store", optional = true }
 
+registrar = { path = "registrar" }
+
 [build-dependencies]
 rustc_version = "0.2"
 
@@ -79,57 +78,66 @@ rustc_version = "0.2"
 pretty_assertions = "0.1"
 ipnetwork = "0.12.6"
 tempdir = "0.3"
+fake-fetch = { path = "util/fake-fetch" }
 
 [target.'cfg(windows)'.dependencies]
-winapi = "0.2"
+winapi = { version = "0.3.4", features = ["winsock2", "winuser", "shellapi"] }
 
 [target.'cfg(not(windows))'.dependencies]
-daemonize = "0.2"
+daemonize = { git = "https://github.com/paritytech/daemonize" }
 
 [features]
-default = ["ui-precompiled"]
-ui = [
-	"ui-enabled",
-	"parity-dapps/ui",
-]
-ui-precompiled = [
-	"ui-enabled",
-	"parity-dapps/ui-precompiled",
-]
-ui-enabled = ["dapps"]
-dapps = ["parity-dapps"]
-jit = ["ethcore/jit"]
+miner-debug = ["ethcore/miner-debug"]
 json-tests = ["ethcore/json-tests"]
+ci-skip-issue = ["ethcore/ci-skip-issue"]
 test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
 secretstore = ["ethcore-secretstore"]
 final = ["parity-version/final"]
+deadlock_detection = ["parking_lot/deadlock_detection"]
+# to create a memory profile (requires nightly rust), use e.g.
+# `heaptrack /path/to/parity <parity params>`,
+# to visualize a memory profile, use `heaptrack_gui`
+# or
+# `valgrind --tool=massif /path/to/parity <parity params>`
+# and `massif-visualizer` for visualization
+memory_profiling = []
+# hardcode version number 1.3.7 of parity to force an update
+# in order to manually test that parity fall-over to the local version
+# in case of invalid or deprecated command line arguments are entered
+test-updater = ["parity-updater/test-updater"]
+
+[lib]
+path = "parity/lib.rs"
 
 [[bin]]
 path = "parity/main.rs"
 name = "parity"
 
 [profile.dev]
-panic = "abort"
 
 [profile.release]
 debug = false
-lto = false
-panic = "abort"
 
 [workspace]
 members = [
 	"chainspec",
-	"dapps/js-glue",
 	"ethcore/wasm/run",
 	"ethcore/types",
 	"ethkey/cli",
 	"ethstore/cli",
 	"evmbin",
 	"miner",
+	"parity-clib",
 	"transaction-pool",
 	"whisper",
-	"util/rlp_compress"
+	"whisper/cli",
+	"util/triehash-ethereum",
+	"util/keccak-hasher",
+	"util/patricia-trie-ethereum",
 ]
+
+[patch.crates-io]
+ring = { git = "https://github.com/paritytech/ring" }

README.md

@@ -1,116 +1,75 @@
-# Parity - fast, light, and robust Ethereum client
+![Parity Ethereum](docs/logo-parity-ethereum.svg)
 
-## [» Download the latest release «](https://github.com/paritytech/parity/releases/latest)
+## The fastest and most advanced Ethereum client.
 
-[![build status](https://gitlab.parity.io/parity/parity/badges/master/build.svg)](https://gitlab.parity.io/parity/parity/commits/master)
-[![codecov](https://codecov.io/gh/paritytech/parity/branch/master/graph/badge.svg)](https://codecov.io/gh/paritytech/parity)
-[![Snap Status](https://build.snapcraft.io/badge/paritytech/parity.svg)](https://build.snapcraft.io/user/paritytech/parity)
-[![GPLv3](https://img.shields.io/badge/license-GPL%20v3-green.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)
+<p align="center"><strong><a href="https://github.com/paritytech/parity-ethereum/releases/latest">» Download the latest release «</a></strong></p>
 
+<p align="center"><a href="https://gitlab.parity.io/parity/parity-ethereum/commits/master" target="_blank"><img src="https://gitlab.parity.io/parity/parity-ethereum/badges/master/build.svg" /></a>
+<a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank"><img src="https://img.shields.io/badge/license-GPL%20v3-green.svg" /></a></p>
 
-### Join the chat!
+**Built for mission-critical use**: Miners, service providers, and exchanges need fast synchronisation and maximum uptime. Parity Ethereum provides the core infrastructure essential for speedy and reliable services.
 
-Get in touch with us on Gitter:
-[![Gitter: Parity](https://img.shields.io/badge/gitter-parity-4AB495.svg)](https://gitter.im/paritytech/parity)
-[![Gitter: Parity.js](https://img.shields.io/badge/gitter-parity.js-4AB495.svg)](https://gitter.im/paritytech/parity.js)
-[![Gitter: Parity/Miners](https://img.shields.io/badge/gitter-parity/miners-4AB495.svg)](https://gitter.im/paritytech/parity/miners)
-[![Gitter: Parity-PoA](https://img.shields.io/badge/gitter-parity--poa-4AB495.svg)](https://gitter.im/paritytech/parity-poa)
+- Clean, modular codebase for easy customisation
+- Advanced CLI-based client
+- Minimal memory and storage footprint
+- Synchronise in hours, not days with Warp Sync
+- Modular for light integration into your service or product
 
-Or join our community on Matrix:
-[![Riot: +Parity](https://img.shields.io/badge/riot-%2Bparity%3Amatrix.parity.io-orange.svg)](https://riot.im/app/#/group/+parity:matrix.parity.io)
+## Technical Overview
 
-Official website: https://parity.io
+Parity Ethereum's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing Parity Ethereum using the sophisticated and cutting-edge **Rust programming language**. Parity Ethereum is licensed under the GPLv3 and can be used for all your Ethereum needs.
 
-Be sure to check out [our wiki](https://paritytech.github.io/wiki/) and the [internal documentation](https://paritytech.github.io/parity/ethcore/index.html) for more information.
+By default, Parity Ethereum runs a JSON-RPC HTTP server on port `:8545` and a Web-Sockets server on port `:8546`. This is fully configurable and supports a number of APIs.
 
-----
+If you run into problems while using Parity Ethereum, check out the [wiki for documentation](https://wiki.parity.io/), feel free to [file an issue in this repository](https://github.com/paritytech/parity-ethereum/issues/new), or hop on our [Gitter](https://gitter.im/paritytech/parity) or [Riot](https://riot.im/app/#/group/+parity:matrix.parity.io) chat room to ask a question. We are glad to help! **For security-critical issues**, please refer to the security policy outlined in [SECURITY.md](SECURITY.md).
 
-## About Parity
+Parity Ethereum's current beta-release is 2.1. You can download it at [the releases page](https://github.com/paritytech/parity-ethereum/releases) or follow the instructions below to build from source. Please, mind the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions.
 
-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.
+## Build Dependencies
 
-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 Ethereum requires **Rust version 1.29.x** to build.
 
-- create and manage your Ethereum accounts;
-- manage your Ether and any Ethereum tokens;
-- create and register your own tokens;
-- and much more.
-
-By default, Parity will also run a JSONRPC server on `127.0.0.1:8545` and a websockets server on `127.0.0.1:8546`. This is fully configurable and supports a number of APIs.
-
-If you run into an issue while using Parity, feel free to file one in this repository or hop on our [Gitter](https://gitter.im/paritytech/parity) or [Riot](https://riot.im/app/#/group/+parity:matrix.parity.io) chat room to ask a question. We are glad to help!
-
-**For security-critical issues**, please refer to the security policy outlined in [SECURITY.MD](SECURITY.md).
-
-Parity's current release is 1.9. You can download it at https://github.com/paritytech/parity/releases or follow the instructions below to build from source.
-
-----
-
-## Build dependencies
-
-**Parity requires Rust version 1.23.0 to build**
-
-We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have rustup, you can install it like this:
+We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have `rustup`, you can install it like this:
 
 - Linux:
-	```bash
-	$ curl https://sh.rustup.rs -sSf | sh
-	```
-
-	Parity also requires `gcc`, `g++`, `libssl-dev`/`openssl`, `libudev-dev` and `pkg-config` packages to be installed.
-
-- OSX:
-	```bash
-	$ curl https://sh.rustup.rs -sSf | sh
-	```
-
-	`clang` is required. It comes with Xcode command line tools or can be installed with homebrew.
-
-- Windows
-  Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the rustup installer from
-	https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe, start "VS2015 x64 Native Tools Command Prompt", and use the following command to install and set up the msvc toolchain:
   ```bash
-	$ rustup default stable-x86_64-pc-windows-msvc
+  $ curl https://sh.rustup.rs -sSf | sh
   ```
 
-Once you have rustup, install Parity or download and build from source
+  Parity Ethereum also requires `gcc`, `g++`, `libudev-dev`, `pkg-config`, `file`, `make`, and `cmake` packages to be installed.
 
-----
+- OSX:
+  ```bash
+  $ curl https://sh.rustup.rs -sSf | sh
+  ```
 
-## Install from the snap store
+  `clang` is required. It comes with Xcode command line tools or can be installed with homebrew.
 
-In any of the [supported Linux distros](https://snapcraft.io/docs/core/install):
+- Windows
+  Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the `rustup` installer from
+  https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe, start "VS2015 x64 Native Tools Command Prompt", and use the following command to install and set up the `msvc` toolchain:
+  ```bash
+  $ rustup default stable-x86_64-pc-windows-msvc
+  ```
+
+Once you have `rustup` installed, then you need to install:
+* [Perl](https://www.perl.org)
+* [Yasm](https://yasm.tortall.net)
+
+Make sure that these binaries are in your `PATH`. After that, you should be able to build Parity Ethereum from source.
+
+## Build from Source Code
 
 ```bash
-sudo snap install parity
-```
-
-Or, if you want to contribute testing the upcoming release:
-
-```bash
-sudo snap install parity --beta
-```
-
-And to test the latest code landed into the master branch:
-
-```bash
-sudo snap install parity --edge
-```
-
-----
-
-## Build from source
-
-```bash
-# download Parity code
-$ git clone https://github.com/paritytech/parity
-$ cd parity
+# download Parity Ethereum code
+$ git clone https://github.com/paritytech/parity-ethereum
+$ cd parity-ethereum
 
 # build in release mode
-$ cargo build --release
+$ cargo build --release --features final
 ```
 
-This will produce an executable in the `./target/release` subdirectory.
+This produces an executable in the `./target/release` subdirectory.
 
 Note: if cargo fails to parse manifest try:
 
@@ -118,19 +77,13 @@ Note: if cargo fails to parse manifest try:
 $ ~/.cargo/bin/cargo build --release
 ```
 
-Note: When compiling a crate and you receive the following error:
-
-```
-error: the crate is compiled with the panic strategy `abort` which is incompatible with this crate's strategy of `unwind`
-```
-
-Cleaning the repository will most likely solve the issue, try:
+Note, when compiling a crate and you receive errors, it's in most cases your outdated version of Rust, or some of your crates have to be recompiled. Cleaning the repository will most likely solve the issue if you are on the latest stable version of Rust, try:
 
 ```bash
 $ cargo clean
 ```
 
-This will always compile the latest nightly builds. If you want to build stable or beta, do a
+This always compiles the latest nightly builds. If you want to build stable or beta, do a
 
 ```bash
 $ git checkout stable
@@ -142,38 +95,61 @@ or
 $ git checkout beta
 ```
 
-first.
-
-----
-
-## Simple one-line installer for Mac and Ubuntu
+## Simple One-Line Installer for Mac and Linux
 
 ```bash
-bash <(curl https://get.parity.io -Lk)
+bash <(curl https://get.parity.io -L)
 ```
 
 The one-line installer always defaults to the latest beta release. To install a stable release, run:
 
 ```bash
-bash <(curl https://get.parity.io -Lk) -r stable
+bash <(curl https://get.parity.io -L) -r stable
 ```
 
-## Start Parity
+## Start Parity Ethereum
 
 ### Manually
 
-To start Parity manually, just run
+To start Parity Ethereum manually, just run
 
 ```bash
 $ ./target/release/parity
 ```
 
-and Parity will begin syncing the Ethereum blockchain.
+so Parity Ethereum begins syncing the Ethereum blockchain.
 
-### Using systemd service file
+### Using `systemd` service file
 
-To start Parity as a regular user using systemd init:
+To start Parity Ethereum as a regular user using `systemd` init:
 
 1. Copy `./scripts/parity.service` to your
-systemd user directory (usually `~/.config/systemd/user`).
-2. To configure Parity, write a `/etc/parity/config.toml` config file, see [Configuring Parity](https://paritytech.github.io/wiki/Configuring-Parity) for details.
+`systemd` user directory (usually `~/.config/systemd/user`).
+2. To configure Parity Ethereum, write a `/etc/parity/config.toml` config file, see [Configuring Parity Ethereum](https://paritytech.github.io/wiki/Configuring-Parity) for details.
+
+## Parity Ethereum toolchain
+
+In addition to the Parity Ethereum client, there are additional tools in this repository available:
+
+- [evmbin](https://github.com/paritytech/parity-ethereum/blob/master/evmbin/) - EVM implementation for Parity Ethereum.
+- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding.
+- [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/ethstore/) - Parity Ethereum key management.
+- [ethkey](https://github.com/paritytech/parity-ethereum/blob/master/ethkey/) - Parity Ethereum keys generator.
+- [whisper](https://github.com/paritytech/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.
+
+## Join the chat!
+
+Questions? Get in touch with us on Gitter:
+[![Gitter: Parity](https://img.shields.io/badge/gitter-parity-4AB495.svg)](https://gitter.im/paritytech/parity)
+[![Gitter: Parity.js](https://img.shields.io/badge/gitter-parity.js-4AB495.svg)](https://gitter.im/paritytech/parity.js)
+[![Gitter: Parity/Miners](https://img.shields.io/badge/gitter-parity/miners-4AB495.svg)](https://gitter.im/paritytech/parity/miners)
+[![Gitter: Parity-PoA](https://img.shields.io/badge/gitter-parity--poa-4AB495.svg)](https://gitter.im/paritytech/parity-poa)
+
+Alternatively, join our community on Matrix:
+[![Riot: +Parity](https://img.shields.io/badge/riot-%2Bparity%3Amatrix.parity.io-orange.svg)](https://riot.im/app/#/group/+parity:matrix.parity.io)
+
+## Documentation
+
+Official website: https://parity.io
+
+Be sure to [check out our wiki](https://wiki.parity.io) for more information.

chainspec/src/main.rs

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

dapps/Cargo.toml

@@ -1,47 +0,0 @@
-[package]
-description = "Parity Dapps crate"
-name = "parity-dapps"
-version = "1.9.0"
-license = "GPL-3.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[lib]
-
-[dependencies]
-base32 = "0.3"
-futures = "0.1"
-futures-cpupool = "0.1"
-linked-hash-map = "0.5"
-log = "0.3"
-parity-dapps-glue = "1.9"
-parking_lot = "0.5"
-mime_guess = "2.0.0-alpha.2"
-rand = "0.4"
-rustc-hex = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
-serde_json = "1.0"
-unicase = "1.4"
-zip = { version = "0.1", default-features = false }
-itertools = "0.5"
-
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.10" }
-jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.10" }
-
-ethcore-bytes = { path = "../util/bytes" }
-ethereum-types = "0.2"
-fetch = { path = "../util/fetch" }
-node-health = { path = "./node-health" }
-parity-hash-fetch = { path = "../hash-fetch" }
-parity-reactor = { path = "../util/reactor" }
-parity-ui = { path = "./ui" }
-keccak-hash = { path = "../util/hash" }
-parity-version = { path = "../util/version" }
-
-[dev-dependencies]
-env_logger = "0.4"
-ethcore-devtools = { path = "../devtools" }
-
-[features]
-ui = ["parity-ui/no-precompiled-js"]
-ui-precompiled = ["parity-ui/use-precompiled-js"]

dapps/js-glue/Cargo.toml

@@ -1,28 +0,0 @@
-[package]
-description = "Base Package for all Parity built-in dapps"
-name = "parity-dapps-glue"
-version = "1.9.1"
-license = "GPL-3.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
-
-[build-dependencies]
-quasi_codegen = { version = "0.32", optional = true }
-syntex = { version = "0.58", optional = true }
-
-[dependencies]
-glob = { version = "0.2.11" }
-mime_guess = { version = "2.0.0-alpha.2" }
-aster = { version = "0.41", default-features = false }
-quasi = { version = "0.32", default-features = false }
-quasi_macros = { version = "0.32", optional = true }
-syntex = { version = "0.58", optional = true }
-syntex_syntax = { version = "0.58", optional = true }
-
-[features]
-default = ["with-syntex"]
-nightly = ["quasi_macros"]
-with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
-use-precompiled-js = []
-
-

dapps/js-glue/README.md

@@ -1,65 +0,0 @@
-# Parity Dapps (JS-glue)
-
-Code generator to simplify creating a built-in Parity Dapp
-
-# How to create new builtin Dapp.
-1. Clone this repository.
-
-   ```bash
-   $ git clone https://github.com/paritytech/parity.git
-   ```
-
-1. Create a new directory for your Dapp. (`./myapp`)
-
-   ```bash
-   $ mkdir -p ./parity/dapps/myapp/src/web
-   ```
-
-1. Copy your frontend files to `./dapps/myapp/src/web` (bundled ones)
-
-   ```bash
-   $ cp -r ./myapp-src/* ./parity/dapps/myapp/src/web
-   ```
-
-1. Instead of creating `web3` in your app. Load (as the first script tag in `head`):
-
-   ```html
-   <script src="/parity-utils/inject.js"></script>
-   ```
-
-   The `inject.js` script will create global `web3` instance with proper provider that should be used by your dapp.
-
-1. Create `./parity/dapps/myapp/Cargo.toml` with you apps details. See example here: [parity-status Cargo.toml](https://github.com/paritytech/parity-ui/blob/master/status/Cargo.toml).
-
-   ```bash
-   $ git clone https://github.com/paritytech/parity-ui.git
-   $ cd ./parity-ui/
-   $ cp ./home/Cargo.toml ../parity/dapps/myapp/Cargo.toml
-   $ cp ./home/build.rs ../parity/dapps/myapp/build.rs
-   $ cp ./home/src/lib.rs ../parity/dapps/myapp/src/lib.rs
-   $ cp ./home/src/lib.rs.in ../parity/dapps/myapp/src/lib.rs.in
-   # And edit the details of your app
-   $ vim ../parity/dapps/myapp/Cargo.toml # Edit the details
-   $ vim ./parity/dapps/myapp/src/lib.rs.in # Edit the details
-   ```
-# How to include your Dapp into `Parity`?
-1. Edit `dapps/Cargo.toml` and add dependency to your application (it can be optional)
-
-   ```toml
-   # Use git repo and version
-   parity-dapps-myapp = { path="./myapp" }
-   ```
-
-1. Edit `dapps/src/apps.rs` and add your application to `all_pages` (if it's optional you need to specify two functions - see `parity-dapps-wallet` example)
-
-1. Compile parity.
-
-   ```bash
-   $ cargo build --release # While inside `parity`
-   ```
-
-1. Commit the results.
-
-   ```bash
-   $ git add myapp && git commit -am "My first Parity Dapp".
-   ```

dapps/js-glue/src/build.rs

@@ -1,65 +0,0 @@
-
-#[cfg(feature = "with-syntex")]
-pub mod inner {
-	use syntex;
-	use codegen;
-	use syntax::{ast, fold};
-	use std::env;
-	use std::path::Path;
-
-	fn strip_attributes(krate: ast::Crate) -> ast::Crate {
-		/// Helper folder that strips the serde attributes after the extensions have been expanded.
-		struct StripAttributeFolder;
-
-		impl fold::Folder for StripAttributeFolder {
-			fn fold_attribute(&mut self, attr: ast::Attribute) -> Option<ast::Attribute> {
-				if &*attr.value.name.as_str() == "webapp" {
-					return None;
-				}
-
-				Some(attr)
-			}
-
-			fn fold_mac(&mut self, mac: ast::Mac) -> ast::Mac {
-				fold::noop_fold_mac(mac, self)
-			}
-		}
-
-		fold::Folder::fold_crate(&mut StripAttributeFolder, krate)
-	}
-
-	pub fn register(reg: &mut syntex::Registry) {
-		reg.add_attr("feature(custom_derive)");
-		reg.add_attr("feature(custom_attribute)");
-
-		reg.add_decorator("derive_WebAppFiles", codegen::expand_webapp_implementation);
-		reg.add_post_expansion_pass(strip_attributes);
-	}
-
-	pub fn generate() {
-		let out_dir = env::var_os("OUT_DIR").unwrap();
-		let mut registry = syntex::Registry::new();
-		register(&mut registry);
-
-		let src = Path::new("src/lib.rs.in");
-		let dst = Path::new(&out_dir).join("lib.rs");
-
-		registry.expand("", &src, &dst).unwrap();
-	}
-}
-
-#[cfg(not(feature = "with-syntex"))]
-pub mod inner {
-	use codegen;
-
-	pub fn register(reg: &mut rustc_plugin::Registry) {
-		reg.register_syntax_extension(
-			syntax::parse::token::intern("derive_WebAppFiles"),
-			syntax::ext::base::MultiDecorator(
-				Box::new(codegen::expand_webapp_implementation)));
-
-		reg.register_attribute("webapp".to_owned(), AttributeType::Normal);
-	}
-
-	pub fn generate() {}
-}

dapps/js-glue/src/codegen.rs

@@ -1,194 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate aster;
-extern crate glob;
-extern crate mime_guess;
-
-use self::mime_guess::guess_mime_type;
-use std::path::{self, Path, PathBuf};
-use std::ops::Deref;
-
-use syntax::attr;
-use syntax::ast::{self, MetaItem, Item};
-use syntax::codemap::Span;
-use syntax::ext::base::{Annotatable, ExtCtxt};
-use syntax::print::pprust::lit_to_string;
-use syntax::symbol::InternedString;
-
-pub fn expand_webapp_implementation(
-	cx: &mut ExtCtxt,
-	span: Span,
-	meta_item: &MetaItem,
-	annotatable: &Annotatable,
-	push: &mut FnMut(Annotatable)
-) {
-	let item = match *annotatable {
-		Annotatable::Item(ref item) => item,
-		_ => {
-			cx.span_err(meta_item.span, "`#[derive(WebAppFiles)]` may only be applied to struct implementations");
-			return;
-		},
-	};
-	let builder = aster::AstBuilder::new().span(span);
-	implement_webapp(cx, &builder, item, push);
-}
-
-fn implement_webapp(cx: &ExtCtxt, builder: &aster::AstBuilder, item: &Item, push: &mut FnMut(Annotatable)) {
-	let static_files_dir = extract_path(cx, item);
-
-	let src = Path::new("src");
-	let static_files = {
-		let mut buf = src.to_path_buf();
-		buf.push(static_files_dir.deref());
-		buf
-	};
-
-	let search_location = {
-		let mut buf = static_files.to_path_buf();
-		buf.push("**");
-		buf.push("*");
-		buf
-	};
-
-	let files = glob::glob(search_location.to_str().expect("Valid UTF8 path"))
-		.expect("The sources directory is missing.")
-		.collect::<Result<Vec<PathBuf>, glob::GlobError>>()
-		.expect("There should be no error when reading a list of files.");
-
-	let statements = files
-		.iter()
-		.filter(|path_buf| path_buf.is_file())
-		.map(|path_buf| {
-			let path = path_buf.as_path();
-			let filename = path.file_name().and_then(|s| s.to_str()).expect("Only UTF8 paths.");
-			let mime_type = guess_mime_type(filename).to_string();
-			let file_path = as_uri(path.strip_prefix(&static_files).ok().expect("Prefix is always there, cause it's absolute path;qed"));
-			let file_path_in_source = path.to_str().expect("Only UTF8 paths.");
-
-			let path_lit = builder.expr().str(file_path.as_str());
-			let mime_lit = builder.expr().str(mime_type.as_str());
-			let web_path_lit = builder.expr().str(file_path_in_source);
-			let separator_lit = builder.expr().str(path::MAIN_SEPARATOR.to_string().as_str());
-			let concat_id = builder.id("concat!");
-			let env_id = builder.id("env!");
-			let macro_id = builder.id("include_bytes!");
-
-			let content = quote_expr!(
-				cx,
-				$macro_id($concat_id($env_id("CARGO_MANIFEST_DIR"), $separator_lit, $web_path_lit))
-			);
-			quote_stmt!(
-				cx,
-				files.insert($path_lit, File { path: $path_lit, content_type: $mime_lit, content: $content });
-			).expect("The statement is always ok, because it just uses literals.")
-		}).collect::<Vec<ast::Stmt>>();
-
-	let type_name = item.ident;
-
-	let files_impl = quote_item!(cx,
-		impl $type_name {
-			#[allow(unused_mut)]
-			fn files() -> ::std::collections::HashMap<&'static str, File> {
-				let mut files = ::std::collections::HashMap::new();
-				$statements
-				files
-			}
-		}
-	).unwrap();
-
-	push(Annotatable::Item(files_impl));
-}
-
-fn extract_path(cx: &ExtCtxt, item: &Item) -> String {
-	for meta_items in item.attrs.iter().filter_map(webapp_meta_items) {
-		for meta_item in meta_items {
-			let is_path = &*meta_item.name.as_str() == "path";
-			match meta_item.node {
-				ast::MetaItemKind::NameValue(ref lit) if is_path => {
-					if let Some(s) = get_str_from_lit(cx, lit) {
-						return s.deref().to_owned();
-					}
-				},
-				_ => {},
-			}
-		}
-	}
-
-	// default
-	"web".to_owned()
-}
-
-fn webapp_meta_items(attr: &ast::Attribute) -> Option<Vec<ast::MetaItem>> {
-	let is_webapp = &*attr.value.name.as_str() == "webapp";
-	match attr.value.node {
-		ast::MetaItemKind::List(ref items) if is_webapp => {
-			attr::mark_used(&attr);
-			Some(
-				items.iter()
-				.map(|item| item.node.clone())
-				.filter_map(|item| match item {
-					ast::NestedMetaItemKind::MetaItem(item) => Some(item),
-					_ => None,
-				})
-				.collect()
-			)
-		}
-		_ => None
-	}
-}
-
-fn get_str_from_lit(cx: &ExtCtxt, lit: &ast::Lit) -> Option<InternedString> {
-	match lit.node {
-		ast::LitKind::Str(ref s, _) => Some(s.clone().as_str()),
-		_ => {
-			cx.span_err(
-				lit.span,
-				&format!("webapp annotation path must be a string, not `{}`",
-					lit_to_string(lit)
-				)
-			);
-			return None;
-		}
-	}
-}
-
-fn as_uri(path: &Path) -> String {
-	let mut s = String::new();
-	for component in path.iter() {
-		s.push_str(component.to_str().expect("Only UTF-8 filenames are supported."));
-		s.push('/');
-	}
-	s[0..s.len()-1].into()
-}
-
-#[test]
-fn should_convert_path_separators_on_all_platforms() {
-	// given
-	let p = {
-		let mut p = PathBuf::new();
-		p.push("web");
-		p.push("src");
-		p.push("index.html");
-		p
-	};
-
-	// when
-	let path = as_uri(&p);
-
-	// then
-	assert_eq!(path, "web/src/index.html".to_owned());
-}

dapps/js-glue/src/js.rs

@@ -1,89 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![cfg_attr(feature="use-precompiled-js", allow(dead_code))]
-#![cfg_attr(feature="use-precompiled-js", allow(unused_imports))]
-
-use std::fmt;
-use std::process::Command;
-
-#[cfg(not(windows))]
-mod platform {
-	use std::process::Command;
-
-	pub static NPM_CMD: &'static str = "npm";
-	pub fn handle_cmd(cmd: &mut Command) -> &mut Command {
-		cmd
-	}
-}
-
-#[cfg(windows)]
-mod platform {
-	use std::process::{Command, Stdio};
-
-	pub static NPM_CMD: &'static str = "cmd.exe";
-	// NOTE [ToDr] For some reason on windows
-	// The command doesn't have %~dp0 set properly
-	// and it cannot load globally installed node.exe
-	pub fn handle_cmd(cmd: &mut Command) -> &mut Command {
-		cmd.stdin(Stdio::null())
-			.arg("/c")
-			.arg("npm.cmd")
-	}
-}
-
-fn die<T : fmt::Debug>(s: &'static str, e: T) -> ! {
-	panic!("Error: {}: {:?}", s, e);
-}
-
-#[cfg(feature = "use-precompiled-js")]
-pub fn test(_path: &str) {
-}
-#[cfg(feature = "use-precompiled-js")]
-pub fn build(_path: &str, _dest: &str) {
-}
-
-#[cfg(not(feature = "use-precompiled-js"))]
-pub fn build(path: &str, dest: &str) {
-	let child = platform::handle_cmd(&mut Command::new(platform::NPM_CMD))
-		.arg("install")
-		.arg("--no-progress")
-		.current_dir(path)
-		.status()
-		.unwrap_or_else(|e| die("Installing node.js dependencies with npm", e));
-	assert!(child.success(), "There was an error installing dependencies.");
-
-	let child = platform::handle_cmd(&mut Command::new(platform::NPM_CMD))
-		.arg("run")
-		.arg("build")
-		.env("NODE_ENV", "production")
-		.env("BUILD_DEST", dest)
-		.current_dir(path)
-		.status()
-		.unwrap_or_else(|e| die("Building JS code", e));
-	assert!(child.success(), "There was an error build JS code.");
-}
-
-#[cfg(not(feature = "use-precompiled-js"))]
-pub fn test(path: &str) {
-	let child = Command::new(platform::NPM_CMD)
-		.arg("run")
-		.arg("test")
-		.current_dir(path)
-		.status()
-		.unwrap_or_else(|e| die("Running test command", e));
-	assert!(child.success(), "There was an error while running JS tests.");
-}

dapps/js-glue/src/lib.rs

@@ -1,38 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-
-#![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))]
-#![cfg_attr(not(feature = "with-syntex"), plugin(quasi_macros))]
-
-#[cfg(feature = "with-syntex")]
-extern crate syntex;
-
-#[cfg(feature = "with-syntex")]
-extern crate syntex_syntax as syntax;
-
-#[cfg(feature = "with-syntex")]
-include!(concat!(env!("OUT_DIR"), "/lib.rs"));
-
-#[cfg(not(feature = "with-syntex"))]
-#[macro_use]
-extern crate syntax;
-
-#[cfg(not(feature = "with-syntex"))]
-extern crate rustc_plugin;
-
-#[cfg(not(feature = "with-syntex"))]
-include!("lib.rs.in");

dapps/node-health/Cargo.toml

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

dapps/node-health/src/health.rs

@@ -1,122 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Reporting node's health.
-
-use std::sync::Arc;
-use std::time;
-use futures::Future;
-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

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

dapps/node-health/src/time.rs

@@ -1,357 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Periodically checks node's time drift using [SNTP](https://tools.ietf.org/html/rfc1769).
-//!
-//! An NTP packet is sent to the server with a local timestamp, the server then completes the packet, yielding the
-//! following timestamps:
-//!
-//!    Timestamp Name          ID   When Generated
-//!   ------------------------------------------------------------
-//!    Originate Timestamp     T1   time request sent by client
-//!    Receive Timestamp       T2   time request received at server
-//!    Transmit Timestamp      T3   time reply sent by server
-//!    Destination Timestamp   T4   time reply received at client
-//!
-//! The drift is defined as:
-//!
-//! drift = ((T2 - T1) + (T3 - T4)) / 2.
-//!
-
-use std::io;
-use std::{fmt, mem, time};
-use std::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

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

dapps/src/api/api.rs

@@ -1,97 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::sync::Arc;
-
-use hyper::{Method, StatusCode};
-
-use api::response;
-use apps::fetcher::Fetcher;
-use endpoint::{Endpoint, Request, Response, EndpointPath};
-use futures::{future, Future};
-use node_health::{NodeHealth, HealthStatus};
-
-#[derive(Clone)]
-pub struct RestApi {
-	fetcher: Arc<Fetcher>,
-	health: NodeHealth,
-}
-
-impl Endpoint for RestApi {
-	fn respond(&self, mut path: EndpointPath, req: Request) -> Response {
-		if let Method::Options = *req.method() {
-			return Box::new(future::ok(response::empty()));
-		}
-
-		let endpoint = path.app_params.get(0).map(String::to_owned);
-		let hash = path.app_params.get(1).map(String::to_owned);
-
-		// at this point path.app_id contains 'api', adjust it to the hash properly, otherwise
-		// we will try and retrieve 'api' as the hash when doing the /api/content route
-		if let Some(ref hash) = hash {
-			path.app_id = hash.to_owned();
-		}
-
-		trace!(target: "dapps", "Handling /api request: {:?}/{:?}", endpoint, hash);
-		match endpoint.as_ref().map(String::as_str) {
-			Some("ping") => Box::new(future::ok(response::ping(req))),
-			Some("health") => self.health(),
-			Some("content") => self.resolve_content(hash.as_ref().map(String::as_str), path, req),
-			_ => Box::new(future::ok(response::not_found())),
-		}
-	}
-}
-
-impl RestApi {
-	pub fn new(
-		fetcher: Arc<Fetcher>,
-		health: NodeHealth,
-	) -> Box<Endpoint> {
-		Box::new(RestApi {
-			fetcher,
-			health,
-		})
-	}
-
-	fn resolve_content(&self, hash: Option<&str>, path: EndpointPath, req: Request) -> Response {
-		trace!(target: "dapps", "Resolving content: {:?} from path: {:?}", hash, path);
-		match hash {
-			Some(hash) if self.fetcher.contains(hash) => {
-				self.fetcher.respond(path, req)
-			},
-			_ => Box::new(future::ok(response::not_found())),
-		}
-	}
-
-	fn health(&self) -> Response {
-		Box::new(self.health.health()
-			.then(|health| {
-				let status = match health {
-					Ok(ref health) => {
-						if [&health.peers.status, &health.sync.status].iter().any(|x| *x != &HealthStatus::Ok) {
-							StatusCode::PreconditionFailed // HTTP 412
-						} else {
-							StatusCode::Ok // HTTP 200
-						}
-					},
-					_ => StatusCode::ServiceUnavailable, // HTTP 503
-				};
-
-				Ok(response::as_json(status, &health).into())
-			})
-		)
-	}
-}

dapps/src/api/response.rs

@@ -1,43 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use serde::Serialize;
-use serde_json;
-use hyper::{self, mime, StatusCode};
-
-use handlers::{ContentHandler, EchoHandler};
-
-pub fn empty() -> hyper::Response {
-	ContentHandler::ok("".into(), mime::TEXT_PLAIN).into()
-}
-
-pub fn as_json<T: Serialize>(status: StatusCode, val: &T) -> hyper::Response {
-	let json = serde_json::to_string(val)
-		.expect("serialization to string is infallible; qed");
-	ContentHandler::new(status, json, mime::APPLICATION_JSON).into()
-}
-
-pub fn ping(req: hyper::Request) -> hyper::Response {
-	EchoHandler::new(req).into()
-}
-
-pub fn not_found() -> hyper::Response {
-	as_json(StatusCode::NotFound, &::api::types::ApiError {
-		code: "404".into(),
-		title: "Not Found".into(),
-		detail: "Resource you requested has not been found.".into(),
-	})
-}

dapps/src/api/types.rs

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

@@ -1,128 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Fetchable Dapps support.
-
-use std::fs;
-
-use linked_hash_map::LinkedHashMap;
-use page::local;
-use handlers::FetchControl;
-
-pub enum ContentStatus {
-	Fetching(FetchControl),
-	Ready(local::Dapp),
-}
-
-#[derive(Default)]
-pub struct ContentCache {
-	cache: LinkedHashMap<String, ContentStatus>,
-}
-
-impl ContentCache {
-	pub fn insert(&mut self, content_id: String, status: ContentStatus) -> Option<ContentStatus> {
-		self.cache.insert(content_id, status)
-	}
-
-	pub fn remove(&mut self, content_id: &str) -> Option<ContentStatus> {
-		self.cache.remove(content_id)
-	}
-
-	pub fn get(&mut self, content_id: &str) -> Option<&mut ContentStatus> {
-		self.cache.get_refresh(content_id)
-	}
-
-	pub fn clear_garbage(&mut self, expected_size: usize) -> Vec<(String, ContentStatus)> {
-		let len = self.cache.len();
-
-		if len <= expected_size {
-			return Vec::new();
-		}
-
-		let mut removed = Vec::with_capacity(len - expected_size);
-
-		while self.cache.len() > expected_size {
-			let entry = self.cache.pop_front().expect("expected_size bounded at 0, len is greater; qed");
-
-			match entry.1 {
-				ContentStatus::Fetching(ref fetch) => {
-					trace!(target: "dapps", "Aborting {} because of limit.", entry.0);
-					// Mark as aborted
-					fetch.abort()
-				},
-				ContentStatus::Ready(ref endpoint) => {
-					trace!(target: "dapps", "Removing {} because of limit.", entry.0);
-					// Remove path (dir or file)
-					let res = fs::remove_dir_all(&endpoint.path()).or_else(|_| fs::remove_file(&endpoint.path()));
-					if let Err(e) = res {
-						warn!(target: "dapps", "Unable to remove dapp/content from cache: {:?}", e);
-					}
-				}
-			}
-
-			removed.push(entry);
-		}
-		removed
-	}
-
-	#[cfg(test)]
-	pub fn len(&self) -> usize {
-		self.cache.len()
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-
-	fn only_keys(data: Vec<(String, ContentStatus)>) -> Vec<String> {
-		data.into_iter().map(|x| x.0).collect()
-	}
-
-	#[test]
-	fn should_remove_least_recently_used() {
-		// given
-		let mut cache = ContentCache::default();
-		cache.insert("a".into(), ContentStatus::Fetching(Default::default()));
-		cache.insert("b".into(), ContentStatus::Fetching(Default::default()));
-		cache.insert("c".into(), ContentStatus::Fetching(Default::default()));
-
-		// when
-		let res = cache.clear_garbage(2);
-
-		// then
-		assert_eq!(cache.len(), 2);
-		assert_eq!(only_keys(res), vec!["a"]);
-	}
-
-	#[test]
-	fn should_update_lru_if_accessed() {
-		// given
-		let mut cache = ContentCache::default();
-		cache.insert("a".into(), ContentStatus::Fetching(Default::default()));
-		cache.insert("b".into(), ContentStatus::Fetching(Default::default()));
-		cache.insert("c".into(), ContentStatus::Fetching(Default::default()));
-
-		// when
-		cache.get("a");
-		let res = cache.clear_garbage(2);
-
-		// then
-		assert_eq!(cache.len(), 2);
-		assert_eq!(only_keys(res), vec!["b"]);
-	}
-
-}

dapps/src/apps/fetcher/installers.rs

@@ -1,267 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use zip;
-use std::{fs, fmt};
-use std::io::{self, Read, Write};
-use std::path::PathBuf;
-use ethereum_types::H256;
-use fetch::{self, Mime};
-use futures_cpupool::CpuPool;
-use hash::keccak_buffer;
-
-use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest, serialize_manifest, Manifest};
-use handlers::{ContentValidator, ValidatorResponse};
-use page::{local, PageCache};
-use Embeddable;
-
-type OnDone = Box<Fn(Option<local::Dapp>) + Send>;
-
-fn write_response_and_check_hash(
-	id: &str,
-	mut content_path: PathBuf,
-	filename: &str,
-	response: fetch::Response
-) -> Result<(fs::File, PathBuf), ValidationError> {
-	// try to parse id
-	let id = id.parse().map_err(|_| ValidationError::InvalidContentId)?;
-
-	// check if content exists
-	if content_path.exists() {
-		warn!(target: "dapps", "Overwriting existing content at 0x{:?}", id);
-		fs::remove_dir_all(&content_path)?
-	}
-
-	// create directory
-	fs::create_dir_all(&content_path)?;
-
-	// append filename
-	content_path.push(filename);
-
-	// Now write the response
-	let mut file = io::BufWriter::new(fs::File::create(&content_path)?);
-	let mut reader = io::BufReader::new(response);
-	io::copy(&mut reader, &mut file)?;
-	file.flush()?;
-
-	// Validate hash
-	// TODO [ToDr] calculate keccak in-flight while reading the response
-	let mut file = io::BufReader::new(fs::File::open(&content_path)?);
-	let hash = keccak_buffer(&mut file)?;
-	if id == hash {
-		Ok((file.into_inner(), content_path))
-	} else {
-		Err(ValidationError::HashMismatch {
-			expected: id,
-			got: hash,
-		})
-	}
-}
-
-pub struct Content {
-	id: String,
-	mime: Mime,
-	content_path: PathBuf,
-	on_done: OnDone,
-	pool: CpuPool,
-}
-
-impl Content {
-	pub fn new(id: String, mime: Mime, content_path: PathBuf, on_done: OnDone, pool: CpuPool) -> Self {
-		Content {
-			id,
-			mime,
-			content_path,
-			on_done,
-			pool,
-		}
-	}
-}
-
-impl ContentValidator for Content {
-	type Error = ValidationError;
-
-	fn validate_and_install(self, response: fetch::Response) -> Result<ValidatorResponse, ValidationError> {
-		let pool = self.pool;
-		let id = self.id.clone();
-		let mime = self.mime;
-		let validate = move |content_path: PathBuf| {
-			// Create dir
-			let (_, content_path) = write_response_and_check_hash(&id, content_path, &id, response)?;
-
-			Ok(local::Dapp::single_file(pool, content_path, mime, PageCache::Enabled))
-		};
-
-		// Prepare path for a file
-		let content_path = self.content_path.join(&self.id);
-		// Make sure to always call on_done (even in case of errors)!
-		let result = validate(content_path.clone());
-		// remove the file if there was an error
-		if result.is_err() {
-			// Ignore errors since the file might not exist
-			let _ = fs::remove_dir_all(&content_path);
-		}
-		(self.on_done)(result.as_ref().ok().cloned());
-		result.map(ValidatorResponse::Local)
-	}
-}
-
-pub struct Dapp {
-	id: String,
-	dapps_path: PathBuf,
-	on_done: OnDone,
-	embeddable_on: Embeddable,
-	pool: CpuPool,
-}
-
-impl Dapp {
-	pub fn new(id: String, dapps_path: PathBuf, on_done: OnDone, embeddable_on: Embeddable, pool: CpuPool) -> Self {
-		Dapp {
-			id,
-			dapps_path,
-			on_done,
-			embeddable_on,
-			pool,
-		}
-	}
-
-	fn find_manifest(zip: &mut zip::ZipArchive<fs::File>) -> Result<(Manifest, PathBuf), ValidationError> {
-		for i in 0..zip.len() {
-			let mut file = zip.by_index(i)?;
-
-			if !file.name().ends_with(MANIFEST_FILENAME) {
-				continue;
-			}
-
-			// try to read manifest
-			let mut manifest = String::new();
-			let manifest = file
-				.read_to_string(&mut manifest).ok()
-				.and_then(|_| deserialize_manifest(manifest).ok());
-
-			if let Some(manifest) = manifest {
-				let mut manifest_location = PathBuf::from(file.name());
-				manifest_location.pop(); // get rid of filename
-				return Ok((manifest, manifest_location));
-			}
-		}
-
-		Err(ValidationError::ManifestNotFound)
-	}
-}
-
-impl ContentValidator for Dapp {
-	type Error = ValidationError;
-
-	fn validate_and_install(self, response: fetch::Response) -> Result<ValidatorResponse, ValidationError> {
-		let id = self.id.clone();
-		let pool = self.pool;
-		let embeddable_on = self.embeddable_on;
-		let validate = move |dapp_path: PathBuf| {
-			let (file, zip_path) = write_response_and_check_hash(&id, dapp_path.clone(), &format!("{}.zip", id), response)?;
-			trace!(target: "dapps", "Opening dapp bundle at {:?}", zip_path);
-			// Unpack archive
-			let mut zip = zip::ZipArchive::new(file)?;
-			// First find manifest file
-			let (mut manifest, manifest_dir) = Self::find_manifest(&mut zip)?;
-			// Overwrite id to match hash
-			manifest.id = Some(id);
-
-			// Unpack zip
-			for i in 0..zip.len() {
-				let mut file = zip.by_index(i)?;
-				let is_dir = file.name().chars().rev().next() == Some('/');
-
-				let file_path = PathBuf::from(file.name());
-				let location_in_manifest_base = file_path.strip_prefix(&manifest_dir);
-				// Create files that are inside manifest directory
-				if let Ok(location_in_manifest_base) = location_in_manifest_base {
-					let p = dapp_path.join(location_in_manifest_base);
-					// Check if it's a directory
-					if is_dir {
-						fs::create_dir_all(p)?;
-					} else {
-						let mut target = fs::File::create(p)?;
-						io::copy(&mut file, &mut target)?;
-					}
-				}
-			}
-
-			// Remove zip
-			fs::remove_file(&zip_path)?;
-
-			// Write manifest
-			let manifest_str = serialize_manifest(&manifest).map_err(ValidationError::ManifestSerialization)?;
-			let manifest_path = dapp_path.join(MANIFEST_FILENAME);
-			let mut manifest_file = fs::File::create(manifest_path)?;
-			manifest_file.write_all(manifest_str.as_bytes())?;
-			// Create endpoint
-			let endpoint = local::Dapp::new(pool, dapp_path, manifest.into(), PageCache::Enabled, embeddable_on);
-			Ok(endpoint)
-		};
-
-		// Prepare directory for dapp
-		let target = self.dapps_path.join(&self.id);
-		// Validate the dapp
-		let result = validate(target.clone());
-		// remove the file if there was an error
-		if result.is_err() {
-			// Ignore errors since the file might not exist
-			let _ = fs::remove_dir_all(&target);
-		}
-		(self.on_done)(result.as_ref().ok().cloned());
-		result.map(ValidatorResponse::Local)
-	}
-}
-
-#[derive(Debug)]
-pub enum ValidationError {
-	Io(io::Error),
-	Zip(zip::result::ZipError),
-	InvalidContentId,
-	ManifestNotFound,
-	ManifestSerialization(String),
-	HashMismatch { expected: H256, got: H256, },
-}
-
-impl fmt::Display for ValidationError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		match *self {
-			ValidationError::Io(ref io) => write!(f, "Unexpected IO error occured: {:?}", io),
-			ValidationError::Zip(ref zip) => write!(f, "Unable to read ZIP archive: {:?}", zip),
-			ValidationError::InvalidContentId => write!(f, "ID is invalid. It should be 256 bits keccak hash of content."),
-			ValidationError::ManifestNotFound => write!(f, "Downloaded Dapp bundle did not contain valid manifest.json file."),
-			ValidationError::ManifestSerialization(ref err) => {
-				write!(f, "There was an error during Dapp Manifest serialization: {:?}", err)
-			},
-			ValidationError::HashMismatch { ref expected, ref got } => {
-				write!(f, "Hash of downloaded content did not match. Expected:{:?}, Got:{:?}.", expected, got)
-			},
-		}
-	}
-}
-
-impl From<io::Error> for ValidationError {
-	fn from(err: io::Error) -> Self {
-		ValidationError::Io(err)
-	}
-}
-
-impl From<zip::result::ZipError> for ValidationError {
-	fn from(err: zip::result::ZipError) -> Self {
-		ValidationError::Zip(err)
-	}
-}

dapps/src/apps/fetcher/mod.rs

@@ -1,341 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Fetchable Dapps support.
-//! Manages downloaded (cached) Dapps and downloads them when necessary.
-//! Uses `URLHint` to resolve addresses into Dapps bundle file location.
-
-mod installers;
-
-use std::{fs, env};
-use std::path::PathBuf;
-use std::sync::Arc;
-use futures::{future, Future};
-use futures_cpupool::CpuPool;
-use fetch::{Client as FetchClient, Fetch};
-use hash_fetch::urlhint::{URLHintContract, URLHint, URLHintResult};
-
-use hyper::StatusCode;
-
-use ethereum_types::H256;
-use {Embeddable, SyncStatus, random_filename};
-use parking_lot::Mutex;
-use page::local;
-use handlers::{ContentHandler, ContentFetcherHandler};
-use endpoint::{self, Endpoint, EndpointPath};
-use apps::cache::{ContentCache, ContentStatus};
-
-/// Limit of cached dapps/content
-const MAX_CACHED_DAPPS: usize = 20;
-
-pub trait Fetcher: Endpoint + 'static {
-	fn contains(&self, content_id: &str) -> bool;
-}
-
-pub struct ContentFetcher<F: Fetch = FetchClient, R: URLHint + 'static = URLHintContract> {
-	cache_path: PathBuf,
-	resolver: R,
-	cache: Arc<Mutex<ContentCache>>,
-	sync: Arc<SyncStatus>,
-	embeddable_on: Embeddable,
-	fetch: F,
-	pool: CpuPool,
-	only_content: bool,
-}
-
-impl<R: URLHint + 'static, F: Fetch> Drop for ContentFetcher<F, R> {
-	fn drop(&mut self) {
-		// Clear cache path
-		let _ = fs::remove_dir_all(&self.cache_path);
-	}
-}
-
-impl<R: URLHint + 'static, F: Fetch> ContentFetcher<F, R> {
-	pub fn new(
-		resolver: R,
-		sync: Arc<SyncStatus>,
-		fetch: F,
-		pool: CpuPool,
-	) -> Self {
-		let mut cache_path = env::temp_dir();
-		cache_path.push(random_filename());
-
-		ContentFetcher {
-			cache_path,
-			resolver,
-			sync,
-			cache: Arc::new(Mutex::new(ContentCache::default())),
-			embeddable_on: None,
-			fetch,
-			pool,
-			only_content: true,
-		}
-	}
-
-	pub fn allow_dapps(mut self, dapps: bool) -> Self {
-		self.only_content = !dapps;
-		self
-	}
-
-	pub fn embeddable_on(mut self, embeddable_on: Embeddable) -> Self {
-		self.embeddable_on = embeddable_on;
-		self
-	}
-
-	fn not_found(embeddable: Embeddable) -> endpoint::Response {
-		Box::new(future::ok(ContentHandler::error(
-			StatusCode::NotFound,
-			"Resource Not Found",
-			"Requested resource was not found.",
-			None,
-			embeddable,
-		).into()))
-	}
-
-	fn still_syncing(embeddable: Embeddable) -> endpoint::Response {
-		Box::new(future::ok(ContentHandler::error(
-			StatusCode::ServiceUnavailable,
-			"Sync In Progress",
-			"Your node is still syncing. We cannot resolve any content before it's fully synced.",
-			Some("<a href=\"javascript:window.location.reload()\">Refresh</a>"),
-			embeddable,
-		).into()))
-	}
-
-	fn dapps_disabled(address: Embeddable) -> endpoint::Response {
-		Box::new(future::ok(ContentHandler::error(
-			StatusCode::ServiceUnavailable,
-			"Network Dapps Not Available",
-			"This interface doesn't support network dapps for security reasons.",
-			None,
-			address,
-		).into()))
-	}
-
-	#[cfg(test)]
-	fn set_status(&self, content_id: &str, status: ContentStatus) {
-		self.cache.lock().insert(content_id.to_owned(), status);
-	}
-
-	// resolve contract call synchronously.
-	// TODO: port to futures-based hyper and make it all async.
-	fn resolve(&self, content_id: H256) -> Option<URLHintResult> {
-		self.resolver.resolve(content_id)
-			.wait()
-			.unwrap_or_else(|e| { warn!("Error resolving content-id: {}", e); None })
-	}
-}
-
-impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
-	fn contains(&self, content_id: &str) -> bool {
-		{
-			let mut cache = self.cache.lock();
-			// Check if we already have the app
-			if cache.get(content_id).is_some() {
-				return true;
-			}
-		}
-		// fallback to resolver
-		if let Ok(content_id) = content_id.parse() {
-			// if there is content or we are syncing return true
-			self.sync.is_major_importing() || self.resolve(content_id).is_some()
-		} else {
-			false
-		}
-	}
-}
-
-impl<R: URLHint + 'static, F: Fetch> Endpoint for ContentFetcher<F, R> {
-	fn respond(&self, path: EndpointPath, req: endpoint::Request) -> endpoint::Response {
-		let mut cache = self.cache.lock();
-		let content_id = path.app_id.clone();
-
-		let (new_status, handler) = {
-			let status = cache.get(&content_id);
-			match status {
-				// Just serve the content
-				Some(&mut ContentStatus::Ready(ref endpoint)) => {
-					(None, endpoint.to_response(&path))
-				},
-				// Content is already being fetched
-				Some(&mut ContentStatus::Fetching(ref fetch_control)) if !fetch_control.is_deadline_reached() => {
-					trace!(target: "dapps", "Content fetching in progress. Waiting...");
-					(None, fetch_control.to_response(path))
-				},
-				// We need to start fetching the content
-				_ => {
-					trace!(target: "dapps", "Content unavailable. Fetching... {:?}", content_id);
-					let content_hex = content_id.parse().expect("to_handler is called only when `contains` returns true.");
-					let content = self.resolve(content_hex);
-
-					let cache = self.cache.clone();
-					let id = content_id.clone();
-					let on_done = move |result: Option<local::Dapp>| {
-						let mut cache = cache.lock();
-						match result {
-							Some(endpoint) => cache.insert(id.clone(), ContentStatus::Ready(endpoint)),
-							// In case of error
-							None => cache.remove(&id),
-						};
-					};
-
-					match content {
-						// Don't serve dapps if we are still syncing (but serve content)
-						Some(URLHintResult::Dapp(_)) if self.sync.is_major_importing() => {
-							(None, Self::still_syncing(self.embeddable_on.clone()))
-						},
-						Some(URLHintResult::Dapp(_)) if self.only_content => {
-							(None, Self::dapps_disabled(self.embeddable_on.clone()))
-						},
-						Some(content) => {
-							let handler = match content {
-								URLHintResult::Dapp(dapp) => {
-									ContentFetcherHandler::new(
-										req.method(),
-										&dapp.url(),
-										path,
-										installers::Dapp::new(
-											content_id.clone(),
-											self.cache_path.clone(),
-											Box::new(on_done),
-											self.embeddable_on.clone(),
-											self.pool.clone(),
-										),
-										self.embeddable_on.clone(),
-										self.fetch.clone(),
-									)
-								},
-							    URLHintResult::GithubDapp(content) => {
-									ContentFetcherHandler::new(
-										req.method(),
-										&content.url,
-										path,
-										installers::Dapp::new(
-											content_id.clone(),
-											self.cache_path.clone(),
-											Box::new(on_done),
-											self.embeddable_on.clone(),
-											self.pool.clone(),
-										),
-										self.embeddable_on.clone(),
-										self.fetch.clone(),
-									)
-							    },
-								URLHintResult::Content(content) => {
-									ContentFetcherHandler::new(
-										req.method(),
-										&content.url,
-										path,
-										installers::Content::new(
-											content_id.clone(),
-											content.mime,
-											self.cache_path.clone(),
-											Box::new(on_done),
-											self.pool.clone(),
-										),
-										self.embeddable_on.clone(),
-										self.fetch.clone(),
-									)
-								},
-							};
-
-							(Some(ContentStatus::Fetching(handler.fetch_control())), Box::new(handler) as endpoint::Response)
-						},
-						None if self.sync.is_major_importing() => {
-							(None, Self::still_syncing(self.embeddable_on.clone()))
-						},
-						None => {
-							// This may happen when sync status changes in between
-							// `contains` and `to_handler`
-							(None, Self::not_found(self.embeddable_on.clone()))
-						},
-					}
-				},
-			}
-		};
-
-		if let Some(status) = new_status {
-			cache.clear_garbage(MAX_CACHED_DAPPS);
-			cache.insert(content_id, status);
-		}
-
-		handler
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use std::env;
-	use std::sync::Arc;
-	use fetch::{Fetch, Client};
-	use futures::{future, Future};
-	use hash_fetch::urlhint::{URLHint, URLHintResult};
-	use ethereum_types::H256;
-
-	use apps::cache::ContentStatus;
-	use endpoint::EndpointInfo;
-	use page::local;
-	use super::{ContentFetcher, Fetcher};
-	use {SyncStatus};
-
-	#[derive(Clone)]
-	struct FakeResolver;
-	impl URLHint for FakeResolver {
-		fn resolve(&self, _id: H256) -> Box<Future<Item = Option<URLHintResult>, Error = String> + Send> {
-			Box::new(future::ok(None))
-		}
-	}
-
-	#[derive(Debug)]
-	struct FakeSync(bool);
-	impl SyncStatus for FakeSync {
-		fn is_major_importing(&self) -> bool { self.0 }
-		fn peers(&self) -> (usize, usize) { (0, 5) }
-	}
-
-	#[test]
-	fn should_true_if_contains_the_app() {
-		// given
-		let pool = ::futures_cpupool::CpuPool::new(1);
-		let path = env::temp_dir();
-		let fetcher = ContentFetcher::new(
-			FakeResolver,
-			Arc::new(FakeSync(false)),
-			Client::new().unwrap(),
-			pool.clone(),
-		).allow_dapps(true);
-
-		let handler = local::Dapp::new(pool, path, EndpointInfo {
-			id: None,
-			name: "fake".into(),
-			description: "".into(),
-			version: "".into(),
-			author: "".into(),
-			icon_url: "".into(),
-			local_url: Some("".into()),
-			allow_js_eval: None,
-		}, Default::default(), None);
-
-		// when
-		fetcher.set_status("test", ContentStatus::Ready(handler));
-		fetcher.set_status("test2", ContentStatus::Fetching(Default::default()));
-
-		// then
-		assert_eq!(fetcher.contains("test"), true);
-		assert_eq!(fetcher.contains("test2"), true);
-		assert_eq!(fetcher.contains("test3"), false);
-	}
-}

dapps/src/apps/fs.rs

@@ -1,139 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::collections::BTreeMap;
-use std::io;
-use std::io::Read;
-use std::fs;
-use std::path::{Path, PathBuf};
-use futures_cpupool::CpuPool;
-
-use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest};
-use endpoint::{Endpoint, EndpointInfo};
-use page::{local, PageCache};
-use Embeddable;
-
-struct LocalDapp {
-	id: String,
-	path: PathBuf,
-	info: EndpointInfo,
-}
-
-/// Tries to find and read manifest file in given `path` to extract `EndpointInfo`
-/// If manifest is not found sensible default `EndpointInfo` is returned based on given `name`.
-fn read_manifest(name: &str, mut path: PathBuf) -> EndpointInfo {
-	path.push(MANIFEST_FILENAME);
-
-	fs::File::open(path.clone())
-		.map_err(|e| format!("{:?}", e))
-		.and_then(|mut f| {
-			// Reat file
-			let mut s = String::new();
-			f.read_to_string(&mut s).map_err(|e| format!("{:?}", e))?;
-			// Try to deserialize manifest
-			deserialize_manifest(s)
-		})
-		.unwrap_or_else(|e| {
-			warn!(target: "dapps", "Cannot read manifest file at: {:?}. Error: {:?}", path, e);
-
-			EndpointInfo {
-				id: None,
-				name: name.into(),
-				description: name.into(),
-				version: "0.0.0".into(),
-				author: "?".into(),
-				icon_url: "icon.png".into(),
-				local_url: None,
-				allow_js_eval: Some(false),
-			}
-		})
-}
-
-/// Returns Dapp Id and Local Dapp Endpoint for given filesystem path.
-/// Parses the path to extract last component (for name).
-/// `None` is returned when path is invalid or non-existent.
-pub fn local_endpoint<P: AsRef<Path>>(path: P, embeddable: Embeddable, pool: CpuPool) -> Option<(String, Box<local::Dapp>)> {
-	let path = path.as_ref().to_owned();
-	path.canonicalize().ok().and_then(|path| {
-		let name = path.file_name().and_then(|name| name.to_str());
-		name.map(|name| {
-			let dapp = local_dapp(name.into(), path.clone());
-			(dapp.id, Box::new(local::Dapp::new(
-				pool.clone(), dapp.path, dapp.info, PageCache::Disabled, embeddable.clone())
-			))
-		})
-	})
-}
-
-
-fn local_dapp(name: String, path: PathBuf) -> LocalDapp {
-	// try to get manifest file
-	let info = read_manifest(&name, path.clone());
-	LocalDapp {
-		id: name,
-		path: path,
-		info: info,
-	}
-}
-
-/// Returns endpoints for Local Dapps found for given filesystem path.
-/// Scans the directory and collects `local::Dapp`.
-pub fn local_endpoints<P: AsRef<Path>>(dapps_path: P, embeddable: Embeddable, pool: CpuPool) -> BTreeMap<String, Box<Endpoint>> {
-	let mut pages = BTreeMap::<String, Box<Endpoint>>::new();
-	for dapp in local_dapps(dapps_path.as_ref()) {
-		pages.insert(
-			dapp.id,
-			Box::new(local::Dapp::new(pool.clone(), dapp.path, dapp.info, PageCache::Disabled, embeddable.clone()))
-		);
-	}
-	pages
-}
-
-
-fn local_dapps(dapps_path: &Path) -> Vec<LocalDapp> {
-	let files = fs::read_dir(dapps_path);
-	if let Err(e) = files {
-		warn!(target: "dapps", "Unable to load local dapps from: {}. Reason: {:?}", dapps_path.display(), e);
-		return vec![];
-	}
-
-	let files = files.expect("Check is done earlier");
-	files.map(|dir| {
-			let entry = dir?;
-			let file_type = entry.file_type()?;
-
-			// skip files
-			if file_type.is_file() {
-				return Err(io::Error::new(io::ErrorKind::NotFound, "Not a file"));
-			}
-
-			// take directory name and path
-			entry.file_name().into_string()
-				.map(|name| (name, entry.path()))
-				.map_err(|e| {
-					info!(target: "dapps", "Unable to load dapp: {:?}. Reason: {:?}", entry.path(), e);
-					io::Error::new(io::ErrorKind::NotFound, "Invalid name")
-				})
-		})
-		.filter_map(|m| {
-			if let Err(ref e) = m {
-				debug!(target: "dapps", "Ignoring local dapp: {:?}", e);
-			}
-			m.ok()
-		})
-		.map(|(name, path)| local_dapp(name, path))
-		.collect()
-}

dapps/src/apps/manifest.rs

@@ -1,34 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use serde_json;
-pub use apps::App as Manifest;
-
-pub const MANIFEST_FILENAME: &'static str = "manifest.json";
-
-pub fn deserialize_manifest(manifest: String) -> Result<Manifest, String> {
-	let mut manifest = serde_json::from_str::<Manifest>(&manifest).map_err(|e| format!("{:?}", e))?;
-	if manifest.id.is_none() {
-		return Err("App 'id' is missing.".into());
-	}
-	manifest.allow_js_eval = Some(manifest.allow_js_eval.unwrap_or(false));
-
-	Ok(manifest)
-}
-
-pub fn serialize_manifest(manifest: &Manifest) -> Result<String, String> {
-	serde_json::to_string_pretty(manifest).map_err(|e| format!("{:?}", e))
-}

dapps/src/apps/mod.rs

@@ -1,100 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use endpoint::{Endpoints, Endpoint};
-use futures_cpupool::CpuPool;
-use page;
-use proxypac::ProxyPac;
-use web::Web;
-use fetch::Fetch;
-use parity_dapps::WebApp;
-use parity_ui;
-use {WebProxyTokens, ParentFrameSettings};
-
-mod app;
-mod cache;
-mod ui;
-pub mod fs;
-pub mod fetcher;
-pub mod manifest;
-
-pub use self::app::App;
-
-pub const HOME_PAGE: &'static str = "home";
-pub const RPC_PATH: &'static str =  "rpc";
-pub const API_PATH: &'static str =  "api";
-pub const UTILS_PATH: &'static str =  "parity-utils";
-pub const WEB_PATH: &'static str = "web";
-pub const URL_REFERER: &'static str = "__referer=";
-
-pub fn utils(pool: CpuPool) -> Box<Endpoint> {
-	Box::new(page::builtin::Dapp::new(pool, parity_ui::App::default()))
-}
-
-pub fn ui(pool: CpuPool) -> Box<Endpoint> {
-	Box::new(page::builtin::Dapp::with_fallback_to_index(pool, parity_ui::App::default()))
-}
-
-pub fn ui_redirection(embeddable: Option<ParentFrameSettings>) -> Box<Endpoint> {
-	Box::new(ui::Redirection::new(embeddable))
-}
-
-pub fn all_endpoints<F: Fetch>(
-	dapps_path: PathBuf,
-	extra_dapps: Vec<PathBuf>,
-	dapps_domain: &str,
-	embeddable: Option<ParentFrameSettings>,
-	web_proxy_tokens: Arc<WebProxyTokens>,
-	fetch: F,
-	pool: CpuPool,
-) -> (Vec<String>, Endpoints) {
-	// fetch fs dapps at first to avoid overwriting builtins
-	let mut pages = fs::local_endpoints(dapps_path.clone(), embeddable.clone(), pool.clone());
-	let local_endpoints: Vec<String> = pages.keys().cloned().collect();
-	for path in extra_dapps {
-		if let Some((id, endpoint)) = fs::local_endpoint(path.clone(), embeddable.clone(), pool.clone()) {
-			pages.insert(id, endpoint);
-		} else {
-			warn!(target: "dapps", "Ignoring invalid dapp at {}", path.display());
-		}
-	}
-
-	// NOTE [ToDr] Dapps will be currently embeded on 8180
-	insert::<parity_ui::App>(&mut pages, "ui", Embeddable::Yes(embeddable.clone()), pool.clone());
-	// old version
-	insert::<parity_ui::old::App>(&mut pages, "v1", 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()));
-
-	(local_endpoints, pages)
-}
-
-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) => page::builtin::Dapp::new_safe_to_embed(pool, T::default(), address),
-		Embeddable::No => page::builtin::Dapp::new(pool, T::default()),
-	}));
-}
-
-enum Embeddable {
-	Yes(Option<ParentFrameSettings>),
-	#[allow(dead_code)]
-	No,
-}

dapps/src/apps/ui.rs

@@ -1,57 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! 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,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! URL Endpoint traits
-
-use std::collections::BTreeMap;
-
-use futures::Future;
-use hyper;
-
-#[derive(Debug, PartialEq, Default, Clone)]
-pub struct EndpointPath {
-	pub app_id: String,
-	pub app_params: Vec<String>,
-	pub query: Option<String>,
-	pub host: String,
-	pub port: u16,
-	pub using_dapps_domains: bool,
-}
-
-impl EndpointPath {
-	pub fn has_no_params(&self) -> bool {
-		self.app_params.is_empty() || self.app_params.iter().all(|x| x.is_empty())
-	}
-}
-
-pub type EndpointInfo = ::apps::App;
-pub type Endpoints = BTreeMap<String, Box<Endpoint>>;
-pub type Response = Box<Future<Item=hyper::Response, Error=hyper::Error> + Send>;
-pub type Request = hyper::Request;
-
-pub trait Endpoint : Send + Sync {
-	fn info(&self) -> Option<&EndpointInfo> { None }
-
-	fn respond(&self, path: EndpointPath, req: Request) -> Response;
-}

dapps/src/error_tpl.html

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

dapps/src/handlers/content.rs

@@ -1,88 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Simple Content Handler
-
-use hyper::{self, mime, header};
-use hyper::StatusCode;
-
-use parity_version::version;
-
-use handlers::add_security_headers;
-use Embeddable;
-
-#[derive(Debug, Clone)]
-pub struct ContentHandler {
-	code: StatusCode,
-	content: String,
-	mimetype: mime::Mime,
-	safe_to_embed_on: Embeddable,
-}
-
-impl ContentHandler {
-	pub fn ok(content: String, mimetype: mime::Mime) -> Self {
-		Self::new(StatusCode::Ok, content, mimetype)
-	}
-
-	pub fn html(code: StatusCode, content: String, embeddable_on: Embeddable) -> Self {
-		Self::new_embeddable(code, content, mime::TEXT_HTML, embeddable_on)
-	}
-
-	pub fn error(
-		code: StatusCode,
-		title: &str,
-		message: &str,
-		details: Option<&str>,
-		embeddable_on: Embeddable,
-	) -> Self {
-		Self::html(code, format!(
-			include_str!("../error_tpl.html"),
-			title=title,
-			message=message,
-			details=details.unwrap_or_else(|| ""),
-			version=version(),
-		), embeddable_on)
-	}
-
-	pub fn new(code: StatusCode, content: String, mimetype: mime::Mime) -> Self {
-		Self::new_embeddable(code, content, mimetype, None)
-	}
-
-	pub fn new_embeddable(
-		code: StatusCode,
-		content: String,
-		mimetype: mime::Mime,
-		safe_to_embed_on: Embeddable,
-	) -> Self {
-		ContentHandler {
-			code,
-			content,
-			mimetype,
-			safe_to_embed_on,
-		}
-	}
-}
-
-impl Into<hyper::Response> for ContentHandler {
-	fn into(self) -> hyper::Response {
-		let mut res = hyper::Response::new()
-			.with_status(self.code)
-			.with_header(header::ContentType(self.mimetype))
-			.with_body(self.content);
-		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on, false);
-		res
-	}
-}

dapps/src/handlers/echo.rs

@@ -1,46 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Echo Handler
-
-use hyper::{self, header};
-
-use handlers::add_security_headers;
-
-#[derive(Debug)]
-pub struct EchoHandler {
-	request: hyper::Request,
-}
-
-impl EchoHandler {
-	pub fn new(request: hyper::Request) -> Self {
-		EchoHandler {
-			request,
-		}
-	}
-}
-
-impl Into<hyper::Response> for EchoHandler {
-	fn into(self) -> hyper::Response {
-		let content_type = self.request.headers().get().cloned();
-		let mut res = hyper::Response::new()
-			.with_header(content_type.unwrap_or(header::ContentType::json()))
-			.with_body(self.request.body());
-
-		add_security_headers(res.headers_mut(), None, false);
-		res
-	}
-}

dapps/src/handlers/fetch.rs

@@ -1,369 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Hyper Server Handler that fetches a file during a request (proxy).
-
-use std::{fmt, mem};
-use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::time::{Instant, Duration};
-use fetch::{self, Fetch};
-use futures::sync::oneshot;
-use futures::{self, Future};
-use hyper::{self, Method, StatusCode};
-use parking_lot::Mutex;
-
-use endpoint::{self, EndpointPath};
-use handlers::{ContentHandler, StreamingHandler};
-use page::local;
-use {Embeddable};
-
-const FETCH_TIMEOUT: u64 = 300;
-
-pub enum ValidatorResponse {
-	Local(local::Dapp),
-	Streaming(StreamingHandler<fetch::Response>),
-}
-
-pub trait ContentValidator: Sized + Send + 'static {
-	type Error: fmt::Debug + fmt::Display;
-
-	fn validate_and_install(self, fetch::Response) -> Result<ValidatorResponse, Self::Error>;
-}
-
-#[derive(Debug, Clone)]
-pub struct FetchControl {
-	abort: Arc<AtomicBool>,
-	listeners: Arc<Mutex<Vec<oneshot::Sender<WaitResult>>>>,
-	deadline: Instant,
-}
-
-impl Default for FetchControl {
-	fn default() -> Self {
-		FetchControl {
-			abort: Arc::new(AtomicBool::new(false)),
-			listeners: Arc::new(Mutex::new(Vec::new())),
-			deadline: Instant::now() + Duration::from_secs(FETCH_TIMEOUT),
-		}
-	}
-}
-
-impl FetchControl {
-	pub fn is_deadline_reached(&self) -> bool {
-		self.deadline < Instant::now()
-	}
-
-	pub fn abort(&self) {
-		self.abort.store(true, Ordering::SeqCst);
-	}
-
-	pub fn to_response(&self, path: EndpointPath) -> endpoint::Response {
-		let (tx, receiver) = oneshot::channel();
-		self.listeners.lock().push(tx);
-
-		Box::new(WaitingHandler {
-			path,
-			state: WaitState::Waiting(receiver),
-		})
-	}
-
-	fn notify<F: Fn() -> WaitResult>(&self, status: F) {
-		let mut listeners = self.listeners.lock();
-		for sender in listeners.drain(..) {
-			trace!(target: "dapps", "Resuming request waiting for content...");
-			if let Err(_) = sender.send(status()) {
-				trace!(target: "dapps", "Waiting listener notification failed.");
-			}
-		}
-	}
-
-	fn set_status(&self, status: &FetchState) {
-		match *status {
-			FetchState::Error(ref handler) => self.notify(|| WaitResult::Error(handler.clone())),
-			FetchState::Done(ref endpoint, _) => self.notify(|| WaitResult::Done(endpoint.clone())),
-			FetchState::Streaming(_) => self.notify(|| WaitResult::NonAwaitable),
-			FetchState::InProgress(_) => {},
-			FetchState::Empty => {},
-		}
-	}
-}
-
-
-enum WaitState {
-	Waiting(oneshot::Receiver<WaitResult>),
-	Done(endpoint::Response),
-}
-
-#[derive(Debug)]
-enum WaitResult {
-	Error(ContentHandler),
-	Done(local::Dapp),
-	NonAwaitable,
-}
-
-pub struct WaitingHandler {
-	path: EndpointPath,
-	state: WaitState,
-}
-
-impl Future for WaitingHandler {
-	type Item = hyper::Response;
-	type Error = hyper::Error;
-
-	fn poll(&mut self) -> futures::Poll<Self::Item, Self::Error> {
-		loop {
-			let new_state = match self.state {
-				WaitState::Waiting(ref mut receiver) => {
-					let result = try_ready!(receiver.poll().map_err(|_| hyper::Error::Timeout));
-
-					match result {
-						WaitResult::Error(handler) => {
-							return Ok(futures::Async::Ready(handler.into()));
-						},
-						WaitResult::NonAwaitable => {
-							let errors = Errors { embeddable_on: None };
-							return Ok(futures::Async::Ready(errors.streaming().into()));
-						},
-						WaitResult::Done(endpoint) => {
-							WaitState::Done(endpoint.to_response(&self.path).into())
-						},
-					}
-				},
-				WaitState::Done(ref mut response) => {
-					return response.poll()
-				},
-			};
-
-			self.state = new_state;
-		}
-	}
-}
-
-#[derive(Debug, Clone)]
-struct Errors {
-	embeddable_on: Embeddable,
-}
-
-impl Errors {
-	fn streaming(&self) -> ContentHandler {
-		ContentHandler::error(
-			StatusCode::BadGateway,
-			"Streaming Error",
-			"This content is being streamed in other place.",
-			None,
-			self.embeddable_on.clone(),
-		)
-	}
-
-	fn download_error<E: fmt::Debug>(&self, e: E) -> ContentHandler {
-		ContentHandler::error(
-			StatusCode::BadGateway,
-			"Download Error",
-			"There was an error when fetching the content.",
-			Some(&format!("{:?}", e)),
-			self.embeddable_on.clone(),
-		)
-	}
-
-	fn invalid_content<E: fmt::Debug>(&self, e: E) -> ContentHandler {
-		ContentHandler::error(
-			StatusCode::BadGateway,
-			"Invalid Dapp",
-			"Downloaded bundle does not contain a valid content.",
-			Some(&format!("{:?}", e)),
-			self.embeddable_on.clone(),
-		)
-	}
-
-	fn timeout_error(&self) -> ContentHandler {
-		ContentHandler::error(
-			StatusCode::GatewayTimeout,
-			"Download Timeout",
-			&format!("Could not fetch content within {} seconds.", FETCH_TIMEOUT),
-			None,
-			self.embeddable_on.clone(),
-		)
-	}
-
-	fn method_not_allowed(&self) -> ContentHandler {
-		ContentHandler::error(
-			StatusCode::MethodNotAllowed,
-			"Method Not Allowed",
-			"Only <code>GET</code> requests are allowed.",
-			None,
-			self.embeddable_on.clone(),
-		)
-	}
-}
-
-enum FetchState {
-	Error(ContentHandler),
-	InProgress(Box<Future<Item=FetchState, Error=()> + Send>),
-	Streaming(hyper::Response),
-	Done(local::Dapp, endpoint::Response),
-	Empty,
-}
-
-impl fmt::Debug for FetchState {
-	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-		use self::FetchState::*;
-
-		write!(fmt, "FetchState(")?;
-		match *self {
-			Error(ref error) => write!(fmt, "error: {:?}", error),
-			InProgress(_) => write!(fmt, "in progress"),
-			Streaming(ref res) => write!(fmt, "streaming: {:?}", res),
-			Done(ref endpoint, _) => write!(fmt, "done: {:?}", endpoint),
-			Empty => write!(fmt, "?"),
-		}?;
-		write!(fmt, ")")
-	}
-}
-
-#[derive(Debug)]
-pub struct ContentFetcherHandler {
-	fetch_control: FetchControl,
-	status: FetchState,
-	errors: Errors,
-}
-
-impl ContentFetcherHandler {
-	pub fn fetch_control(&self) -> FetchControl {
-		self.fetch_control.clone()
-	}
-
-	pub fn new<H: ContentValidator, F: Fetch>(
-		method: &hyper::Method,
-		url: &str,
-		path: EndpointPath,
-		installer: H,
-		embeddable_on: Embeddable,
-		fetch: F,
-	) -> Self {
-		let fetch_control = FetchControl::default();
-		let errors = Errors { embeddable_on };
-
-		// Validation of method
-		let status = match *method {
-			// Start fetching content
-			Method::Get => {
-				trace!(target: "dapps", "Fetching content from: {:?}", url);
-				FetchState::InProgress(Self::fetch_content(
-						fetch,
-						url,
-						fetch_control.abort.clone(),
-						path,
-						errors.clone(),
-						installer,
-				))
-			},
-			// or return error
-			_ => FetchState::Error(errors.method_not_allowed()),
-		};
-
-		ContentFetcherHandler {
-			fetch_control,
-			status,
-			errors,
-		}
-	}
-
-	fn fetch_content<H: ContentValidator, F: Fetch>(
-		fetch: F,
-		url: &str,
-		abort: Arc<AtomicBool>,
-		path: EndpointPath,
-		errors: Errors,
-		installer: H,
-	) -> Box<Future<Item=FetchState, Error=()> + Send> {
-		// 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);
-			Ok(match result {
-				Ok(response) => match installer.validate_and_install(response) {
-					Ok(ValidatorResponse::Local(endpoint)) => {
-						trace!(target: "dapps", "Validation OK. Returning response.");
-						let response = endpoint.to_response(&path);
-						FetchState::Done(endpoint, response)
-					},
-					Ok(ValidatorResponse::Streaming(stream)) => {
-						trace!(target: "dapps", "Validation OK. Streaming response.");
-						let (reading, response) = stream.into_response();
-						fetch2.process_and_forget(reading);
-						FetchState::Streaming(response)
-					},
-					Err(e) => {
-						trace!(target: "dapps", "Error while validating content: {:?}", e);
-						FetchState::Error(errors.invalid_content(e))
-					},
-				},
-				Err(e) => {
-					warn!(target: "dapps", "Unable to fetch content: {:?}", e);
-					FetchState::Error(errors.download_error(e))
-				},
-			})
-		});
-
-		// make sure to run within fetch thread pool.
-		fetch.process(future)
-	}
-}
-
-impl Future for ContentFetcherHandler {
-	type Item = hyper::Response;
-	type Error = hyper::Error;
-
-	fn poll(&mut self) -> futures::Poll<Self::Item, Self::Error> {
-		loop {
-			trace!(target: "dapps", "Polling status: {:?}", self.status);
-			self.status = match mem::replace(&mut self.status, FetchState::Empty) {
-				FetchState::Error(error) => {
-					return Ok(futures::Async::Ready(error.into()));
-				},
-				FetchState::Streaming(response) => {
-					return Ok(futures::Async::Ready(response));
-				},
-				any => any,
-			};
-
-			let status = match self.status {
-				// Request may time out
-				FetchState::InProgress(_) if self.fetch_control.is_deadline_reached() => {
-					trace!(target: "dapps", "Fetching dapp failed because of timeout.");
-					FetchState::Error(self.errors.timeout_error())
-				},
-				FetchState::InProgress(ref mut receiver) => {
-					// Check if there is a response
-					trace!(target: "dapps", "Polling streaming response.");
-					try_ready!(receiver.poll().map_err(|err| {
-						warn!(target: "dapps", "Error while fetching response: {:?}", err);
-						hyper::Error::Timeout
-					}))
-				},
-				FetchState::Done(_, ref mut response) => {
-					return response.poll()
-				},
-				FetchState::Empty => panic!("Future polled twice."),
-				_ => unreachable!(),
-			};
-
-			trace!(target: "dapps", "New status: {:?}", status);
-			self.fetch_control.set_status(&status);
-			self.status = status;
-		}
-	}
-}

dapps/src/handlers/mod.rs

@@ -1,121 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Hyper handlers implementations.
-
-mod content;
-mod echo;
-mod fetch;
-mod reader;
-mod redirect;
-mod streaming;
-
-pub use self::content::ContentHandler;
-pub use self::echo::EchoHandler;
-pub use self::fetch::{ContentFetcherHandler, ContentValidator, FetchControl, ValidatorResponse};
-pub use self::reader::Reader;
-pub use self::redirect::Redirection;
-pub use self::streaming::StreamingHandler;
-
-use std::iter;
-use itertools::Itertools;
-use hyper::header;
-use {apps, address, Embeddable};
-
-/// Adds security-related headers to the Response.
-pub fn add_security_headers(headers: &mut header::Headers, embeddable_on: Embeddable, allow_js_eval: bool) {
-	headers.set_raw("X-XSS-Protection", "1; mode=block");
-	headers.set_raw("X-Content-Type-Options", "nosniff");
-
-	// Embedding header:
-	if let None = embeddable_on {
-		headers.set_raw("X-Frame-Options",  "SAMEORIGIN");
-	}
-
-	// Content Security Policy headers
-	headers.set_raw("Content-Security-Policy", String::new()
-		// Restrict everything to the same origin by default.
-		+ "default-src 'self';"
-		// Allow connecting to WS servers and HTTP(S) servers.
-		// We could be more restrictive and allow only RPC server URL.
-		+ "connect-src http: https: ws: wss:;"
-		// Allow framing any content from HTTP(S).
-		// Again we could only allow embedding from RPC server URL.
-		// (deprecated)
-		+ "frame-src 'self' http: https:;"
-		// Allow framing and web workers from HTTP(S).
-		+ "child-src 'self' http: https:;"
-		// We allow data: blob: and HTTP(s) images.
-		// We could get rid of wildcarding HTTP and only allow RPC server URL.
-		// (http required for local dapps icons)
-		+ "img-src 'self' 'unsafe-inline' data: blob: http: https:;"
-		// Allow style from data: blob: and HTTPS.
-		+ "style-src 'self' 'unsafe-inline' data: blob: https:;"
-		// Allow fonts from data: and HTTPS.
-		+ "font-src 'self' data: https:;"
-		// Disallow objects
-		+ "object-src 'none';"
-		// Allow scripts
-		+ {
-			let script_src = embeddable_on.as_ref()
-				.map(|e| e.extra_script_src.iter()
-					 .map(|&(ref host, port)| address(host, port))
-					 .join(" ")
-				).unwrap_or_default();
-			let eval = if allow_js_eval { " 'unsafe-eval'" } else { "" };
-
-			&format!(
-				"script-src 'self' {}{};",
-				script_src,
-				eval
-			)
-		}
-		// Same restrictions as script-src with additional
-		// blob: that is required for camera access (worker)
-		+ "worker-src 'self' https: blob:;"
-		// Run in sandbox mode (although it's not fully safe since we allow same-origin and script)
-		+ "sandbox allow-same-origin allow-forms allow-modals allow-popups allow-presentation allow-scripts;"
-		// Disallow submitting forms from any dapps
-		+ "form-action 'none';"
-		// Never allow mixed content
-		+ "block-all-mixed-content;"
-		// Specify if the site can be embedded.
-		+ &match embeddable_on {
-			Some(ref embed) => {
-				let std = address(&embed.host, embed.port);
-				let proxy = format!("{}.{}", apps::HOME_PAGE, embed.dapps_domain);
-				let domain = format!("*.{}:{}", embed.dapps_domain, embed.port);
-
-				let mut ancestors = vec![std, domain, proxy]
-					.into_iter()
-					.chain(embed.extra_embed_on
-						.iter()
-						.map(|&(ref host, port)| address(host, port))
-					);
-
-				let ancestors = if embed.host == "127.0.0.1" {
-					let localhost = address("localhost", embed.port);
-					ancestors.chain(iter::once(localhost)).join(" ")
-				} else {
-					ancestors.join(" ")
-				};
-
-				format!("frame-ancestors {};", ancestors)
-			},
-			None => format!("frame-ancestors 'self';"),
-		}
-	);
-}

dapps/src/handlers/reader.rs

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

@@ -1,58 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Content Stream Response
-
-use std::io;
-use hyper::{self, header, mime, StatusCode};
-
-use handlers::{add_security_headers, Reader};
-use Embeddable;
-
-pub struct StreamingHandler<R> {
-	initial: Vec<u8>,
-	content: R,
-	status: StatusCode,
-	mimetype: mime::Mime,
-	safe_to_embed_on: Embeddable,
-}
-
-impl<R: io::Read> StreamingHandler<R> {
-	pub fn new(content: R, status: StatusCode, mimetype: mime::Mime, safe_to_embed_on: Embeddable) -> Self {
-		StreamingHandler {
-			initial: Vec::new(),
-			content,
-			status,
-			mimetype,
-			safe_to_embed_on,
-		}
-	}
-
-	pub fn set_initial_content(&mut self, content: &str) {
-		self.initial = content.as_bytes().to_vec();
-	}
-
-	pub fn into_response(self) -> (Reader<R>, hyper::Response) {
-		let (reader, body) = Reader::pair(self.content, self.initial);
-		let mut res = hyper::Response::new()
-			.with_status(self.status)
-			.with_header(header::ContentType(self.mimetype))
-			.with_body(body);
-		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on, false);
-
-		(reader, res)
-	}
-}

dapps/src/lib.rs

@@ -1,320 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Ethcore Webapplications for Parity
-#![warn(missing_docs)]
-
-extern crate base32;
-extern crate futures_cpupool;
-extern crate itertools;
-extern crate linked_hash_map;
-extern crate mime_guess;
-extern crate parking_lot;
-extern crate rand;
-extern crate rustc_hex;
-extern crate serde;
-extern crate serde_json;
-extern crate unicase;
-extern crate zip;
-
-extern crate jsonrpc_http_server;
-
-extern crate ethcore_bytes as bytes;
-extern crate ethereum_types;
-extern crate fetch;
-extern crate node_health;
-extern crate parity_dapps_glue as parity_dapps;
-extern crate parity_hash_fetch as hash_fetch;
-extern crate parity_ui;
-extern crate keccak_hash as hash;
-extern crate parity_version;
-
-#[macro_use]
-extern crate futures;
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate serde_derive;
-
-#[cfg(test)]
-extern crate env_logger;
-#[cfg(test)]
-extern crate ethcore_devtools as devtools;
-#[cfg(test)]
-extern crate jsonrpc_core;
-#[cfg(test)]
-extern crate parity_reactor;
-
-mod endpoint;
-mod apps;
-mod page;
-mod router;
-mod handlers;
-mod api;
-mod proxypac;
-mod web;
-#[cfg(test)]
-mod tests;
-
-use std::collections::HashMap;
-use std::mem;
-use std::path::PathBuf;
-use std::sync::Arc;
-use futures_cpupool::CpuPool;
-use jsonrpc_http_server::{self as http, hyper, Origin};
-use parking_lot::RwLock;
-
-use fetch::Fetch;
-use node_health::NodeHealth;
-
-pub use hash_fetch::urlhint::ContractClient;
-pub use node_health::SyncStatus;
-
-
-/// Validates Web Proxy tokens
-pub trait WebProxyTokens: Send + Sync {
-	/// Should return a domain allowed to be accessed by this token or `None` if the token is not valid
-	fn domain(&self, token: &str) -> Option<Origin>;
-}
-
-impl<F> WebProxyTokens for F where F: Fn(String) -> Option<Origin> + Send + Sync {
-	fn domain(&self, token: &str) -> Option<Origin> { self(token.to_owned()) }
-}
-
-/// Current supported endpoints.
-#[derive(Default, Clone)]
-pub struct Endpoints {
-	local_endpoints: Arc<RwLock<Vec<String>>>,
-	endpoints: Arc<RwLock<endpoint::Endpoints>>,
-	dapps_path: PathBuf,
-	embeddable: Option<ParentFrameSettings>,
-	pool: Option<CpuPool>,
-}
-
-impl Endpoints {
-	/// Returns a current list of app endpoints.
-	pub fn list(&self) -> Vec<apps::App> {
-		self.endpoints.read().iter().filter_map(|(ref k, ref e)| {
-			e.info().map(|ref info| info.with_id(k))
-		}).collect()
-	}
-
-	/// Check for any changes in the local dapps folder and update.
-	pub fn refresh_local_dapps(&self) {
-		let pool = match self.pool.as_ref() {
-			None => return,
-			Some(pool) => pool,
-		};
-		let new_local = apps::fs::local_endpoints(&self.dapps_path, self.embeddable.clone(), pool.clone());
-		let old_local = mem::replace(&mut *self.local_endpoints.write(), new_local.keys().cloned().collect());
-		let (_, to_remove): (_, Vec<_>) = old_local
-			.into_iter()
-			.partition(|k| new_local.contains_key(&k.clone()));
-
-		let mut endpoints = self.endpoints.write();
-		// remove the dead dapps
-		for k in to_remove {
-			endpoints.remove(&k);
-		}
-		// new dapps to be added
-		for (k, v) in new_local {
-			if !endpoints.contains_key(&k) {
-				endpoints.insert(k, v);
-			}
-		}
-	}
-}
-
-/// Dapps server as `jsonrpc-http-server` request middleware.
-pub struct Middleware {
-	endpoints: Endpoints,
-	router: router::Router,
-}
-
-impl Middleware {
-	/// Get local endpoints handle.
-	pub fn endpoints(&self) -> &Endpoints {
-		&self.endpoints
-	}
-
-	/// Creates new middleware for UI server.
-	pub fn ui<F: Fetch>(
-		pool: CpuPool,
-		health: NodeHealth,
-		dapps_domain: &str,
-		registrar: Arc<ContractClient>,
-		sync_status: Arc<SyncStatus>,
-		fetch: F,
-	) -> 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,
-		}
-	}
-
-	/// Creates new Dapps server middleware.
-	pub fn dapps<F: Fetch>(
-		pool: CpuPool,
-		health: NodeHealth,
-		ui_address: Option<(String, u16)>,
-		extra_embed_on: Vec<(String, u16)>,
-		extra_script_src: Vec<(String, u16)>,
-		dapps_path: PathBuf,
-		extra_dapps: Vec<PathBuf>,
-		dapps_domain: &str,
-		registrar: Arc<ContractClient>,
-		sync_status: Arc<SyncStatus>,
-		web_proxy_tokens: Arc<WebProxyTokens>,
-		fetch: F,
-	) -> Self {
-		let embeddable = as_embeddable(ui_address, extra_embed_on, extra_script_src, dapps_domain);
-		let content_fetcher = Arc::new(apps::fetcher::ContentFetcher::new(
-			hash_fetch::urlhint::URLHintContract::new(registrar),
-			sync_status.clone(),
-			fetch.clone(),
-			pool.clone(),
-		).embeddable_on(embeddable.clone()).allow_dapps(true));
-		let (local_endpoints, endpoints) = apps::all_endpoints(
-			dapps_path.clone(),
-			extra_dapps,
-			dapps_domain,
-			embeddable.clone(),
-			web_proxy_tokens,
-			fetch.clone(),
-			pool.clone(),
-		);
-		let endpoints = Endpoints {
-			endpoints: Arc::new(RwLock::new(endpoints)),
-			dapps_path,
-			local_endpoints: Arc::new(RwLock::new(local_endpoints)),
-			embeddable: embeddable.clone(),
-			pool: Some(pool.clone()),
-		};
-
-		let special = {
-			let mut special = special_endpoints(
-				pool.clone(),
-				health,
-				content_fetcher.clone(),
-			);
-			special.insert(
-				router::SpecialEndpoint::Home,
-				Some(apps::ui_redirection(embeddable.clone())),
-			);
-			special
-		};
-
-		let router = router::Router::new(
-			content_fetcher,
-			Some(endpoints.clone()),
-			special,
-			embeddable,
-			dapps_domain.to_owned(),
-		);
-
-		Middleware {
-			endpoints,
-			router,
-		}
-	}
-}
-
-impl http::RequestMiddleware for Middleware {
-	fn on_request(&self, req: hyper::Request) -> http::RequestMiddlewareAction {
-		self.router.on_request(req)
-	}
-}
-
-fn special_endpoints(
-	pool: CpuPool,
-	health: NodeHealth,
-	content_fetcher: Arc<apps::fetcher::Fetcher>,
-) -> HashMap<router::SpecialEndpoint, Option<Box<endpoint::Endpoint>>> {
-	let mut special = HashMap::new();
-	special.insert(router::SpecialEndpoint::Rpc, None);
-	special.insert(router::SpecialEndpoint::Utils, Some(apps::utils(pool)));
-	special.insert(router::SpecialEndpoint::Api, Some(api::RestApi::new(
-		content_fetcher,
-		health,
-	)));
-	special
-}
-
-fn address(host: &str, port: u16) -> String {
-	format!("{}:{}", host, port)
-}
-
-fn as_embeddable(
-	ui_address: Option<(String, u16)>,
-	extra_embed_on: Vec<(String, u16)>,
-	extra_script_src: Vec<(String, u16)>,
-	dapps_domain: &str,
-) -> Option<ParentFrameSettings> {
-	ui_address.map(|(host, port)| ParentFrameSettings {
-		host,
-		port,
-		extra_embed_on,
-		extra_script_src,
-		dapps_domain: dapps_domain.to_owned(),
-	})
-}
-
-/// Random filename
-fn random_filename() -> String {
-	use ::rand::Rng;
-	let mut rng = ::rand::OsRng::new().unwrap();
-	rng.gen_ascii_chars().take(12).collect()
-}
-
-type Embeddable = Option<ParentFrameSettings>;
-
-/// Parent frame host and port allowed to embed the content.
-#[derive(Debug, Clone)]
-pub struct ParentFrameSettings {
-	/// Hostname
-	pub host: String,
-	/// Port
-	pub port: u16,
-	/// Additional URLs the dapps can be embedded on.
-	pub extra_embed_on: Vec<(String, u16)>,
-	/// Additional URLs the dapp scripts can be loaded from.
-	pub extra_script_src: Vec<(String, u16)>,
-	/// Dapps Domain (web3.site)
-	pub dapps_domain: String,
-}

dapps/src/page/builtin.rs

@@ -1,160 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::io;
-use futures::future;
-use futures_cpupool::CpuPool;
-use hyper::mime::{self, Mime};
-use itertools::Itertools;
-use parity_dapps::{WebApp, Info};
-
-use endpoint::{Endpoint, EndpointInfo, EndpointPath, Request, Response};
-use page::{handler, PageCache};
-use Embeddable;
-
-pub struct Dapp<T: WebApp + 'static> {
-	/// futures cpu pool
-	pool: CpuPool,
-	/// Content of the files
-	app: T,
-	/// Safe to be loaded in frame by other origin. (use wisely!)
-	safe_to_embed_on: Embeddable,
-	info: EndpointInfo,
-	fallback_to_index_html: bool,
-}
-
-impl<T: WebApp + 'static> Dapp<T> {
-	/// Creates new `Dapp` for builtin (compile time) Dapp.
-	pub fn new(pool: CpuPool, app: T) -> Self {
-		let info = app.info();
-		Dapp {
-			pool,
-			app,
-			safe_to_embed_on: None,
-			info: EndpointInfo::from(info),
-			fallback_to_index_html: false,
-		}
-	}
-
-	/// Creates a new `Dapp` for builtin (compile time) Dapp.
-	/// Instead of returning 404 this endpoint will always server index.html.
-	pub fn with_fallback_to_index(pool: CpuPool, app: T) -> Self {
-		let info = app.info();
-		Dapp {
-			pool,
-			app,
-			safe_to_embed_on: None,
-			info: EndpointInfo::from(info),
-			fallback_to_index_html: true,
-		}
-	}
-
-	/// Creates new `Dapp` which can be safely used in iframe
-	/// even from different origin. It might be dangerous (clickjacking).
-	/// Use wisely!
-	pub fn new_safe_to_embed(pool: CpuPool, app: T, address: Embeddable) -> Self {
-		let info = app.info();
-		Dapp {
-			pool,
-			app,
-			safe_to_embed_on: address,
-			info: EndpointInfo::from(info),
-			fallback_to_index_html: false,
-		}
-	}
-}
-
-impl<T: WebApp> Endpoint for Dapp<T> {
-	fn info(&self) -> Option<&EndpointInfo> {
-		Some(&self.info)
-	}
-
-	fn respond(&self, path: EndpointPath, _req: Request) -> Response {
-		trace!(target: "dapps", "Builtin file path: {:?}", path);
-		let file_path = if path.has_no_params() {
-			"index.html".to_owned()
-		} else {
-			path.app_params.into_iter().filter(|x| !x.is_empty()).join("/")
-		};
-		trace!(target: "dapps", "Builtin file: {:?}", file_path);
-
-		let file = {
-			let file = |path| self.app.file(path).map(|file| {
-				let content_type = match file.content_type.parse() {
-					Ok(mime) => mime,
-					Err(_) => {
-						warn!(target: "dapps", "invalid MIME type: {}", file.content_type);
-						mime::TEXT_HTML
-					},
-				};
-				BuiltinFile {
-					content_type,
-					content: io::Cursor::new(file.content),
-				}
-			});
-			let res = file(&file_path);
-			if self.fallback_to_index_html {
-				res.or_else(|| file("index.html"))
-			} else {
-				res
-			}
-		};
-
-		let (reader, response) = handler::PageHandler {
-			file,
-			cache: PageCache::Disabled,
-			safe_to_embed_on: self.safe_to_embed_on.clone(),
-			allow_js_eval: self.info.allow_js_eval.clone().unwrap_or(false),
-		}.into_response();
-
-		self.pool.spawn(reader).forget();
-
-		Box::new(future::ok(response))
-	}
-}
-
-impl From<Info> for EndpointInfo {
-	fn from(info: Info) -> Self {
-		EndpointInfo {
-			id: None,
-			name: info.name.into(),
-			description: info.description.into(),
-			author: info.author.into(),
-			icon_url: info.icon_url.into(),
-			local_url: None,
-			version: info.version.into(),
-			allow_js_eval: None,
-		}
-	}
-}
-
-
-struct BuiltinFile {
-	content_type: Mime,
-	content: io::Cursor<&'static [u8]>,
-}
-
-impl handler::DappFile for BuiltinFile {
-	type Reader = io::Cursor<&'static [u8]>;
-
-	fn content_type(&self) -> &Mime {
-		&self.content_type
-	}
-
-	fn into_reader(self) -> Self::Reader {
-		self.content
-	}
-}

dapps/src/page/handler.rs

@@ -1,116 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::io;
-use std::time::{Duration, SystemTime};
-use hyper::{self, header, StatusCode};
-use hyper::mime::{self, Mime};
-
-use apps;
-use handlers::{Reader, ContentHandler, add_security_headers};
-use {Embeddable};
-
-/// Represents a file that can be sent to client.
-/// Implementation should keep track of bytes already sent internally.
-pub trait DappFile {
-	/// A reader type returned by this file.
-	type Reader: io::Read;
-
-	/// Returns a content-type of this file.
-	fn content_type(&self) -> &Mime;
-
-	/// Convert this file into io::Read instance.
-	fn into_reader(self) -> Self::Reader where Self: Sized;
-}
-
-/// Defines what cache headers should be appended to returned resources.
-#[derive(Debug, Copy, Clone, PartialEq)]
-pub enum PageCache {
-	Enabled,
-	Disabled,
-}
-
-impl Default for PageCache {
-	fn default() -> Self {
-		PageCache::Disabled
-	}
-}
-
-/// A handler for a single webapp.
-/// Resolves correct paths and serves as a plumbing code between
-/// hyper server and dapp.
-pub struct PageHandler<T: DappFile> {
-	/// File currently being served
-	pub file: Option<T>,
-	/// Flag indicating if the file can be safely embeded (put in iframe).
-	pub safe_to_embed_on: Embeddable,
-	/// Cache settings for this page.
-	pub cache: PageCache,
-	/// Allow JS unsafe-eval.
-	pub allow_js_eval: bool,
-}
-
-impl<T: DappFile> PageHandler<T> {
-	pub fn into_response(self) -> (Option<Reader<T::Reader>>, hyper::Response) {
-		let file = match self.file {
-			None => return (None, ContentHandler::error(
-				StatusCode::NotFound,
-				"File not found",
-				"Requested file has not been found.",
-				None,
-				self.safe_to_embed_on,
-			).into()),
-			Some(file) => file,
-		};
-
-		let mut res = hyper::Response::new()
-			.with_status(StatusCode::Ok);
-
-		// headers
-		{
-			let mut headers = res.headers_mut();
-
-			if let PageCache::Enabled = self.cache {
-				let validity_secs = 365u32 * 24 * 3600;
-				let validity = Duration::from_secs(validity_secs as u64);
-				headers.set(header::CacheControl(vec![
-					header::CacheDirective::Public,
-					header::CacheDirective::MaxAge(validity_secs),
-				]));
-				headers.set(header::Expires(header::HttpDate::from(SystemTime::now() + validity)));
-			}
-
-			headers.set(header::ContentType(file.content_type().to_owned()));
-
-			add_security_headers(&mut headers, self.safe_to_embed_on, self.allow_js_eval);
-		}
-
-		let initial_content = if file.content_type().to_owned() == mime::TEXT_HTML {
-			let content = &format!(
-				r#"<script src="/{}/inject.js"></script>"#,
-				apps::UTILS_PATH,
-			);
-
-			content.as_bytes().to_vec()
-		} else {
-			Vec::new()
-		};
-
-		let (reader, body) = Reader::pair(file.into_reader(), initial_content);
-		res.set_body(body);
-		(Some(reader), res)
-	}
-}

dapps/src/page/local.rs

@@ -1,148 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use mime_guess;
-use std::{fs, fmt};
-use std::path::{Path, PathBuf};
-use futures::{future};
-use futures_cpupool::CpuPool;
-use page::handler::{self, PageCache};
-use endpoint::{Endpoint, EndpointInfo, EndpointPath, Request, Response};
-use hyper::mime::Mime;
-use Embeddable;
-
-#[derive(Clone)]
-pub struct Dapp {
-	pool: CpuPool,
-	path: PathBuf,
-	mime: Option<Mime>,
-	info: Option<EndpointInfo>,
-	cache: PageCache,
-	embeddable_on: Embeddable,
-}
-
-impl fmt::Debug for Dapp {
-	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-		fmt.debug_struct("Dapp")
-			.field("path", &self.path)
-			.field("mime", &self.mime)
-			.field("info", &self.info)
-			.field("cache", &self.cache)
-			.field("embeddable_on", &self.embeddable_on)
-			.finish()
-	}
-}
-
-impl Dapp {
-	pub fn new(pool: CpuPool, path: PathBuf, info: EndpointInfo, cache: PageCache, embeddable_on: Embeddable) -> Self {
-		Dapp {
-			pool,
-			path,
-			mime: None,
-			info: Some(info),
-			cache,
-			embeddable_on,
-		}
-	}
-
-	pub fn single_file(pool: CpuPool, path: PathBuf, mime: Mime, cache: PageCache) -> Self {
-		Dapp {
-			pool,
-			path,
-			mime: Some(mime),
-			info: None,
-			cache,
-			embeddable_on: None,
-		}
-	}
-
-	pub fn path(&self) -> PathBuf {
-		self.path.clone()
-	}
-
-	fn get_file(&self, path: &EndpointPath) -> Option<LocalFile> {
-		if let Some(ref mime) = self.mime {
-			return LocalFile::from_path(&self.path, mime.to_owned());
-		}
-
-		let mut file_path = self.path.to_owned();
-
-		if path.has_no_params() {
-			file_path.push("index.html");
-		} else {
-			for part in &path.app_params {
-				file_path.push(part);
-			}
-		}
-
-		let mime = mime_guess::guess_mime_type(&file_path);
-		LocalFile::from_path(&file_path, mime)
-	}
-
-
-	pub fn to_response(&self, path: &EndpointPath) -> Response {
-		let (reader, response) = handler::PageHandler {
-			file: self.get_file(path),
-			cache: self.cache,
-			safe_to_embed_on: self.embeddable_on.clone(),
-			allow_js_eval: self.info.as_ref().and_then(|x| x.allow_js_eval).unwrap_or(false),
-		}.into_response();
-
-		self.pool.spawn(reader).forget();
-
-		Box::new(future::ok(response))
-	}
-}
-
-impl Endpoint for Dapp {
-	fn info(&self) -> Option<&EndpointInfo> {
-		self.info.as_ref()
-	}
-
-	fn respond(&self, path: EndpointPath, _req: Request) -> Response {
-		self.to_response(&path)
-	}
-}
-
-struct LocalFile {
-	content_type: Mime,
-	file: fs::File,
-}
-
-impl LocalFile {
-	fn from_path<P: AsRef<Path>>(path: P, content_type: Mime) -> Option<Self> {
-		trace!(target: "dapps", "Local file: {:?}", path.as_ref());
-		// Check if file exists
-		fs::File::open(&path).ok().map(|file| {
-			LocalFile {
-				content_type,
-				file,
-			}
-		})
-	}
-}
-
-impl handler::DappFile for LocalFile {
-	type Reader = fs::File;
-
-	fn content_type(&self) -> &Mime {
-		&self.content_type
-	}
-
-	fn into_reader(self) -> Self::Reader {
-		self.file
-	}
-}

dapps/src/proxypac.rs

@@ -1,68 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Serving ProxyPac file
-
-use apps::HOME_PAGE;
-use endpoint::{Endpoint, Request, Response, EndpointPath};
-use futures::future;
-use handlers::ContentHandler;
-use hyper::mime;
-use {address, Embeddable};
-
-pub struct ProxyPac {
-	embeddable: Embeddable,
-	dapps_domain: String,
-}
-
-impl ProxyPac {
-	pub fn boxed(embeddable: Embeddable, dapps_domain: String) -> Box<Endpoint> {
-		Box::new(ProxyPac { embeddable, dapps_domain })
-	}
-}
-
-impl Endpoint for ProxyPac {
-	fn respond(&self, path: EndpointPath, _req: Request) -> Response {
-		let ui = self.embeddable
-			.as_ref()
-			.map(|ref parent| address(&parent.host, parent.port))
-			.unwrap_or_else(|| format!("{}:{}", path.host, path.port));
-
-		let content = format!(
-r#"
-function FindProxyForURL(url, host) {{
-	if (shExpMatch(host, "{0}.{1}"))
-	{{
-		return "PROXY {4}";
-	}}
-
-	if (shExpMatch(host, "*.{1}"))
-	{{
-		return "PROXY {2}:{3}";
-	}}
-
-	return "DIRECT";
-}}
-"#,
-		HOME_PAGE, self.dapps_domain, path.host, path.port, ui);
-
-		Box::new(future::ok(
-			ContentHandler::ok(content, mime::TEXT_JAVASCRIPT).into()
-		))
-	}
-}
-
-

dapps/src/router.rs

@@ -1,407 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Router implementation
-//! Dispatch requests to proper application.
-
-use std::sync::Arc;
-use std::collections::HashMap;
-
-use futures::future;
-use hyper::{self, header, Uri};
-use jsonrpc_http_server as http;
-
-use apps;
-use apps::fetcher::Fetcher;
-use endpoint::{self, Endpoint, EndpointPath};
-use Endpoints;
-use handlers;
-use Embeddable;
-
-/// Special endpoints are accessible on every domain (every dapp)
-#[derive(Debug, PartialEq, Hash, Eq)]
-pub enum SpecialEndpoint {
-	Rpc,
-	Api,
-	Utils,
-	Home,
-	None,
-}
-
-enum Response {
-	Some(endpoint::Response),
-	None(hyper::Request),
-}
-
-/// An endpoint router.
-/// Dispatches the request to particular Endpoint by requested uri/path.
-pub struct Router {
-	endpoints: Option<Endpoints>,
-	fetch: Arc<Fetcher>,
-	special: HashMap<SpecialEndpoint, Option<Box<Endpoint>>>,
-	embeddable_on: Embeddable,
-	dapps_domain: String,
-}
-
-impl Router {
-	fn resolve_request(&self, req: hyper::Request, refresh_dapps: bool) -> (bool, Response) {
-		// Choose proper handler depending on path / domain
-		let endpoint = extract_endpoint(req.uri(), req.headers().get(), &self.dapps_domain);
-		let referer = extract_referer_endpoint(&req, &self.dapps_domain);
-		let is_utils = endpoint.1 == SpecialEndpoint::Utils;
-		let is_get_request = *req.method() == hyper::Method::Get;
-		let is_head_request = *req.method() == hyper::Method::Head;
-		let has_dapp = |dapp: &str| self.endpoints
-			.as_ref()
-			.map_or(false, |endpoints| endpoints.endpoints.read().contains_key(dapp));
-
-		trace!(target: "dapps", "Routing request to {:?}. Details: {:?}", req.uri(), req);
-		debug!(target: "dapps", "Handling endpoint request: {:?}, referer: {:?}", endpoint, referer);
-
-		(is_utils, match (endpoint.0, endpoint.1, referer) {
-			// Handle invalid web requests that we can recover from
-			(ref path, SpecialEndpoint::None, Some(ref referer))
-				if referer.app_id == apps::WEB_PATH
-					&& has_dapp(apps::WEB_PATH)
-					&& !is_web_endpoint(path)
-				=>
-			{
-				let token = referer.app_params.get(0).map(String::as_str).unwrap_or("");
-				let requested = req.uri().path();
-				let query = req.uri().query().map_or_else(String::new, |query| format!("?{}", query));
-				let redirect_url = format!("/{}/{}{}{}", apps::WEB_PATH, token, requested, query);
-				trace!(target: "dapps", "Redirecting to correct web request: {:?}", redirect_url);
-				Response::Some(Box::new(future::ok(
-					handlers::Redirection::new(redirect_url).into()
-				)))
-			},
-			// First check special endpoints
-			(ref path, ref endpoint, _) if self.special.contains_key(endpoint) => {
-				trace!(target: "dapps", "Resolving to special endpoint.");
-				let special = self.special.get(endpoint).expect("special known to contain key; qed");
-				match *special {
-					Some(ref special) => Response::Some(special.respond(path.clone().unwrap_or_default(), req)),
-					None => Response::None(req),
-				}
-			},
-			// Then delegate to dapp
-			(Some(ref path), _, _) if has_dapp(&path.app_id) => {
-				trace!(target: "dapps", "Resolving to local/builtin dapp.");
-				Response::Some(self.endpoints
-					.as_ref()
-					.expect("endpoints known to be set; qed")
-					.endpoints
-					.read()
-					.get(&path.app_id)
-					.expect("endpoints known to contain key; qed")
-					.respond(path.clone(), req))
-			},
-			// Try to resolve and fetch the dapp
-			(Some(ref path), _, _) if self.fetch.contains(&path.app_id) => {
-				trace!(target: "dapps", "Resolving to fetchable content.");
-				Response::Some(self.fetch.respond(path.clone(), req))
-			},
-			// 404 for non-existent content (only if serving endpoints and not homepage)
-			(Some(ref path), _, _)
-				if (is_get_request || is_head_request)
-					&& self.endpoints.is_some()
-					&& path.app_id != apps::HOME_PAGE
-				=>
-			{
-				trace!(target: "dapps", "Resolving to 404.");
-				if refresh_dapps {
-					debug!(target: "dapps", "Refreshing dapps and re-trying.");
-					self.endpoints.as_ref().map(|endpoints| endpoints.refresh_local_dapps());
-					return self.resolve_request(req, false);
-				} else {
-					Response::Some(Box::new(future::ok(handlers::ContentHandler::error(
-						hyper::StatusCode::NotFound,
-						"404 Not Found",
-						"Requested content was not found.",
-						None,
-						self.embeddable_on.clone(),
-					).into())))
-				}
-			},
-			// Any other GET|HEAD requests to home page.
-			_ if (is_get_request || is_head_request) && self.special.contains_key(&SpecialEndpoint::Home) => {
-				trace!(target: "dapps", "Resolving to home page.");
-				let special = self.special.get(&SpecialEndpoint::Home).expect("special known to contain key; qed");
-				match *special {
-					Some(ref special) => {
-						let mut endpoint = EndpointPath::default();
-						endpoint.app_params = req.uri().path().split('/').map(str::to_owned).collect();
-						Response::Some(special.respond(endpoint, req))
-					},
-					None => Response::None(req),
-				}
-			},
-			// RPC by default
-			_ => {
-				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/tests/api.rs

@@ -1,86 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use tests::helpers::{serve, serve_with_registrar, request, assert_security_headers};
-
-#[test]
-fn should_return_error() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET /api/empty HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 404 Not Found");
-	response.assert_header("Content-Type", "application/json");
-	assert_eq!(response.body, format!("58\n{}\n0\n\n", r#"{"code":"404","title":"Not Found","detail":"Resource you requested has not been found."}"#));
-	assert_security_headers(&response.headers);
-}
-
-#[test]
-fn should_handle_ping() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			POST /api/ping HTTP/1.1\r\n\
-			Host: home.parity\r\n\
-			Content-Type: application/json\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 200 OK");
-	response.assert_header("Content-Type", "application/json");
-	assert_eq!(response.body, "0\n\n".to_owned());
-	assert_security_headers(&response.headers);
-}
-
-
-#[test]
-fn should_try_to_resolve_dapp() {
-	// given
-	let (server, registrar) = serve_with_registrar();
-
-	// when
-	let response = request(server,
-		"\
-			GET /api/content/1472a9e190620cdf6b31f383373e45efcfe869a820c91f9ccd7eb9fb45e4985d HTTP/1.1\r\n\
-			Host: home.parity\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 404 Not Found");
-	assert_eq!(registrar.calls.lock().len(), 2);
-	assert_security_headers(&response.headers);
-}

dapps/src/tests/fetch.rs

@@ -1,545 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use devtools::http_client;
-use rustc_hex::FromHex;
-use tests::helpers::{
-	serve_with_registrar, serve_with_registrar_and_sync, serve_with_fetch,
-	serve_with_registrar_and_fetch,
-	request, assert_security_headers_for_embed,
-};
-
-#[test]
-fn should_resolve_dapp() {
-	// given
-	let (server, registrar) = serve_with_registrar();
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: 1472a9e190620cdf6b31f383373e45efcfe869a820c91f9ccd7eb9fb45e4985d.web3.site\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 404 Not Found");
-	assert_eq!(registrar.calls.lock().len(), 4);
-	assert_security_headers_for_embed(&response.headers);
-}
-
-#[test]
-fn should_return_503_when_syncing_but_should_make_the_calls() {
-	// given
-	let (server, registrar) = serve_with_registrar_and_sync();
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: 1472a9e190620cdf6b31f383373e45efcfe869a820c91f9ccd7eb9fb45e4985d.web3.site\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 503 Service Unavailable");
-	assert_eq!(registrar.calls.lock().len(), 2);
-	assert_security_headers_for_embed(&response.headers);
-}
-
-const GAVCOIN_DAPP: &'static str = "00000000000000000000000000000000000000000000000000000000000000609faf32e1e3845e237cc6efd27187cee13b3b99db000000000000000000000000000000000000000000000000d8bd350823e28ff75e74a34215faefdc8a52fd8e00000000000000000000000000000000000000000000000000000000000000116761766f66796f726b2f676176636f696e000000000000000000000000000000";
-const GAVCOIN_ICON: &'static str = "00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d8bd350823e28ff75e74a34215faefdc8a52fd8e000000000000000000000000000000000000000000000000000000000000007768747470733a2f2f7261772e67697468756275736572636f6e74656e742e636f6d2f657468636f72652f646170702d6173736574732f623838653938336162616131613661363334356238643934343863313562313137646462353430652f746f6b656e732f676176636f696e2d36347836342e706e67000000000000000000";
-
-#[test]
-fn should_return_502_on_hash_mismatch() {
-	// given
-	let (server, fetch, registrar) = serve_with_registrar_and_fetch();
-	let gavcoin = GAVCOIN_DAPP.from_hex().unwrap();
-	registrar.set_result(
-		"94f093625c06887d94d9fee0d5f9cc4aaa46f33d24d1c7e4b5237e7c37d547dd".parse().unwrap(),
-		Ok(gavcoin.clone())
-	);
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: 94f093625c06887d94d9fee0d5f9cc4aaa46f33d24d1c7e4b5237e7c37d547dd.web3.site\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	assert_eq!(registrar.calls.lock().len(), 4);
-
-	fetch.assert_requested("https://codeload.github.com/gavofyork/gavcoin/zip/9faf32e1e3845e237cc6efd27187cee13b3b99db");
-	fetch.assert_no_more_requests();
-
-	response.assert_status("HTTP/1.1 502 Bad Gateway");
-	assert!(response.body.contains("HashMismatch"), "Expected hash mismatch response, got: {:?}", response.body);
-	assert_security_headers_for_embed(&response.headers);
-}
-
-#[test]
-fn should_return_error_for_invalid_dapp_zip() {
-	// given
-	let (server, fetch, registrar) = serve_with_registrar_and_fetch();
-	let gavcoin = GAVCOIN_DAPP.from_hex().unwrap();
-	registrar.set_result(
-		"2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e".parse().unwrap(),
-		Ok(gavcoin.clone())
-	);
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.web3.site\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	assert_eq!(registrar.calls.lock().len(), 4);
-
-	fetch.assert_requested("https://codeload.github.com/gavofyork/gavcoin/zip/9faf32e1e3845e237cc6efd27187cee13b3b99db");
-	fetch.assert_no_more_requests();
-
-	response.assert_status("HTTP/1.1 502 Bad Gateway");
-	assert!(response.body.contains("InvalidArchive"), "Expected invalid zip response, got: {:?}", response.body);
-	assert_security_headers_for_embed(&response.headers);
-}
-
-#[test]
-fn should_return_fetched_dapp_content() {
-	// given
-	let (server, fetch, registrar) = serve_with_registrar_and_fetch();
-	let gavcoin = GAVCOIN_DAPP.from_hex().unwrap();
-	registrar.set_result(
-		"9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a".parse().unwrap(),
-		Ok(gavcoin.clone())
-	);
-	fetch.set_response(include_bytes!("../../res/gavcoin.zip"));
-
-	// when
-	let response1 = http_client::request(server.addr(),
-		"\
-			GET /index.html HTTP/1.1\r\n\
-			Host: 9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a.web3.site\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-	let response2 = http_client::request(server.addr(),
-		"\
-			GET /manifest.json HTTP/1.1\r\n\
-			Host: 9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a.web3.site\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	assert_eq!(registrar.calls.lock().len(), 4);
-
-	fetch.assert_requested("https://codeload.github.com/gavofyork/gavcoin/zip/9faf32e1e3845e237cc6efd27187cee13b3b99db");
-	fetch.assert_no_more_requests();
-
-	response1.assert_status("HTTP/1.1 200 OK");
-	assert_security_headers_for_embed(&response1.headers);
-	assert!(
-		response1.body.contains(r#"18
-<h1>Hello Gavcoin!</h1>
-
-0
-
-"#),
-		"Expected Gavcoin body: {}",
-		response1.body
-	);
-
-	response2.assert_status("HTTP/1.1 200 OK");
-	assert_security_headers_for_embed(&response2.headers);
-	assert_eq!(
-		response2.body,
-		r#"EA
-{
-  "id": "9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a",
-  "name": "Gavcoin",
-  "description": "Gavcoin",
-  "version": "1.0.0",
-  "author": "",
-  "iconUrl": "icon.png",
-  "localUrl": null,
-  "allowJsEval": false
-}
-0
-
-"#
-	);
-}
-
-#[test]
-fn should_return_fetched_content() {
-	// given
-	let (server, fetch, registrar) = serve_with_registrar_and_fetch();
-	let gavcoin = GAVCOIN_ICON.from_hex().unwrap();
-	registrar.set_result(
-		"2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e".parse().unwrap(),
-		Ok(gavcoin.clone())
-	);
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.web3.site\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	assert_eq!(registrar.calls.lock().len(), 4);
-
-	fetch.assert_requested("https://raw.githubusercontent.com/ethcore/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/tokens/gavcoin-64x64.png");
-	fetch.assert_no_more_requests();
-
-	response.assert_status("HTTP/1.1 200 OK");
-	response.assert_security_headers_present(None);
-}
-
-#[test]
-fn should_cache_content() {
-	// given
-	let (server, fetch, registrar) = serve_with_registrar_and_fetch();
-	let gavcoin = GAVCOIN_ICON.from_hex().unwrap();
-	registrar.set_result(
-		"2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e".parse().unwrap(),
-		Ok(gavcoin.clone())
-	);
-	let request_str = "\
-		GET / HTTP/1.1\r\n\
-		Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.web3.site\r\n\
-		Connection: close\r\n\
-		\r\n\
-	";
-
-	let response = http_client::request(server.addr(), request_str);
-	fetch.assert_requested("https://raw.githubusercontent.com/ethcore/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/tokens/gavcoin-64x64.png");
-	fetch.assert_no_more_requests();
-	response.assert_status("HTTP/1.1 200 OK");
-
-	// when
-	let response = http_client::request(server.addr(), request_str);
-
-	// then
-	fetch.assert_no_more_requests();
-	response.assert_status("HTTP/1.1 200 OK");
-}
-
-#[test]
-fn should_not_request_content_twice() {
-	use std::thread;
-
-	// given
-	let (server, fetch, registrar) = serve_with_registrar_and_fetch();
-	let gavcoin = GAVCOIN_ICON.from_hex().unwrap();
-	registrar.set_result(
-		"2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e".parse().unwrap(),
-		Ok(gavcoin.clone())
-	);
-	let request_str = "\
-		GET / HTTP/1.1\r\n\
-		Host: 2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e.web3.site\r\n\
-		Connection: close\r\n\
-		\r\n\
-	";
-	let fire_request = || {
-		let addr = server.addr().to_owned();
-		let req = request_str.to_owned();
-		thread::spawn(move || {
-			http_client::request(&addr, &req)
-		})
-	};
-	let control = fetch.manual();
-
-	// when
-
-	// Fire two requests at the same time
-	let r1 = fire_request();
-	let r2 = fire_request();
-
-	// wait for single request in fetch, the second one should go into waiting state.
-	control.wait_for_requests(1);
-	control.respond();
-
-	let response1 = r1.join().unwrap();
-	let response2 = r2.join().unwrap();
-
-	// then
-	fetch.assert_requested("https://raw.githubusercontent.com/ethcore/dapp-assets/b88e983abaa1a6a6345b8d9448c15b117ddb540e/tokens/gavcoin-64x64.png");
-	fetch.assert_no_more_requests();
-	response1.assert_status("HTTP/1.1 200 OK");
-	response2.assert_status("HTTP/1.1 200 OK");
-}
-
-#[test]
-fn should_encode_and_decode_base32() {
-	use base32;
-
-	let encoded = base32::encode(base32::Alphabet::Crockford, "token+https://parity.io".as_bytes());
-	assert_eq!("EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY", &encoded);
-
-	let data = base32::decode(base32::Alphabet::Crockford, "EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY").unwrap();
-	assert_eq!("token+https://parity.io", &String::from_utf8(data).unwrap());
-}
-
-#[test]
-fn should_stream_web_content() {
-	// given
-	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY.web.web3.site\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 200 OK");
-	assert_security_headers_for_embed(&response.headers);
-
-	fetch.assert_requested("https://parity.io/");
-	fetch.assert_no_more_requests();
-}
-
-#[test]
-fn should_support_base32_encoded_web_urls() {
-	// given
-	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
-
-	// when
-	let response = request(server,
-		"\
-			GET /styles.css?test=123 HTTP/1.1\r\n\
-			Host: EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY.web.web3.site\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 200 OK");
-	assert_security_headers_for_embed(&response.headers);
-
-	fetch.assert_requested("https://parity.io/styles.css?test=123");
-	fetch.assert_no_more_requests();
-}
-
-#[test]
-fn should_correctly_handle_long_label_when_splitted() {
-	// given
-	let (server, fetch) = serve_with_fetch("xolrg9fePeQyKLnL", "https://contribution.melonport.com");
-
-	// when
-	let response = request(server,
-		"\
-			GET /styles.css?test=123 HTTP/1.1\r\n\
-			Host: f1qprwk775k6am35a5wmpk3e9gnpgx3me1sk.mbsfcdqpwx3jd5h7ax39dxq2wvb5dhqpww3fe9t2wrvfdm.web.web3.site\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 200 OK");
-	assert_security_headers_for_embed(&response.headers);
-
-	fetch.assert_requested("https://contribution.melonport.com/styles.css?test=123");
-	fetch.assert_no_more_requests();
-}
-
-
-#[test]
-fn should_support_base32_encoded_web_urls_as_path() {
-	// given
-	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
-
-	// when
-	let response = request(server,
-		"\
-			GET /web/EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY/styles.css?test=123 HTTP/1.1\r\n\
-			Host: localhost:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 200 OK");
-	assert_security_headers_for_embed(&response.headers);
-
-	fetch.assert_requested("https://parity.io/styles.css?test=123");
-	fetch.assert_no_more_requests();
-}
-
-#[test]
-fn should_return_error_on_non_whitelisted_domain() {
-	// given
-	let (server, fetch) = serve_with_fetch("token", "https://ethcore.io");
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY.web.web3.site\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 400 Bad Request");
-	assert_security_headers_for_embed(&response.headers);
-
-	fetch.assert_no_more_requests();
-}
-
-#[test]
-fn should_return_error_on_invalid_token() {
-	// given
-	let (server, fetch) = serve_with_fetch("test", "https://parity.io");
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY.web.web3.site\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 400 Bad Request");
-	assert_security_headers_for_embed(&response.headers);
-
-	fetch.assert_no_more_requests();
-}
-
-#[test]
-fn should_return_error_on_invalid_protocol() {
-	// given
-	let (server, fetch) = serve_with_fetch("token", "ftp://parity.io");
-
-	// when
-	let response = request(server,
-		"\
-			GET /web/token/ftp/parity.io/ HTTP/1.1\r\n\
-			Host: localhost:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 400 Bad Request");
-	assert_security_headers_for_embed(&response.headers);
-
-	fetch.assert_no_more_requests();
-}
-
-#[test]
-fn should_disallow_non_get_requests() {
-	// given
-	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
-
-	// when
-	let response = request(server,
-		"\
-			POST / HTTP/1.1\r\n\
-			Host: EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY.web.web3.site\r\n\
-			Content-Type: application/json\r\n\
-			Connection: close\r\n\
-			\r\n\
-			123\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 405 Method Not Allowed");
-	assert_security_headers_for_embed(&response.headers);
-
-	fetch.assert_no_more_requests();
-}
-
-#[test]
-fn should_fix_absolute_requests_based_on_referer() {
-	// given
-	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
-
-	// when
-	let response = request(server,
-		"\
-			GET /styles.css HTTP/1.1\r\n\
-			Host: localhost:8080\r\n\
-			Connection: close\r\n\
-			Referer: http://localhost:8080/web/EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY/\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 302 Found");
-	response.assert_header("Location", "/web/EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY/styles.css");
-
-	fetch.assert_no_more_requests();
-}
-
-#[test]
-fn should_fix_absolute_requests_based_on_referer_in_url() {
-	// given
-	let (server, fetch) = serve_with_fetch("token", "https://parity.io");
-
-	// when
-	let response = request(server,
-		"\
-			GET /styles.css HTTP/1.1\r\n\
-			Host: localhost:8080\r\n\
-			Connection: close\r\n\
-			Referer: http://localhost:8080/?__referer=web/EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY/\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 302 Found");
-	response.assert_header("Location", "/web/EHQPPSBE5DM78X3GECX2YBVGC5S6JX3S5SMPY/styles.css");
-
-	fetch.assert_no_more_requests();
-}

dapps/src/tests/helpers/fetch.rs

@@ -1,133 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{io, thread, time};
-use std::sync::{atomic, mpsc, Arc};
-use parking_lot::Mutex;
-
-use futures::{self, Future};
-use fetch::{self, Fetch};
-
-pub struct FetchControl {
-	sender: mpsc::Sender<()>,
-	fetch: FakeFetch,
-}
-
-impl FetchControl {
-	pub fn respond(self) {
-		self.sender.send(())
-			.expect("Fetch cannot be finished without sending a response at least once.");
-	}
-
-	pub fn wait_for_requests(&self, len: usize) {
-		const MAX_TIMEOUT_MS: u64 = 5000;
-		const ATTEMPTS: u64 = 10;
-		let mut attempts_left = ATTEMPTS;
-		loop {
-			let current = self.fetch.requested.lock().len();
-
-			if current == len {
-				break;
-			} else if attempts_left == 0 {
-				panic!(
-					"Timeout reached when waiting for pending requests. Expected: {}, current: {}",
-					len, current
-				);
-			} else {
-				attempts_left -= 1;
-				// Should we handle spurious timeouts better?
-				thread::park_timeout(time::Duration::from_millis(MAX_TIMEOUT_MS / ATTEMPTS));
-			}
-		}
-	}
-}
-
-#[derive(Clone, Default)]
-pub struct FakeFetch {
-	manual: Arc<Mutex<Option<mpsc::Receiver<()>>>>,
-	response: Arc<Mutex<Option<&'static [u8]>>>,
-	asserted: Arc<atomic::AtomicUsize>,
-	requested: Arc<Mutex<Vec<String>>>,
-}
-
-impl FakeFetch {
-	pub fn set_response(&self, data: &'static [u8]) {
-		*self.response.lock() = Some(data);
-	}
-
-	pub fn manual(&self) -> FetchControl {
-		assert!(self.manual.lock().is_none(), "Only one manual control may be active.");
-		let (tx, rx) = mpsc::channel();
-		*self.manual.lock() = Some(rx);
-
-		FetchControl {
-			sender: tx,
-			fetch: self.clone(),
-		}
-	}
-
-	pub fn assert_requested(&self, url: &str) {
-		let requests = self.requested.lock();
-		let idx = self.asserted.fetch_add(1, atomic::Ordering::SeqCst);
-
-		assert_eq!(requests.get(idx), Some(&url.to_owned()), "Expected fetch from specific URL.");
-	}
-
-	pub fn assert_no_more_requests(&self) {
-		let requests = self.requested.lock();
-		let len = self.asserted.load(atomic::Ordering::SeqCst);
-		assert_eq!(requests.len(), len, "Didn't expect any more requests, got: {:?}", &requests[len..]);
-	}
-}
-
-impl Fetch for FakeFetch {
-	type Result = Box<Future<Item = fetch::Response, Error = fetch::Error> + Send>;
-
-	fn new() -> Result<Self, fetch::Error> where Self: Sized {
-		Ok(FakeFetch::default())
-	}
-
-	fn fetch_with_abort(&self, url: &str, _abort: fetch::Abort) -> Self::Result {
-		self.requested.lock().push(url.into());
-		let manual = self.manual.clone();
-		let response = self.response.clone();
-
-		let (tx, rx) = futures::oneshot();
-		thread::spawn(move || {
-			if let Some(rx) = manual.lock().take() {
-				// wait for manual resume
-				let _ = rx.recv();
-			}
-
-			let data = response.lock().take().unwrap_or(b"Some content");
-			let cursor = io::Cursor::new(data);
-			tx.send(fetch::Response::from_reader(cursor)).unwrap();
-		});
-
-		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,297 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::{env, io, str};
-use std::net::SocketAddr;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-use env_logger::LogBuilder;
-use jsonrpc_core::IoHandler;
-use jsonrpc_http_server::{self as http, Host, DomainsValidation};
-use parity_reactor::Remote;
-
-use devtools::http_client;
-use hash_fetch::urlhint::ContractClient;
-use fetch::{Fetch, Client as FetchClient};
-use node_health::{NodeHealth, TimeChecker, CpuPool};
-
-use {Middleware, SyncStatus, WebProxyTokens};
-
-mod registrar;
-mod fetch;
-
-use self::registrar::FakeRegistrar;
-use self::fetch::FakeFetch;
-
-const SIGNER_PORT: u16 = 18180;
-
-#[derive(Debug)]
-struct FakeSync(bool);
-impl SyncStatus for FakeSync {
-	fn is_major_importing(&self) -> bool { self.0 }
-	fn peers(&self) -> (usize, usize) { (0, 5) }
-}
-
-fn init_logger() {
-	// Initialize logger
-	if let Ok(log) = env::var("RUST_LOG") {
-		let mut builder = LogBuilder::new();
-		builder.parse(&log);
-		let _ = builder.init();	// ignore errors since ./test.sh will call this multiple times.
-	}
-}
-
-pub fn init_server<F, B>(process: F, io: IoHandler) -> (Server, Arc<FakeRegistrar>) where
-	F: FnOnce(ServerBuilder) -> ServerBuilder<B>,
-	B: Fetch,
-{
-	init_logger();
-	let registrar = Arc::new(FakeRegistrar::new());
-	let mut dapps_path = env::temp_dir();
-	dapps_path.push("non-existent-dir-to-prevent-fs-files-from-loading");
-
-	let mut builder = ServerBuilder::new(&dapps_path, registrar.clone());
-	builder.signer_address = Some(("127.0.0.1".into(), SIGNER_PORT));
-	let server = process(builder).start_unsecured_http(&"127.0.0.1:0".parse().unwrap(), io).unwrap();
-	(
-		server,
-		registrar,
-	)
-}
-
-pub fn serve_with_rpc(io: IoHandler) -> Server {
-	init_server(|builder| builder, io).0
-}
-
-pub fn serve_hosts(hosts: Option<Vec<String>>) -> Server {
-	let hosts = hosts.map(|hosts| hosts.into_iter().map(Into::into).collect());
-	init_server(|mut builder| {
-		builder.allowed_hosts = hosts.into();
-		builder
-	}, Default::default()).0
-}
-
-pub fn serve_with_registrar() -> (Server, Arc<FakeRegistrar>) {
-	init_server(|builder| builder, Default::default())
-}
-
-pub fn serve_with_registrar_and_sync() -> (Server, Arc<FakeRegistrar>) {
-	init_server(|mut builder| {
-		builder.sync_status = Arc::new(FakeSync(true));
-		builder
-	}, Default::default())
-}
-
-pub fn serve_with_registrar_and_fetch() -> (Server, FakeFetch, Arc<FakeRegistrar>) {
-	let fetch = FakeFetch::default();
-	let f = fetch.clone();
-	let (server, reg) = init_server(move |builder| {
-		builder.fetch(f.clone())
-	}, Default::default());
-
-	(server, fetch, reg)
-}
-
-pub fn serve_with_fetch(web_token: &'static str, domain: &'static str) -> (Server, FakeFetch) {
-	let fetch = FakeFetch::default();
-	let f = fetch.clone();
-	let (server, _) = init_server(move |mut builder| {
-		builder.web_proxy_tokens = Arc::new(move |token| {
-			if &token == web_token { Some(domain.into()) } else { None }
-		});
-		builder.fetch(f.clone())
-	}, Default::default());
-
-	(server, fetch)
-}
-
-pub fn serve() -> Server {
-	init_server(|builder| builder, Default::default()).0
-}
-
-pub fn serve_ui() -> Server {
-	init_server(|mut builder| {
-		builder.serve_ui = true;
-		builder
-	}, Default::default()).0
-}
-
-pub fn request(server: Server, request: &str) -> http_client::Response {
-	http_client::request(server.addr(), request)
-}
-
-pub fn assert_security_headers(headers: &[String]) {
-	http_client::assert_security_headers_present(headers, None)
-}
-pub fn assert_security_headers_for_embed(headers: &[String]) {
-	http_client::assert_security_headers_present(headers, Some(SIGNER_PORT))
-}
-
-
-/// Webapps HTTP+RPC server build.
-pub struct ServerBuilder<T: Fetch = FetchClient> {
-	dapps_path: PathBuf,
-	registrar: Arc<ContractClient>,
-	sync_status: Arc<SyncStatus>,
-	web_proxy_tokens: Arc<WebProxyTokens>,
-	signer_address: Option<(String, u16)>,
-	allowed_hosts: DomainsValidation<Host>,
-	fetch: 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) -> io::Result<Server> {
-		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,
-	) -> io::Result<Server> {
-		let health = NodeHealth::new(
-			sync_status.clone(),
-			TimeChecker::new::<String>(&[], CpuPool::new(1)),
-			remote.clone(),
-		);
-		let pool = ::futures_cpupool::CpuPool::new(1);
-		let middleware = if serve_ui {
-			Middleware::ui(
-				pool,
-				health,
-				DAPPS_DOMAIN.into(),
-				registrar,
-				sync_status,
-				fetch,
-			)
-		} else {
-			Middleware::dapps(
-				pool,
-				health,
-				signer_address,
-				vec![],
-				vec![],
-				dapps_path,
-				extra_dapps,
-				DAPPS_DOMAIN.into(),
-				registrar,
-				sync_status,
-				web_proxy_tokens,
-				fetch,
-			)
-		};
-
-		let mut allowed_hosts: Option<Vec<Host>> = allowed_hosts.into();
-		allowed_hosts.as_mut().map(|hosts| {
-			hosts.push(format!("http://*.{}:*", DAPPS_DOMAIN).into());
-			hosts.push(format!("http://*.{}", DAPPS_DOMAIN).into());
-		});
-
-		http::ServerBuilder::new(io)
-			.request_middleware(middleware)
-			.allowed_hosts(allowed_hosts.into())
-			.cors(http::DomainsValidation::Disabled)
-			.start_http(addr)
-			.map(|server| Server {
-				server: Some(server),
-			})
-	}
-
-	/// Returns address that this server is bound to.
-	pub fn addr(&self) -> &SocketAddr {
-		self.server.as_ref()
-			.expect("server is always Some at the start; it's consumed only when object is dropped; qed")
-			.address()
-	}
-}
-
-impl Drop for Server {
-	fn drop(&mut self) {
-		self.server.take().unwrap().close()
-	}
-}

dapps/src/tests/helpers/registrar.rs

@@ -1,76 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::str;
-use std::sync::Arc;
-use std::collections::HashMap;
-
-use futures::Future;
-use ethereum_types::{H256, Address};
-use bytes::{Bytes, ToPretty};
-use hash_fetch::urlhint::ContractClient;
-use parking_lot::Mutex;
-use rustc_hex::FromHex;
-
-const REGISTRAR: &'static str = "8e4e9b13d4b45cb0befc93c3061b1408f67316b2";
-const URLHINT: &'static str = "deadbeefcafe0000000000000000000000000000";
-const URLHINT_RESOLVE: &'static str = "267b6922";
-const DEFAULT_HASH: &'static str = "1472a9e190620cdf6b31f383373e45efcfe869a820c91f9ccd7eb9fb45e4985d";
-
-pub struct FakeRegistrar {
-	pub calls: Arc<Mutex<Vec<(String, String)>>>,
-	pub responses: Mutex<HashMap<(String, String), Result<Bytes, String>>>,
-}
-
-impl FakeRegistrar {
-	pub fn new() -> Self {
-		FakeRegistrar {
-			calls: Arc::new(Mutex::new(Vec::new())),
-			responses: Mutex::new({
-				let mut map = HashMap::new();
-				map.insert(
-					(REGISTRAR.into(), "6795dbcd058740ee9a5a3fb9f1cfa10752baec87e09cc45cd7027fd54708271aca300c75000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000014100000000000000000000000000000000000000000000000000000000000000".into()),
-					Ok(format!("000000000000000000000000{}", URLHINT).from_hex().unwrap()),
-				);
-				map.insert(
-					(URLHINT.into(), format!("{}{}", URLHINT_RESOLVE, DEFAULT_HASH)),
-					Ok(vec![])
-				);
-				map
-			}),
-		}
-	}
-
-	pub fn set_result(&self, hash: H256, result: Result<Bytes, String>) {
-		self.responses.lock().insert(
-			(URLHINT.into(), format!("{}{:?}", URLHINT_RESOLVE, hash)),
-			result
-		);
-	}
-}
-
-impl ContractClient for FakeRegistrar {
-	fn registrar(&self) -> Result<Address, String> {
-		Ok(REGISTRAR.parse().unwrap())
-	}
-
-	fn call(&self, address: Address, data: Bytes) -> Box<Future<Item = Bytes, Error = String> + Send> {
-		let call = (address.to_hex(), data.to_hex());
-		self.calls.lock().push(call.clone());
-		let res = self.responses.lock().get(&call).cloned().expect(&format!("No response for call: {:?}", call));
-		Box::new(::futures::future::done(res))
-	}
-}

dapps/src/tests/home.rs

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

dapps/src/tests/mod.rs

@@ -1,27 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Dapps server test suite
-
-mod helpers;
-
-mod api;
-mod fetch;
-mod home;
-mod redirection;
-mod rpc;
-mod validation;
-

dapps/src/tests/redirection.rs

@@ -1,207 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use tests::helpers::{serve, request, assert_security_headers, assert_security_headers_for_embed};
-
-#[test]
-fn should_redirect_to_home() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 302 Found");
-	assert_eq!(response.headers.get(0).unwrap(), "Location: http://127.0.0.1:18180");
-}
-
-#[test]
-fn should_redirect_to_home_with_domain() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: home.web3.site\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 302 Found");
-	assert_eq!(response.headers.get(0).unwrap(), "Location: http://127.0.0.1:18180");
-}
-
-#[test]
-fn should_redirect_to_home_when_trailing_slash_is_missing() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET /app HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 302 Found");
-	assert_eq!(response.headers.get(0).unwrap(), "Location: http://127.0.0.1:18180");
-}
-
-#[test]
-fn should_display_404_on_invalid_dapp() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET /invaliddapp/ HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 404 Not Found");
-	assert_security_headers_for_embed(&response.headers);
-}
-
-#[test]
-fn should_display_404_on_invalid_dapp_with_domain() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: invaliddapp.web3.site\r\n\
-			Connection: close\r\n\
-			\r\n\
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 404 Not Found");
-	assert_security_headers_for_embed(&response.headers);
-}
-
-#[test]
-fn should_serve_rpc() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			POST / HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			Content-Type: application/json\r\n
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 200 OK");
-	assert_eq!(response.body, format!("4C\n{}\n\n0\n\n", r#"{"jsonrpc":"2.0","error":{"code":-32700,"message":"Parse error"},"id":null}"#));
-}
-
-#[test]
-fn should_serve_rpc_at_slash_rpc() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			POST /rpc HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			Content-Type: application/json\r\n
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 200 OK");
-	assert_eq!(response.body, format!("4C\n{}\n\n0\n\n", r#"{"jsonrpc":"2.0","error":{"code":-32700,"message":"Parse error"},"id":null}"#));
-}
-
-
-#[test]
-fn should_serve_proxy_pac() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET /proxy/proxy.pac HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 200 OK");
-	assert_eq!(response.body, "DB\n\nfunction FindProxyForURL(url, host) {\n\tif (shExpMatch(host, \"home.web3.site\"))\n\t{\n\t\treturn \"PROXY 127.0.0.1:18180\";\n\t}\n\n\tif (shExpMatch(host, \"*.web3.site\"))\n\t{\n\t\treturn \"PROXY 127.0.0.1:8080\";\n\t}\n\n\treturn \"DIRECT\";\n}\n\n0\n\n".to_owned());
-	assert_security_headers(&response.headers);
-}
-
-#[test]
-fn should_serve_utils() {
-	// given
-	let server = serve();
-
-	// when
-	let response = request(server,
-		"\
-			GET /parity-utils/inject.js HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 200 OK");
-	response.assert_header("Content-Type", "application/javascript");
-	assert_eq!(response.body.contains("function(){"), true, "Expected function in: {}", response.body);
-	assert_security_headers(&response.headers);
-}

dapps/src/tests/rpc.rs

@@ -1,49 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-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,99 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use tests::helpers::{serve_hosts, request};
-
-#[test]
-fn should_reject_invalid_host() {
-	// given
-	let server = serve_hosts(Some(vec!["localhost:8080".into()]));
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 403 Forbidden");
-	assert!(response.body.contains("Provided Host header is not whitelisted."), response.body);
-}
-
-#[test]
-fn should_allow_valid_host() {
-	// given
-	let server = serve_hosts(Some(vec!["localhost:8080".into()]));
-
-	// when
-	let response = request(server,
-		"\
-			GET /ui/ HTTP/1.1\r\n\
-			Host: localhost:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 200 OK");
-}
-
-#[test]
-fn should_serve_dapps_domains() {
-	// given
-	let server = serve_hosts(Some(vec!["localhost:8080".into()]));
-
-	// when
-	let response = request(server,
-		"\
-			GET / HTTP/1.1\r\n\
-			Host: ui.web3.site\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 200 OK");
-}
-
-#[test]
-// NOTE [todr] This is required for error pages to be styled properly.
-fn should_allow_parity_utils_even_on_invalid_domain() {
-	// given
-	let server = serve_hosts(Some(vec!["localhost:8080".into()]));
-
-	// when
-	let response = request(server,
-		"\
-			GET /parity-utils/styles.css HTTP/1.1\r\n\
-			Host: 127.0.0.1:8080\r\n\
-			Connection: close\r\n\
-			\r\n\
-			{}
-		"
-	);
-
-	// then
-	response.assert_status("HTTP/1.1 200 OK");
-}

dapps/src/web.rs

@@ -1,166 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Serving web-based content (proxying)
-
-use std::sync::Arc;
-
-use base32;
-use fetch::{self, Fetch};
-use hyper::{mime, StatusCode};
-
-use apps;
-use endpoint::{Endpoint, EndpointPath, Request, Response};
-use futures::future;
-use handlers::{
-	ContentFetcherHandler, ContentHandler, ContentValidator, ValidatorResponse,
-	StreamingHandler,
-};
-use {Embeddable, WebProxyTokens};
-
-pub struct Web<F> {
-	embeddable_on: Embeddable,
-	web_proxy_tokens: Arc<WebProxyTokens>,
-	fetch: F,
-}
-
-impl<F: Fetch> Web<F> {
-	pub fn boxed(
-		embeddable_on: Embeddable,
-		web_proxy_tokens: Arc<WebProxyTokens>,
-		fetch: F,
-	) -> Box<Endpoint> {
-		Box::new(Web {
-			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 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 = response.status();
-		let is_html = response.is_html();
-		let mime = response.content_type().unwrap_or(mime::TEXT_HTML);
-		let mut handler = StreamingHandler::new(
-			response,
-			status,
-			mime,
-			self.embeddable_on,
-		);
-		if is_html {
-			handler.set_initial_content(&format!(
-				r#"<script src="/{}/inject.js"></script><script>history.replaceState({{}}, "", "/?{}{}/{}")</script>"#,
-				apps::UTILS_PATH,
-				apps::URL_REFERER,
-				apps::WEB_PATH,
-				&self.token,
-			));
-		}
-		Ok(ValidatorResponse::Streaming(handler))
-	}
-}
-

dapps/ui/Cargo.toml

@@ -1,20 +0,0 @@
-[package]
-description = "Ethcore Parity UI"
-homepage = "http://parity.io"
-license = "GPL-3.0"
-name = "parity-ui"
-version = "1.9.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[build-dependencies]
-rustc_version = "0.2"
-
-[dependencies]
-parity-ui-dev = { git = "https://github.com/parity-js/shell.git", rev = "2f07ecec53a2319f41e5b83c01073b5386243173", optional = true }
-parity-ui-old-dev = { git = "https://github.com/parity-js/dapp-wallet.git", rev = "1a58bf4836c84e1632e27ef607b5a388abd2bf2d", optional = true }
-parity-ui-precompiled = { git = "https://github.com/js-dist-paritytech/parity-master-1-10-shell.git", rev="3fb77b61a7f30d6658f81d687e7e415657bd20bd", optional = true }
-parity-ui-old-precompiled = { git = "https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git", rev="4c067dfa1a17fe71ab2ca26b18c52dcbd0f4fc04", optional = true }
-
-[features]
-no-precompiled-js = ["parity-ui-dev", "parity-ui-old-dev"]
-use-precompiled-js = ["parity-ui-precompiled", "parity-ui-old-precompiled"]

dapps/ui/src/lib.rs

@@ -1,46 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-
-#[cfg(feature = "parity-ui-dev")]
-mod inner {
-	extern crate parity_ui_dev;
-
-	pub use self::parity_ui_dev::*;
-}
-
-#[cfg(feature = "parity-ui-precompiled")]
-mod inner {
-	extern crate parity_ui_precompiled;
-
-	pub use self::parity_ui_precompiled::*;
-}
-
-#[cfg(feature = "parity-ui-old-dev")]
-pub mod old {
-	extern crate parity_ui_old_dev;
-
-	pub use self::parity_ui_old_dev::*;
-}
-
-#[cfg(feature = "parity-ui-old-precompiled")]
-pub mod old {
-	extern crate parity_ui_old_precompiled;
-
-	pub use self::parity_ui_old_precompiled::*;
-}
-
-pub use self::inner::*;

devtools/Cargo.toml

@@ -3,5 +3,5 @@ description = "Ethcore development/test/build tools"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-devtools"
-version = "1.9.0"
+version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]

devtools/src/http_client.rs

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

devtools/src/lib.rs

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

docker/README.md

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

docker/centos/Dockerfile

@@ -1,36 +0,0 @@
-FROM centos:latest
-WORKDIR /build
-
-# install tools and dependencies
-RUN yum -y update&& \
-    yum install -y git make gcc-c++ gcc file binutils
-
-# install rustup
-RUN curl -sSf https://static.rust-lang.org/rustup.sh -o rustup.sh &&\
-ls&&\
- sh rustup.sh --disable-sudo
-
-# show backtraces
-ENV RUST_BACKTRACE 1
-
-# set compiler
-ENV CXX g++
-ENV CC gcc
-
-# show tools
-RUN rustc -vV && \
-cargo -V && \
-gcc -v &&\
-g++ -v
-
-# build parity
-ADD . /build/parity
-RUN cd parity&&\
-    cargo build --release --verbose && \
-	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/hub/Dockerfile

@@ -1,83 +0,0 @@
-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-jit/Dockerfile

@@ -1,58 +0,0 @@
-FROM ubuntu:14.04
-WORKDIR /build
-
-# install tools and dependencies
-RUN apt-get update && \
-        apt-get install -y \
-        # make
-        build-essential \
-        # add-apt-repository
-        software-properties-common \
-        curl \
-        wget \
-        git \
-        g++ \
-        binutils \
-        file \
-        # evmjit dependencies
-        zlib1g-dev \
-        libedit-dev
-
-# cmake and llvm 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
-
-# show tools
-RUN rustc -vV && \
-cargo -V && \
-gcc -v &&\
-g++ -v
-
-# build parity
-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
-
-RUN file /build/parity/target/release/parity
-
-EXPOSE 8080 8545 8180
-ENTRYPOINT ["/build/parity/target/release/parity"]

docker/ubuntu/Dockerfile

@@ -1,42 +0,0 @@
-FROM ubuntu:14.04
-WORKDIR /build
-
-# install tools and dependencies
-RUN apt-get update && \
-        apt-get install -y \
-        g++ \
-        build-essential \
-        curl \
-        git \
-        file \
-        binutils \
-        libssl-dev \
-        pkg-config \
-        libudev-dev
-
-# 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
-ADD . /build/parity
-RUN cd parity && \
-        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"]

docs/CHANGELOG-1.10.md

@@ -0,0 +1,467 @@
+## Parity [v1.10.9](https://github.com/paritytech/parity/releases/tag/v1.10.9) (2018-07-07)
+
+Parity 1.10.9 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Stable: 1.10.9 backports ([#9016](https://github.com/paritytech/parity/pull/9016))
+  - Parity-version: bump stable to 1.10.9
+  - Scripts: remove md5 checksums ([#8884](https://github.com/paritytech/parity/pull/8884))
+  - Add support for --chain tobalaba ([#8870](https://github.com/paritytech/parity/pull/8870))
+    - Add support for --chain tobalaba
+  - Only return error log for rustls ([#9025](https://github.com/paritytech/parity/pull/9025))
+  - Fixes for misbehavior reporting in AuthorityRound ([#8998](https://github.com/paritytech/parity/pull/8998))
+    - Aura: only report after checking for repeated skipped primaries
+    - Aura: refactor duplicate code for getting epoch validator set
+    - Aura: verify_external: report on validator set contract instance
+    - Aura: use correct validator set epoch number when reporting
+    - Aura: use epoch set when verifying blocks
+    - Aura: report skipped primaries when generating seal
+    - Aura: handle immediate transitions
+    - Aura: don't report skipped steps from genesis to first block
+    - Aura: fix reporting test
+    - Aura: refactor duplicate code to handle immediate_transitions
+    - Aura: let reporting fail on verify_block_basic
+    - Aura: add comment about possible failure of reporting
+
+## Parity [v1.10.8](https://github.com/paritytech/parity/releases/tag/v1.10.8) (2018-06-29)
+
+Parity 1.10.8 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Backports ([#8986](https://github.com/paritytech/parity/pull/8986))
+  - Snap: downgrade rust to revision 1.26.2, ref snapcraft/+bug/1778530 ([#8984](https://github.com/paritytech/parity/pull/8984))
+    - Snap: downgrade rust to revision 1.26.2, ref snapcraft/+bug/1778530
+    - Snap: use plugin rust
+  - Fix deadlock in blockchain. ([#8977](https://github.com/paritytech/parity/pull/8977))
+  - Remove js-glue from workspace
+- Bump stable to 1.10.8 ([#8951](https://github.com/paritytech/parity/pull/8951))
+  - Parity-version: bump stable to 1.10.8
+  - Update ropsten.json ([#8926](https://github.com/paritytech/parity/pull/8926))
+  - Scripts: minor improvements ([#8930](https://github.com/paritytech/parity/pull/8930))
+    - CI: enable 'latest' docker tag on master pipeline
+    - CI: mark both beta and stable as stable snap.
+    - CI: sign all windows binaries
+    - Scripts: remove whisper target not available in stable
+  - Scripts: fix gitlab strip binaries
+  - Scripts: fix docker build tag on latest using master ([#8952](https://github.com/paritytech/parity/pull/8952))
+  - Rpc: cap gas limit of local calls ([#8943](https://github.com/paritytech/parity/pull/8943))
+
+## Parity [v1.10.7](https://github.com/paritytech/parity/releases/tag/v1.10.7) (2018-06-20)
+
+Parity 1.10.7 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Backports ([#8919](https://github.com/paritytech/parity/pull/8919))
+  - Fixed AuthorityRound deadlock on shutdown, closes [#8088](https://github.com/paritytech/parity/issues/8088) ([#8803](https://github.com/paritytech/parity/pull/8803))
+  - CI: Fix docker tags ([#8822](https://github.com/paritytech/parity/pull/8822))
+    - Scripts: enable docker builds for beta and stable
+    - Scripts: docker latest should be beta not master
+    - Scripts: docker latest is master
+  - Fix concurrent access to signer queue ([#8854](https://github.com/paritytech/parity/pull/8854))
+    - Fix concurrent access to signer queue
+    - Put request back to the queue if confirmation failed
+    - Typo: fix docs and rename functions to be more specific
+    - Change trace info "Transaction" -> "Request"
+  - Add new ovh bootnodes and fix port for foundation bootnode 3.2 ([#8886](https://github.com/paritytech/parity/pull/8886))
+    - Add new ovh bootnodes and fix port for foundation bootnode 3.2
+    - Remove old bootnodes.
+    - Remove duplicate 1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082
+  - Block 0 is valid in queries ([#8891](https://github.com/paritytech/parity/pull/8891))
+  - Update jsonrpc libs, fixed ipc leak, closes [#8774](https://github.com/paritytech/parity/issues/8774) ([#8876](https://github.com/paritytech/parity/pull/8876))
+  - Add ETC Cooperative-run load balanced parity node ([#8892](https://github.com/paritytech/parity/pull/8892))
+  - Minor fix in chain supplier and light provider ([#8906](https://github.com/paritytech/parity/pull/8906))
+    - Fix chain supplier increment
+    - Fix light provider block_headers
+- Parity-version: stable release 1.10.7 ([#8855](https://github.com/paritytech/parity/pull/8855))
+  - Cherry-pick network-specific release flag ([#8821](https://github.com/paritytech/parity/pull/8821))
+  - Parity-version: bump stable to 1.10.7
+
+## Parity [v1.10.6](https://github.com/paritytech/parity/releases/tag/v1.10.6) (2018-06-05)
+
+Parity 1.10.6 is a security-relevant release. Please upgrade your nodes as soon as possible.
+
+If you can not upgrade to 1.10+ yet, please use the following branches and build your own binaries from source:
+
+- git checkout [old-stable-1.9](https://github.com/paritytech/parity/tree/old-stable-1.9) # `v1.9.8` (EOL)
+- git checkout [old-stable-1.8](https://github.com/paritytech/parity/tree/old-stable-1.8) # `v1.8.12` (EOL)
+- git checkout [old-stable-1.7](https://github.com/paritytech/parity/tree/old-stable-1.7) # `v1.7.14` (EOL)
+
+The full list of included changes:
+
+- Parity-version: bump stable to 1.10.6 ([#8805](https://github.com/paritytech/parity/pull/8805))
+  - Parity-version: bump stable to 1.10.6
+  - Disallow unsigned transactions in case EIP-86 is disabled ([#8802](https://github.com/paritytech/parity/pull/8802))
+- Update shell32-sys to fix windows build ([#8793](https://github.com/paritytech/parity/pull/8793))
+- Backports ([#8782](https://github.com/paritytech/parity/pull/8782))
+  - Fix light sync with initial validator-set contract ([#8528](https://github.com/paritytech/parity/pull/8528))
+    - Fix #8468
+    - Use U256::max_value() instead
+    - Fix again
+    - Also change initial transaction gas
+  - Don't open Browser post-install on Mac ([#8641](https://github.com/paritytech/parity/pull/8641))
+  - Prefix uint fmt with `0x` with alternate flag
+  - Set the request index to that of the current request ([#8683](https://github.com/paritytech/parity/pull/8683))
+    - Set the request index to that of the current request
+  - Node table sorting according to last contact data ([#8541](https://github.com/paritytech/parity/pull/8541))
+    - Network-devp2p: sort nodes in node table using last contact data
+    - Network-devp2p: rename node contact types in node table json output
+    - Network-devp2p: fix node table tests
+    - Network-devp2p: note node failure when failed to establish connection
+    - Network-devp2p: handle UselessPeer error
+    - Network-devp2p: note failure when marking node as useless
+  - Network-devp2p: handle UselessPeer disconnect ([#8686](https://github.com/paritytech/parity/pull/8686))
+- Parity: bump stable version to 1.10.5 ([#8749](https://github.com/paritytech/parity/pull/8749))
+  - Parity: bump stable version to 1.10.5
+  - Fix failing doc tests running on non-code
+
+## Parity [v1.10.4](https://github.com/paritytech/parity/releases/tag/v1.10.4) (2018-05-15)
+
+Parity 1.10.4 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Backports ([#8623](https://github.com/paritytech/parity/pull/8623))
+  - Fix account list double 0x display ([#8596](https://github.com/paritytech/parity/pull/8596))
+    - Remove unused self import
+    - Fix account list double 0x display
+  - Trace precompiled contracts when the transfer value is not zero ([#8486](https://github.com/paritytech/parity/pull/8486))
+    - Trace precompiled contracts when the transfer value is not zero
+    - Add tests for precompiled CALL tracing
+    - Use byzantium test machine for the new test
+    - Add notes in comments on why we don't trace all precompileds
+    - Use is_transferred instead of transferred
+  - Gitlab test script fixes ([#8573](https://github.com/paritytech/parity/pull/8573))
+    - Exclude /docs from modified files.
+    - Ensure all references in the working tree are available
+    - Remove duplicated line from test script
+- Bump stable to 1.10.4 ([#8626](https://github.com/paritytech/parity/pull/8626))
+- Allow stable snaps to be stable. ([#8582](https://github.com/paritytech/parity/pull/8582))
+
+## Parity [v1.10.3](https://github.com/paritytech/parity/releases/tag/v1.10.3) (2018-05-08)
+
+Parity 1.10.3 marks the first stable release on the 1.10 track. Among others, it improves performance and stability.
+
+The full list of included changes:
+
+- Backports ([#8557](https://github.com/paritytech/parity/pull/8557))
+  - Update wasmi and pwasm-utils ([#8493](https://github.com/paritytech/parity/pull/8493))
+    - Update wasmi to 0.2
+    - Update pwasm-utils to 0.1.5
+  - Fetching logs by hash in blockchain database ([#8463](https://github.com/paritytech/parity/pull/8463))
+    - Fetch logs by hash in blockchain database
+    - Fix tests
+    - Add unit test for branch block logs fetching
+    - Add docs that blocks must already be sorted
+    - Handle branch block cases properly
+    - typo: empty -> is_empty
+    - Remove return_empty_if_none by using a closure
+    - Use BTreeSet to avoid sorting again
+    - Move is_canon to BlockChain
+    - typo: pass value by reference
+    - Use loop and wrap inside blocks to simplify the code
+    - typo: missed a comment
+  - Pass on storage keys tracing to handle the case when it is not modified ([#8491](https://github.com/paritytech/parity/pull/8491))
+    - Pass on storage keys even if it is not modified
+    - typo: account and storage query `to_pod_diff` builds both `touched_addresses` merge and storage keys merge.
+    - Fix tests
+    - Use state query directly because of suicided accounts
+    - Fix a RefCell borrow issue
+    - Add tests for unmodified storage trace
+    - Address grumbles
+    - typo: remove unwanted empty line
+    - ensure_cached compiles with the original signature
+  - Enable WebAssembly and Byzantium for Ellaism ([#8520](https://github.com/paritytech/parity/pull/8520))
+    - Enable WebAssembly and Byzantium for Ellaism
+    - Fix indentation
+    - Remove empty lines
+  - Fix compilation.
+- Stabilize 1.10.3 ([#8474](https://github.com/paritytech/parity/pull/8474))
+  - Stabelize 1.10
+  - Bump stable to 1.10.3
+  - Update Gitlab scripts
+  - Fix snap builds ([#8483](https://github.com/paritytech/parity/pull/8483))
+  - Fix docker build ([#8462](https://github.com/paritytech/parity/pull/8462))
+  - Use `master` as Docker's `latest` (`beta-release` is not used anymore)
+
+## Parity [v1.10.2](https://github.com/paritytech/parity/releases/tag/v1.10.2) (2018-04-24)
+
+Parity 1.10.2 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Update Parity beta to 1.10.2 + Backports ([#8455](https://github.com/paritytech/parity/pull/8455))
+  - Update Parity beta to 1.10.2
+  - Allow 32-bit pipelines to fail ([#8454](https://github.com/paritytech/parity/pull/8454))
+    - Disable 32-bit targets for Gitlab
+    - Rename Linux pipelines
+  - Update wasmi ([#8452](https://github.com/paritytech/parity/pull/8452))
+  - Fix Cargo.lock
+- Backports ([#8450](https://github.com/paritytech/parity/pull/8450))
+  - Use forked app_dirs crate for reverted Windows dir behavior  ([#8438](https://github.com/paritytech/parity/pull/8438))
+    - Remove unused app_dirs dependency in CLI
+    - Use forked app_dirs crate for reverted Windows dir behavior
+  - Remove Tendermint extra_info due to seal inconsistencies ([#8367](https://github.com/paritytech/parity/pull/8367))
+  - Handle queue import errors a bit more gracefully ([#8385](https://github.com/paritytech/parity/pull/8385))
+  - Improve VM executor stack size estimation rules ([#8439](https://github.com/paritytech/parity/pull/8439))
+    - Improve VM executor stack size estimation rules
+    - Typo: docs add "(Debug build)" comment
+    - Fix an off by one typo and set minimal stack size
+    - Use saturating_sub to avoid potential overflow
+
+## Parity [v1.10.1](https://github.com/paritytech/parity/releases/tag/v1.10.1) (2018-04-17)
+
+Parity 1.10.1 is a bug-fix release to improve performance and stability. Among other changes, you can now use `--warp-barrier [BLOCK]` to specify a minimum block number to `--warp` to. This is useful in cases where clients restore to outdated snapshots far behind the latest chain head.
+
+The full list of included changes:
+
+- Bump beta to 1.10.1 ([#8350](https://github.com/paritytech/parity/pull/8350))
+  - Bump beta to 1.10.1
+  - Unflag critical release
+- Backports ([#8346](https://github.com/paritytech/parity/pull/8346))
+  - Warp-only sync with warp-barrier [blocknumber] flag. ([#8228](https://github.com/paritytech/parity/pull/8228))
+    - Warp-only sync with warp-after [blocknumber] flag.
+    - Fix tests.
+    - Fix configuration tests.
+    - Rename to warp barrier.
+  - Allow unsafe js eval on Parity Wallet. ([#8204](https://github.com/paritytech/parity/pull/8204))
+  - Update musicoin spec in line with gmc v2.6.2 ([#8242](https://github.com/paritytech/parity/pull/8242))
+  - Supress TemporaryInvalid verification failures. ([#8256](https://github.com/paritytech/parity/pull/8256))
+  - Include suicided accounts in state diff ([#8297](https://github.com/paritytech/parity/pull/8297))
+    - Include suicided accounts in state diff
+    - Shorten form match -> if let
+    - Test suicide trace diff in State
+  - Replace_home for password_files, reserved_peers and log_file ([#8324](https://github.com/paritytech/parity/pull/8324))
+    - Replace_home for password_files, reserved_peers and log_file
+    - Typo: arg_log_file is Option
+    - Enable UI by default, but only display info page.
+    - Fix test.
+    - Fix naming and remove old todo.
+    - Change "wallet" with "browser UI"
+- Change name Wallet -> UI ([#8164](https://github.com/paritytech/parity/pull/8164)) ([#8205](https://github.com/paritytech/parity/pull/8205))
+  - Change name Wallet -> UI
+  - Make warning bold
+- Backport [#8099](https://github.com/paritytech/parity/pull/8099) ([#8132](https://github.com/paritytech/parity/pull/8132))
+- WASM libs ([#8220](https://github.com/paritytech/parity/pull/8220))
+  - Bump wasm libs ([#8171](https://github.com/paritytech/parity/pull/8171))
+  - Bump wasmi version ([#8209](https://github.com/paritytech/parity/pull/8209))
+- Update hyper to 0.11.24 ([#8203](https://github.com/paritytech/parity/pull/8203))
+- Updated jsonrpc to include latest backports (beta) ([#8181](https://github.com/paritytech/parity/pull/8181))
+  - Updated jsonrpc to include latest backports
+  - Update dependencies.
+
+## Parity [v1.10.0](https://github.com/paritytech/parity/releases/tag/v1.10.0) (2018-03-22)
+
+This is the Parity 1.10.0-beta release! Cool!
+
+### Disabling the Parity Wallet
+
+The **Parity Wallet (a.k.a. "UI") is now disabled by default**. We are preparing to split the wallet from the core client.
+
+To reactivate the parity wallet, you have to run Parity either with `parity --force-ui` (not recommended) or `parity ui` (deprecated) from the command line. Or, if you feel super fancy and want to test our pre-releases of the stand-alone electron wallet, head over to the [Parity-JS repositories and check the releases](https://github.com/Parity-JS/shell/releases).
+
+Further reading:
+
+- [Docs: Parity Wallet](https://wiki.parity.io/Parity-Wallet)
+- [Docs: How to customize Parity UI?](https://wiki.parity.io/FAQ-Customize-Parity-UI.html)
+- [Github: Parity-JS](https://github.com/parity-js)
+
+### Introducing the Wasm VM
+
+We are excited to announce support for **Wasm Smart Contracts on Kovan network**. The hard-fork to activate the Wasm-VM will take place on block `6_600_000`.
+
+To enable Wasm contracts on your custom network, just schedule a `wasmActivationTransition` at your favorite block number (e.g., `42`, `666`, or `0xbada55`). To hack your first Wasm smart contracts in Rust, have a look at the [Parity Wasm Tutorials](https://github.com/paritytech/pwasm-tutorial).
+
+Further reading:
+
+- [Docs: WebAssembly (wasm)](https://wiki.parity.io/WebAssembly-Home)
+- [Docs: Wasm VM Design](https://wiki.parity.io/WebAssembly-Design)
+- [Docs: Wasm tutorials and examples](https://wiki.parity.io/WebAssembly-Links)
+
+### Empty step messages in PoA
+
+To **reduce blockchain bloat, proof-of-authority networks can now enable _empty step messages_ which replace empty blocks**. Each step message will be signed and broadcasted by the issuing authorities, and included and rewarded in the next non-empty block.
+
+To enable empty step messages, set the `emptyStepsTransition` to your favorite block number. You can also specify a maximum number of empty steps with `maximumEmptySteps` in your chain spec.
+
+### Other noteworthy changes
+
+We removed the old database migrations from 2016. In case you upgrade Parity from a really, really old version, you will have to reset your database manually first with `parity <options> db kill`.
+
+We fixed  DELEGATECALL `from` and `to` fields, see [#7166](https://github.com/paritytech/parity/issues/7166).
+
+We reduced the default USD per transaction value to 0.0001. Thanks, @MysticRyuujin!
+
+The Musicoin chain is now enabled with Byzantium features starting at block `2_222_222`.
+
+### Overview of all changes included
+
+The full list of included changes:
+
+- Re-enable signer, even with no UI. ([#8167](https://github.com/paritytech/parity/pull/8167)) ([#8168](https://github.com/paritytech/parity/pull/8168))
+  - Re-enable signer, even with no UI.
+  - Fix message.
+- Beta Backports ([#8136](https://github.com/paritytech/parity/pull/8136))
+  - Support parity protocol. ([#8035](https://github.com/paritytech/parity/pull/8035))
+  - updater: apply exponential backoff after download failure ([#8059](https://github.com/paritytech/parity/pull/8059))
+    - updater: apply exponential backoff after download failure
+    - updater: reset backoff on new release
+  - Max code size on Kovan ([#8067](https://github.com/paritytech/parity/pull/8067))
+    - Enable code size limit on kovan
+    - Fix formatting.
+  - Limit incoming connections.  ([#8060](https://github.com/paritytech/parity/pull/8060))
+    - Limit ingress connections
+    - Optimized handshakes logging
+  - WASM libraries bump ([#7970](https://github.com/paritytech/parity/pull/7970))
+    - update wasmi, parity-wasm, wasm-utils to latest version
+    - Update to new wasmi & error handling
+    - also utilize new stack limiter
+    - fix typo
+    - replace dependency url
+    - Cargo.lock update
+  - add some dos protection ([#8084](https://github.com/paritytech/parity/pull/8084))
+  - revert removing blooms ([#8066](https://github.com/paritytech/parity/pull/8066))
+  - Revert "fix traces, removed bloomchain crate, closes [#7228](https://github.com/paritytech/parity/issues/7228), closes [#7167](https://github.com/paritytech/parity/issues/7167)"
+  - Revert "fixed broken logs ([#7934](https://github.com/paritytech/parity/pull/7934))"
+    - fixed broken logs
+    - bring back old lock order
+    - remove migration v13
+    - revert CURRENT_VERSION to 12 in migration.rs
+  - more dos protection ([#8104](https://github.com/paritytech/parity/pull/8104))
+  - Const time comparison ([#8113](https://github.com/paritytech/parity/pull/8113))
+    - Use `subtle::slices_equal` for constant time comparison.
+    - Also update the existing version of subtle in `ethcrypto` from 0.1 to 0.5
+    - Test specifically for InvalidPassword error.
+  - fix trace filter returning returning unrelated reward calls, closes #8070 ([#8098](https://github.com/paritytech/parity/pull/8098))
+  - network: init discovery using healthy nodes ([#8061](https://github.com/paritytech/parity/pull/8061))
+    - network: init discovery using healthy nodes
+    - network: fix style grumble
+    - network: fix typo
+  - Postpone Kovan hard fork ([#8137](https://github.com/paritytech/parity/pull/8137))
+    - ethcore: postpone Kovan hard fork
+    - util: update version fork metadata
+  - Disable UI by default. ([#8105](https://github.com/paritytech/parity/pull/8105))
+  - dapps: update parity-ui dependencies ([#8160](https://github.com/paritytech/parity/pull/8160))
+- Probe changes one step deeper ([#8134](https://github.com/paritytech/parity/pull/8134)) ([#8135](https://github.com/paritytech/parity/pull/8135))
+- Beta backports ([#8053](https://github.com/paritytech/parity/pull/8053))
+  - CI: Fix cargo cache ([#7968](https://github.com/paritytech/parity/pull/7968))
+    - Fix cache
+    - Only clean locked cargo cache on windows
+  - fixed ethstore sign ([#8026](https://github.com/paritytech/parity/pull/8026))
+  - fixed parsing ethash seals and verify_block_undordered ([#8031](https://github.com/paritytech/parity/pull/8031))
+  - fix for verify_block_basic crashing on invalid transaction rlp ([#8032](https://github.com/paritytech/parity/pull/8032))
+  - fix cache & snapcraft CI build ([#8052](https://github.com/paritytech/parity/pull/8052))
+  - Add MCIP-6 Byzyantium transition to Musicoin spec ([#7841](https://github.com/paritytech/parity/pull/7841))
+    - Add test chain spec for musicoin byzantium testnet
+    - Add MCIP-6 Byzyantium transition to Musicoin spec
+    - Update mcip6_byz.json
+    - ethcore: update musicoin byzantium block number
+    - ethcore: update musicoin bootnodes
+    - Update musicoin.json
+    - More bootnodes.
+- Make 1.10 beta ([#8022](https://github.com/paritytech/parity/pull/8022))
+  - Make 1.10 beta
+  - Fix gitlab builds
+- SecretStore: secretstore_generateDocumentKey RPC ([#7864](https://github.com/paritytech/parity/pull/7864))
+- SecretStore: ECDSA session for cases when 2*t < N ([#7739](https://github.com/paritytech/parity/pull/7739))
+- bump tiny-keccak ([#8019](https://github.com/paritytech/parity/pull/8019))
+- Remove un-necessary comment ([#8014](https://github.com/paritytech/parity/pull/8014))
+- clean up account fmt::Debug ([#7983](https://github.com/paritytech/parity/pull/7983))
+- improve quality of vote_collector module ([#7984](https://github.com/paritytech/parity/pull/7984))
+- ExecutedBlock cleanup ([#7991](https://github.com/paritytech/parity/pull/7991))
+- Hardware-wallet/usb-subscribe-refactor ([#7860](https://github.com/paritytech/parity/pull/7860))
+- remove wildcard imports from views, make tests more idiomatic ([#7986](https://github.com/paritytech/parity/pull/7986))
+- moved PerfTimer to a separate crate - "trace-time" ([#7985](https://github.com/paritytech/parity/pull/7985))
+- clean up ethcore::spec module imports ([#7990](https://github.com/paritytech/parity/pull/7990))
+- rpc: don't include current block in new_block_filter ([#7982](https://github.com/paritytech/parity/pull/7982))
+- fix traces, removed bloomchain crate ([#7979](https://github.com/paritytech/parity/pull/7979))
+- simplify compression and move it out of rlp crate ([#7957](https://github.com/paritytech/parity/pull/7957))
+- removed old migrations ([#7974](https://github.com/paritytech/parity/pull/7974))
+- Reject too large packets in snapshot sync. ([#7977](https://github.com/paritytech/parity/pull/7977))
+- fixed broken logs ([#7934](https://github.com/paritytech/parity/pull/7934))
+- Increase max download limit to 128MB ([#7965](https://github.com/paritytech/parity/pull/7965))
+- Calculate proper keccak256/sha3 using parity. ([#7953](https://github.com/paritytech/parity/pull/7953))
+- Add changelog for 1.8.10 stable and 1.9.3 beta ([#7947](https://github.com/paritytech/parity/pull/7947))
+- kvdb-rocksdb: remove buffered operations when committing transaction ([#7950](https://github.com/paritytech/parity/pull/7950))
+- Bump WebSockets ([#7952](https://github.com/paritytech/parity/pull/7952))
+- removed redundant Bloom conversions ([#7932](https://github.com/paritytech/parity/pull/7932))
+- simplify RefInfo fmt ([#7929](https://github.com/paritytech/parity/pull/7929))
+- Kovan WASM fork code ([#7849](https://github.com/paritytech/parity/pull/7849))
+- bring back trie and triehash benches ([#7926](https://github.com/paritytech/parity/pull/7926))
+- removed redundant PodAccount::new method ([#7928](https://github.com/paritytech/parity/pull/7928))
+- removed dummy wrapper structure - LogGroupPosition ([#7922](https://github.com/paritytech/parity/pull/7922))
+- spec: Validate required divisor fields are not 0 ([#7933](https://github.com/paritytech/parity/pull/7933))
+- simplify Client::filter_traces method ([#7936](https://github.com/paritytech/parity/pull/7936))
+- gitlab cache ([#7921](https://github.com/paritytech/parity/pull/7921))
+- Fix a division by zero in light client RPC handler ([#7917](https://github.com/paritytech/parity/pull/7917))
+- triehash optimisations ([#7920](https://github.com/paritytech/parity/pull/7920))
+- removed redundant Blockchain::db method ([#7919](https://github.com/paritytech/parity/pull/7919))
+- removed redundant Blockchain::rewind method ([#7918](https://github.com/paritytech/parity/pull/7918))
+- Pending transactions subscription ([#7906](https://github.com/paritytech/parity/pull/7906))
+- removed redundant otry! macro from ethcore ([#7916](https://github.com/paritytech/parity/pull/7916))
+- Make block generator easier to use ([#7888](https://github.com/paritytech/parity/pull/7888))
+- ECIP 1041 - Remove Difficulty Bomb ([#7905](https://github.com/paritytech/parity/pull/7905))
+- Fix CSP for dapps that require eval. ([#7867](https://github.com/paritytech/parity/pull/7867))
+- Fix gitlab ([#7901](https://github.com/paritytech/parity/pull/7901))
+- Gitlb snap master patch ([#7900](https://github.com/paritytech/parity/pull/7900))
+- fix snap build master ([#7896](https://github.com/paritytech/parity/pull/7896))
+- Fix wallet import ([#7873](https://github.com/paritytech/parity/pull/7873))
+- Fix snapcraft nightly ([#7884](https://github.com/paritytech/parity/pull/7884))
+- Add a timeout for light client sync requests ([#7848](https://github.com/paritytech/parity/pull/7848))
+- SecretStore: fixed test ([#7878](https://github.com/paritytech/parity/pull/7878))
+- Fix checksums and auto-update push ([#7846](https://github.com/paritytech/parity/pull/7846))
+- Forward-port snap fixes ([#7831](https://github.com/paritytech/parity/pull/7831))
+- Update gitlab-test.sh ([#7883](https://github.com/paritytech/parity/pull/7883))
+- Fix installer binary names for macos and windows ([#7881](https://github.com/paritytech/parity/pull/7881))
+- Fix string typo: "develoopment" -> "development" ([#7874](https://github.com/paritytech/parity/pull/7874))
+- Update the instructions to install the stable snap ([#7876](https://github.com/paritytech/parity/pull/7876))
+- SecretStore: 'broadcast' decryption session ([#7843](https://github.com/paritytech/parity/pull/7843))
+- Flush keyfiles. Resolves #7632 ([#7868](https://github.com/paritytech/parity/pull/7868))
+- Read registry_address from given block ([#7866](https://github.com/paritytech/parity/pull/7866))
+- Clean up docs formatting for Wasm runtime ([#7869](https://github.com/paritytech/parity/pull/7869))
+- WASM: Disable internal memory ([#7842](https://github.com/paritytech/parity/pull/7842))
+- Update gitlab-build.sh ([#7855](https://github.com/paritytech/parity/pull/7855))
+- ethabi version 5 ([#7723](https://github.com/paritytech/parity/pull/7723))
+- Light client: randomize the peer we dispatch requests to ([#7844](https://github.com/paritytech/parity/pull/7844))
+- Store updater metadata in a single place ([#7832](https://github.com/paritytech/parity/pull/7832))
+- Add new EF ropstens nodes. ([#7824](https://github.com/paritytech/parity/pull/7824))
+- refactor stratum to remove retain cycle ([#7827](https://github.com/paritytech/parity/pull/7827))
+- Bump jsonrpc. ([#7828](https://github.com/paritytech/parity/pull/7828))
+- Add binary identifiers and sha256sum to builds ([#7830](https://github.com/paritytech/parity/pull/7830))
+- Update references to UI shell & wallet ([#7808](https://github.com/paritytech/parity/pull/7808))
+- Adjust storage update evm-style ([#7812](https://github.com/paritytech/parity/pull/7812))
+- Updated WASM Runtime & new interpreter (wasmi) ([#7796](https://github.com/paritytech/parity/pull/7796))
+- SecretStore: ignore removed authorities when running auto-migration ([#7674](https://github.com/paritytech/parity/pull/7674))
+- Fix build ([#7807](https://github.com/paritytech/parity/pull/7807))
+- Move js & js-old code to github.com/parity-js ([#7685](https://github.com/paritytech/parity/pull/7685))
+- More changelogs :) ([#7782](https://github.com/paritytech/parity/pull/7782))
+- Actualized API set in help ([#7790](https://github.com/paritytech/parity/pull/7790))
+- Removed obsolete file ([#7788](https://github.com/paritytech/parity/pull/7788))
+- Update ropsten bootnodes ([#7776](https://github.com/paritytech/parity/pull/7776))
+- CHANGELOG for 1.9.1 and 1.8.8 ([#7775](https://github.com/paritytech/parity/pull/7775))
+- Enable byzantium features on non-ethash chains ([#7753](https://github.com/paritytech/parity/pull/7753))
+- Fix client not being dropped on shutdown ([#7695](https://github.com/paritytech/parity/pull/7695))
+- Filter-out nodes.json ([#7716](https://github.com/paritytech/parity/pull/7716))
+- Removes redundant parentheses ([#7721](https://github.com/paritytech/parity/pull/7721))
+- Transaction-pool fixes ([#7741](https://github.com/paritytech/parity/pull/7741))
+- More visible download link in README.md ([#7707](https://github.com/paritytech/parity/pull/7707))
+- Changelog for 1.9.0 ([#7664](https://github.com/paritytech/parity/pull/7664))
+- Add scroll when too many accounts ([#7677](https://github.com/paritytech/parity/pull/7677))
+- SecretStore: return HTTP 403 (access denied) if consensus is unreachable ([#7656](https://github.com/paritytech/parity/pull/7656))
+- Moved StopGaurd to it's own crate ([#7635](https://github.com/paritytech/parity/pull/7635))
+
+## Previous releases
+
+- [CHANGELOG-1.9](docs/CHANGELOG-1.9.md) (_stable_)
+- [CHANGELOG-1.8](docs/CHANGELOG-1.8.md) (EOL: 2018-03-22)
+- [CHANGELOG-1.7](docs/CHANGELOG-1.7.md) (EOL: 2018-01-25)
+- [CHANGELOG-1.6](docs/CHANGELOG-1.6.md) (EOL: 2017-10-15)
+- [CHANGELOG-1.5](docs/CHANGELOG-1.5.md) (EOL: 2017-07-28)
+- [CHANGELOG-1.4](docs/CHANGELOG-1.4.md) (EOL: 2017-03-13)
+- [CHANGELOG-1.3](docs/CHANGELOG-1.3.md) (EOL: 2017-01-19)
+- [CHANGELOG-1.2](docs/CHANGELOG-1.2.md) (EOL: 2016-11-07)
+- [CHANGELOG-1.1](docs/CHANGELOG-1.1.md) (EOL: 2016-08-12)
+- [CHANGELOG-1.0](docs/CHANGELOG-1.0.md) (EOL: 2016-06-24)
+- [CHANGELOG-0.9](docs/CHANGELOG-0.9.md) (EOL: 2016-05-02)

docs/CHANGELOG-1.8.md

@@ -1,3 +1,18 @@
+Note: Parity 1.8 reached End-of-Life on 2018-03-22 (EOL).
+
+## Parity [v1.8.11](https://github.com/paritytech/parity/releases/tag/v1.8.11) (2018-03-01)
+
+Parity 1.8.11 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Bump stable to 1.8.11 ([#8010](https://github.com/paritytech/parity/pull/8010))
+- Stable Backports ([#8008](https://github.com/paritytech/parity/pull/8008))
+  - Reject too large packets in snapshot sync. ([#7977](https://github.com/paritytech/parity/pull/7977))
+  - Increase max download limit to 128MB ([#7965](https://github.com/paritytech/parity/pull/7965))
+  - Calculate proper keccak256/sha3 using parity. ([#7953](https://github.com/paritytech/parity/pull/7953))
+  - Bump WebSockets ([#7952](https://github.com/paritytech/parity/pull/7952))
+
 ## Parity [v1.8.10](https://github.com/paritytech/parity/releases/tag/v1.8.10) (2018-02-20)
 
 Parity 1.8.10 is a bug-fix release to improve performance and stability.

docs/CHANGELOG-1.9.md

@@ -0,0 +1,533 @@
+Note: Parity 1.9 reached End-of-Life on 2018-05-09 (EOL).
+
+## Parity [v1.9.7](https://github.com/paritytech/parity/releases/tag/v1.9.7) (2018-04-23)
+
+Parity 1.9.7 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Update Parity stable to 1.9.7 + Backports ([#8456](https://github.com/paritytech/parity/pull/8456))
+  - Update Parity stable to 1.9.7
+  - Allow 32-bit pipelines to fail ([#8454](https://github.com/paritytech/parity/pull/8454))
+    - Disable 32-bit targets for Gitlab
+    - Rename Linux pipelines
+  - Update wasmi ([#8452](https://github.com/paritytech/parity/pull/8452))
+  - Revert Cargo lock update from master
+  - Fix Cargo.lock
+- Backports ([#8449](https://github.com/paritytech/parity/pull/8449))
+  - Use forked app_dirs crate for reverted Windows dir behavior  ([#8438](https://github.com/paritytech/parity/pull/8438))
+    - Remove unused app_dirs dependency in CLI
+    - Use forked app_dirs crate for reverted Windows dir behavior
+  - Remove Tendermint extra_info due to seal inconsistencies ([#8367](https://github.com/paritytech/parity/pull/8367))
+  - Improve VM executor stack size estimation rules ([#8439](https://github.com/paritytech/parity/pull/8439))
+    - Improve VM executor stack size estimation rules
+    - Typo: docs add "(Debug build)" comment
+    - Fix an off by one typo and set minimal stack size
+    - Use saturating_sub to avoid potential overflow
+  - Upgrade crossbeam to 0.3
+
+## Parity [v1.9.6](https://github.com/paritytech/parity/releases/tag/v1.9.6) (2018-04-16)
+
+Parity 1.9.6 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Bump app_dirs, fixes [#8315](https://github.com/paritytech/parity/issues/8315) ([#8355](https://github.com/paritytech/parity/pull/8355))
+- Fix Cargo lock
+- Backports ([#8352](https://github.com/paritytech/parity/pull/8352))
+  - Update musicoin spec in line with gmc v2.6.2 ([#8242](https://github.com/paritytech/parity/pull/8242))
+  - Supress TemporaryInvalid verification failures. ([#8256](https://github.com/paritytech/parity/pull/8256))
+  - Include suicided accounts in state diff ([#8297](https://github.com/paritytech/parity/pull/8297))
+    - Include suicided accounts in state diff
+    - Shorten form match -> if let
+    - Test suicide trace diff in State
+  - Replace_home for password_files, reserved_peers and log_file ([#8324](https://github.com/paritytech/parity/pull/8324))
+    - Replace_home for password_files, reserved_peers and log_file
+    - Typo: arg_log_file is Option
+    - Bump version in util/version
+- Bump stable to 1.9.6 ([#8348](https://github.com/paritytech/parity/pull/8348))
+- WASM libraries bump ([#8219](https://github.com/paritytech/parity/pull/8219))
+  - Bump wasm libs ([#8171](https://github.com/paritytech/parity/pull/8171))
+  - Bump wasmi version ([#8209](https://github.com/paritytech/parity/pull/8209))
+- Updated jsonrpc to include latest backports (1.9) ([#8182](https://github.com/paritytech/parity/pull/8182))
+  - Updated jsonrpc to include latest backports (1.9)
+  - Update dependencies.
+
+## Parity [v1.9.5](https://github.com/paritytech/parity/releases/tag/v1.9.5) (2018-03-21)
+
+Parity 1.9.5 is a bug-fix release to improve performance and stability. This release marks the 1.9 track _stable_.
+
+We are excited to announce support for **Wasm Smart Contracts on Kovan network**. The hard-fork to activate the Wasm-VM will take place on block `6600000`.
+
+The full list of included changes:
+
+- Do a meaningful commit that does not contain the words "ci" or "skip"
+- Triggering build for stable.
+- Postpone Kovan hard fork ([#8137](https://github.com/paritytech/parity/pull/8137)) ([#8152](https://github.com/paritytech/parity/pull/8152))
+  - Postpone Kovan hard fork ([#8137](https://github.com/paritytech/parity/pull/8137))
+    - ethcore: postpone Kovan hard fork
+    - util: update version fork metadata
+  - WASM libraries bump ([#7970](https://github.com/paritytech/parity/pull/7970))
+    - update wasmi, parity-wasm, wasm-utils to latest version
+    - Update to new wasmi & error handling
+    - also utilize new stack limiter
+    - fix typo
+    - replace dependency url
+    - Cargo.lock update
+- Fix scripts. Force JS rebuild. ([#8144](https://github.com/paritytech/parity/pull/8144))
+- Stable Backports ([#8133](https://github.com/paritytech/parity/pull/8133))
+  - updater: apply exponential backoff after download failure ([#8059](https://github.com/paritytech/parity/pull/8059))
+    - updater: apply exponential backoff after download failure
+    - updater: reset backoff on new release
+  - Limit incoming connections.  ([#8060](https://github.com/paritytech/parity/pull/8060))
+    - Limit ingress connections
+    - Optimized handshakes logging
+  - Max code size on Kovan ([#8067](https://github.com/paritytech/parity/pull/8067))
+    - Enable code size limit on kovan
+    - Fix formatting.
+  - add some dos protection ([#8084](https://github.com/paritytech/parity/pull/8084))
+  - more dos protection ([#8104](https://github.com/paritytech/parity/pull/8104))
+  - Const time comparison ([#8113](https://github.com/paritytech/parity/pull/8113))
+    - Use `subtle::slices_equal` for constant time comparison.
+    - Also update the existing version of subtle in `ethcrypto` from
+    - 0.1 to 0.5
+    - Test specifically for InvalidPassword error.
+  - revert removing blooms ([#8066](https://github.com/paritytech/parity/pull/8066))
+  - Revert "fix traces, removed bloomchain crate, closes [#7228](https://github.com/paritytech/parity/pull/7228), closes [#7167](https://github.com/paritytech/parity/pull/7167)"
+  - Revert "fixed broken logs ([#7934](https://github.com/paritytech/parity/pull/7934))"
+    - fixed broken logs
+    - bring back old lock order
+    - remove migration v13
+    - revert CURRENT_VERSION to 12 in migration.rs
+    - Fix compilation.
+    - Check one step deeper if we're on release track branches
+    - add missing pr
+    - Fix blooms?
+    - Fix tests compiilation.
+    - Fix size.
+- Check one step deeper if we're on release track branches ([#8134](https://github.com/paritytech/parity/pull/8134)) ([#8140](https://github.com/paritytech/parity/pull/8140))
+- Trigger js build. ([#8121](https://github.com/paritytech/parity/pull/8121))
+- Stable backports ([#8055](https://github.com/paritytech/parity/pull/8055))
+  - CI: Fix cargo cache ([#7968](https://github.com/paritytech/parity/pull/7968))
+  - Fix cache
+Blocking waiting for file lock on the registry index
+  - Only clean locked cargo cache on windows
+  - fixed ethstore sign ([#8026](https://github.com/paritytech/parity/pull/8026))
+  - fix cache & snapcraft CI build ([#8052](https://github.com/paritytech/parity/pull/8052))
+  - Add MCIP-6 Byzyantium transition to Musicoin spec ([#7841](https://github.com/paritytech/parity/pull/7841))
+    - Add test chain spec for musicoin byzantium testnet
+    - Add MCIP-6 Byzyantium transition to Musicoin spec
+    - Update mcip6_byz.json
+    - ethcore: update musicoin byzantium block number
+    - ethcore: update musicoin bootnodes
+    - Update musicoin.json
+    - More bootnodes.
+- Optimize JS build ([#8093](https://github.com/paritytech/parity/pull/8093))
+  - Extract common chunks plugin.
+  - Fix common CSS.
+  - Fix js push for stable.
+  - Remove arguments to getPlugins.
+- Stable Backports ([#8058](https://github.com/paritytech/parity/pull/8058))
+  - fixed parsing ethash seals and verify_block_undordered ([#8031](https://github.com/paritytech/parity/pull/8031))
+  - fix for verify_block_basic crashing on invalid transaction rlp ([#8032](https://github.com/paritytech/parity/pull/8032))
+- Make 1.9 stable ([#8023](https://github.com/paritytech/parity/pull/8023))
+  - Make 1.9 stable
+  - Bump stable to 1.9.5
+  - Fix gitlab builds
+
+## Parity [v1.9.4](https://github.com/paritytech/parity/releases/tag/v1.9.4) (2018-03-01)
+
+Parity 1.9.4 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Bump beta to 1.9.4 ([#8016](https://github.com/paritytech/parity/pull/8016))
+- Beta Backports ([#8011](https://github.com/paritytech/parity/pull/8011))
+  - Fix traces, removed bloomchain crate ([#7979](https://github.com/paritytech/parity/pull/7979))
+  - Reject too large packets in snapshot sync. ([#7977](https://github.com/paritytech/parity/pull/7977))
+  - Fixed broken logs ([#7934](https://github.com/paritytech/parity/pull/7934))
+  - Increase max download limit to 128MB ([#7965](https://github.com/paritytech/parity/pull/7965))
+  - Calculate proper keccak256/sha3 using parity. ([#7953](https://github.com/paritytech/parity/pull/7953))
+  - Bump WebSockets ([#7952](https://github.com/paritytech/parity/pull/7952))
+  - Hardware-wallet/usb-subscribe-refactor ([#7860](https://github.com/paritytech/parity/pull/7860))
+  - Make block generator easier to use ([#7888](https://github.com/paritytech/parity/pull/7888))
+
+## Parity [v1.9.3](https://github.com/paritytech/parity/releases/tag/v1.9.3) (2018-02-20)
+
+Parity 1.9.3 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Backports ([#7945](https://github.com/paritytech/parity/pull/7945))
+  - ECIP 1041 - Remove Difficulty Bomb ([#7905](https://github.com/paritytech/parity/pull/7905))
+  - spec: Validate required divisor fields are not 0 ([#7933](https://github.com/paritytech/parity/pull/7933))
+  - Kovan WASM fork code ([#7849](https://github.com/paritytech/parity/pull/7849))
+- Gitlab Cargo Cache ([#7944](https://github.com/paritytech/parity/pull/7944))
+- Bump react-qr-reader ([#7943](https://github.com/paritytech/parity/pull/7943))
+  - Update react-qr-reader
+  - Explicit webrtc-adapter dependency (package-lock workaround)
+  - Iframe with allow (QR, new Chrome policy)
+- Backport of [#7844](https://github.com/paritytech/parity/pull/7844) and [#7917](https://github.com/paritytech/parity/pull/7917) to beta ([#7940](https://github.com/paritytech/parity/pull/7940))
+  - Randomize the peer we dispatch to
+  - Fix a division by zero in light client RPC handler
+- Wallet allowJsEval: true ([#7913](https://github.com/paritytech/parity/pull/7913))
+  - Wallet allowJsEval: true
+  - Fix unsafe wallet.
+  - Enable unsafe-eval for all dapps.
+- Fix CSP for dapps that require eval. ([#7867](https://github.com/paritytech/parity/pull/7867)) ([#7903](https://github.com/paritytech/parity/pull/7903))
+  - Add allowJsEval to manifest.
+  - Enable 'unsafe-eval' if requested in manifest.
+- Fix snap build beta ([#7895](https://github.com/paritytech/parity/pull/7895))
+- Fix snapcraft grade to stable ([#7894](https://github.com/paritytech/parity/pull/7894))
+- Backport Master CI PRs to Beta ([#7890](https://github.com/paritytech/parity/pull/7890))
+  - Add binary identifiers and sha256sum to builds ([#7830](https://github.com/paritytech/parity/pull/7830))
+  - Fix checksums and auto-update push ([#7846](https://github.com/paritytech/parity/pull/7846))
+  - Update gitlab-build.sh ([#7855](https://github.com/paritytech/parity/pull/7855))
+  - Fix installer binary names for macos and windows ([#7881](https://github.com/paritytech/parity/pull/7881))
+  - Update gitlab-test.sh ([#7883](https://github.com/paritytech/parity/pull/7883))
+  - Fix snapcraft nightly ([#7884](https://github.com/paritytech/parity/pull/7884))
+- Backport Core PRs to beta ([#7891](https://github.com/paritytech/parity/pull/7891))
+  - Update back-references more aggressively after answering from cache ([#7578](https://github.com/paritytech/parity/pull/7578))
+  - Updated WASM Runtime & new interpreter (wasmi) ([#7796](https://github.com/paritytech/parity/pull/7796))
+  - Adjust storage update evm-style ([#7812](https://github.com/paritytech/parity/pull/7812))
+  - Add new EF ropstens nodes ([#7824](https://github.com/paritytech/parity/pull/7824))
+  - Store updater metadata in a single place ([#7832](https://github.com/paritytech/parity/pull/7832))
+  - WASM: Disable internal memory ([#7842](https://github.com/paritytech/parity/pull/7842))
+  - Add a timeout for light client sync requests ([#7848](https://github.com/paritytech/parity/pull/7848))
+  - Flush keyfiles. Resolves [#7632](https://github.com/paritytech/parity/issues/7632) ([#7868](https://github.com/paritytech/parity/pull/7868))
+  - Fix wallet import ([#7873](https://github.com/paritytech/parity/pull/7873))
+
+## Parity [v1.9.2](https://github.com/paritytech/parity/releases/tag/v1.9.2) (2018-02-02)
+
+Parity 1.9.2 is a bug-fix release to improve performance and stability. It adds additional bootnodes for the Ropsten test network.
+
+The full list of included changes:
+
+- Backports beta ([#7780](https://github.com/paritytech/parity/pull/7780))
+  - Bump beta to 1.9.2
+  - Update ropsten.json ([#7776](https://github.com/paritytech/parity/pull/7776))
+- Snapcraft push beta
+
+## Parity [v1.9.1](https://github.com/paritytech/parity/releases/tag/v1.9.1) (2018-02-01)
+
+Parity 1.9.1 is a bug-fix release to improve performance and stability. It restores ERC-20 token balances, improves networking, fixes database corruptions on client shutdown, and fixes issues with the `--password` command-line flag. Happy syncing, fellow Ethereans!
+
+In addition, this stabilizes Kovan and other Proof-of-Authority networks. If you run a network with AuRa engine, updating is highly encouraged!
+
+The full list of included changes:
+
+- Beta Backports ([#7756](https://github.com/paritytech/parity/pull/7756))
+  - Filter-out nodes.json ([#7716](https://github.com/paritytech/parity/pull/7716))
+    - Filter-out nodes.json
+    - network: sort node table nodes by failure ratio
+    - network: fix node table tests
+    - network: fit node failure percentage into buckets of 5%
+    - network: consider number of attempts in sorting of node table
+    - network: fix node table grumbles
+  - Fix client not being dropped on shutdown ([#7695](https://github.com/paritytech/parity/pull/7695))
+    - parity: wait for client to drop on shutdown
+    - parity: fix grumbles in shutdown wait
+    - parity: increase shutdown timeouts
+  - Wrap --help output to 120 characters ([#7626](https://github.com/paritytech/parity/pull/7626))
+    - Update Clap dependency and remove workarounds
+    - WIP
+    - Remove line breaks in help messages for now
+    - Multiple values can only be separated by commas (closes [#7428](https://github.com/paritytech/parity/issues/7428))
+    - Grumbles; refactor repeating code; add constant
+    - Use a single Wrapper rather than allocate a new one for each call
+    - Wrap --help to 120 characters rather than 100 characte
+- Token filter balances (throttle) ([#7742](https://github.com/paritytech/parity/pull/7742))
+  - Token filter balances (throttle)
+  - Cleanups
+  - Remove unused uniq
+  - Update @parity/shared to 2.2.23
+  - Remove unused code paths
+- Bump beta to 1.9.1 ([#7751](https://github.com/paritytech/parity/pull/7751))
+- Explicitly add branch name ([#7754](https://github.com/paritytech/parity/pull/7754))
+  - Explicitly add branch name
+  - Fix cargo update branch to beta
+- Revert revert revert ([#7715](https://github.com/paritytech/parity/pull/7715))
+ - This reverts commit 568dc33.
+
+## Parity [v1.9.0](https://github.com/paritytech/parity/releases/tag/v1.9.0) "Velocity" (2018-01-25)
+
+We are happy to announce our newest Parity 1.9 release. Among others, it enables the following features:
+
+- It integrates the fully reworked Parity Wallet and DApps browser (a.k.a. "UI 2.0", [#6819](https://github.com/paritytech/parity/pull/6819)).
+- It enables devp2p snappy compression ([#6683](https://github.com/paritytech/parity/pull/6683)).
+- AuRa Proof-of-Authority chains now disable uncles by default ([#7006](https://github.com/paritytech/parity/pull/7006)). Existing PoA chains can go through a "maximum uncle count transition" to achieve more stability ([#7196](https://github.com/paritytech/parity/pull/7196)).
+- Added Expanse's Byzantium hard-fork ([#7463](https://github.com/paritytech/parity/pull/7463)).
+- Added support for Ellaism chain ([#7222](https://github.com/paritytech/parity/pull/7222)).
+
+Further, users upgrading from 1.8 should acknowledge the following changes:
+
+- Fixed DELEGATECALL's from/to field ([#7568](https://github.com/paritytech/parity/pull/7568)).
+- Set zero nonce and gas price for calls by default ([#6954](https://github.com/paritytech/parity/pull/6954)).
+- Create pending blocks with all transactions from the queue ([#6942](https://github.com/paritytech/parity/pull/6942)).
+- Remove RPC parameter leniency now that Mist formats correctly ([#6651](https://github.com/paritytech/parity/pull/6651)). Parity stops accepting decimal-formatted block numbers and stops parsing the empty string as empty bytes.
+- Public nodes do not support the user interface anymore. If you are running a public node, please stay on the 1.8 branch of the stable releases.
+
+Additional noteworthy changes:
+
+- `ethstore` and `ethkey` have been significantly improved ([#6961](https://github.com/paritytech/parity/pull/6961)):
+  - `ethstore` now supports brute forcing pre-sale wallets given a password list for recovery.
+  - `ethkey` now supports multi-threaded generation of prefix-matching addresses.
+  - `ethkey` now supports prefix-matching brain wallets.
+  - `ethkey` now supports brain-wallets recovery-phrases lookup. This helps to find a correct phrase if you know the address you want to get yet you made a typo backing the phrase up, or forgot a word.
+
+Read more about Parity 1.9 in our [blog post](http://paritytech.io/velocity-the-fastest-parity-released/).
+
+The full list of included changes:
+
+- Add scroll when when too many accounts ([#7677](https://github.com/paritytech/parity/pull/7677)) ([#7679](https://github.com/paritytech/parity/pull/7679))
+- Update installer.nsi
+- Fix conditions in gitlab-test ([#7676](https://github.com/paritytech/parity/pull/7676))
+  - Fix conditions in gitlab-test
+  - Update gitlab-test.sh
+- Remove cargo cache
+- Backports to beta ([#7660](https://github.com/paritytech/parity/pull/7660))
+  - Improve handling of RocksDB corruption ([#7630](https://github.com/paritytech/parity/pull/7630))
+    - Kvdb-rocksdb: update rust-rocksdb version
+    - Kvdb-rocksdb: mark corruptions and attempt repair on db open
+    - Kvdb-rocksdb: better corruption detection on open
+    - Kvdb-rocksdb: add corruption_file_name const
+    - Kvdb-rocksdb: rename mark_corruption to check_for_corruption
+  - Hardening of CSP ([#7621](https://github.com/paritytech/parity/pull/7621))
+  - Fixed delegatecall's from/to ([#7568](https://github.com/paritytech/parity/pull/7568))
+    - Fixed delegatecall's from/to, closes [#7166](https://github.com/paritytech/parity/issues/7166)
+    - Added tests for delegatecall traces, [#7167](https://github.com/paritytech/parity/issues/7167)
+  - Light client RPCs ([#7603](https://github.com/paritytech/parity/pull/7603))
+    - Implement registrar.
+    - Implement eth_getCode
+    - Don't wait for providers.
+    - Don't wait for providers.
+    - Fix linting and wasm tests.
+  - Problem: AttachedProtocols don't get registered ([#7610](https://github.com/paritytech/parity/pull/7610))
+  - Fix Temporarily Invalid blocks handling ([#7613](https://github.com/paritytech/parity/pull/7613))
+    - Handle temporarily invalid blocks in sync.
+    - Fix tests.
+- Add docker build for beta ([#7671](https://github.com/paritytech/parity/pull/7671))
+  - Add docker build for beta
+  - Add cargo cache
+- Fix snapcraft build for beta ([#7670](https://github.com/paritytech/parity/pull/7670))
+- Update Parity.pkgproj
+- update gitlab build from master
+- Update references to dapp sources ([#7634](https://github.com/paritytech/parity/pull/7634)) ([#7636](https://github.com/paritytech/parity/pull/7636))
+- Update tokenreg ([#7618](https://github.com/paritytech/parity/pull/7618)) ([#7619](https://github.com/paritytech/parity/pull/7619))
+- Fix cache:key ([#7598](https://github.com/paritytech/parity/pull/7598))
+- Make 1.9 beta ([#7533](https://github.com/paritytech/parity/pull/7533))
+- Trigger js-precompiled ([#7535](https://github.com/paritytech/parity/pull/7535))
+- RocksDB fix ([#7512](https://github.com/paritytech/parity/pull/7512))
+- Update js-api ([#7510](https://github.com/paritytech/parity/pull/7510))
+- Expose default gas price percentile configuration in CLI ([#7497](https://github.com/paritytech/parity/pull/7497))
+- Use https connection ([#7503](https://github.com/paritytech/parity/pull/7503))
+- More thorough changes detection ([#7472](https://github.com/paritytech/parity/pull/7472))
+- Fix small layout issues ([#7500](https://github.com/paritytech/parity/pull/7500))
+- Show all accounts on Topbar ([#7498](https://github.com/paritytech/parity/pull/7498))
+- Update Parity Mainnet Bootnodes ([#7476](https://github.com/paritytech/parity/pull/7476))
+- Fixed panic when io is not available for export block ([#7495](https://github.com/paritytech/parity/pull/7495))
+- Advance AuRa step as far as we can and prevent invalid blocks. ([#7451](https://github.com/paritytech/parity/pull/7451))
+- Update package-lock in js-old ([#7494](https://github.com/paritytech/parity/pull/7494))
+- Update issue template and readme ([#7450](https://github.com/paritytech/parity/pull/7450))
+- Update package-lock.json pinned versions  ([#7492](https://github.com/paritytech/parity/pull/7492))
+- Explicit pre-precompiled push checkout ([#7474](https://github.com/paritytech/parity/pull/7474))
+- Trigger js-precompiled ([#7473](https://github.com/paritytech/parity/pull/7473))
+- Expanse Byzantium update w/ correct metropolis difficulty increment divisor ([#7463](https://github.com/paritytech/parity/pull/7463))
+- Updated icons ([#7469](https://github.com/paritytech/parity/pull/7469))
+- Cleanup certifications ([#7454](https://github.com/paritytech/parity/pull/7454))
+- Fix css lint (updated stylelint) ([#7471](https://github.com/paritytech/parity/pull/7471))
+- Upgrade markdown-loader & marked ([#7467](https://github.com/paritytech/parity/pull/7467))
+- Remove JS test for removed code ([#7461](https://github.com/paritytech/parity/pull/7461))
+- Pull in dapp-status ([#7457](https://github.com/paritytech/parity/pull/7457))
+- Bump openssl crate ([#7455](https://github.com/paritytech/parity/pull/7455))
+- Signer updates from global Redux state ([#7452](https://github.com/paritytech/parity/pull/7452))
+- Remove expanse chain ([#7437](https://github.com/paritytech/parity/pull/7437))
+- Store tokens with repeatable id ([#7435](https://github.com/paritytech/parity/pull/7435))
+- Strict config parsing ([#7433](https://github.com/paritytech/parity/pull/7433))
+- Upgrade to RocksDB 5.8.8 and tune settings to reduce space amplification ([#7348](https://github.com/paritytech/parity/pull/7348))
+- Fix status layout ([#7432](https://github.com/paritytech/parity/pull/7432))
+- Fix tracing failed calls. ([#7412](https://github.com/paritytech/parity/pull/7412))
+- Problem: sending any Whisper message fails ([#7421](https://github.com/paritytech/parity/pull/7421))
+- Wait for future blocks in AuRa ([#7368](https://github.com/paritytech/parity/pull/7368))
+- Fix final feature. ([#7426](https://github.com/paritytech/parity/pull/7426))
+- Use RwLock for state DB ([#7425](https://github.com/paritytech/parity/pull/7425))
+- Update branding on UI ([#7370](https://github.com/paritytech/parity/pull/7370))
+- Changelog for 1.8.5 and 1.7.11 ([#7401](https://github.com/paritytech/parity/pull/7401))
+- Added checking tx-type using transactions permission contract for miners ([#7359](https://github.com/paritytech/parity/pull/7359))
+- Standalone dir crate, replaces [#7383](https://github.com/paritytech/parity/issues/7383) ([#7409](https://github.com/paritytech/parity/pull/7409))
+- SecretStore: secretstore_signRawHash method ([#7336](https://github.com/paritytech/parity/pull/7336))
+- SecretStore: return error 404 when there's no key shares for given key on all nodes ([#7331](https://github.com/paritytech/parity/pull/7331))
+- SecretStore: PoA integration initial version ([#7101](https://github.com/paritytech/parity/pull/7101))
+- Update bootnodes ([#7363](https://github.com/paritytech/parity/pull/7363))
+- Fix default CORS settings. ([#7387](https://github.com/paritytech/parity/pull/7387))
+- Fix version ([#7390](https://github.com/paritytech/parity/pull/7390))
+- Wasm runtime update ([#7356](https://github.com/paritytech/parity/pull/7356))
+- Parity-version pr reopen ([#7136](https://github.com/paritytech/parity/pull/7136))
+- Get rid of clippy remainings. ([#7355](https://github.com/paritytech/parity/pull/7355))
+- Avoid using ok_or with allocated argument ([#7357](https://github.com/paritytech/parity/pull/7357))
+- Make accounts refresh time configurable. ([#7345](https://github.com/paritytech/parity/pull/7345))
+- Enable traces for DEV chain ([#7327](https://github.com/paritytech/parity/pull/7327))
+- Problem: AuRa's unsafeties around step duration ([#7282](https://github.com/paritytech/parity/pull/7282))
+- Problem: Cargo.toml file contains [project] key ([#7346](https://github.com/paritytech/parity/pull/7346))
+- Fix broken flex modal layouts ([#7343](https://github.com/paritytech/parity/pull/7343))
+- Fix dappIcon & Fix Signer Pending ([#7338](https://github.com/paritytech/parity/pull/7338))
+- Fix wallet token/badge icons not showing up ([#7333](https://github.com/paritytech/parity/pull/7333))
+- Add Ellaism coin in chain config ([#7222](https://github.com/paritytech/parity/pull/7222))
+- Update bootnodes ([#7296](https://github.com/paritytech/parity/pull/7296))
+- Adds `personal_signTransaction` RPC method ([#6991](https://github.com/paritytech/parity/pull/6991))
+- Fix double initialization of embeded providers. ([#7326](https://github.com/paritytech/parity/pull/7326))
+- Transaction Pool re-implementation ([#6994](https://github.com/paritytech/parity/pull/6994))
+- UI package bump ([#7318](https://github.com/paritytech/parity/pull/7318))
+- Test framework and basic test for whisper ([#7011](https://github.com/paritytech/parity/pull/7011))
+- CI js-precompiled trigger ([#7316](https://github.com/paritytech/parity/pull/7316))
+- Fix inject.js & Signer store duplication ([#7299](https://github.com/paritytech/parity/pull/7299))
+- Detect different node, same-key signing in aura ([#7245](https://github.com/paritytech/parity/pull/7245))
+- New warp enodes ([#7287](https://github.com/paritytech/parity/pull/7287))
+- CSS fixes for v1 ([#7285](https://github.com/paritytech/parity/pull/7285))
+- Wallet subscriptions & refresh ([#7283](https://github.com/paritytech/parity/pull/7283))
+- Update inject web3 dependencies ([#7286](https://github.com/paritytech/parity/pull/7286))
+- Some padding around dapp image ([#7276](https://github.com/paritytech/parity/pull/7276))
+- Expand available middleware methods ([#7275](https://github.com/paritytech/parity/pull/7275))
+- Inject parity script to all dapps // Expand dapps to any ZIP file ([#7260](https://github.com/paritytech/parity/pull/7260))
+- New Homepage ([#7266](https://github.com/paritytech/parity/pull/7266))
+- Update kovan HF block number. ([#7259](https://github.com/paritytech/parity/pull/7259))
+- CHANGELOG for 1.7.10 and 1.8.4 ([#7265](https://github.com/paritytech/parity/pull/7265))
+- Remove extraneous id hashing ([#7269](https://github.com/paritytech/parity/pull/7269))
+- Simplify status + content display overlaps/page fixing ([#7264](https://github.com/paritytech/parity/pull/7264))
+- UI redirect to 127.0.0.1 when localhost requested ([#7236](https://github.com/paritytech/parity/pull/7236))
+- Usability improvements to security token Dialog [#7112](https://github.com/paritytech/parity/issues/7112) ([#7134](https://github.com/paritytech/parity/pull/7134))
+- Don't display unneeded notifications ([#7237](https://github.com/paritytech/parity/pull/7237))
+- Reduce max block timestamp drift to 15 seconds ([#7240](https://github.com/paritytech/parity/pull/7240))
+- Increase allowed time drift to 10s. ([#7238](https://github.com/paritytech/parity/pull/7238))
+- Improve building from source ([#7239](https://github.com/paritytech/parity/pull/7239))
+- Fix/Update method permissions ([#7233](https://github.com/paritytech/parity/pull/7233))
+- Fix aura difficulty race ([#7198](https://github.com/paritytech/parity/pull/7198))
+- Dependency updates ([#7226](https://github.com/paritytech/parity/pull/7226))
+- Display all dapps (shell) & wallet tabs (v1) by default ([#7213](https://github.com/paritytech/parity/pull/7213))
+- Rework dapps list ([#7206](https://github.com/paritytech/parity/pull/7206))
+- Add contributing guidelines and code of conduct. ([#7157](https://github.com/paritytech/parity/pull/7157))
+- Make Signing Requests more visible ([#7204](https://github.com/paritytech/parity/pull/7204))
+- Send each log as a separate notification ([#7175](https://github.com/paritytech/parity/pull/7175))
+- Deleting a mistake comment in calc difficulty ([#7154](https://github.com/paritytech/parity/pull/7154))
+- Maximum uncle count transition ([#7196](https://github.com/paritytech/parity/pull/7196))
+- Update FirstRun for UI-2 ([#7195](https://github.com/paritytech/parity/pull/7195))
+- Update mocha import stubs ([#7191](https://github.com/paritytech/parity/pull/7191))
+- Escape inifinite loop in estimte_gas ([#7075](https://github.com/paritytech/parity/pull/7075))
+- New account selector UI in top bar ([#7179](https://github.com/paritytech/parity/pull/7179))
+- Removed ethcore-util dependency from ethcore-network ([#7180](https://github.com/paritytech/parity/pull/7180))
+- WASM test runner utility upgrade ([#7147](https://github.com/paritytech/parity/pull/7147))
+- React 16 ([#7174](https://github.com/paritytech/parity/pull/7174))
+- Assorted improvements for ethstore and ethkey ([#6961](https://github.com/paritytech/parity/pull/6961))
+- Delete unused package.json (dist bundles) ([#7173](https://github.com/paritytech/parity/pull/7173))
+- Remove *.css.map & *.js.map ([#7168](https://github.com/paritytech/parity/pull/7168))
+- Use git flag to remove old js artifacts ([#7165](https://github.com/paritytech/parity/pull/7165))
+- Cleanup JS build artifacts ([#7164](https://github.com/paritytech/parity/pull/7164))
+- Fixes typo in user config path ([#7159](https://github.com/paritytech/parity/pull/7159))
+- Pull in new dapp-{methods,visible} dapps ([#7150](https://github.com/paritytech/parity/pull/7150))
+- WASM test runner utility ([#7142](https://github.com/paritytech/parity/pull/7142))
+- WASM Remove blockhash error ([#7121](https://github.com/paritytech/parity/pull/7121))
+- ECIP-1039: Monetary policy rounding specification ([#7067](https://github.com/paritytech/parity/pull/7067))
+- Fixed `RotatingLogger` after migrating to new arrayvec ([#7129](https://github.com/paritytech/parity/pull/7129))
+- Push to correct shell branch ([#7135](https://github.com/paritytech/parity/pull/7135))
+- Update js-precompiled ref, trigger JS build ([#7132](https://github.com/paritytech/parity/pull/7132))
+- Fixed build && test ([#7128](https://github.com/paritytech/parity/pull/7128))
+- Update packages, pull in compiled-only repos ([#7125](https://github.com/paritytech/parity/pull/7125))
+- Cleanup top bar, add Home icon for navigation ([#7118](https://github.com/paritytech/parity/pull/7118))
+- WASM storage_read and storage_write don't return anything ([#7110](https://github.com/paritytech/parity/pull/7110))
+- Local dapp development URL ([#7100](https://github.com/paritytech/parity/pull/7100))
+- Remove unused and duplicated files in js-old ([#7082](https://github.com/paritytech/parity/pull/7082))
+- Optimize & group dapp requests ([#7083](https://github.com/paritytech/parity/pull/7083))
+- WASM parse payload from panics ([#7097](https://github.com/paritytech/parity/pull/7097))
+- Fix no-default-features. ([#7096](https://github.com/paritytech/parity/pull/7096))
+- Updated eth-secp256k1 ([#7090](https://github.com/paritytech/parity/pull/7090))
+- Improve Github Issue Template ([#7099](https://github.com/paritytech/parity/pull/7099))
+- Changes necessary to upload crates to crates.io ([#7020](https://github.com/paritytech/parity/pull/7020))
+- Reopened 6860 - iterate over both buffered and unbuffered database entries ([#7048](https://github.com/paritytech/parity/pull/7048))
+- SecretStore: servers set change session api ([#6925](https://github.com/paritytech/parity/pull/6925))
+- Disable uncles by default ([#7006](https://github.com/paritytech/parity/pull/7006))
+- Squashed ethcore-network changes which introduce error-chain ([#7040](https://github.com/paritytech/parity/pull/7040))
+- Removed redundant imports ([#7057](https://github.com/paritytech/parity/pull/7057))
+- CHANGELOG for 1.7.8, 1.7.9, 1.8.2, and 1.8.3 ([#7055](https://github.com/paritytech/parity/pull/7055))
+- Properly display Signer errors (Snackbar display popup) ([#7053](https://github.com/paritytech/parity/pull/7053))
+- Add the desktop file for the snap ([#7059](https://github.com/paritytech/parity/pull/7059))
+- Small performance gain in allocations ([#7054](https://github.com/paritytech/parity/pull/7054))
+- Bump JSON-RPC version ([#7051](https://github.com/paritytech/parity/pull/7051))
+- Fix nonce reservation ([#7025](https://github.com/paritytech/parity/pull/7025))
+- Fixed ethstore-cli output ([#7052](https://github.com/paritytech/parity/pull/7052))
+- Add mui for embed compilation ([#7049](https://github.com/paritytech/parity/pull/7049))
+- Update the snap metadata to keep working strictly confined ([#6993](https://github.com/paritytech/parity/pull/6993))
+- Remove unused js packages (dapp cleanups) ([#7046](https://github.com/paritytech/parity/pull/7046))
+- Gitlog location update  ([#7042](https://github.com/paritytech/parity/pull/7042))
+- Move git logging to .git-release.log ([#7041](https://github.com/paritytech/parity/pull/7041))
+- Start from rust root in release update step ([#7039](https://github.com/paritytech/parity/pull/7039))
+- Complete token merge, remove unused files ([#7037](https://github.com/paritytech/parity/pull/7037))
+- Add missing cargo-push.sh shell variable ([#7036](https://github.com/paritytech/parity/pull/7036))
+- Fix npm start script ([#7034](https://github.com/paritytech/parity/pull/7034))
+-  Update executable flags on release scripts ([#7035](https://github.com/paritytech/parity/pull/7035))
+- Fix v1 precompiled ([#7033](https://github.com/paritytech/parity/pull/7033))
+- Push precompiled to correct branch (v1) ([#7031](https://github.com/paritytech/parity/pull/7031))
+- Update v1 Wallet Dapp ([#6935](https://github.com/paritytech/parity/pull/6935))
+- WASM tests update ([#7018](https://github.com/paritytech/parity/pull/7018))
+- Events in WASM runtime ([#6967](https://github.com/paritytech/parity/pull/6967))
+- Adds validate_node_url() and refactors boot node check ([#6907](https://github.com/paritytech/parity/pull/6907)) ([#6970](https://github.com/paritytech/parity/pull/6970))
+- Fix windows build (with ui rebuild) ([#7016](https://github.com/paritytech/parity/pull/7016))
+- Make CLI arguments parsing more backwards compatible ([#7004](https://github.com/paritytech/parity/pull/7004))
+- Fixes for parity-extension ([#6990](https://github.com/paritytech/parity/pull/6990))
+- Update ethcore-bigint ([#6992](https://github.com/paritytech/parity/pull/6992))
+- Get local transactions by hash in the light client ([#6874](https://github.com/paritytech/parity/pull/6874))
+- Warn when blacklisted account present in store ([#6875](https://github.com/paritytech/parity/pull/6875))
+- Skip nonce check for gas estimation ([#6997](https://github.com/paritytech/parity/pull/6997))
+- Creating pending block with all transactions from the queue ([#6942](https://github.com/paritytech/parity/pull/6942))
+- Removes `MAX_TX_TO_IMPORT` from `ChainSync` ([#6976](https://github.com/paritytech/parity/pull/6976))
+- SecretStore: versioned keys ([#6910](https://github.com/paritytech/parity/pull/6910))
+- Removes `FUTURE_QUEUE_LIMITS_SHIFT` ([#6962](https://github.com/paritytech/parity/pull/6962))
+- Set zero nonce and gas price for calls by default ([#6954](https://github.com/paritytech/parity/pull/6954))
+- Add hint in ActionParams for splitting code/data ([#6957](https://github.com/paritytech/parity/pull/6957))
+- Return decoded seal fields. ([#6932](https://github.com/paritytech/parity/pull/6932))
+- Fix serialization of status in transaction receipts. ([#6926](https://github.com/paritytech/parity/pull/6926))
+- Reserve nonces for signing ([#6834](https://github.com/paritytech/parity/pull/6834))
+- Windows fixes ([#6921](https://github.com/paritytech/parity/pull/6921))
+- Don't add {css,js}.map from dapps ([#6931](https://github.com/paritytech/parity/pull/6931))
+- Fix JSON tracing for sub-calls. ([#6842](https://github.com/paritytech/parity/pull/6842))
+- Shell updates (bonds, updated Dapps) ([#6897](https://github.com/paritytech/parity/pull/6897))
+- Fix [#6228](https://github.com/paritytech/parity/issues/6228): do not display eth price in cli for etc ([#6877](https://github.com/paritytech/parity/pull/6877))
+- Fix mining help ([#6885](https://github.com/paritytech/parity/pull/6885))
+- Refactor static context check in CREATE. ([#6886](https://github.com/paritytech/parity/pull/6886))
+- Cleanup some configuration options ([#6878](https://github.com/paritytech/parity/pull/6878))
+- Fix serialization of non-localized transactions ([#6868](https://github.com/paritytech/parity/pull/6868))
+- Updated ntp to version 0.3 ([#6854](https://github.com/paritytech/parity/pull/6854))
+- Align README with 1.8 and prepare CHANGELOG with 1.8.1 ([#6833](https://github.com/paritytech/parity/pull/6833))
+- Return error on timed unlock ([#6777](https://github.com/paritytech/parity/pull/6777))
+- Fix dapps tests in master ([#6866](https://github.com/paritytech/parity/pull/6866))
+- Ethstore optimizations ([#6827](https://github.com/paritytech/parity/pull/6827))
+- Add ECIP1017 to Morden config ([#6810](https://github.com/paritytech/parity/pull/6810))
+- Remove all package publishing to npm ([#6838](https://github.com/paritytech/parity/pull/6838))
+- Util crates use tempdir crate instead of devtools to create temp path ([#6807](https://github.com/paritytech/parity/pull/6807))
+- Trigger js build ([#6836](https://github.com/paritytech/parity/pull/6836))
+- Clean-up scripts. ([#6832](https://github.com/paritytech/parity/pull/6832))
+- Tweaked snapshot sync threshold ([#6829](https://github.com/paritytech/parity/pull/6829))
+- Integrate UI 2 ([#6819](https://github.com/paritytech/parity/pull/6819))
+- Refresh cached tokens based on registry info & random balances ([#6818](https://github.com/paritytech/parity/pull/6818))
+- Change keypath derivation logic ([#6815](https://github.com/paritytech/parity/pull/6815))
+- Refactors journaldb as a separate crate ([#6801](https://github.com/paritytech/parity/pull/6801))
+- Trigger UI build. ([#6817](https://github.com/paritytech/parity/pull/6817))
+- Bumped more crate versions ([#6809](https://github.com/paritytech/parity/pull/6809))
+- Fix RPC compilation warnings. ([#6808](https://github.com/paritytech/parity/pull/6808))
+- Remove internal ipc ([#6795](https://github.com/paritytech/parity/pull/6795))
+- Consistent KeyValueDB errors ([#6792](https://github.com/paritytech/parity/pull/6792))
+- Squash remaining warnings ([#6789](https://github.com/paritytech/parity/pull/6789))
+- Forward-port [#6754](https://github.com/paritytech/parity/issues/6754) [#6755](https://github.com/paritytech/parity/issues/6755) ([#6785](https://github.com/paritytech/parity/pull/6785))
+- Removed duplicated versions of clippy ([#6776](https://github.com/paritytech/parity/pull/6776))
+- Updated ethabi to version 4.0 ([#6742](https://github.com/paritytech/parity/pull/6742))
+- Updated rpc_cli and parity to rpassword 1.0 ([#6774](https://github.com/paritytech/parity/pull/6774))
+- Fix sign data typo ([#6750](https://github.com/paritytech/parity/pull/6750))
+- Refactoring/cache 6693 ([#6772](https://github.com/paritytech/parity/pull/6772))
+- Fix CHANGLOG for 1.8.0 ([#6751](https://github.com/paritytech/parity/pull/6751))
+- Removes redundant `mut` in service.rs.in ([#6775](https://github.com/paritytech/parity/pull/6775))
+- Remove redundant `mut` ([#6773](https://github.com/paritytech/parity/pull/6773))
+- Fixed kovan chain validation ([#6758](https://github.com/paritytech/parity/pull/6758))
+- Removed redundant evm deps ([#6757](https://github.com/paritytech/parity/pull/6757))
+- Fixed modexp gas calculation overflow ([#6741](https://github.com/paritytech/parity/pull/6741))
+- Use cc 1.0 instead of gcc ([#6733](https://github.com/paritytech/parity/pull/6733))
+- Version bump to 1.9.0 ([#6727](https://github.com/paritytech/parity/pull/6727))
+- Fix badges not showing up ([#6730](https://github.com/paritytech/parity/pull/6730))

ethash/Cargo.toml

@@ -1,18 +1,22 @@
 [package]
 name = "ethash"
-version = "1.9.0"
+version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [lib]
 
 [dependencies]
-log = "0.3"
-keccak-hash = { path = "../util/hash" }
-primal = "0.2.3"
-parking_lot = "0.5"
 crunchy = "0.1.0"
-memmap = "0.6"
 either = "1.0.0"
+ethereum-types = "0.3"
+keccak-hash = { git = "https://github.com/paritytech/parity-common" }
+log = "0.4"
+memmap = "0.6"
+parking_lot = "0.6"
+primal = "0.2.3"
+
+[dev-dependencies]
+tempdir = "0.3"
 
 [features]
 benches = []

ethash/src/cache.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -91,7 +91,7 @@ impl NodeCacheBuilder {
 
 	pub fn new<T: Into<Option<OptimizeFor>>>(optimize_for: T) -> Self {
 		NodeCacheBuilder {
-			seedhash: Arc::new(Mutex::new(SeedHashCompute::new())),
+			seedhash: Arc::new(Mutex::new(SeedHashCompute::default())),
 			optimize_for: optimize_for.into().unwrap_or_default(),
 		}
 	}

ethash/src/compute.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -25,9 +25,8 @@ use seed_compute::SeedHashCompute;
 use shared::*;
 use std::io;
 
-use std::mem;
+use std::{mem, ptr};
 use std::path::Path;
-use std::ptr;
 
 const MIX_WORDS: usize = ETHASH_MIX_BYTES / 4;
 const MIX_NODES: usize = MIX_WORDS / NODE_WORDS;
@@ -111,7 +110,7 @@ pub fn quick_get_difficulty(header_hash: &H256, nonce: u64, mix_hash: &H256) ->
 		let mut buf: [u8; 64 + 32] = mem::uninitialized();
 
 		ptr::copy_nonoverlapping(header_hash.as_ptr(), buf.as_mut_ptr(), 32);
-		ptr::copy_nonoverlapping(mem::transmute(&nonce), buf[32..].as_mut_ptr(), 8);
+		ptr::copy_nonoverlapping(&nonce as *const u64 as *const u8, buf[32..].as_mut_ptr(), 8);
 
 		keccak_512::unchecked(buf.as_mut_ptr(), 64, buf.as_ptr(), 40);
 		ptr::copy_nonoverlapping(mix_hash.as_ptr(), buf[64..].as_mut_ptr(), 32);
@@ -138,11 +137,11 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 		($n:expr, $value:expr) => {{
 			// We use explicit lifetimes to ensure that val's borrow is invalidated until the
 			// transmuted val dies.
-			unsafe fn make_const_array<'a, T, U>(val: &'a mut [T]) -> &'a mut [U; $n] {
+			unsafe fn make_const_array<T, U>(val: &mut [T]) -> &mut [U; $n] {
 				use ::std::mem;
 
 				debug_assert_eq!(val.len() * mem::size_of::<T>(), $n * mem::size_of::<U>());
-				mem::transmute(val.as_mut_ptr())
+ 				&mut *(val.as_mut_ptr() as *mut [U; $n])
 			}
 
 			make_const_array($value)
@@ -178,7 +177,7 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 
 			ptr::copy_nonoverlapping(header_hash.as_ptr(), out.as_mut_ptr(), header_hash.len());
 			ptr::copy_nonoverlapping(
-				mem::transmute(&nonce),
+				&nonce as *const u64 as *const u8,
 				out[header_hash.len()..].as_mut_ptr(),
 				mem::size_of::<u64>(),
 			);
@@ -267,18 +266,20 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 
 	let mix_hash = buf.compress_bytes;
 
-	let value: H256 = unsafe {
+	let value: H256 = {
 		// We can interpret the buffer as an array of `u8`s, since it's `repr(C)`.
-		let read_ptr: *const u8 = mem::transmute(&buf);
+		let read_ptr: *const u8 = &buf as *const MixBuf as *const u8;
 		// We overwrite the second half since `keccak_256` has an internal buffer and so allows
 		// overlapping arrays as input.
-		let write_ptr: *mut u8 = mem::transmute(&mut buf.compress_bytes);
-		keccak_256::unchecked(
-			write_ptr,
-			buf.compress_bytes.len(),
-			read_ptr,
-			buf.half_mix.bytes.len() + buf.compress_bytes.len(),
-		);
+		let write_ptr: *mut u8 = &mut buf.compress_bytes as *mut [u8; 32] as *mut u8;
+		unsafe { 
+			keccak_256::unchecked(
+				write_ptr,
+				buf.compress_bytes.len(),
+				read_ptr,
+				buf.half_mix.bytes.len() + buf.compress_bytes.len(),
+			);
+		}
 		buf.compress_bytes
 	};
 
@@ -315,6 +316,7 @@ fn calculate_dag_item(node_index: u32, cache: &[Node]) -> Node {
 mod test {
 	use super::*;
 	use std::fs;
+	use tempdir::TempDir;
 
 	#[test]
 	fn test_get_cache_size() {
@@ -386,8 +388,10 @@ mod test {
 			0xe9, 0x7e, 0x53, 0x84,
 		];
 		let nonce = 0xd7b3ac70a301a249;
+
+		let tempdir = TempDir::new("").unwrap();
 		// difficulty = 0x085657254bd9u64;
-		let light = NodeCacheBuilder::new(None).light(&::std::env::temp_dir(), 486382);
+		let light = NodeCacheBuilder::new(None).light(tempdir.path(), 486382);
 		let result = light_compute(&light, &hash, nonce);
 		assert_eq!(result.mix_hash[..], mix_hash[..]);
 		assert_eq!(result.value[..], boundary[..]);
@@ -395,18 +399,18 @@ mod test {
 
 	#[test]
 	fn test_drop_old_data() {
-		let path = ::std::env::temp_dir();
+		let tempdir = TempDir::new("").unwrap();
 		let builder = NodeCacheBuilder::new(None);
-		let first = builder.light(&path, 0).to_file().unwrap().to_owned();
+		let first = builder.light(tempdir.path(), 0).to_file().unwrap().to_owned();
 
-		let second = builder.light(&path, ETHASH_EPOCH_LENGTH).to_file().unwrap().to_owned();
+		let second = builder.light(tempdir.path(), ETHASH_EPOCH_LENGTH).to_file().unwrap().to_owned();
 		assert!(fs::metadata(&first).is_ok());
 
-		let _ = builder.light(&path, ETHASH_EPOCH_LENGTH * 2).to_file();
+		let _ = builder.light(tempdir.path(), ETHASH_EPOCH_LENGTH * 2).to_file();
 		assert!(fs::metadata(&first).is_err());
 		assert!(fs::metadata(&second).is_ok());
 
-		let _ = builder.light(&path, ETHASH_EPOCH_LENGTH * 3).to_file();
+		let _ = builder.light(tempdir.path(), ETHASH_EPOCH_LENGTH * 3).to_file();
 		assert!(fs::metadata(&second).is_err());
 	}
 }

ethash/src/keccak.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -21,32 +21,36 @@ pub type H256 = [u8; 32];
 pub mod keccak_512 {
 	use super::hash;
 
-	pub use self::hash::keccak_512 as unchecked;
+	pub use self::hash::keccak_512_unchecked as unchecked;
 
 	pub fn write(input: &[u8], output: &mut [u8]) {
-		unsafe { hash::keccak_512(output.as_mut_ptr(), output.len(), input.as_ptr(), input.len()) };
+		hash::keccak_512(input, output);
 	}
 
 	pub fn inplace(input: &mut [u8]) {
-		// This is safe since `sha3_*` uses an internal buffer and copies the result to the output. This
+		// This is safe since `keccak_*` uses an internal buffer and copies the result to the output. This
 		// means that we can reuse the input buffer for both input and output.
-		unsafe { hash::keccak_512(input.as_mut_ptr(), input.len(), input.as_ptr(), input.len()) };
+		unsafe {
+			hash::keccak_512_unchecked(input.as_mut_ptr(), input.len(), input.as_ptr(), input.len());
+		}
 	}
 }
 
 pub mod keccak_256 {
 	use super::hash;
 
-	pub use self::hash::keccak_256 as unchecked;
+	pub use self::hash::keccak_256_unchecked as unchecked;
 
 	#[allow(dead_code)]
 	pub fn write(input: &[u8], output: &mut [u8]) {
-		unsafe { hash::keccak_256(output.as_mut_ptr(), output.len(), input.as_ptr(), input.len()) };
+		hash::keccak_256(input, output);
 	}
 
 	pub fn inplace(input: &mut [u8]) {
-		// This is safe since `sha3_*` uses an internal buffer and copies the result to the output. This
+		// This is safe since `keccak_*` uses an internal buffer and copies the result to the output. This
 		// means that we can reuse the input buffer for both input and output.
-		unsafe { hash::keccak_256(input.as_mut_ptr(), input.len(), input.as_ptr(), input.len()) };
+		unsafe {
+			hash::keccak_256_unchecked(input.as_mut_ptr(), input.len(), input.as_ptr(), input.len());
+		}
 	}
 }

ethash/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,16 +16,20 @@
 
 #![cfg_attr(feature = "benches", feature(test))]
 
-extern crate primal;
-extern crate parking_lot;
 extern crate either;
+extern crate ethereum_types;
 extern crate memmap;
+extern crate parking_lot;
+extern crate primal;
 
 #[macro_use]
 extern crate crunchy;
 #[macro_use]
 extern crate log;
 
+#[cfg(test)]
+extern crate tempdir;
+
 mod compute;
 mod seed_compute;
 mod cache;
@@ -35,6 +39,7 @@ mod shared;
 pub use cache::{NodeCacheBuilder, OptimizeFor};
 pub use compute::{ProofOfWork, quick_get_difficulty, slow_hash_block_number};
 use compute::Light;
+use ethereum_types::{U256, U512};
 use keccak::H256;
 use parking_lot::Mutex;
 pub use seed_compute::SeedHashCompute;
@@ -133,9 +138,35 @@ impl EthashManager {
 	}
 }
 
+/// Convert an Ethash boundary to its original difficulty. Basically just `f(x) = 2^256 / x`.
+pub fn boundary_to_difficulty(boundary: &ethereum_types::H256) -> U256 {
+	difficulty_to_boundary_aux(&**boundary)
+}
+
+/// Convert an Ethash difficulty to the target boundary. Basically just `f(x) = 2^256 / x`.
+pub fn difficulty_to_boundary(difficulty: &U256) -> ethereum_types::H256 {
+	difficulty_to_boundary_aux(difficulty).into()
+}
+
+fn difficulty_to_boundary_aux<T: Into<U512>>(difficulty: T) -> ethereum_types::U256 {
+	let difficulty = difficulty.into();
+
+	assert!(!difficulty.is_zero());
+
+	if difficulty == U512::one() {
+		U256::max_value()
+	} else {
+		// difficulty > 1, so result should never overflow 256 bits
+		U256::from((U512::one() << 256) / difficulty)
+	}
+}
+
 #[test]
 fn test_lru() {
-	let ethash = EthashManager::new(&::std::env::temp_dir(), None);
+	use tempdir::TempDir;
+
+	let tempdir = TempDir::new("").unwrap();
+	let ethash = EthashManager::new(tempdir.path(), None);
 	let hash = [0u8; 32];
 	ethash.compute_light(1, &hash, 1);
 	ethash.compute_light(50000, &hash, 1);
@@ -149,6 +180,43 @@ fn test_lru() {
 	assert_eq!(ethash.cache.lock().prev_epoch.unwrap(), 0);
 }
 
+#[test]
+fn test_difficulty_to_boundary() {
+	use ethereum_types::H256;
+	use std::str::FromStr;
+
+	assert_eq!(difficulty_to_boundary(&U256::from(1)), H256::from(U256::max_value()));
+	assert_eq!(difficulty_to_boundary(&U256::from(2)), H256::from_str("8000000000000000000000000000000000000000000000000000000000000000").unwrap());
+	assert_eq!(difficulty_to_boundary(&U256::from(4)), H256::from_str("4000000000000000000000000000000000000000000000000000000000000000").unwrap());
+	assert_eq!(difficulty_to_boundary(&U256::from(32)), H256::from_str("0800000000000000000000000000000000000000000000000000000000000000").unwrap());
+}
+
+#[test]
+fn test_difficulty_to_boundary_regression() {
+	use ethereum_types::H256;
+
+	// the last bit was originally being truncated when performing the conversion
+	// https://github.com/paritytech/parity-ethereum/issues/8397
+	for difficulty in 1..9 {
+		assert_eq!(U256::from(difficulty), boundary_to_difficulty(&difficulty_to_boundary(&difficulty.into())));
+		assert_eq!(H256::from(difficulty), difficulty_to_boundary(&boundary_to_difficulty(&difficulty.into())));
+		assert_eq!(U256::from(difficulty), boundary_to_difficulty(&boundary_to_difficulty(&difficulty.into()).into()));
+		assert_eq!(H256::from(difficulty), difficulty_to_boundary(&difficulty_to_boundary(&difficulty.into()).into()));
+	}
+}
+
+#[test]
+#[should_panic]
+fn test_difficulty_to_boundary_panics_on_zero() {
+	difficulty_to_boundary(&U256::from(0));
+}
+
+#[test]
+#[should_panic]
+fn test_boundary_to_difficulty_panics_on_zero() {
+	boundary_to_difficulty(&ethereum_types::H256::from(0));
+}
+
 #[cfg(feature = "benches")]
 mod benchmarks {
 	extern crate test;

ethash/src/seed_compute.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -19,20 +19,13 @@ use keccak::{keccak_256, H256};
 
 use std::cell::Cell;
 
+#[derive(Default)]
 pub struct SeedHashCompute {
 	prev_epoch: Cell<u64>,
 	prev_seedhash: Cell<H256>,
 }
 
 impl SeedHashCompute {
-	#[inline]
-	pub fn new() -> SeedHashCompute {
-		SeedHashCompute {
-			prev_epoch: Cell::new(0),
-			prev_seedhash: Cell::new([0u8; 32]),
-		}
-	}
-
 	#[inline]
 	fn reset_cache(&self) {
 		self.prev_epoch.set(0);
@@ -77,20 +70,20 @@ mod tests {
 
 	#[test]
 	fn test_seed_compute_once() {
-		let seed_compute = SeedHashCompute::new();
+		let seed_compute = SeedHashCompute::default();
 		let hash = [241, 175, 44, 134, 39, 121, 245, 239, 228, 236, 43, 160, 195, 152, 46, 7, 199, 5, 253, 147, 241, 206, 98, 43, 3, 104, 17, 40, 192, 79, 106, 162];
 		assert_eq!(seed_compute.hash_block_number(486382), hash);
 	}
 
 	#[test]
 	fn test_seed_compute_zero() {
-		let seed_compute = SeedHashCompute::new();
+		let seed_compute = SeedHashCompute::default();
 		assert_eq!(seed_compute.hash_block_number(0), [0u8; 32]);
 	}
 
 	#[test]
 	fn test_seed_compute_after_older() {
-		let seed_compute = SeedHashCompute::new();
+		let seed_compute = SeedHashCompute::default();
 		// calculating an older value first shouldn't affect the result
 		let _ = seed_compute.hash_block_number(50000);
 		let hash = [241, 175, 44, 134, 39, 121, 245, 239, 228, 236, 43, 160, 195, 152, 46, 7, 199, 5, 253, 147, 241, 206, 98, 43, 3, 104, 17, 40, 192, 79, 106, 162];
@@ -99,7 +92,7 @@ mod tests {
 
 	#[test]
 	fn test_seed_compute_after_newer() {
-		let seed_compute = SeedHashCompute::new();
+		let seed_compute = SeedHashCompute::default();
 		// calculating an newer value first shouldn't affect the result
 		let _ = seed_compute.hash_block_number(972764);
 		let hash = [241, 175, 44, 134, 39, 121, 245, 239, 228, 236, 43, 160, 195, 152, 46, 7, 199, 5, 253, 147, 241, 206, 98, 43, 3, 104, 17, 40, 192, 79, 106, 162];

ethash/src/shared.rs

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

ethcore/Cargo.toml

@@ -3,27 +3,31 @@ description = "Ethcore library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore"
-version = "1.9.0"
+version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 ansi_term = "0.10"
-bn = { git = "https://github.com/paritytech/bn" }
+blooms-db = { path = "../util/blooms-db" }
+bn = { git = "https://github.com/paritytech/bn", default-features = false }
 byteorder = "1.0"
 common-types = { path = "types" }
 crossbeam = "0.3"
 ethash = { path = "../ethash" }
 ethcore-bloom-journal = { path = "../util/bloom" }
-ethcore-bytes = { path = "../util/bytes" }
-hashdb = { path = "../util/hashdb" }
-memorydb = { path = "../util/memorydb" }
-patricia-trie = { path = "../util/patricia_trie" }
+parity-bytes = { git = "https://github.com/paritytech/parity-common" }
+hashdb = { git = "https://github.com/paritytech/parity-common" }
+memorydb = { git = "https://github.com/paritytech/parity-common" }
+patricia-trie = { git = "https://github.com/paritytech/parity-common" }
+patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
+parity-crypto = { git = "https://github.com/paritytech/parity-common" }
+error-chain = { version = "0.12", default-features = false }
 ethcore-io = { path = "../util/io" }
 ethcore-logger = { path = "../logger" }
 ethcore-miner = { path = "../miner" }
-ethcore-stratum = { path = "../stratum" }
+ethcore-stratum = { path = "./stratum", optional = true }
 ethcore-transaction = { path = "./transaction" }
-ethereum-types = "0.2"
+ethereum-types = "0.3"
 memory-cache = { path = "../util/memory_cache" }
 ethabi = "5.1"
 ethabi-derive = "5.0"
@@ -32,54 +36,77 @@ ethjson = { path = "../json" }
 ethkey = { path = "../ethkey" }
 ethstore = { path = "../ethstore" }
 evm = { path = "evm" }
-hardware-wallet = { path = "../hw" }
 heapsize = "0.4"
 itertools = "0.5"
 lazy_static = "1.0"
 log = "0.3"
 lru-cache = "0.1"
-num = "0.1"
+num = { version = "0.1", default-features = false, features = ["bigint"] }
 num_cpus = "1.2"
 parity-machine = { path = "../machine" }
-parking_lot = "0.5"
-price-info = { path = "../price-info" }
-rayon = "0.8"
+parking_lot = "0.6"
+rayon = "1.0"
 rand = "0.4"
-rlp = { path = "../util/rlp" }
+rlp = { git = "https://github.com/paritytech/parity-common" }
 rlp_compress = { path = "../util/rlp_compress" }
 rlp_derive = { path = "../util/rlp_derive" }
-kvdb = { path = "../util/kvdb" }
-kvdb-rocksdb = { path = "../util/kvdb-rocksdb" }
-kvdb-memorydb = { path = "../util/kvdb-memorydb" }
-util-error = { path = "../util/error" }
+kvdb = { git = "https://github.com/paritytech/parity-common" }
+kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" }
 snappy = { git = "https://github.com/paritytech/rust-snappy" }
 stop-guard = { path = "../util/stop-guard" }
-migration = { path = "../util/migration" }
 macros = { path = "../util/macros" }
-rust-crypto = "0.2.34"
 rustc-hex = "1.0"
 stats = { path = "../util/stats" }
-time = "0.1"
 trace-time = { path = "../util/trace-time" }
 using_queue = { path = "../util/using_queue" }
-table = { path = "../util/table" }
 vm = { path = "vm" }
 wasm = { path = "wasm" }
-keccak-hash = { path = "../util/hash" }
-triehash = { path = "../util/triehash" }
+keccak-hash = { git = "https://github.com/paritytech/parity-common" }
+triehash-ethereum = { version = "0.2",  path = "../util/triehash-ethereum" }
 unexpected = { path = "../util/unexpected" }
 journaldb = { path = "../util/journaldb" }
-tempdir = "0.3"
+keccak-hasher = { path = "../util/keccak-hasher" }
+kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" }
+tempdir = {version="0.3", optional = true}
+
+[target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android"))'.dependencies]
+hardware-wallet = { path = "../hw" }
+
+[target.'cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android")))'.dependencies]
+fake-hardware-wallet = { path = "../util/fake-hardware-wallet" }
 
 [dev-dependencies]
-trie-standardmap = { path = "../util/trie-standardmap" }
+tempdir = "0.3"
+trie-standardmap = { git = "https://github.com/paritytech/parity-common" }
 
 [features]
-jit = ["evm/jit"]
-evm-debug = ["slow-blocks"]
+parity = ["work-notify", "price-info", "stratum"]
+# Large optional features that are enabled by default for Parity,
+# but might be omitted for other dependent crates.
+work-notify = ["ethcore-miner/work-notify"]
+price-info = ["ethcore-miner/price-info"]
+stratum = ["ethcore-stratum"]
+
+# Disables seal verification for mined blocks.
+# This allows you to submit any seal via RPC to test and benchmark
+# how fast pending block get's created while running on the mainnet.
+miner-debug = []
+# Display EVM debug traces.
+evm-debug = ["evm/evm-debug"]
+# Display EVM debug traces when running tests.
 evm-debug-tests = ["evm-debug", "evm/evm-debug-tests"]
-slow-blocks = [] # Use SLOW_TX_DURATION="50" (compile time!) to track transactions over 50ms
-json-tests = ["ethcore-transaction/json-tests"]
+# Measure time of transaction execution.
+# Whenever the transaction execution time (in millis) exceeds the value of
+# SLOW_TX_DURATION env variable (provided compile time!)
+# EVM debug traces are printed.
+slow-blocks = []
+# Run JSON consensus tests.
+json-tests = ["ethcore-transaction/json-tests", "test-helpers", "tempdir"]
+# Skip JSON consensus tests with pending issues.
+ci-skip-issue = []
+# Run memory/cpu heavy tests.
 test-heavy = []
-default = []
+# Compile benches
 benches = []
+# Compile test helpers
+test-helpers = ["tempdir"]

ethcore/benches/evm.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -16,18 +16,16 @@
 
 #![feature(test)]
 
-extern crate test;
-extern crate ethcore_util as util;
-extern crate rand;
 extern crate bn;
-extern crate crypto;
+extern crate ethereum_types;
 extern crate ethkey;
+extern crate parity_crypto;
+extern crate rand;
 extern crate rustc_hex;
-extern crate ethcore_bigint;
-
-use self::test::{Bencher};
-use rand::{StdRng};
+extern crate test;
 
+use self::test::Bencher;
+use rand::StdRng;
 
 #[bench]
 fn bn_128_pairing(b: &mut Bencher) {
@@ -61,16 +59,12 @@ fn bn_128_mul(b: &mut Bencher) {
 
 #[bench]
 fn sha256(b: &mut Bencher) {
-	use crypto::sha2::Sha256;
-	use crypto::digest::Digest;
+	use parity_crypto::digest::sha256;
 
-	let mut input: [u8; 256] = [0; 256];
-	let mut out = [0; 32];
+	let input = [0_u8; 256];
 
 	b.iter(|| {
-		let mut sha = Sha256::new();
-		sha.input(&input);
-		sha.result(&mut input[0..32]);
+		sha256(&input);
 	});
 }
 
@@ -78,7 +72,7 @@ fn sha256(b: &mut Bencher) {
 fn ecrecover(b: &mut Bencher) {
 	use rustc_hex::FromHex;
 	use ethkey::{Signature, recover as ec_recover};
-	use ethcore_bigint::hash::H256;
+	use ethereum_types::H256;
 	let input = FromHex::from_hex("47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad000000000000000000000000000000000000000000000000000000000000001b650acf9d3f5f0a2c799776a1254355d5f4061762a237396a99a0e0e3fc2bcd6729514a0dacb2e623ac4abd157cb18163ff942280db4d5caad66ddf941ba12e03").unwrap();
 	let hash = H256::from_slice(&input[0..32]);
 	let v = H256::from_slice(&input[32..64]);
@@ -95,4 +89,3 @@ fn ecrecover(b: &mut Bencher) {
 		let _ = ec_recover(&s, &hash);
 	});
 }
-

ethcore/evm/Cargo.toml

@@ -5,20 +5,18 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 bit-set = "0.4"
-ethereum-types = "0.2"
-evmjit = { path = "../../evmjit", optional = true }
+ethereum-types = "0.3"
 heapsize = "0.4"
 lazy_static = "1.0"
 log = "0.3"
 vm = { path = "../vm" }
-keccak-hash = { path = "../../util/hash" }
-parking_lot = "0.5"
+keccak-hash = { git = "https://github.com/paritytech/parity-common" }
+parking_lot = "0.6"
 memory-cache = { path = "../../util/memory_cache" }
 
 [dev-dependencies]
 rustc-hex = "1.0"
 
 [features]
-jit = ["evmjit"]
 evm-debug = []
 evm-debug-tests = ["evm-debug"]

ethcore/evm/src/benches/mod.rs

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

ethcore/evm/src/evm.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -57,7 +57,7 @@ impl Finalize for Result<GasLeft> {
 
 /// Cost calculation type. For low-gas usage we calculate costs using usize instead of U256
 pub trait CostType: Sized + From<usize> + Copy
-	+ ops::Mul<Output=Self> + ops::Div<Output=Self> + ops::Add<Output=Self> +ops::Sub<Output=Self>
+	+ ops::Mul<Output=Self> + ops::Div<Output=Self> + ops::Add<Output=Self> + ops::Sub<Output=Self>
 	+ ops::Shr<usize, Output=Self> + ops::Shl<usize, Output=Self>
 	+ cmp::Ord + fmt::Debug {
 	/// Converts this cost into `U256`

ethcore/evm/src/factory.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -32,23 +32,6 @@ pub struct Factory {
 impl Factory {
 	/// Create fresh instance of VM
 	/// Might choose implementation depending on supplied gas.
-	#[cfg(feature = "jit")]
-	pub fn create(&self, gas: &U256) -> Box<Vm> {
-		match self.evm {
-			VMType::Jit => {
-				Box::new(super::jit::JitEvm::default())
-			},
-			VMType::Interpreter => if Self::can_fit_in_usize(gas) {
-				Box::new(super::interpreter::Interpreter::<usize>::new(self.evm_cache.clone()))
-			} else {
-				Box::new(super::interpreter::Interpreter::<U256>::new(self.evm_cache.clone()))
-			}
-		}
-	}
-
-	/// Create fresh instance of VM
-	/// Might choose implementation depending on supplied gas.
-	#[cfg(not(feature = "jit"))]
 	pub fn create(&self, gas: &U256) -> Box<Vm> {
 		match self.evm {
 			VMType::Interpreter => if Self::can_fit_in_usize(gas) {
@@ -74,17 +57,7 @@ impl Factory {
 }
 
 impl Default for Factory {
-	/// Returns jitvm factory
-	#[cfg(all(feature = "jit", not(test)))]
-	fn default() -> Factory {
-		Factory {
-			evm: VMType::Jit,
-			evm_cache: Arc::new(SharedCache::default()),
-		}
-	}
-
 	/// Returns native rust evm factory
-	#[cfg(any(not(feature = "jit"), test))]
 	fn default() -> Factory {
 		Factory {
 			evm: VMType::Interpreter,
@@ -101,24 +74,7 @@ fn test_create_vm() {
 /// Create tests by injecting different VM factories
 #[macro_export]
 macro_rules! evm_test(
-	(ignorejit => $name_test: ident: $name_jit: ident, $name_int: ident) => {
-		#[test]
-		#[ignore]
-		#[cfg(feature = "jit")]
-		fn $name_jit() {
-			$name_test(Factory::new(VMType::Jit, 1024 * 32));
-		}
-		#[test]
-		fn $name_int() {
-			$name_test(Factory::new(VMType::Interpreter, 1024 * 32));
-		}
-	};
-	($name_test: ident: $name_jit: ident, $name_int: ident) => {
-		#[test]
-		#[cfg(feature = "jit")]
-		fn $name_jit() {
-			$name_test(Factory::new(VMType::Jit, 1024 * 32));
-		}
+	($name_test: ident: $name_int: ident) => {
 		#[test]
 		fn $name_int() {
 			$name_test(Factory::new(VMType::Interpreter, 1024 * 32));
@@ -129,14 +85,7 @@ macro_rules! evm_test(
 /// Create ignored tests by injecting different VM factories
 #[macro_export]
 macro_rules! evm_test_ignore(
-	($name_test: ident: $name_jit: ident, $name_int: ident) => {
-		#[test]
-		#[ignore]
-		#[cfg(feature = "jit")]
-		#[cfg(feature = "ignored-tests")]
-		fn $name_jit() {
-			$name_test(Factory::new(VMType::Jit, 1024 * 32));
-		}
+	($name_test: ident: $name_int: ident) => {
 		#[test]
 		#[ignore]
 		#[cfg(feature = "ignored-tests")]

ethcore/evm/src/interpreter/gasometer.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -113,7 +113,7 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 		current_mem_size: usize,
 	) -> vm::Result<InstructionRequirements<Gas>> {
 		let schedule = ext.schedule();
-		let tier = instructions::get_tier_idx(info.tier);
+		let tier = info.tier.idx();
 		let default_gas = Gas::from(schedule.tier_step_gas[tier]);
 
 		let cost = match instruction {
@@ -125,12 +125,17 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 				let newval = stack.peek(1);
 				let val = U256::from(&*ext.storage_at(&address)?);
 
-				let gas = if val.is_zero() && !newval.is_zero() {
-					schedule.sstore_set_gas
+				let gas = if schedule.eip1283 {
+					let orig = U256::from(&*ext.initial_storage_at(&address)?);
+					calculate_eip1283_sstore_gas(schedule, &orig, &val, &newval)
 				} else {
-					// Refund for below case is added when actually executing sstore
-					// !is_zero(&val) && is_zero(newval)
-					schedule.sstore_reset_gas
+					if val.is_zero() && !newval.is_zero() {
+						schedule.sstore_set_gas
+					} else {
+						// Refund for below case is added when actually executing sstore
+						// !is_zero(&val) && is_zero(newval)
+						schedule.sstore_reset_gas
+					}
 				};
 				Request::Gas(Gas::from(gas))
 			},
@@ -143,6 +148,9 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 			instructions::EXTCODESIZE => {
 				Request::Gas(Gas::from(schedule.extcodesize_gas))
 			},
+			instructions::EXTCODEHASH => {
+				Request::Gas(Gas::from(schedule.extcodehash_gas))
+			},
 			instructions::SUICIDE => {
 				let mut gas = Gas::from(schedule.suicide_gas);
 
@@ -168,9 +176,8 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 				Request::GasMem(default_gas, mem_needed(stack.peek(0), stack.peek(1))?)
 			},
 			instructions::SHA3 => {
-				let w = overflowing!(add_gas_usize(Gas::from_u256(*stack.peek(1))?, 31));
-				let words = w >> 5;
-				let gas = Gas::from(schedule.sha3_gas) + (Gas::from(schedule.sha3_word_gas) * words);
+				let words = overflowing!(to_word_size(Gas::from_u256(*stack.peek(1))?));
+				let gas = overflowing!(Gas::from(schedule.sha3_gas).overflow_add(overflowing!(Gas::from(schedule.sha3_word_gas).overflow_mul(words))));
 				Request::GasMem(gas, mem_needed(stack.peek(0), stack.peek(1))?)
 			},
 			instructions::CALLDATACOPY | instructions::CODECOPY | instructions::RETURNDATACOPY => {
@@ -179,8 +186,8 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 			instructions::EXTCODECOPY => {
 				Request::GasMemCopy(schedule.extcodecopy_base_gas.into(), mem_needed(stack.peek(1), stack.peek(3))?, Gas::from_u256(*stack.peek(3))?)
 			},
-			instructions::LOG0...instructions::LOG4 => {
-				let no_of_topics = instructions::get_log_topics(instruction);
+			instructions::LOG0 | instructions::LOG1 | instructions::LOG2 | instructions::LOG3 | instructions::LOG4 => {
+				let no_of_topics = instruction.log_topics().expect("log_topics always return some for LOG* instructions; qed");
 				let log_gas = schedule.log_gas + schedule.log_topic_gas * no_of_topics;
 
 				let data_gas = overflowing!(Gas::from_u256(*stack.peek(1))?.overflow_mul(Gas::from(schedule.log_data_gas)));
@@ -223,9 +230,24 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 
 				Request::GasMemProvide(gas, mem, Some(requested))
 			},
-			instructions::CREATE | instructions::CREATE2 => {
+			instructions::CREATE => {
+				let start = stack.peek(1);
+				let len = stack.peek(2);
+
 				let gas = Gas::from(schedule.create_gas);
-				let mem = mem_needed(stack.peek(1), stack.peek(2))?;
+				let mem = mem_needed(start, len)?;
+
+				Request::GasMemProvide(gas, mem, None)
+			},
+			instructions::CREATE2 => {
+				let start = stack.peek(1);
+				let len = stack.peek(2);
+
+				let base = Gas::from(schedule.create_gas);
+				let word = overflowing!(to_word_size(Gas::from_u256(*len)?));
+				let word_gas = overflowing!(Gas::from(schedule.sha3_word_gas).overflow_mul(word));
+				let gas = overflowing!(base.overflow_add(word_gas));
+				let mem = mem_needed(start, len)?;
 
 				Request::GasMemProvide(gas, mem, None)
 			},
@@ -275,8 +297,8 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 			},
 			Request::GasMemCopy(gas, mem_size, copy) => {
 				let (mem_gas_cost, new_mem_gas, new_mem_size) = self.mem_gas_cost(schedule, current_mem_size, &mem_size)?;
-				let copy = overflowing!(add_gas_usize(copy, 31)) >> 5;
-				let copy_gas = Gas::from(schedule.copy_gas) * copy;
+				let copy = overflowing!(to_word_size(copy));
+				let copy_gas = overflowing!(Gas::from(schedule.copy_gas).overflow_mul(copy));
 				let gas = overflowing!(gas.overflow_add(copy_gas));
 				let gas = overflowing!(gas.overflow_add(mem_gas_cost));
 
@@ -303,7 +325,7 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 		};
 
 		let current_mem_size = Gas::from(current_mem_size);
-		let req_mem_size_rounded = (overflowing!(mem_size.overflow_add(Gas::from(31 as usize))) >> 5) << 5;
+		let req_mem_size_rounded = overflowing!(to_word_size(*mem_size)) << 5;
 
 		let (mem_gas_cost, new_mem_gas) = if req_mem_size_rounded > current_mem_size {
 			let new_mem_gas = gas_for_mem(req_mem_size_rounded)?;
@@ -316,7 +338,6 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 	}
 }
 
-
 #[inline]
 fn mem_needed_const<Gas: evm::CostType>(mem: &U256, add: usize) -> vm::Result<Gas> {
 	Gas::from_u256(overflowing!(mem.overflowing_add(U256::from(add))))
@@ -336,6 +357,99 @@ fn add_gas_usize<Gas: evm::CostType>(value: Gas, num: usize) -> (Gas, bool) {
 	value.overflow_add(Gas::from(num))
 }
 
+#[inline]
+fn to_word_size<Gas: evm::CostType>(value: Gas) -> (Gas, bool) {
+	let (gas, overflow) = add_gas_usize(value, 31);
+	if overflow {
+		return (gas, overflow);
+	}
+
+	(gas >> 5, false)
+}
+
+#[inline]
+fn calculate_eip1283_sstore_gas<Gas: evm::CostType>(schedule: &Schedule, original: &U256, current: &U256, new: &U256) -> Gas {
+	Gas::from(
+		if current == new {
+			// 1. If current value equals new value (this is a no-op), 200 gas is deducted.
+			schedule.sload_gas
+		} else {
+			// 2. If current value does not equal new value
+			if original == current {
+				// 2.1. If original value equals current value (this storage slot has not been changed by the current execution context)
+				if original.is_zero() {
+					// 2.1.1. If original value is 0, 20000 gas is deducted.
+					schedule.sstore_set_gas
+				} else {
+					// 2.1.2. Otherwise, 5000 gas is deducted.
+					schedule.sstore_reset_gas
+
+					// 2.1.2.1. If new value is 0, add 15000 gas to refund counter.
+				}
+			} else {
+				// 2.2. If original value does not equal current value (this storage slot is dirty), 200 gas is deducted. Apply both of the following clauses.
+				schedule.sload_gas
+
+				// 2.2.1. If original value is not 0
+				// 2.2.1.1. If current value is 0 (also means that new value is not 0), remove 15000 gas from refund counter. We can prove that refund counter will never go below 0.
+				// 2.2.1.2. If new value is 0 (also means that current value is not 0), add 15000 gas to refund counter.
+
+				// 2.2.2. If original value equals new value (this storage slot is reset)
+				// 2.2.2.1. If original value is 0, add 19800 gas to refund counter.
+				// 2.2.2.2. Otherwise, add 4800 gas to refund counter.
+			}
+		}
+	)
+}
+
+pub fn handle_eip1283_sstore_clears_refund(ext: &mut vm::Ext, original: &U256, current: &U256, new: &U256) {
+	let sstore_clears_schedule = ext.schedule().sstore_refund_gas;
+
+	if current == new {
+		// 1. If current value equals new value (this is a no-op), 200 gas is deducted.
+	} else {
+		// 2. If current value does not equal new value
+		if original == current {
+			// 2.1. If original value equals current value (this storage slot has not been changed by the current execution context)
+			if original.is_zero() {
+				// 2.1.1. If original value is 0, 20000 gas is deducted.
+			} else {
+				// 2.1.2. Otherwise, 5000 gas is deducted.
+				if new.is_zero() {
+					// 2.1.2.1. If new value is 0, add 15000 gas to refund counter.
+					ext.add_sstore_refund(sstore_clears_schedule);
+				}
+			}
+		} else {
+			// 2.2. If original value does not equal current value (this storage slot is dirty), 200 gas is deducted. Apply both of the following clauses.
+
+			if !original.is_zero() {
+				// 2.2.1. If original value is not 0
+				if current.is_zero() {
+					// 2.2.1.1. If current value is 0 (also means that new value is not 0), remove 15000 gas from refund counter. We can prove that refund counter will never go below 0.
+					ext.sub_sstore_refund(sstore_clears_schedule);
+				} else if new.is_zero() {
+					// 2.2.1.2. If new value is 0 (also means that current value is not 0), add 15000 gas to refund counter.
+					ext.add_sstore_refund(sstore_clears_schedule);
+				}
+			}
+
+			if original == new {
+				// 2.2.2. If original value equals new value (this storage slot is reset)
+				if original.is_zero() {
+					// 2.2.2.1. If original value is 0, add 19800 gas to refund counter.
+					let refund = ext.schedule().sstore_set_gas - ext.schedule().sload_gas;
+					ext.add_sstore_refund(refund);
+				} else {
+					// 2.2.2.2. Otherwise, add 4800 gas to refund counter.
+					let refund = ext.schedule().sstore_reset_gas - ext.schedule().sload_gas;
+					ext.add_sstore_refund(refund);
+				}
+			}
+		}
+	}
+}
+
 #[test]
 fn test_mem_gas_cost() {
 	// given
@@ -369,4 +483,3 @@ fn test_calculate_mem_cost() {
 	assert_eq!(new_mem_gas, 3);
 	assert_eq!(mem_size, 32);
 }
-

ethcore/evm/src/interpreter/informant.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -39,7 +39,7 @@ mod inner {
 	use std::collections::HashMap;
 	use std::time::{Instant, Duration};
 
-	use bigint::prelude::U256;
+	use ethereum_types::U256;
 
 	use interpreter::stack::Stack;
 	use instructions::{Instruction, InstructionInfo, INSTRUCTIONS};

ethcore/evm/src/interpreter/memory.rs

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

ethcore/evm/src/interpreter/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -64,7 +64,6 @@ struct CodeReader<'a> {
 }
 
 impl<'a> CodeReader<'a> {
-
 	/// Create new code reader - starting at position 0.
 	fn new(code: &'a [u8]) -> Self {
 		CodeReader {
@@ -81,7 +80,7 @@ impl<'a> CodeReader<'a> {
 		U256::from(&self.code[pos..max])
 	}
 
-	fn len (&self) -> usize {
+	fn len(&self) -> usize {
 		self.code.len()
 	}
 }
@@ -103,7 +102,6 @@ enum InstructionResult<Gas> {
 	StopExecution,
 }
 
-
 /// Intepreter EVM implementation
 pub struct Interpreter<Cost: CostType> {
 	mem: Vec<u8>,
@@ -125,24 +123,31 @@ impl<Cost: CostType> vm::Vm for Interpreter<Cost> {
 		let mut gasometer = Gasometer::<Cost>::new(Cost::from_u256(params.gas)?);
 		let mut stack = VecStack::with_capacity(ext.schedule().stack_limit, U256::zero());
 		let mut reader = CodeReader::new(code);
-		let infos = &*instructions::INSTRUCTIONS;
 
 		while reader.position < code.len() {
-			let instruction = code[reader.position];
+			let opcode = code[reader.position];
+			let instruction = Instruction::from_u8(opcode);
 			reader.position += 1;
 
 			// TODO: make compile-time removable if too much of a performance hit.
 			do_trace = do_trace && ext.trace_next_instruction(
-				reader.position - 1, instruction, gasometer.current_gas.as_u256(),
+				reader.position - 1, opcode, gasometer.current_gas.as_u256(),
 			);
 
-			let info = &infos[instruction as usize];
+			if instruction.is_none() {
+				return Err(vm::Error::BadInstruction {
+					instruction: opcode
+				});
+			}
+			let instruction = instruction.expect("None case is checked above; qed");
+
+			let info = instruction.info();
 			self.verify_instruction(ext, instruction, info, &stack)?;
 
 			// Calculate gas cost
 			let requirements = gasometer.requirements(ext, instruction, info, &stack, self.mem.size())?;
 			if do_trace {
-				ext.trace_prepare_execute(reader.position - 1, instruction, requirements.gas_cost.as_u256());
+				ext.trace_prepare_execute(reader.position - 1, opcode, requirements.gas_cost.as_u256());
 			}
 
 			gasometer.verify_gas(&requirements.gas_cost)?;
@@ -181,8 +186,7 @@ impl<Cost: CostType> vm::Vm for Interpreter<Cost> {
 			match result {
 				InstructionResult::JumpToPosition(position) => {
 					if valid_jump_destinations.is_none() {
-						let code_hash = params.code_hash.clone().unwrap_or_else(|| keccak(code.as_ref()));
-						valid_jump_destinations = Some(self.cache.jump_destinations(&code_hash, code));
+						valid_jump_destinations = Some(self.cache.jump_destinations(&params.code_hash, code));
 					}
 					let jump_destinations = valid_jump_destinations.as_ref().expect("jump_destinations are initialized on first jump; qed");
 					let pos = self.verify_jump(position, jump_destinations)?;
@@ -224,16 +228,12 @@ impl<Cost: CostType> Interpreter<Cost> {
 			(instruction == instructions::CREATE2 && !schedule.have_create2) ||
 			(instruction == instructions::STATICCALL && !schedule.have_static_call) ||
 			((instruction == instructions::RETURNDATACOPY || instruction == instructions::RETURNDATASIZE) && !schedule.have_return_data) ||
-			(instruction == instructions::REVERT && !schedule.have_revert) {
-
+			(instruction == instructions::REVERT && !schedule.have_revert) ||
+			((instruction == instructions::SHL || instruction == instructions::SHR || instruction == instructions::SAR) && !schedule.have_bitwise_shifting) ||
+			(instruction == instructions::EXTCODEHASH && !schedule.have_extcodehash)
+		{
 			return Err(vm::Error::BadInstruction {
-				instruction: instruction
-			});
-		}
-
-		if info.tier == instructions::GasPriceTier::Invalid {
-			return Err(vm::Error::BadInstruction {
-				instruction: instruction
+				instruction: instruction as u8
 			});
 		}
 
@@ -318,6 +318,11 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let endowment = stack.pop_back();
 				let init_off = stack.pop_back();
 				let init_size = stack.pop_back();
+				let address_scheme = match instruction {
+					instructions::CREATE => CreateContractAddress::FromSenderAndNonce,
+					instructions::CREATE2 => CreateContractAddress::FromSenderSaltAndCodeHash(stack.pop_back().into()),
+					_ => unreachable!("instruction can only be CREATE/CREATE2 checked above; qed"),
+				};
 
 				let create_gas = provided.expect("`provided` comes through Self::exec from `Gasometer::get_gas_cost_mem`; `gas_gas_mem_cost` guarantees `Some` when instruction is `CALL`/`CALLCODE`/`DELEGATECALL`/`CREATE`; this is `CREATE`; qed");
 
@@ -335,7 +340,6 @@ impl<Cost: CostType> Interpreter<Cost> {
 				}
 
 				let contract_code = self.mem.read_slice(init_off, init_size);
-				let address_scheme = if instruction == instructions::CREATE { CreateContractAddress::FromSenderAndNonce } else { CreateContractAddress::FromSenderAndCodeHash };
 
 				let create_result = ext.create(&create_gas.as_u256(), &endowment, contract_code, address_scheme);
 				return match create_result {
@@ -396,7 +400,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 					},
 					instructions::DELEGATECALL => (&params.sender, &params.address, true, CallType::DelegateCall),
 					instructions::STATICCALL => (&params.address, &code_address, true, CallType::StaticCall),
-					_ => panic!(format!("Unexpected instruction {} in CALL branch.", instruction))
+					_ => panic!(format!("Unexpected instruction {:?} in CALL branch.", instruction))
 				};
 
 				// clear return data buffer before creating new call frame.
@@ -453,8 +457,8 @@ impl<Cost: CostType> Interpreter<Cost> {
 				ext.suicide(&u256_to_address(&address))?;
 				return Ok(InstructionResult::StopExecution);
 			},
-			instructions::LOG0...instructions::LOG4 => {
-				let no_of_topics = instructions::get_log_topics(instruction);
+			instructions::LOG0 | instructions::LOG1 | instructions::LOG2 | instructions::LOG3 | instructions::LOG4 => {
+				let no_of_topics = instruction.log_topics().expect("log_topics always return some for LOG* instructions; qed");
 
 				let offset = stack.pop_back();
 				let size = stack.pop_back();
@@ -464,8 +468,15 @@ impl<Cost: CostType> Interpreter<Cost> {
 					.collect();
 				ext.log(topics, self.mem.read_slice(offset, size))?;
 			},
-			instructions::PUSH1...instructions::PUSH32 => {
-				let bytes = instructions::get_push_bytes(instruction);
+			instructions::PUSH1 | instructions::PUSH2 | instructions::PUSH3 | instructions::PUSH4 |
+			instructions::PUSH5 | instructions::PUSH6 | instructions::PUSH7 | instructions::PUSH8 |
+			instructions::PUSH9 | instructions::PUSH10 | instructions::PUSH11 | instructions::PUSH12 |
+			instructions::PUSH13 | instructions::PUSH14 | instructions::PUSH15 | instructions::PUSH16 |
+			instructions::PUSH17 | instructions::PUSH18 | instructions::PUSH19 | instructions::PUSH20 |
+			instructions::PUSH21 | instructions::PUSH22 | instructions::PUSH23 | instructions::PUSH24 |
+			instructions::PUSH25 | instructions::PUSH26 | instructions::PUSH27 | instructions::PUSH28 |
+			instructions::PUSH29 | instructions::PUSH30 | instructions::PUSH31 | instructions::PUSH32 => {
+				let bytes = instruction.push_bytes().expect("push_bytes always return some for PUSH* instructions");
 				let val = code.read(bytes);
 				stack.push(val);
 			},
@@ -503,8 +514,14 @@ impl<Cost: CostType> Interpreter<Cost> {
 
 				let current_val = U256::from(&*ext.storage_at(&address)?);
 				// Increase refund for clear
-				if !self.is_zero(&current_val) && self.is_zero(&val) {
-					ext.inc_sstore_clears();
+				if ext.schedule().eip1283 {
+					let original_val = U256::from(&*ext.initial_storage_at(&address)?);
+					gasometer::handle_eip1283_sstore_clears_refund(ext, &original_val, &current_val, &val);
+				} else {
+					if !current_val.is_zero() && val.is_zero() {
+						let sstore_clears_schedule = ext.schedule().sstore_refund_gas;
+						ext.add_sstore_refund(sstore_clears_schedule);
+					}
 				}
 				ext.set_storage(address, H256::from(&val))?;
 			},
@@ -561,9 +578,14 @@ impl<Cost: CostType> Interpreter<Cost> {
 			},
 			instructions::EXTCODESIZE => {
 				let address = u256_to_address(&stack.pop_back());
-				let len = ext.extcodesize(&address)?;
+				let len = ext.extcodesize(&address)?.unwrap_or(0);
 				stack.push(U256::from(len));
 			},
+			instructions::EXTCODEHASH => {
+				let address = u256_to_address(&stack.pop_back());
+				let hash = ext.extcodehash(&address)?.unwrap_or_else(H256::zero);
+				stack.push(U256::from(hash));
+			},
 			instructions::CALLDATACOPY => {
 				Self::copy_data_to_memory(&mut self.mem, stack, params.data.as_ref().map_or_else(|| &[] as &[u8], |d| &*d as &[u8]));
 			},
@@ -584,7 +606,11 @@ impl<Cost: CostType> Interpreter<Cost> {
 			instructions::EXTCODECOPY => {
 				let address = u256_to_address(&stack.pop_back());
 				let code = ext.extcode(&address)?;
-				Self::copy_data_to_memory(&mut self.mem, stack, &code);
+				Self::copy_data_to_memory(
+					&mut self.mem,
+					stack,
+					code.as_ref().map(|c| &(*c)[..]).unwrap_or(&[])
+				);
 			},
 			instructions::GASPRICE => {
 				stack.push(params.gas_price.clone());
@@ -609,73 +635,22 @@ impl<Cost: CostType> Interpreter<Cost> {
 			instructions::GASLIMIT => {
 				stack.push(ext.env_info().gas_limit.clone());
 			},
-			_ => {
-				self.exec_stack_instruction(instruction, stack)?;
-			}
-		};
-		Ok(InstructionResult::Ok)
-	}
 
-	fn copy_data_to_memory(mem: &mut Vec<u8>, stack: &mut Stack<U256>, source: &[u8]) {
-		let dest_offset = stack.pop_back();
-		let source_offset = stack.pop_back();
-		let size = stack.pop_back();
-		let source_size = U256::from(source.len());
+			// Stack instructions
 
-		let output_end = match source_offset > source_size || size > source_size || source_offset + size > source_size {
-			true => {
-				let zero_slice = if source_offset > source_size {
-					mem.writeable_slice(dest_offset, size)
-				} else {
-					mem.writeable_slice(dest_offset + source_size - source_offset, source_offset + size - source_size)
-				};
-				for i in zero_slice.iter_mut() {
-					*i = 0;
-				}
-				source.len()
-			},
-			false => (size.low_u64() + source_offset.low_u64()) as usize
-		};
-
-		if source_offset < source_size {
-			let output_begin = source_offset.low_u64() as usize;
-			mem.write_slice(dest_offset, &source[output_begin..output_end]);
-		}
-	}
-
-	fn verify_jump(&self, jump_u: U256, valid_jump_destinations: &BitSet) -> vm::Result<usize> {
-		let jump = jump_u.low_u64() as usize;
-
-		if valid_jump_destinations.contains(jump) && U256::from(jump) == jump_u {
-			Ok(jump)
-		} else {
-			Err(vm::Error::BadJumpDestination {
-				destination: jump
-			})
-		}
-	}
-
-	fn is_zero(&self, val: &U256) -> bool {
-		val.is_zero()
-	}
-
-	fn bool_to_u256(&self, val: bool) -> U256 {
-		if val {
-			U256::one()
-		} else {
-			U256::zero()
-		}
-	}
-
-	fn exec_stack_instruction(&self, instruction: Instruction, stack: &mut Stack<U256>) -> vm::Result<()> {
-		match instruction {
-			instructions::DUP1...instructions::DUP16 => {
-				let position = instructions::get_dup_position(instruction);
+			instructions::DUP1 | instructions::DUP2 | instructions::DUP3 | instructions::DUP4 |
+			instructions::DUP5 | instructions::DUP6 | instructions::DUP7 | instructions::DUP8 |
+			instructions::DUP9 | instructions::DUP10 | instructions::DUP11 | instructions::DUP12 |
+			instructions::DUP13 | instructions::DUP14 | instructions::DUP15 | instructions::DUP16 => {
+				let position = instruction.dup_position().expect("dup_position always return some for DUP* instructions");
 				let val = stack.peek(position).clone();
 				stack.push(val);
 			},
-			instructions::SWAP1...instructions::SWAP16 => {
-				let position = instructions::get_swap_position(instruction);
+			instructions::SWAP1 | instructions::SWAP2 | instructions::SWAP3 | instructions::SWAP4 |
+			instructions::SWAP5 | instructions::SWAP6 | instructions::SWAP7 | instructions::SWAP8 |
+			instructions::SWAP9 | instructions::SWAP10 | instructions::SWAP11 | instructions::SWAP12 |
+			instructions::SWAP13 | instructions::SWAP14 | instructions::SWAP15 | instructions::SWAP16 => {
+				let position = instruction.swap_position().expect("swap_position always return some for SWAP* instructions");
 				stack.swap_with_top(position)
 			},
 			instructions::POP => {
@@ -871,15 +846,112 @@ impl<Cost: CostType> Interpreter<Cost> {
 					});
 				}
 			},
-			_ => {
-				return Err(vm::Error::BadInstruction {
-					instruction: instruction
-				});
-			}
-		}
-		Ok(())
+			instructions::SHL => {
+				const CONST_256: U256 = U256([256, 0, 0, 0]);
+
+				let shift = stack.pop_back();
+				let value = stack.pop_back();
+
+				let result = if shift >= CONST_256 {
+					U256::zero()
+				} else {
+					value << (shift.as_u32() as usize)
+				};
+				stack.push(result);
+			},
+			instructions::SHR => {
+				const CONST_256: U256 = U256([256, 0, 0, 0]);
+
+				let shift = stack.pop_back();
+				let value = stack.pop_back();
+
+				let result = if shift >= CONST_256 {
+					U256::zero()
+				} else {
+					value >> (shift.as_u32() as usize)
+				};
+				stack.push(result);
+			},
+			instructions::SAR => {
+				// We cannot use get_and_reset_sign/set_sign here, because the rounding looks different.
+
+				const CONST_256: U256 = U256([256, 0, 0, 0]);
+				const CONST_HIBIT: U256 = U256([0, 0, 0, 0x8000000000000000]);
+
+				let shift = stack.pop_back();
+				let value = stack.pop_back();
+				let sign = value & CONST_HIBIT != U256::zero();
+
+				let result = if shift >= CONST_256 {
+					if sign {
+						U256::max_value()
+					} else {
+						U256::zero()
+					}
+				} else {
+					let shift = shift.as_u32() as usize;
+					let mut shifted = value >> shift;
+					if sign {
+						shifted = shifted | (U256::max_value() << (256 - shift));
+					}
+					shifted
+				};
+				stack.push(result);
+			},
+		};
+		Ok(InstructionResult::Ok)
 	}
 
+	fn copy_data_to_memory(mem: &mut Vec<u8>, stack: &mut Stack<U256>, source: &[u8]) {
+		let dest_offset = stack.pop_back();
+		let source_offset = stack.pop_back();
+		let size = stack.pop_back();
+		let source_size = U256::from(source.len());
+
+		let output_end = match source_offset > source_size || size > source_size || source_offset + size > source_size {
+			true => {
+				let zero_slice = if source_offset > source_size {
+					mem.writeable_slice(dest_offset, size)
+				} else {
+					mem.writeable_slice(dest_offset + source_size - source_offset, source_offset + size - source_size)
+				};
+				for i in zero_slice.iter_mut() {
+					*i = 0;
+				}
+				source.len()
+			},
+			false => (size.low_u64() + source_offset.low_u64()) as usize
+		};
+
+		if source_offset < source_size {
+			let output_begin = source_offset.low_u64() as usize;
+			mem.write_slice(dest_offset, &source[output_begin..output_end]);
+		}
+	}
+
+	fn verify_jump(&self, jump_u: U256, valid_jump_destinations: &BitSet) -> vm::Result<usize> {
+		let jump = jump_u.low_u64() as usize;
+
+		if valid_jump_destinations.contains(jump) && U256::from(jump) == jump_u {
+			Ok(jump)
+		} else {
+			Err(vm::Error::BadJumpDestination {
+				destination: jump
+			})
+		}
+	}
+
+	fn is_zero(&self, val: &U256) -> bool {
+		val.is_zero()
+	}
+
+	fn bool_to_u256(&self, val: bool) -> U256 {
+		if val {
+			U256::one()
+		} else {
+			U256::zero()
+		}
+	}
 }
 
 fn get_and_reset_sign(value: U256) -> (U256, bool) {
@@ -906,7 +978,6 @@ fn address_to_u256(value: Address) -> U256 {
 	U256::from(&*H256::from(value))
 }
 
-
 #[cfg(test)]
 mod tests {
 	use std::sync::Arc;

ethcore/evm/src/interpreter/shared_cache.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -21,7 +21,7 @@ use ethereum_types::H256;
 use parking_lot::Mutex;
 use memory_cache::MemoryLruCache;
 use bit_set::BitSet;
-use super::super::instructions;
+use super::super::instructions::{self, Instruction};
 
 const DEFAULT_CACHE_SIZE: usize = 4 * 1024 * 1024;
 
@@ -50,17 +50,22 @@ impl SharedCache {
 	}
 
 	/// Get jump destinations bitmap for a contract.
-	pub fn jump_destinations(&self, code_hash: &H256, code: &[u8]) -> Arc<BitSet> {
-		if code_hash == &KECCAK_EMPTY {
-			return Self::find_jump_destinations(code);
-		}
+	pub fn jump_destinations(&self, code_hash: &Option<H256>, code: &[u8]) -> Arc<BitSet> {
+		if let Some(ref code_hash) = code_hash {
+			if code_hash == &KECCAK_EMPTY {
+				return Self::find_jump_destinations(code);
+			}
 
-		if let Some(d) = self.jump_destinations.lock().get_mut(code_hash) {
-			return d.0.clone();
+			if let Some(d) = self.jump_destinations.lock().get_mut(code_hash) {
+				return d.0.clone();
+			}
 		}
 
 		let d = Self::find_jump_destinations(code);
-		self.jump_destinations.lock().insert(code_hash.clone(), Bits(d.clone()));
+
+		if let Some(ref code_hash) = code_hash {
+			self.jump_destinations.lock().insert(*code_hash, Bits(d.clone()));
+		}
 
 		d
 	}
@@ -70,12 +75,14 @@ impl SharedCache {
 		let mut position = 0;
 
 		while position < code.len() {
-			let instruction = code[position];
+			let instruction = Instruction::from_u8(code[position]);
 
-			if instruction == instructions::JUMPDEST {
-				jump_dests.insert(position);
-			} else if instructions::is_push(instruction) {
-				position += instructions::get_push_bytes(instruction);
+			if let Some(instruction) = instruction {
+				if instruction == instructions::JUMPDEST {
+					jump_dests.insert(position);
+				} else if let Some(push_bytes) = instruction.push_bytes() {
+					position += push_bytes;
+				}
 			}
 			position += 1;
 		}
@@ -91,7 +98,6 @@ impl Default for SharedCache {
 	}
 }
 
-
 #[test]
 fn test_find_jump_destinations() {
 	use rustc_hex::FromHex;

ethcore/evm/src/interpreter/stack.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -95,4 +95,3 @@ impl<S : fmt::Display> Stack<S> for VecStack<S> {
 		&self.stack[self.stack.len() - no_from_top .. self.stack.len()]
 	}
 }
-

ethcore/evm/src/jit.rs

@@ -1,414 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Just in time compiler execution environment.
-use bigint::prelude::U256;
-use bigint::hash::H256;
-use util::*;
-use evmjit;
-use evm::{self, GasLeft};
-use evm::CallType;
-use vm::{self, Vm};
-
-/// Should be used to convert jit types to ethcore
-trait FromJit<T>: Sized {
-	fn from_jit(input: T) -> Self;
-}
-
-/// Should be used to covert ethcore types to jit
-trait IntoJit<T> {
-	fn into_jit(self) -> T;
-}
-
-impl<'a> FromJit<&'a evmjit::I256> for U256 {
-	fn from_jit(input: &'a evmjit::I256) -> Self {
-		unsafe {
-			let mut res: U256 = mem::uninitialized();
-			ptr::copy(input.words.as_ptr(), res.0.as_mut_ptr(), 4);
-			res
-		}
-	}
-}
-
-impl<'a> FromJit<&'a evmjit::I256> for H256 {
-	fn from_jit(input: &'a evmjit::I256) -> Self {
-		let u = U256::from_jit(input);
-		H256::from(&u)
-	}
-}
-
-impl<'a> FromJit<&'a evmjit::I256> for Address {
-	fn from_jit(input: &'a evmjit::I256) -> Self {
-		Address::from(H256::from_jit(input))
-	}
-}
-
-impl<'a> FromJit<&'a evmjit::H256> for H256 {
-	fn from_jit(input: &'a evmjit::H256) -> Self {
-		H256::from_jit(&evmjit::I256::from(input.clone()))
-	}
-}
-
-impl<'a> FromJit<&'a evmjit::H256> for Address {
-	fn from_jit(input: &'a evmjit::H256) -> Self {
-		Address::from(H256::from_jit(input))
-	}
-}
-
-impl IntoJit<evmjit::I256> for U256 {
-	fn into_jit(self) -> evmjit::I256 {
-		unsafe {
-			let mut res: evmjit::I256 = mem::uninitialized();
-			ptr::copy(self.0.as_ptr(), res.words.as_mut_ptr(), 4);
-			res
-		}
-	}
-}
-
-impl IntoJit<evmjit::I256> for H256 {
-	fn into_jit(self) -> evmjit::I256 {
-		let mut ret = [0; 4];
-		let len = self.len();
-		for i in 0..len {
-			let rev = len - 1 - i;
-			let pos = rev / 8;
-			ret[pos] += (self[i] as u64) << ((rev % 8) * 8);
-		}
-		evmjit::I256 { words: ret }
-	}
-}
-
-impl IntoJit<evmjit::H256> for H256 {
-	fn into_jit(self) -> evmjit::H256 {
-		let i: evmjit::I256 = self.into_jit();
-		From::from(i)
-	}
-}
-
-impl IntoJit<evmjit::I256> for Address {
-	fn into_jit(self) -> evmjit::I256 {
-		H256::from(self).into_jit()
-	}
-}
-
-impl IntoJit<evmjit::H256> for Address {
-	fn into_jit(self) -> evmjit::H256 {
-		H256::from(self).into_jit()
-	}
-}
-
-/// Externalities adapter. Maps callbacks from evmjit to externalities trait.
-///
-/// Evmjit doesn't have to know about children execution failures.
-/// This adapter 'catches' them and moves upstream.
-struct ExtAdapter<'a> {
-	ext: &'a mut evm::Ext,
-	address: Address
-}
-
-impl<'a> ExtAdapter<'a> {
-	fn new(ext: &'a mut evm::Ext, address: Address) -> Self {
-		ExtAdapter {
-			ext: ext,
-			address: address
-		}
-	}
-}
-
-impl<'a> evmjit::Ext for ExtAdapter<'a> {
-	fn sload(&self, key: *const evmjit::I256, out_value: *mut evmjit::I256) {
-		unsafe {
-			let i = H256::from_jit(&*key);
-			let o = self.ext.storage_at(&i);
-			*out_value = o.into_jit();
-		}
-	}
-
-	fn sstore(&mut self, key: *const evmjit::I256, value: *const evmjit::I256) {
-		let key = unsafe { H256::from_jit(&*key) };
-		let value = unsafe { H256::from_jit(&*value) };
-		let old_value = self.ext.storage_at(&key);
-		// if SSTORE nonzero -> zero, increment refund count
-		if !old_value.is_zero() && value.is_zero() {
-			self.ext.inc_sstore_clears();
-		}
-		self.ext.set_storage(key, value);
-	}
-
-	fn balance(&self, address: *const evmjit::H256, out_value: *mut evmjit::I256) {
-		unsafe {
-			let a = Address::from_jit(&*address);
-			let o = self.ext.balance(&a);
-			*out_value = o.into_jit();
-		}
-	}
-
-	fn blockhash(&self, number: *const evmjit::I256, out_hash: *mut evmjit::H256) {
-		unsafe {
-			let n = U256::from_jit(&*number);
-			let o = self.ext.blockhash(&n);
-			*out_hash = o.into_jit();
-		}
-	}
-
-	fn create(&mut self,
-			  io_gas: *mut u64,
-			  value: *const evmjit::I256,
-			  init_beg: *const u8,
-			  init_size: u64,
-			  address: *mut evmjit::H256) {
-
-		let gas = unsafe { U256::from(*io_gas) };
-		let value = unsafe { U256::from_jit(&*value) };
-		let code = unsafe { slice::from_raw_parts(init_beg, init_size as usize) };
-
-		// check if balance is sufficient and we are not too deep
-		if self.ext.balance(&self.address) >= value && self.ext.depth() < self.ext.schedule().max_depth {
-			match self.ext.create(&gas, &value, code) {
-				evm::ContractCreateResult::Created(new_address, gas_left) => unsafe {
-					*address = new_address.into_jit();
-					*io_gas = gas_left.low_u64();
-				},
-				evm::ContractCreateResult::Failed => unsafe {
-					*address = Address::new().into_jit();
-					*io_gas = 0;
-				}
-			}
-		} else {
-			unsafe { *address = Address::new().into_jit(); }
-		}
-	}
-
-	fn call(&mut self,
-				io_gas: *mut u64,
-				call_gas: u64,
-				sender_address: *const evmjit::H256,
-				receive_address: *const evmjit::H256,
-				code_address: *const evmjit::H256,
-				transfer_value: *const evmjit::I256,
-				// We are ignoring apparent value - it's handled in externalities.
-				_apparent_value: *const evmjit::I256,
-				in_beg: *const u8,
-				in_size: u64,
-				out_beg: *mut u8,
-				out_size: u64) -> bool {
-
-		let mut gas = unsafe { U256::from(*io_gas) };
-		let mut call_gas = U256::from(call_gas);
-		let mut gas_cost = call_gas;
-		let sender_address = unsafe { Address::from_jit(&*sender_address) };
-		let receive_address = unsafe { Address::from_jit(&*receive_address) };
-		let code_address = unsafe { Address::from_jit(&*code_address) };
-		let transfer_value = unsafe { U256::from_jit(&*transfer_value) };
-
-		// receive address and code address are the same in normal calls
-		let is_callcode = receive_address != code_address;
-		let is_delegatecall = is_callcode && sender_address != receive_address;
-
-		let value = if is_delegatecall { None } else { Some(transfer_value) };
-
-		if !is_callcode && !self.ext.exists(&code_address) {
-			gas_cost = gas_cost + U256::from(self.ext.schedule().call_new_account_gas);
-		}
-
-		if transfer_value > U256::zero() {
-			assert!(self.ext.schedule().call_value_transfer_gas > self.ext.schedule().call_stipend, "overflow possible");
-			gas_cost = gas_cost + U256::from(self.ext.schedule().call_value_transfer_gas);
-			call_gas = call_gas + U256::from(self.ext.schedule().call_stipend);
-		}
-
-		if gas_cost > gas {
-			unsafe {
-				*io_gas = -1i64 as u64;
-				return false;
-			}
-		}
-
-		gas = gas - gas_cost;
-
-		// check if balance is sufficient and we are not too deep
-		if self.ext.balance(&self.address) < transfer_value || self.ext.depth() >= self.ext.schedule().max_depth {
-			unsafe {
-				*io_gas = (gas + call_gas).low_u64();
-				return false;
-			}
-		}
-
-		let call_type = match (is_callcode, is_delegatecall) {
-			(_, true) => CallType::DelegateCall,
-			(true, false) => CallType::CallCode,
-			(false, false) => CallType::Call,
-		};
-
-		match self.ext.call(
-					  &call_gas,
-					  &sender_address,
-					  &receive_address,
-					  value,
-					  unsafe { slice::from_raw_parts(in_beg, in_size as usize) },
-					  &code_address,
-					  unsafe { slice::from_raw_parts_mut(out_beg, out_size as usize) },
-					  call_type,
-					  ) {
-			evm::MessageCallResult::Success(gas_left) => unsafe {
-				*io_gas = (gas + gas_left).low_u64();
-				true
-			},
-			evm::MessageCallResult::Failed => unsafe {
-				*io_gas = gas.low_u64();
-				false
-			}
-		}
-	}
-
-	fn log(&mut self,
-		   beg: *const u8,
-		   size: u64,
-		   topic1: *const evmjit::H256,
-		   topic2: *const evmjit::H256,
-		   topic3: *const evmjit::H256,
-		   topic4: *const evmjit::H256) {
-
-		unsafe {
-			let mut topics = vec![];
-			if !topic1.is_null() {
-				topics.push(H256::from_jit(&*topic1));
-			}
-
-			if !topic2.is_null() {
-				topics.push(H256::from_jit(&*topic2));
-			}
-
-			if !topic3.is_null() {
-				topics.push(H256::from_jit(&*topic3));
-			}
-
-			if !topic4.is_null() {
-				topics.push(H256::from_jit(&*topic4));
-			}
-
-			let bytes_ref: &[u8] = slice::from_raw_parts(beg, size as usize);
-			self.ext.log(topics, bytes_ref);
-		}
-	}
-
-	fn extcode(&self, address: *const evmjit::H256, size: *mut u64) -> *const u8 {
-		unsafe {
-			let code = self.ext.extcode(&Address::from_jit(&*address));
-			*size = code.len() as u64;
-			let ptr = code.as_ptr();
-			mem::forget(code);
-			ptr
-		}
-	}
-}
-
-#[derive(Default)]
-pub struct JitEvm {
-	context: Option<evmjit::ContextHandle>,
-}
-
-impl vm::Vm for JitEvm {
-	fn exec(&mut self, params: ActionParams, ext: &mut evm::Ext) -> evm::Result<GasLeft> {
-		// Dirty hack. This is unsafe, but we interact with ffi, so it's justified.
-		let ext_adapter: ExtAdapter<'static> = unsafe { ::std::mem::transmute(ExtAdapter::new(ext, params.address.clone())) };
-		let mut ext_handle = evmjit::ExtHandle::new(ext_adapter);
-		assert!(params.gas <= U256::from(i64::max_value() as u64), "evmjit max gas is 2 ^ 63");
-		assert!(params.gas_price <= U256::from(i64::max_value() as u64), "evmjit max gas is 2 ^ 63");
-
-		let call_data = params.data.unwrap_or_else(Vec::new);
-		let code = params.code.unwrap_or_else(Vec::new);
-
-		let mut data = evmjit::RuntimeDataHandle::new();
-		data.gas = params.gas.low_u64() as i64;
-		data.gas_price = params.gas_price.low_u64() as i64;
-		data.call_data = call_data.as_ptr();
-		data.call_data_size = call_data.len() as u64;
-		mem::forget(call_data);
-		data.code = code.as_ptr();
-		data.code_size = code.len() as u64;
-		data.code_hash = code.sha3().into_jit();
-		mem::forget(code);
-		data.address = params.address.into_jit();
-		data.caller = params.sender.into_jit();
-		data.origin = params.origin.into_jit();
-		data.transfer_value = match params.value {
-			ActionValue::Transfer(val) => val.into_jit(),
-			ActionValue::Apparent(val) => val.into_jit()
-		};
-		data.apparent_value = data.transfer_value;
-
-		let mut schedule = evmjit::ScheduleHandle::new();
-		schedule.have_delegate_call = ext.schedule().have_delegate_call;
-
-		data.author = ext.env_info().author.clone().into_jit();
-		data.difficulty = ext.env_info().difficulty.into_jit();
-		data.gas_limit = ext.env_info().gas_limit.into_jit();
-		data.number = ext.env_info().number;
-		// don't really know why jit timestamp is int..
-		data.timestamp = ext.env_info().timestamp as i64;
-
-		self.context = Some(unsafe { evmjit::ContextHandle::new(data, schedule, &mut ext_handle) });
-		let mut context = self.context.as_mut().expect("context handle set on the prior line; qed");
-		let res = context.exec();
-
-		match res {
-			evmjit::ReturnCode::Stop => Ok(GasLeft::Known(U256::from(context.gas_left()))),
-			evmjit::ReturnCode::Return =>
-				Ok(GasLeft::NeedsReturn(U256::from(context.gas_left()), context.output_data())),
-			evmjit::ReturnCode::Suicide => {
-				ext.suicide(&Address::from_jit(&context.suicide_refund_address()));
-				Ok(GasLeft::Known(U256::from(context.gas_left())))
-			},
-			evmjit::ReturnCode::OutOfGas => Err(vm::Error::OutOfGas),
-			_err => Err(vm::Error::Internal)
-		}
-	}
-}
-
-#[test]
-fn test_to_and_from_u256() {
-	let u = U256::from_str("d4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3").unwrap();
-	let j = u.into_jit();
-	let u2 = U256::from_jit(&j);
-	assert_eq!(u, u2);
-}
-
-#[test]
-fn test_to_and_from_h256() {
-	let h = H256::from_str("d4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3").unwrap();
-	let j: ::evmjit::I256 = h.clone().into_jit();
-	let h2 = H256::from_jit(&j);
-
-	assert_eq!(h, h2);
-
-	let j: ::evmjit::H256 = h.clone().into_jit();
-	let h2 = H256::from_jit(&j);
-	assert_eq!(h, h2);
-}
-
-#[test]
-fn test_to_and_from_address() {
-	let a = Address::from_str("2adc25665018aa1fe0e6bc666dac8fc2697ff9ba").unwrap();
-	let j: ::evmjit::I256 = a.clone().into_jit();
-	let a2 = Address::from_jit(&j);
-
-	assert_eq!(a, a2);
-
-	let j: ::evmjit::H256 = a.clone().into_jit();
-	let a2 = Address::from_jit(&j);
-	assert_eq!(a, a2);
-}

ethcore/evm/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -30,9 +30,6 @@ extern crate lazy_static;
 #[cfg_attr(feature = "evm-debug", macro_use)]
 extern crate log;
 
-#[cfg(feature = "jit")]
-extern crate evmjit;
-
 #[cfg(test)]
 extern crate rustc_hex;
 
@@ -44,12 +41,9 @@ pub mod factory;
 mod vmtype;
 mod instructions;
 
-#[cfg(feature = "jit" )]
-mod jit;
-
 #[cfg(test)]
 mod tests;
-#[cfg(all(feature="benches", test))]
+#[cfg(all(feature = "benches", test))]
 mod benches;
 
 pub use vm::{
@@ -58,6 +52,6 @@ pub use vm::{
     GasLeft, ReturnData
 };
 pub use self::evm::{Finalize, FinalizationResult, CostType};
-pub use self::instructions::{InstructionInfo, INSTRUCTIONS, push_bytes};
+pub use self::instructions::{InstructionInfo, Instruction};
 pub use self::vmtype::VMType;
 pub use self::factory::Factory;

ethcore/evm/src/tests.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -26,9 +26,9 @@ use vm::tests::{FakeExt, FakeCall, FakeCallType, test_finalize};
 use factory::Factory;
 use vmtype::VMType;
 
-evm_test!{test_add: test_add_jit, test_add_int}
+evm_test!{test_add: test_add_int}
 fn test_add(factory: super::Factory) {
-  let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
+	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
 	let code = "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01600055".from_hex().unwrap();
 
 	let mut params = ActionParams::default();
@@ -46,7 +46,7 @@ fn test_add(factory: super::Factory) {
 	assert_store(&ext, 0, "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe");
 }
 
-evm_test!{test_sha3: test_sha3_jit, test_sha3_int}
+evm_test!{test_sha3: test_sha3_int}
 fn test_sha3(factory: super::Factory) {
 	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
 	let code = "6000600020600055".from_hex().unwrap();
@@ -66,7 +66,7 @@ fn test_sha3(factory: super::Factory) {
 	assert_store(&ext, 0, "c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
 }
 
-evm_test!{test_address: test_address_jit, test_address_int}
+evm_test!{test_address: test_address_int}
 fn test_address(factory: super::Factory) {
 	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
 	let code = "30600055".from_hex().unwrap();
@@ -86,7 +86,7 @@ fn test_address(factory: super::Factory) {
 	assert_store(&ext, 0, "0000000000000000000000000f572e5295c57f15886f9b263e2f6d2d6c7b5ec6");
 }
 
-evm_test!{test_origin: test_origin_jit, test_origin_int}
+evm_test!{test_origin: test_origin_int}
 fn test_origin(factory: super::Factory) {
 	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
 	let origin = Address::from_str("cd1722f2947def4cf144679da39c4c32bdc35681").unwrap();
@@ -108,7 +108,7 @@ fn test_origin(factory: super::Factory) {
 	assert_store(&ext, 0, "000000000000000000000000cd1722f2947def4cf144679da39c4c32bdc35681");
 }
 
-evm_test!{test_sender: test_sender_jit, test_sender_int}
+evm_test!{test_sender: test_sender_int}
 fn test_sender(factory: super::Factory) {
 	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
 	let sender = Address::from_str("cd1722f2947def4cf144679da39c4c32bdc35681").unwrap();
@@ -130,7 +130,7 @@ fn test_sender(factory: super::Factory) {
 	assert_store(&ext, 0, "000000000000000000000000cd1722f2947def4cf144679da39c4c32bdc35681");
 }
 
-evm_test!{test_extcodecopy: test_extcodecopy_jit, test_extcodecopy_int}
+evm_test!{test_extcodecopy: test_extcodecopy_int}
 fn test_extcodecopy(factory: super::Factory) {
 		// 33 - sender
 		// 3b - extcodesize
@@ -165,7 +165,7 @@ fn test_extcodecopy(factory: super::Factory) {
 	assert_store(&ext, 0, "6005600055000000000000000000000000000000000000000000000000000000");
 }
 
-evm_test!{test_log_empty: test_log_empty_jit, test_log_empty_int}
+evm_test!{test_log_empty: test_log_empty_int}
 fn test_log_empty(factory: super::Factory) {
 	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
 	let code = "60006000a0".from_hex().unwrap();
@@ -187,7 +187,7 @@ fn test_log_empty(factory: super::Factory) {
 	assert!(ext.logs[0].data.is_empty());
 }
 
-evm_test!{test_log_sender: test_log_sender_jit, test_log_sender_int}
+evm_test!{test_log_sender: test_log_sender_int}
 fn test_log_sender(factory: super::Factory) {
 	// 60 ff - push ff
 	// 60 00 - push 00
@@ -220,7 +220,7 @@ fn test_log_sender(factory: super::Factory) {
 	assert_eq!(ext.logs[0].data, "ff00000000000000000000000000000000000000000000000000000000000000".from_hex().unwrap());
 }
 
-evm_test!{test_blockhash: test_blockhash_jit, test_blockhash_int}
+evm_test!{test_blockhash: test_blockhash_int}
 fn test_blockhash(factory: super::Factory) {
 	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
 	let code = "600040600055".from_hex().unwrap();
@@ -242,7 +242,7 @@ fn test_blockhash(factory: super::Factory) {
 	assert_eq!(ext.store.get(&H256::new()).unwrap(), &blockhash);
 }
 
-evm_test!{test_calldataload: test_calldataload_jit, test_calldataload_int}
+evm_test!{test_calldataload: test_calldataload_int}
 fn test_calldataload(factory: super::Factory) {
 	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
 	let code = "600135600055".from_hex().unwrap();
@@ -265,7 +265,7 @@ fn test_calldataload(factory: super::Factory) {
 
 }
 
-evm_test!{test_author: test_author_jit, test_author_int}
+evm_test!{test_author: test_author_int}
 fn test_author(factory: super::Factory) {
 	let author = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
 	let code = "41600055".from_hex().unwrap();
@@ -285,7 +285,7 @@ fn test_author(factory: super::Factory) {
 	assert_store(&ext, 0, "0000000000000000000000000f572e5295c57f15886f9b263e2f6d2d6c7b5ec6");
 }
 
-evm_test!{test_timestamp: test_timestamp_jit, test_timestamp_int}
+evm_test!{test_timestamp: test_timestamp_int}
 fn test_timestamp(factory: super::Factory) {
 	let timestamp = 0x1234;
 	let code = "42600055".from_hex().unwrap();
@@ -305,7 +305,7 @@ fn test_timestamp(factory: super::Factory) {
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000001234");
 }
 
-evm_test!{test_number: test_number_jit, test_number_int}
+evm_test!{test_number: test_number_int}
 fn test_number(factory: super::Factory) {
 	let number = 0x1234;
 	let code = "43600055".from_hex().unwrap();
@@ -325,7 +325,7 @@ fn test_number(factory: super::Factory) {
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000001234");
 }
 
-evm_test!{test_difficulty: test_difficulty_jit, test_difficulty_int}
+evm_test!{test_difficulty: test_difficulty_int}
 fn test_difficulty(factory: super::Factory) {
 	let difficulty = U256::from(0x1234);
 	let code = "44600055".from_hex().unwrap();
@@ -345,7 +345,7 @@ fn test_difficulty(factory: super::Factory) {
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000001234");
 }
 
-evm_test!{test_gas_limit: test_gas_limit_jit, test_gas_limit_int}
+evm_test!{test_gas_limit: test_gas_limit_int}
 fn test_gas_limit(factory: super::Factory) {
 	let gas_limit = U256::from(0x1234);
 	let code = "45600055".from_hex().unwrap();
@@ -365,7 +365,7 @@ fn test_gas_limit(factory: super::Factory) {
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000001234");
 }
 
-evm_test!{test_mul: test_mul_jit, test_mul_int}
+evm_test!{test_mul: test_mul_int}
 fn test_mul(factory: super::Factory) {
 	let code = "65012365124623626543219002600055".from_hex().unwrap();
 
@@ -383,7 +383,7 @@ fn test_mul(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(79_983));
 }
 
-evm_test!{test_sub: test_sub_jit, test_sub_int}
+evm_test!{test_sub: test_sub_int}
 fn test_sub(factory: super::Factory) {
 	let code = "65012365124623626543219003600055".from_hex().unwrap();
 
@@ -401,7 +401,7 @@ fn test_sub(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(79_985));
 }
 
-evm_test!{test_div: test_div_jit, test_div_int}
+evm_test!{test_div: test_div_int}
 fn test_div(factory: super::Factory) {
 	let code = "65012365124623626543219004600055".from_hex().unwrap();
 
@@ -419,7 +419,7 @@ fn test_div(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(79_983));
 }
 
-evm_test!{test_div_zero: test_div_zero_jit, test_div_zero_int}
+evm_test!{test_div_zero: test_div_zero_int}
 fn test_div_zero(factory: super::Factory) {
 	let code = "6501236512462360009004600055".from_hex().unwrap();
 
@@ -437,7 +437,7 @@ fn test_div_zero(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(94_983));
 }
 
-evm_test!{test_mod: test_mod_jit, test_mod_int}
+evm_test!{test_mod: test_mod_int}
 fn test_mod(factory: super::Factory) {
 	let code = "650123651246236265432290066000556501236512462360009006600155".from_hex().unwrap();
 
@@ -456,7 +456,7 @@ fn test_mod(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(74_966));
 }
 
-evm_test!{test_smod: test_smod_jit, test_smod_int}
+evm_test!{test_smod: test_smod_int}
 fn test_smod(factory: super::Factory) {
 	let code = "650123651246236265432290076000556501236512462360009007600155".from_hex().unwrap();
 
@@ -475,7 +475,7 @@ fn test_smod(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(74_966));
 }
 
-evm_test!{test_sdiv: test_sdiv_jit, test_sdiv_int}
+evm_test!{test_sdiv: test_sdiv_int}
 fn test_sdiv(factory: super::Factory) {
 	let code = "650123651246236265432290056000556501236512462360009005600155".from_hex().unwrap();
 
@@ -494,7 +494,7 @@ fn test_sdiv(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(74_966));
 }
 
-evm_test!{test_exp: test_exp_jit, test_exp_int}
+evm_test!{test_exp: test_exp_int}
 fn test_exp(factory: super::Factory) {
 	let code = "6016650123651246230a6000556001650123651246230a6001556000650123651246230a600255".from_hex().unwrap();
 
@@ -514,7 +514,7 @@ fn test_exp(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(39_923));
 }
 
-evm_test!{test_comparison: test_comparison_jit, test_comparison_int}
+evm_test!{test_comparison: test_comparison_int}
 fn test_comparison(factory: super::Factory) {
 	let code = "601665012365124623818181811060005511600155146002556415235412358014600355".from_hex().unwrap();
 
@@ -535,7 +535,7 @@ fn test_comparison(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(49_952));
 }
 
-evm_test!{test_signed_comparison: test_signed_comparison_jit, test_signed_comparison_int}
+evm_test!{test_signed_comparison: test_signed_comparison_int}
 fn test_signed_comparison(factory: super::Factory) {
 	let code = "60106000036010818112600055136001556010601060000381811260025513600355".from_hex().unwrap();
 
@@ -556,7 +556,7 @@ fn test_signed_comparison(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(49_940));
 }
 
-evm_test!{test_bitops: test_bitops_jit, test_bitops_int}
+evm_test!{test_bitops: test_bitops_int}
 fn test_bitops(factory: super::Factory) {
 	let code = "60ff610ff08181818116600055176001551860025560008015600355198015600455600555".from_hex().unwrap();
 
@@ -579,7 +579,7 @@ fn test_bitops(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(44_937));
 }
 
-evm_test!{test_addmod_mulmod: test_addmod_mulmod_jit, test_addmod_mulmod_int}
+evm_test!{test_addmod_mulmod: test_addmod_mulmod_int}
 fn test_addmod_mulmod(factory: super::Factory) {
 	let code = "60ff60f060108282820860005509600155600060f0601082828208196002550919600355".from_hex().unwrap();
 
@@ -600,7 +600,7 @@ fn test_addmod_mulmod(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(19_914));
 }
 
-evm_test!{test_byte: test_byte_jit, test_byte_int}
+evm_test!{test_byte: test_byte_int}
 fn test_byte(factory: super::Factory) {
 	let code = "60f061ffff1a600055610fff601f1a600155".from_hex().unwrap();
 
@@ -619,7 +619,7 @@ fn test_byte(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(74_976));
 }
 
-evm_test!{test_signextend: test_signextend_jit, test_signextend_int}
+evm_test!{test_signextend: test_signextend_int}
 fn test_signextend(factory: super::Factory) {
 	let code = "610fff60020b60005560ff60200b600155".from_hex().unwrap();
 
@@ -659,7 +659,7 @@ fn test_badinstruction_int() {
 	}
 }
 
-evm_test!{test_pop: test_pop_jit, test_pop_int}
+evm_test!{test_pop: test_pop_int}
 fn test_pop(factory: super::Factory) {
 	let code = "60f060aa50600055".from_hex().unwrap();
 
@@ -677,7 +677,7 @@ fn test_pop(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(79_989));
 }
 
-evm_test!{test_extops: test_extops_jit, test_extops_int}
+evm_test!{test_extops: test_extops_int}
 fn test_extops(factory: super::Factory) {
 	let code = "5a6001555836553a600255386003553460045560016001526016590454600555".from_hex().unwrap();
 
@@ -702,7 +702,7 @@ fn test_extops(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(29_898));
 }
 
-evm_test!{test_jumps: test_jumps_jit, test_jumps_int}
+evm_test!{test_jumps: test_jumps_int}
 fn test_jumps(factory: super::Factory) {
 	let code = "600160015560066000555b60016000540380806000551560245760015402600155600a565b".from_hex().unwrap();
 
@@ -716,13 +716,13 @@ fn test_jumps(factory: super::Factory) {
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
-	assert_eq!(ext.sstore_clears, 1);
+	assert_eq!(ext.sstore_clears, ext.schedule.sstore_refund_gas as i128);
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000000"); // 5!
 	assert_store(&ext, 1, "0000000000000000000000000000000000000000000000000000000000000078"); // 5!
 	assert_eq!(gas_left, U256::from(54_117));
 }
 
-evm_test!{test_calls: test_calls_jit, test_calls_int}
+evm_test!{test_calls: test_calls_int}
 fn test_calls(factory: super::Factory) {
 	let code = "600054602d57600160005560006000600060006050610998610100f160006000600060006050610998610100f25b".from_hex().unwrap();
 
@@ -746,6 +746,7 @@ fn test_calls(factory: super::Factory) {
 
 	assert_set_contains(&ext.calls, &FakeCall {
 		call_type: FakeCallType::Call,
+		create_scheme: None,
 		gas: U256::from(2556),
 		sender_address: Some(address.clone()),
 		receive_address: Some(code_address.clone()),
@@ -755,6 +756,7 @@ fn test_calls(factory: super::Factory) {
 	});
 	assert_set_contains(&ext.calls, &FakeCall {
 		call_type: FakeCallType::Call,
+		create_scheme: None,
 		gas: U256::from(2556),
 		sender_address: Some(address.clone()),
 		receive_address: Some(address.clone()),
@@ -766,7 +768,7 @@ fn test_calls(factory: super::Factory) {
 	assert_eq!(ext.calls.len(), 2);
 }
 
-evm_test!{test_create_in_staticcall: test_create_in_staticcall_jit, test_create_in_staticcall_int}
+evm_test!{test_create_in_staticcall: test_create_in_staticcall_int}
 fn test_create_in_staticcall(factory: super::Factory) {
 	let code = "600060006064f000".from_hex().unwrap();
 
@@ -787,6 +789,273 @@ fn test_create_in_staticcall(factory: super::Factory) {
 	assert_eq!(ext.calls.len(), 0);
 }
 
+evm_test!{test_shl: test_shl_int}
+fn test_shl(factory: super::Factory) {
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1b,
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		"00",
+		"0000000000000000000000000000000000000000000000000000000000000001");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1b,
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		"01",
+		"0000000000000000000000000000000000000000000000000000000000000002");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1b,
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		"ff",
+		"8000000000000000000000000000000000000000000000000000000000000000");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1b,
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		"0100",
+		"0000000000000000000000000000000000000000000000000000000000000000");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1b,
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		"0101",
+		"0000000000000000000000000000000000000000000000000000000000000000");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1b,
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"00",
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1b,
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"01",
+		"fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1b,
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"ff",
+		"8000000000000000000000000000000000000000000000000000000000000000");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1b,
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"0100",
+		"0000000000000000000000000000000000000000000000000000000000000000");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1b,
+		"0000000000000000000000000000000000000000000000000000000000000000",
+		"01",
+		"0000000000000000000000000000000000000000000000000000000000000000");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1b,
+		"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"01",
+		"fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe");
+}
+
+evm_test!{test_shr: test_shr_int}
+fn test_shr(factory: super::Factory) {
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1c,
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		"00",
+		"0000000000000000000000000000000000000000000000000000000000000001");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1c,
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		"01",
+		"0000000000000000000000000000000000000000000000000000000000000000");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1c,
+		"8000000000000000000000000000000000000000000000000000000000000000",
+		"01",
+		"4000000000000000000000000000000000000000000000000000000000000000");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1c,
+		"8000000000000000000000000000000000000000000000000000000000000000",
+		"ff",
+		"0000000000000000000000000000000000000000000000000000000000000001");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1c,
+		"8000000000000000000000000000000000000000000000000000000000000000",
+		"0100",
+		"0000000000000000000000000000000000000000000000000000000000000000");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1c,
+		"8000000000000000000000000000000000000000000000000000000000000000",
+		"0101",
+		"0000000000000000000000000000000000000000000000000000000000000000");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1c,
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"00",
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1c,
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"01",
+		"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1c,
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"ff",
+		"0000000000000000000000000000000000000000000000000000000000000001");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1c,
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"0100",
+		"0000000000000000000000000000000000000000000000000000000000000000");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1c,
+		"0000000000000000000000000000000000000000000000000000000000000000",
+		"01",
+		"0000000000000000000000000000000000000000000000000000000000000000");
+}
+
+evm_test!{test_sar: test_sar_int}
+fn test_sar(factory: super::Factory) {
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		"00",
+		"0000000000000000000000000000000000000000000000000000000000000001");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		"01",
+		"0000000000000000000000000000000000000000000000000000000000000000");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"8000000000000000000000000000000000000000000000000000000000000000",
+		"01",
+		"c000000000000000000000000000000000000000000000000000000000000000");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"8000000000000000000000000000000000000000000000000000000000000000",
+		"ff",
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"8000000000000000000000000000000000000000000000000000000000000000",
+		"0100",
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"8000000000000000000000000000000000000000000000000000000000000000",
+		"0101",
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"00",
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"01",
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"ff",
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"0100",
+		"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"0000000000000000000000000000000000000000000000000000000000000000",
+		"01",
+		"0000000000000000000000000000000000000000000000000000000000000000");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"4000000000000000000000000000000000000000000000000000000000000000",
+		"fe",
+		"0000000000000000000000000000000000000000000000000000000000000001");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"f8",
+		"000000000000000000000000000000000000000000000000000000000000007f");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"fe",
+		"0000000000000000000000000000000000000000000000000000000000000001");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"ff",
+		"0000000000000000000000000000000000000000000000000000000000000000");
+	push_two_pop_one_constantinople_test(
+		&factory,
+		0x1d,
+		"7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"0100",
+		"0000000000000000000000000000000000000000000000000000000000000000");
+}
+
+fn push_two_pop_one_constantinople_test(factory: &super::Factory, opcode: u8, push1: &str, push2: &str, result: &str) {
+	let mut push1 = push1.from_hex().unwrap();
+	let mut push2 = push2.from_hex().unwrap();
+	assert!(push1.len() <= 32 && push1.len() != 0);
+	assert!(push2.len() <= 32 && push2.len() != 0);
+
+	let mut code = Vec::new();
+	code.push(0x60 + ((push1.len() - 1) as u8));
+	code.append(&mut push1);
+	code.push(0x60 + ((push2.len() - 1) as u8));
+	code.append(&mut push2);
+	code.push(opcode);
+	code.append(&mut vec![0x60, 0x00, 0x55]);
+
+	let mut params = ActionParams::default();
+	params.gas = U256::from(100_000);
+	params.code = Some(Arc::new(code));
+	let mut ext = FakeExt::new_constantinople();
+
+	let _ = {
+		let mut vm = factory.create(&params.gas);
+		test_finalize(vm.exec(params, &mut ext)).unwrap()
+	};
+
+	assert_store(&ext, 0, result);
+}
+
 fn assert_set_contains<T : Debug + Eq + PartialEq + Hash>(set: &HashSet<T>, val: &T) {
 	let contains = set.contains(val);
 	if !contains {
@@ -799,4 +1068,3 @@ fn assert_set_contains<T : Debug + Eq + PartialEq + Hash>(set: &HashSet<T>, val:
 fn assert_store(ext: &FakeExt, pos: u64, val: &str) {
 	assert_eq!(ext.store.get(&H256::from(pos)).unwrap(), &H256::from_str(val).unwrap());
 }
-

ethcore/evm/src/vmtype.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -19,22 +19,11 @@ use std::fmt;
 /// Type of EVM to use.
 #[derive(Debug, PartialEq, Clone)]
 pub enum VMType {
-	/// JIT EVM
-	#[cfg(feature = "jit")]
-	Jit,
 	/// RUST EVM
 	Interpreter
 }
 
 impl fmt::Display for VMType {
-	#[cfg(feature="jit")]
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		write!(f, "{}", match *self {
-			VMType::Jit => "JIT",
-			VMType::Interpreter => "INT"
-		})
-	}
-	#[cfg(not(feature="jit"))]
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		write!(f, "{}", match *self {
 			VMType::Interpreter => "INT"
@@ -49,27 +38,8 @@ impl Default for VMType {
 }
 
 impl VMType {
-	/// Return all possible VMs (JIT, Interpreter)
-	#[cfg(feature = "jit")]
-	pub fn all() -> Vec<VMType> {
-		vec![VMType::Jit, VMType::Interpreter]
-	}
-
 	/// Return all possible VMs (Interpreter)
-	#[cfg(not(feature = "jit"))]
 	pub fn all() -> Vec<VMType> {
 		vec![VMType::Interpreter]
 	}
-
-	/// Return new jit if it's possible
-	#[cfg(not(feature = "jit"))]
-	pub fn jit() -> Option<Self> {
-		None
-	}
-
-	/// Return new jit if it's possible
-	#[cfg(feature = "jit")]
-	pub fn jit() -> Option<Self> {
-		Some(VMType::Jit)
-	}
 }

ethcore/light/Cargo.toml

@@ -3,26 +3,26 @@ description = "Parity Light Client Implementation"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-light"
-version = "1.9.0"
+version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 log = "0.3"
 ethcore = { path = ".."}
-ethcore-bytes = { path = "../../util/bytes" }
+parity-bytes = { git = "https://github.com/paritytech/parity-common" }
 ethcore-transaction = { path = "../transaction" }
-ethereum-types = "0.2"
-memorydb = { path = "../../util/memorydb" }
-patricia-trie = { path = "../../util/patricia_trie" }
+ethereum-types = "0.3"
+memorydb = { git = "https://github.com/paritytech/parity-common" }
+patricia-trie = { git = "https://github.com/paritytech/parity-common" }
+patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 ethcore-network = { path = "../../util/network" }
 ethcore-io = { path = "../../util/io" }
-hashdb = { path = "../../util/hashdb" }
+hashdb = { git = "https://github.com/paritytech/parity-common" }
 heapsize = "0.4"
 vm = { path = "../vm" }
-plain_hasher = { path = "../../util/plain_hasher" }
-rlp = { path = "../../util/rlp" }
+plain_hasher = { git = "https://github.com/paritytech/parity-common" }
+rlp = { git = "https://github.com/paritytech/parity-common" }
 rlp_derive = { path = "../../util/rlp_derive" }
-time = "0.1"
 smallvec = "0.4"
 futures = "0.1"
 rand = "0.4"
@@ -30,16 +30,18 @@ itertools = "0.5"
 bincode = "0.8.0"
 serde = "1.0"
 serde_derive = "1.0"
-parking_lot = "0.5"
+parking_lot = "0.6"
 stats = { path = "../../util/stats" }
-keccak-hash = { path = "../../util/hash" }
-triehash = { path = "../../util/triehash" }
-kvdb = { path = "../../util/kvdb" }
-kvdb-rocksdb = { path = "../../util/kvdb-rocksdb" }
-kvdb-memorydb = { path = "../../util/kvdb-memorydb" }
+keccak-hash = { git = "https://github.com/paritytech/parity-common" }
+keccak-hasher = { path = "../../util/keccak-hasher" }
+triehash-ethereum = { version = "0.2",  path = "../../util/triehash-ethereum" }
+kvdb = { git = "https://github.com/paritytech/parity-common" }
 memory-cache = { path = "../../util/memory_cache" }
+error-chain = { version = "0.12", default-features = false }
 
 [dev-dependencies]
+ethcore = { path = "..", features = ["test-helpers"] }
+kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" }
 tempdir = "0.3"
 
 [features]

ethcore/light/src/cache.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -25,7 +25,7 @@ use ethcore::header::BlockNumber;
 use ethcore::receipt::Receipt;
 
 use stats::Corpus;
-use time::{SteadyTime, Duration};
+use std::time::{Instant, Duration};
 use heapsize::HeapSizeOf;
 use ethereum_types::{H256, U256};
 use memory_cache::MemoryLruCache;
@@ -69,7 +69,7 @@ pub struct Cache {
 	bodies: MemoryLruCache<H256, encoded::Body>,
 	receipts: MemoryLruCache<H256, Vec<Receipt>>,
 	chain_score: MemoryLruCache<H256, U256>,
-	corpus: Option<(Corpus<U256>, SteadyTime)>,
+	corpus: Option<(Corpus<U256>, Instant)>,
 	corpus_expiration: Duration,
 }
 
@@ -139,7 +139,7 @@ impl Cache {
 
 	/// Get gas price corpus, if recent enough.
 	pub fn gas_price_corpus(&self) -> Option<Corpus<U256>> {
-		let now = SteadyTime::now();
+		let now = Instant::now();
 
 		self.corpus.as_ref().and_then(|&(ref corpus, ref tm)| {
 			if *tm + self.corpus_expiration >= now {
@@ -152,7 +152,7 @@ impl Cache {
 
 	/// Set the cached gas price corpus.
 	pub fn set_gas_price_corpus(&mut self, corpus: Corpus<U256>) {
-		self.corpus = Some((corpus, SteadyTime::now()))
+		self.corpus = Some((corpus, Instant::now()))
 	}
 
 	/// Get the memory used.
@@ -175,18 +175,18 @@ impl HeapSizeOf for Cache {
 #[cfg(test)]
 mod tests {
 	use super::Cache;
-	use time::Duration;
+	use std::time::Duration;
 
 	#[test]
 	fn corpus_inaccessible() {
-		let mut cache = Cache::new(Default::default(), Duration::hours(5));
+		let mut cache = Cache::new(Default::default(), Duration::from_secs(5 * 3600));
 
 		cache.set_gas_price_corpus(vec![].into());
 		assert_eq!(cache.gas_price_corpus(), Some(vec![].into()));
 
 		{
 			let corpus_time = &mut cache.corpus.as_mut().unwrap().1;
-			*corpus_time = *corpus_time - Duration::hours(6);
+			*corpus_time = *corpus_time - Duration::from_secs(6 * 3600);
 		}
 		assert!(cache.gas_price_corpus().is_none());
 	}

ethcore/light/src/cht.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -11,6 +11,9 @@
 // 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/>.
+
 //! Canonical hash trie definitions and helper functions.
 //!
 //! Each CHT is a trie mapping block numbers to canonical hashes and total difficulty.
@@ -23,10 +26,12 @@
 use ethcore::ids::BlockId;
 use ethereum_types::{H256, U256};
 use hashdb::HashDB;
+use keccak_hasher::KeccakHasher;
 use memorydb::MemoryDB;
 use bytes::Bytes;
-use trie::{self, TrieMut, TrieDBMut, Trie, TrieDB, Recorder};
-use rlp::{RlpStream, UntrustedRlp};
+use trie::{TrieMut, Trie, Recorder};
+use ethtrie::{self, TrieDB, TrieDBMut};
+use rlp::{RlpStream, Rlp};
 
 // encode a key.
 macro_rules! key {
@@ -47,13 +52,13 @@ pub const SIZE: u64 = 2048;
 /// A canonical hash trie. This is generic over any database it can query.
 /// See module docs for more details.
 #[derive(Debug, Clone)]
-pub struct CHT<DB: HashDB> {
+pub struct CHT<DB: HashDB<KeccakHasher>> {
 	db: DB,
 	root: H256, // the root of this CHT.
 	number: u64,
 }
 
-impl<DB: HashDB> CHT<DB> {
+impl<DB: HashDB<KeccakHasher>> CHT<DB> {
 	/// Query the root of the CHT.
 	pub fn root(&self) -> H256 { self.root }
 
@@ -63,7 +68,7 @@ impl<DB: HashDB> CHT<DB> {
 	/// Generate an inclusion proof for the entry at a specific block.
 	/// Nodes before level `from_level` will be omitted.
 	/// Returns an error on an incomplete trie, and `Ok(None)` on an unprovable request.
-	pub fn prove(&self, num: u64, from_level: u32) -> trie::Result<Option<Vec<Bytes>>> {
+	pub fn prove(&self, num: u64, from_level: u32) -> ethtrie::Result<Option<Vec<Bytes>>> {
 		if block_to_cht_number(num) != Some(self.number) { return Ok(None) }
 
 		let mut recorder = Recorder::with_depth(from_level);
@@ -87,10 +92,10 @@ pub struct BlockInfo {
 /// Build an in-memory CHT from a closure which provides necessary information
 /// about blocks. If the fetcher ever fails to provide the info, the CHT
 /// will not be generated.
-pub fn build<F>(cht_num: u64, mut fetcher: F) ->  Option<CHT<MemoryDB>>
+pub fn build<F>(cht_num: u64, mut fetcher: F) ->  Option<CHT<MemoryDB<KeccakHasher>>>
 	where F: FnMut(BlockId) -> Option<BlockInfo>
 {
-	let mut db = MemoryDB::new();
+	let mut db = MemoryDB::<KeccakHasher>::new();
 
 	// start from the last block by number and work backwards.
 	let last_num = start_number(cht_num + 1) - 1;
@@ -144,13 +149,13 @@ pub fn compute_root<I>(cht_num: u64, iterable: I) -> Option<H256>
 /// verify the given trie branch and extract the canonical hash and total difficulty.
 // TODO: better support for partially-checked queries.
 pub fn check_proof(proof: &[Bytes], num: u64, root: H256) -> Option<(H256, U256)> {
-	let mut db = MemoryDB::new();
+	let mut db = MemoryDB::<KeccakHasher>::new();
 
 	for node in proof { db.insert(&node[..]); }
 	let res = match TrieDB::new(&db, &root) {
 		Err(_) => return None,
 		Ok(trie) => trie.get_with(&key!(num), |val: &[u8]| {
-			let rlp = UntrustedRlp::new(val);
+			let rlp = Rlp::new(val);
 			rlp.val_at::<H256>(0)
 				.and_then(|h| rlp.val_at::<U256>(1).map(|td| (h, td)))
 				.ok()

ethcore/light/src/client/fetch.rs

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

ethcore/light/src/client/header_chain.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -28,28 +28,21 @@
 use std::collections::BTreeMap;
 use std::sync::Arc;
 
+use cache::Cache;
 use cht;
-
 use ethcore::block_status::BlockStatus;
-use ethcore::error::{BlockImportError, BlockError};
 use ethcore::encoded;
+use ethcore::engines::epoch::{Transition as EpochTransition, PendingTransition as PendingEpochTransition};
+use ethcore::error::{Error, BlockImportError, BlockImportErrorKind, BlockError};
 use ethcore::header::Header;
 use ethcore::ids::BlockId;
-use ethcore::spec::Spec;
-use ethcore::engines::epoch::{
-	Transition as EpochTransition,
-	PendingTransition as PendingEpochTransition
-};
-
-use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp, UntrustedRlp};
-use heapsize::HeapSizeOf;
+use ethcore::spec::{Spec, SpecHardcodedSync};
 use ethereum_types::{H256, H264, U256};
-use plain_hasher::H256FastMap;
-use kvdb::{self, DBTransaction, KeyValueDB};
-
-use cache::Cache;
+use heapsize::HeapSizeOf;
+use kvdb::{DBTransaction, KeyValueDB};
 use parking_lot::{Mutex, RwLock};
-
+use plain_hasher::H256FastMap;
+use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp};
 use smallvec::SmallVec;
 
 /// Store at least this many candidate headers at all times.
@@ -74,6 +67,22 @@ pub struct BlockDescriptor {
 	pub total_difficulty: U256,
 }
 
+// best block data
+#[derive(RlpEncodable, RlpDecodable)]
+struct BestAndLatest {
+	best_num: u64,
+	latest_num: u64
+}
+
+impl BestAndLatest {
+	fn new(best_num: u64, latest_num: u64) -> Self {
+		BestAndLatest {
+			best_num,
+			latest_num,
+		}
+	}
+}
+
 // candidate block description.
 struct Candidate {
 	hash: H256,
@@ -109,7 +118,7 @@ impl Encodable for Entry {
 }
 
 impl Decodable for Entry {
-	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
+	fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
 		let mut candidates = SmallVec::<[Candidate; 3]>::new();
 
 		for item in rlp.iter() {
@@ -170,7 +179,7 @@ fn encode_canonical_transition(header: &Header, proof: &[u8]) -> Vec<u8> {
 
 // decode last canonical transition entry.
 fn decode_canonical_transition(t: &[u8]) -> Result<(Header, &[u8]), DecoderError> {
-	let rlp = UntrustedRlp::new(t);
+	let rlp = Rlp::new(t);
 
 	Ok((rlp.val_at(0)?, rlp.at(1)?.data()?))
 }
@@ -180,6 +189,12 @@ pub struct PendingChanges {
 	best_block: Option<BlockDescriptor>, // new best block.
 }
 
+/// Whether or not the hardcoded sync feature is allowed.
+pub enum HardcodedSync {
+	Allow,
+	Deny,
+}
+
 /// Header chain. See module docs for more details.
 pub struct HeaderChain {
 	genesis_header: encoded::Header, // special-case the genesis.
@@ -198,25 +213,23 @@ impl HeaderChain {
 		col: Option<u32>,
 		spec: &Spec,
 		cache: Arc<Mutex<Cache>>,
-	) -> Result<Self, kvdb::Error> {
+		allow_hs: HardcodedSync,
+	) -> Result<Self, Error> {
 		let mut live_epoch_proofs = ::std::collections::HashMap::default();
 
 		let genesis = ::rlp::encode(&spec.genesis_header()).into_vec();
 		let decoded_header = spec.genesis_header();
 
 		let chain = if let Some(current) = db.get(col, CURRENT_KEY)? {
-			let (best_number, highest_number) = {
-				let rlp = Rlp::new(&current);
-				(rlp.val_at(0), rlp.val_at(1))
-			};
+			let curr : BestAndLatest = ::rlp::decode(&current).expect("decoding db value failed");
 
-			let mut cur_number = highest_number;
+			let mut cur_number = curr.latest_num;
 			let mut candidates = BTreeMap::new();
 
 			// load all era entries, referenced headers within them,
 			// and live epoch proofs.
 			while let Some(entry) = db.get(col, era_key(cur_number).as_bytes())? {
-				let entry: Entry = ::rlp::decode(&entry);
+				let entry: Entry = ::rlp::decode(&entry).expect("decoding db value failed");
 				trace!(target: "chain", "loaded header chain entry for era {} with {} candidates",
 					cur_number, entry.candidates.len());
 
@@ -238,15 +251,15 @@ impl HeaderChain {
 
 			// fill best block block descriptor.
 			let best_block = {
-				let era = match candidates.get(&best_number) {
+				let era = match candidates.get(&curr.best_num) {
 					Some(era) => era,
-					None => return Err("Database corrupt: highest block referenced but no data.".into()),
+					None => bail!("Database corrupt: highest block referenced but no data."),
 				};
 
 				let best = &era.candidates[0];
 				BlockDescriptor {
 					hash: best.hash,
-					number: best_number,
+					number: curr.best_num,
 					total_difficulty: best.total_difficulty,
 				}
 			};
@@ -260,8 +273,9 @@ impl HeaderChain {
 				col: col,
 				cache: cache,
 			}
+
 		} else {
-			HeaderChain {
+			let chain = HeaderChain {
 				genesis_header: encoded::Header::new(genesis),
 				best_block: RwLock::new(BlockDescriptor {
 					hash: decoded_header.hash(),
@@ -270,10 +284,43 @@ impl HeaderChain {
 				}),
 				candidates: RwLock::new(BTreeMap::new()),
 				live_epoch_proofs: RwLock::new(live_epoch_proofs),
-				db: db,
+				db: db.clone(),
 				col: col,
 				cache: cache,
+			};
+
+			// insert the hardcoded sync into the database.
+			if let (&Some(ref hardcoded_sync), HardcodedSync::Allow) = (&spec.hardcoded_sync, allow_hs) {
+				let mut batch = db.transaction();
+
+				// insert the hardcoded CHT roots into the database.
+				for (cht_num, cht_root) in hardcoded_sync.chts.iter().enumerate() {
+					batch.put(col, cht_key(cht_num as u64).as_bytes(), &::rlp::encode(cht_root));
+				}
+
+				let decoded_header = hardcoded_sync.header.decode()?;
+				let decoded_header_num = decoded_header.number();
+
+				// write the block in the DB.
+				info!(target: "chain", "Inserting hardcoded block #{} in chain",
+					  decoded_header_num);
+				let pending = chain.insert_with_td(&mut batch, decoded_header,
+												hardcoded_sync.total_difficulty, None)?;
+
+				// check that we have enough hardcoded CHT roots. avoids panicking later.
+				let cht_num = cht::block_to_cht_number(decoded_header_num - 1)
+					.expect("specs provided a hardcoded block with height 0");
+				if cht_num >= hardcoded_sync.chts.len() as u64 {
+					warn!(target: "chain", "specs didn't provide enough CHT roots for its \
+											hardcoded block ; falling back to non-hardcoded sync \
+											mode");
+				} else {
+					db.write_buffered(batch);
+					chain.apply_pending(pending);
+				}
 			}
+
+			chain
 		};
 
 		// instantiate genesis epoch data if it doesn't exist.
@@ -304,6 +351,29 @@ impl HeaderChain {
 		transaction: &mut DBTransaction,
 		header: Header,
 		transition_proof: Option<Vec<u8>>,
+	) -> Result<PendingChanges, BlockImportError> {
+		self.insert_inner(transaction, header, None, transition_proof)
+	}
+
+	/// Insert a pre-verified header, with a known total difficulty. Similary to `insert`.
+	///
+	/// This blindly trusts that the data given to it is sensible.
+	pub fn insert_with_td(
+		&self,
+		transaction: &mut DBTransaction,
+		header: Header,
+		total_difficulty: U256,
+		transition_proof: Option<Vec<u8>>,
+	) -> Result<PendingChanges, BlockImportError> {
+		self.insert_inner(transaction, header, Some(total_difficulty), transition_proof)
+	}
+
+	fn insert_inner(
+		&self,
+		transaction: &mut DBTransaction,
+		header: Header,
+		total_difficulty: Option<U256>,
+		transition_proof: Option<Vec<u8>>,
 	) -> Result<PendingChanges, BlockImportError> {
 		let hash = header.hash();
 		let number = header.number();
@@ -321,19 +391,24 @@ impl HeaderChain {
 		// hold candidates the whole time to guard import order.
 		let mut candidates = self.candidates.write();
 
-		// find parent details.
-		let parent_td =
-			if number == 1 {
-				self.genesis_header.difficulty()
-			} else {
-				candidates.get(&(number - 1))
-					.and_then(|entry| entry.candidates.iter().find(|c| c.hash == parent_hash))
-					.map(|c| c.total_difficulty)
-					.ok_or_else(|| BlockError::UnknownParent(parent_hash))
-					.map_err(BlockImportError::Block)?
-			};
+		// find total difficulty.
+		let total_difficulty = match total_difficulty {
+			Some(td) => td,
+			None => {
+				let parent_td =
+					if number == 1 {
+						self.genesis_header.difficulty()
+					} else {
+						candidates.get(&(number - 1))
+							.and_then(|entry| entry.candidates.iter().find(|c| c.hash == parent_hash))
+							.map(|c| c.total_difficulty)
+							.ok_or_else(|| BlockError::UnknownParent(parent_hash))
+							.map_err(BlockImportErrorKind::Block)?
+					};
 
-		let total_difficulty = parent_td + *header.difficulty();
+				parent_td + *header.difficulty()
+			},
+		};
 
 		// insert headers and candidates entries and write era to disk.
 		{
@@ -363,6 +438,7 @@ impl HeaderChain {
 		let raw = header.encoded().into_inner();
 		transaction.put_vec(self.col, &hash[..], raw);
 
+		// TODO: For engines when required, use cryptoeconomic guarantees.
 		let (best_num, is_new_best) = {
 			let cur_best = self.best_block.read();
 			if cur_best.total_difficulty < total_difficulty {
@@ -442,7 +518,10 @@ impl HeaderChain {
 											None
 										}
 										Ok(None) => panic!("stored candidates always have corresponding headers; qed"),
-										Ok(Some(header)) => Some((epoch_transition, ::rlp::decode(&header))),
+										Ok(Some(header)) => Some((
+											epoch_transition,
+											::rlp::decode(&header).expect("decoding value from db failed")
+										)),
 									};
 								}
 							}
@@ -472,13 +551,69 @@ impl HeaderChain {
 		// write the best and latest eras to the database.
 		{
 			let latest_num = *candidates.iter().rev().next().expect("at least one era just inserted; qed").0;
-			let mut stream = RlpStream::new_list(2);
-			stream.append(&best_num).append(&latest_num);
-			transaction.put(self.col, CURRENT_KEY, &stream.out())
+			let curr = BestAndLatest::new(best_num, latest_num);
+			transaction.put(self.col, CURRENT_KEY, &::rlp::encode(&curr))
 		}
 		Ok(pending)
 	}
 
+	/// Generates the specifications for hardcoded sync. This is typically only called manually
+	/// from time to time by a Parity developer in order to update the chain specifications.
+	///
+	/// Returns `None` if we are at the genesis block, or if an error happens .
+	pub fn read_hardcoded_sync(&self) -> Result<Option<SpecHardcodedSync>, Error> {
+		let mut chts = Vec::new();
+		let mut cht_num = 0;
+
+		loop {
+			let cht = match self.cht_root(cht_num) {
+				Some(cht) => cht,
+				None if cht_num != 0 => {
+					// end of the iteration
+					let h_num = 1 + cht_num as u64 * cht::SIZE;
+					let header = if let Some(header) = self.block_header(BlockId::Number(h_num)) {
+						header
+					} else {
+						let msg = format!("header of block #{} not found in DB ; database in an \
+											inconsistent state", h_num);
+						bail!(msg);
+					};
+
+					let decoded = header.decode().expect("decoding db value failed");
+
+					let entry: Entry = {
+						let bytes = self.db.get(self.col, era_key(h_num).as_bytes())?
+							.ok_or_else(|| {
+								format!("entry for era #{} not found in DB ; database \
+										in an inconsistent state", h_num)
+							})?;
+						::rlp::decode(&bytes).expect("decoding db value failed")
+					};
+
+					let total_difficulty = entry.candidates.iter()
+						.find(|c| c.hash == decoded.hash())
+						.ok_or_else(|| {
+							"no candidate matching block found in DB ; database in an \
+										inconsistent state"
+						})?
+						.total_difficulty;
+
+					break Ok(Some(SpecHardcodedSync {
+						header,
+						total_difficulty,
+						chts,
+					}));
+				},
+				None => {
+					break Ok(None);
+				},
+			};
+
+			chts.push(cht);
+			cht_num += 1;
+		}
+	}
+
 	/// Apply pending changes from a previous `insert` operation.
 	/// Must be done before the next `insert` call.
 	pub fn apply_pending(&self, pending: PendingChanges) {
@@ -497,7 +632,7 @@ impl HeaderChain {
 				if self.best_block.read().number < num { return None }
 				self.candidates.read().get(&num).map(|entry| entry.canonical_hash)
 			}
-			BlockId::Latest | BlockId::Pending => {
+			BlockId::Latest => {
 				Some(self.best_block.read().hash)
 			}
 		}
@@ -539,7 +674,7 @@ impl HeaderChain {
 				self.candidates.read().get(&num).map(|entry| entry.canonical_hash)
 					.and_then(load_from_db)
 			}
-			BlockId::Latest | BlockId::Pending => {
+			BlockId::Latest => {
 				// hold candidates hear to prevent deletion of the header
 				// as we read it.
 				let _candidates = self.candidates.read();
@@ -575,7 +710,7 @@ impl HeaderChain {
 				if self.best_block.read().number < num { return None }
 				candidates.get(&num).map(|era| era.candidates[0].total_difficulty)
 			}
-			BlockId::Latest | BlockId::Pending => Some(self.best_block.read().total_difficulty)
+			BlockId::Latest => Some(self.best_block.read().total_difficulty)
 		}
 	}
 
@@ -602,7 +737,7 @@ impl HeaderChain {
 	/// so including it within a CHT would be redundant.
 	pub fn cht_root(&self, n: usize) -> Option<H256> {
 		match self.db.get(self.col, cht_key(n as u64).as_bytes()) {
-			Ok(val) => val.map(|x| ::rlp::decode(&x)),
+			Ok(db_fetch) => db_fetch.map(|bytes| ::rlp::decode(&bytes).expect("decoding value from db failed")),
 			Err(e) => {
 				warn!(target: "chain", "Error reading from database: {}", e);
 				None
@@ -653,7 +788,7 @@ impl HeaderChain {
 	pub fn pending_transition(&self, hash: H256) -> Option<PendingEpochTransition> {
 		let key = pending_transition_key(hash);
 		match self.db.get(self.col, &*key) {
-			Ok(val) => val.map(|x| ::rlp::decode(&x)),
+			Ok(db_fetch) => db_fetch.map(|bytes| ::rlp::decode(&bytes).expect("decoding value from db failed")),
 			Err(e) => {
 				warn!(target: "chain", "Error reading from database: {}", e);
 				None
@@ -672,7 +807,9 @@ impl HeaderChain {
 
 		for hdr in self.ancestry_iter(BlockId::Hash(parent_hash)) {
 			if let Some(transition) = live_proofs.get(&hdr.hash()).cloned() {
-				return Some((hdr.decode(), transition.proof))
+				return hdr.decode().map(|decoded_hdr| {
+					(decoded_hdr, transition.proof)
+				}).ok();
 			}
 		}
 
@@ -721,7 +858,7 @@ impl<'a> Iterator for AncestryIter<'a> {
 
 #[cfg(test)]
 mod tests {
-	use super::HeaderChain;
+	use super::{HeaderChain, HardcodedSync};
 	use std::sync::Arc;
 
 	use ethereum_types::U256;
@@ -732,7 +869,7 @@ mod tests {
 	use kvdb::KeyValueDB;
 	use kvdb_memorydb;
 
-	use time::Duration;
+	use std::time::Duration;
 	use parking_lot::Mutex;
 
 	fn make_db() -> Arc<KeyValueDB> {
@@ -745,9 +882,9 @@ mod tests {
 		let genesis_header = spec.genesis_header();
 		let db = make_db();
 
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
 
-		let chain = HeaderChain::new(db.clone(), None, &spec, cache).unwrap();
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache, HardcodedSync::Allow).unwrap();
 
 		let mut parent_hash = genesis_header.hash();
 		let mut rolling_timestamp = genesis_header.timestamp();
@@ -778,9 +915,9 @@ mod tests {
 		let spec = Spec::new_test();
 		let genesis_header = spec.genesis_header();
 		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
 
-		let chain = HeaderChain::new(db.clone(), None, &spec, cache).unwrap();
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache, HardcodedSync::Allow).unwrap();
 
 		let mut parent_hash = genesis_header.hash();
 		let mut rolling_timestamp = genesis_header.timestamp();
@@ -860,13 +997,12 @@ mod tests {
 	fn earliest_is_latest() {
 		let spec = Spec::new_test();
 		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
 
-		let chain = HeaderChain::new(db.clone(), None, &spec, cache).unwrap();
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache, HardcodedSync::Allow).unwrap();
 
 		assert!(chain.block_header(BlockId::Earliest).is_some());
 		assert!(chain.block_header(BlockId::Latest).is_some());
-		assert!(chain.block_header(BlockId::Pending).is_some());
 	}
 
 	#[test]
@@ -874,10 +1010,11 @@ mod tests {
 		let spec = Spec::new_test();
 		let genesis_header = spec.genesis_header();
 		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
 
 		{
-			let chain = HeaderChain::new(db.clone(), None, &spec, cache.clone()).unwrap();
+			let chain = HeaderChain::new(db.clone(), None, &spec, cache.clone(),
+										HardcodedSync::Allow).unwrap();
 			let mut parent_hash = genesis_header.hash();
 			let mut rolling_timestamp = genesis_header.timestamp();
 			for i in 1..10000 {
@@ -897,7 +1034,8 @@ mod tests {
 			}
 		}
 
-		let chain = HeaderChain::new(db.clone(), None, &spec, cache.clone()).unwrap();
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache.clone(),
+									HardcodedSync::Allow).unwrap();
 		assert!(chain.block_header(BlockId::Number(10)).is_none());
 		assert!(chain.block_header(BlockId::Number(9000)).is_some());
 		assert!(chain.cht_root(2).is_some());
@@ -910,10 +1048,11 @@ mod tests {
 		let spec = Spec::new_test();
 		let genesis_header = spec.genesis_header();
 		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
 
 		{
-			let chain = HeaderChain::new(db.clone(), None, &spec, cache.clone()).unwrap();
+			let chain = HeaderChain::new(db.clone(), None, &spec, cache.clone(),
+										HardcodedSync::Allow).unwrap();
 			let mut parent_hash = genesis_header.hash();
 			let mut rolling_timestamp = genesis_header.timestamp();
 
@@ -955,7 +1094,8 @@ mod tests {
 		}
 
 		// after restoration, non-canonical eras should still be loaded.
-		let chain = HeaderChain::new(db.clone(), None, &spec, cache.clone()).unwrap();
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache.clone(),
+									HardcodedSync::Allow).unwrap();
 		assert_eq!(chain.block_header(BlockId::Latest).unwrap().number(), 10);
 		assert!(chain.candidates.read().get(&100).is_some())
 	}
@@ -965,9 +1105,10 @@ mod tests {
 		let spec = Spec::new_test();
 		let genesis_header = spec.genesis_header();
 		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
 
-		let chain = HeaderChain::new(db.clone(), None, &spec, cache.clone()).unwrap();
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache.clone(),
+									HardcodedSync::Allow).unwrap();
 
 		assert!(chain.block_header(BlockId::Earliest).is_some());
 		assert!(chain.block_header(BlockId::Number(0)).is_some());
@@ -979,9 +1120,9 @@ mod tests {
 		let spec = Spec::new_test();
 		let genesis_header = spec.genesis_header();
 		let db = make_db();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
 
-		let chain = HeaderChain::new(db.clone(), None, &spec, cache).unwrap();
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache, HardcodedSync::Allow).unwrap();
 
 		let mut parent_hash = genesis_header.hash();
 		let mut rolling_timestamp = genesis_header.timestamp();
@@ -1039,4 +1180,45 @@ mod tests {
 		assert!(chain.live_epoch_proofs.read().is_empty());
 		assert_eq!(chain.epoch_transition_for(parent_hash).unwrap().1, vec![1, 2, 3, 4]);
 	}
+
+	#[test]
+	fn hardcoded_sync_gen() {
+		let spec = Spec::new_test();
+		let genesis_header = spec.genesis_header();
+		let db = make_db();
+
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
+
+		let chain = HeaderChain::new(db.clone(), None, &spec, cache, HardcodedSync::Allow).expect("failed to instantiate a new HeaderChain");
+
+		let mut parent_hash = genesis_header.hash();
+		let mut rolling_timestamp = genesis_header.timestamp();
+		let mut total_difficulty = *genesis_header.difficulty();
+		let h_num = 3 * ::cht::SIZE + 1;
+		for i in 1..10000 {
+			let mut header = Header::new();
+			header.set_parent_hash(parent_hash);
+			header.set_number(i);
+			header.set_timestamp(rolling_timestamp);
+			let diff = *genesis_header.difficulty() * i as u32;
+			header.set_difficulty(diff);
+			if i <= h_num {
+				total_difficulty = total_difficulty + diff;
+			}
+			parent_hash = header.hash();
+
+			let mut tx = db.transaction();
+			let pending = chain.insert(&mut tx, header, None).expect("failed inserting a transaction");
+			db.write(tx).unwrap();
+			chain.apply_pending(pending);
+
+			rolling_timestamp += 10;
+		}
+
+		let hardcoded_sync = chain.read_hardcoded_sync().expect("failed reading hardcoded sync").expect("failed unwrapping hardcoded sync");
+		assert_eq!(hardcoded_sync.chts.len(), 3);
+		assert_eq!(hardcoded_sync.total_difficulty, total_difficulty);
+		let decoded: Header = hardcoded_sync.header.decode().expect("decoding failed");
+		assert_eq!(decoded.number(), h_num);
+	}
 }

ethcore/light/src/client/mod.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -19,27 +19,25 @@
 use std::sync::{Weak, Arc};
 
 use ethcore::block_status::BlockStatus;
-use ethcore::client::{ClientReport, EnvInfo};
+use ethcore::client::{ClientReport, EnvInfo, ClientIoMessage};
 use ethcore::engines::{epoch, EthEngine, EpochChange, EpochTransition, Proof};
 use ethcore::machine::EthereumMachine;
-use ethcore::error::BlockImportError;
+use ethcore::error::{Error, BlockImportError};
 use ethcore::ids::BlockId;
 use ethcore::header::{BlockNumber, Header};
 use ethcore::verification::queue::{self, HeaderQueue};
 use ethcore::blockchain_info::BlockChainInfo;
-use ethcore::spec::Spec;
-use ethcore::service::ClientIoMessage;
+use ethcore::spec::{Spec, SpecHardcodedSync};
 use ethcore::encoded;
 use io::IoChannel;
 use parking_lot::{Mutex, RwLock};
 use ethereum_types::{H256, U256};
 use futures::{IntoFuture, Future};
 
-use kvdb::{self, KeyValueDB};
-use kvdb_rocksdb::CompactionProfile;
+use kvdb::KeyValueDB;
 
 use self::fetch::ChainDataFetcher;
-use self::header_chain::{AncestryIter, HeaderChain};
+use self::header_chain::{AncestryIter, HeaderChain, HardcodedSync};
 
 use cache::Cache;
 
@@ -57,16 +55,12 @@ pub struct Config {
 	pub queue: queue::Config,
 	/// Chain column in database.
 	pub chain_column: Option<u32>,
-	/// Database cache size. `None` => rocksdb default.
-	pub db_cache_size: Option<usize>,
-	/// State db compaction profile
-	pub db_compaction: CompactionProfile,
-	/// Should db have WAL enabled?
-	pub db_wal: bool,
 	/// Should it do full verification of blocks?
 	pub verify_full: bool,
 	/// Should it check the seal of blocks?
 	pub check_seal: bool,
+	/// Disable hardcoded sync.
+	pub no_hardcoded_sync: bool,
 }
 
 impl Default for Config {
@@ -74,11 +68,9 @@ impl Default for Config {
 		Config {
 			queue: Default::default(),
 			chain_column: None,
-			db_cache_size: None,
-			db_compaction: CompactionProfile::default(),
-			db_wal: true,
 			verify_full: true,
 			check_seal: true,
+			no_hardcoded_sync: false,
 		}
 	}
 }
@@ -135,9 +127,6 @@ pub trait LightChainClient: Send + Sync {
 	/// Get the `i`th CHT root.
 	fn cht_root(&self, i: usize) -> Option<H256>;
 
-	/// Get the EIP-86 transition block number.
-	fn eip86_transition(&self) -> BlockNumber;
-
 	/// Get a report of import activity since the last call.
 	fn report(&self) -> ClientReport;
 }
@@ -186,11 +175,14 @@ impl<T: ChainDataFetcher> Client<T> {
 		fetcher: T,
 		io_channel: IoChannel<ClientIoMessage>,
 		cache: Arc<Mutex<Cache>>
-	) -> Result<Self, kvdb::Error> {
+	) -> Result<Self, Error> {
 		Ok(Client {
 			queue: HeaderQueue::new(config.queue, spec.engine.clone(), io_channel, config.check_seal),
 			engine: spec.engine.clone(),
-			chain: HeaderChain::new(db.clone(), chain_col, &spec, cache)?,
+			chain: {
+				let hs_cfg = if config.no_hardcoded_sync { HardcodedSync::Deny } else { HardcodedSync::Allow };
+				HeaderChain::new(db.clone(), chain_col, &spec, cache, hs_cfg)?
+			},
 			report: RwLock::new(ClientReport::default()),
 			import_lock: Mutex::new(()),
 			db: db,
@@ -200,33 +192,19 @@ impl<T: ChainDataFetcher> Client<T> {
 		})
 	}
 
+	/// Generates the specifications for hardcoded sync. This is typically only called manually
+	/// from time to time by a Parity developer in order to update the chain specifications.
+	///
+	/// Returns `None` if we are at the genesis block.
+	pub fn read_hardcoded_sync(&self) -> Result<Option<SpecHardcodedSync>, Error> {
+		self.chain.read_hardcoded_sync()
+	}
+
 	/// Adds a new `LightChainNotify` listener.
 	pub fn add_listener(&self, listener: Weak<LightChainNotify>) {
 		self.listeners.write().push(listener);
 	}
 
-	/// Create a new `Client` backed purely in-memory.
-	/// This will ignore all database options in the configuration.
-	pub fn in_memory(
-		config: Config,
-		spec: &Spec,
-		fetcher: T,
-		io_channel: IoChannel<ClientIoMessage>,
-		cache: Arc<Mutex<Cache>>
-	) -> Self {
-		let db = ::kvdb_memorydb::create(0);
-
-		Client::new(
-			config,
-			Arc::new(db),
-			None,
-			spec,
-			fetcher,
-			io_channel,
-			cache
-		).expect("New DB creation infallible; qed")
-	}
-
 	/// Import a header to the queue for additional verification.
 	pub fn import_header(&self, header: Header) -> Result<H256, BlockImportError> {
 		self.queue.import(header).map_err(Into::into)
@@ -337,7 +315,7 @@ impl<T: ChainDataFetcher> Client<T> {
 
 			let epoch_proof =  self.engine.is_epoch_end(
 				&verified_header,
-				&|h| self.chain.block_header(BlockId::Hash(h)).map(|hdr| hdr.decode()),
+				&|h| self.chain.block_header(BlockId::Hash(h)).and_then(|hdr| hdr.decode().ok()),
 				&|h| self.chain.pending_transition(h),
 			);
 
@@ -445,7 +423,15 @@ impl<T: ChainDataFetcher> Client<T> {
 		};
 
 		// Verify Block Family
-		let verify_family_result = self.engine.verify_block_family(&verified_header, &parent_header.decode());
+
+		let verify_family_result = {
+			parent_header.decode()
+				.map_err(|dec_err| dec_err.into())
+				.and_then(|decoded| {
+					self.engine.verify_block_family(&verified_header, &decoded)
+				})
+
+		};
 		if let Err(e) = verify_family_result {
 			warn!(target: "client", "Stage 3 block verification failed for #{} ({})\nError: {:?}",
 				verified_header.number(), verified_header.hash(), e);
@@ -474,7 +460,6 @@ impl<T: ChainDataFetcher> Client<T> {
 
 		loop {
 
-
 			let is_signal = {
 				let auxiliary = AuxiliaryData {
 					bytes: block.as_ref().map(|x| &x[..]),
@@ -597,15 +582,17 @@ impl<T: ChainDataFetcher> LightChainClient for Client<T> {
 		Client::cht_root(self, i)
 	}
 
-	fn eip86_transition(&self) -> BlockNumber {
-		self.engine().params().eip86_transition
-	}
-
 	fn report(&self) -> ClientReport {
 		Client::report(self)
 	}
 }
 
+impl<T: ChainDataFetcher> ::ethcore::client::ChainInfo for Client<T> {
+	fn chain_info(&self) -> BlockChainInfo {
+		Client::chain_info(self)
+	}
+}
+
 impl<T: ChainDataFetcher> ::ethcore::client::EngineClient for Client<T> {
 	fn update_sealing(&self) { }
 	fn submit_seal(&self, _block_hash: H256, _seal: Vec<Vec<u8>>) { }
@@ -619,10 +606,6 @@ impl<T: ChainDataFetcher> ::ethcore::client::EngineClient for Client<T> {
 		})
 	}
 
-	fn chain_info(&self) -> BlockChainInfo {
-		Client::chain_info(self)
-	}
-
 	fn as_full_client(&self) -> Option<&::ethcore::client::BlockChainClient> {
 		None
 	}

ethcore/light/src/client/service.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -18,34 +18,39 @@
 //! Just handles block import messages and passes them to the client.
 
 use std::fmt;
-use std::path::Path;
 use std::sync::Arc;
 
-use ethcore::db;
-use ethcore::service::ClientIoMessage;
+use ethcore::client::ClientIoMessage;
+use ethcore::{db, BlockChainDB};
+use ethcore::error::Error as CoreError;
 use ethcore::spec::Spec;
 use io::{IoContext, IoError, IoHandler, IoService};
-use kvdb;
-use kvdb_rocksdb::{Database, DatabaseConfig};
 
 use cache::Cache;
 use parking_lot::Mutex;
 
-use super::{ChainDataFetcher, Client, Config as ClientConfig};
+use super::{ChainDataFetcher, LightChainNotify, Client, Config as ClientConfig};
 
 /// Errors on service initialization.
 #[derive(Debug)]
 pub enum Error {
-	/// Database error.
-	Database(kvdb::Error),
+	/// Core error.
+	Core(CoreError),
 	/// I/O service error.
 	Io(IoError),
 }
 
+impl From<CoreError> for Error {
+	#[inline]
+	fn from(err: CoreError) -> Error {
+		Error::Core(err)
+	}
+}
+
 impl fmt::Display for Error {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match *self {
-			Error::Database(ref msg) => write!(f, "Database error: {}", msg),
+			Error::Core(ref msg) => write!(f, "Core error: {}", msg),
 			Error::Io(ref err) => write!(f, "I/O service error: {}", err),
 		}
 	}
@@ -59,29 +64,16 @@ pub struct Service<T> {
 
 impl<T: ChainDataFetcher> Service<T> {
 	/// Start the service: initialize I/O workers and client itself.
-	pub fn start(config: ClientConfig, spec: &Spec, fetcher: T, path: &Path, cache: Arc<Mutex<Cache>>) -> Result<Self, Error> {
-
-		// initialize database.
-		let mut db_config = DatabaseConfig::with_columns(db::NUM_COLUMNS);
-
-		db_config.memory_budget = config.db_cache_size;
-		db_config.compaction = config.db_compaction;
-		db_config.wal = config.db_wal;
-
-		let db = Arc::new(Database::open(
-			&db_config,
-			&path.to_str().expect("DB path could not be converted to string.")
-		).map_err(Error::Database)?);
-
+	pub fn start(config: ClientConfig, spec: &Spec, fetcher: T, db: Arc<BlockChainDB>, cache: Arc<Mutex<Cache>>) -> Result<Self, Error> {
 		let io_service = IoService::<ClientIoMessage>::start().map_err(Error::Io)?;
 		let client = Arc::new(Client::new(config,
-			db,
+			db.key_value().clone(),
 			db::COL_LIGHT_CHAIN,
 			spec,
 			fetcher,
 			io_service.channel(),
 			cache,
-		).map_err(Error::Database)?);
+		)?);
 
 		io_service.register_handler(Arc::new(ImportBlocks(client.clone()))).map_err(Error::Io)?;
 		spec.engine.register_client(Arc::downgrade(&client) as _);
@@ -92,6 +84,11 @@ impl<T: ChainDataFetcher> Service<T> {
 		})
 	}
 
+	/// Set the actor to be notified on certain chain events
+	pub fn add_notify(&self, notify: Arc<LightChainNotify>) {
+		self.client.add_listener(Arc::downgrade(&notify));
+	}
+
 	/// Register an I/O handler on the service.
 	pub fn register_handler(&self, handler: Arc<IoHandler<ClientIoMessage> + Send>) -> Result<(), IoError> {
 		self.io_service.register_handler(handler)
@@ -121,16 +118,16 @@ mod tests {
 	use std::sync::Arc;
 	use cache::Cache;
 	use client::fetch;
-	use time::Duration;
+	use std::time::Duration;
 	use parking_lot::Mutex;
-	use tempdir::TempDir;
+	use ethcore::test_helpers;
 
 	#[test]
 	fn it_works() {
-		let tempdir = TempDir::new("").unwrap();
+		let db = test_helpers::new_db();
 		let spec = Spec::new_test();
-		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
+		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(6 * 3600))));
 
-		Service::start(Default::default(), &spec, fetch::unavailable(), tempdir.path(), cache).unwrap();
+		Service::start(Default::default(), &spec, fetch::unavailable(), db, cache).unwrap();
 	}
 }

ethcore/light/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -43,7 +43,7 @@ pub mod provider;
 mod types;
 
 pub use self::cache::Cache;
-pub use self::provider::Provider;
+pub use self::provider::{Provider, MAX_HEADERS_PER_REQUEST};
 pub use self::transaction_queue::TransactionQueue;
 pub use types::request as request;
 
@@ -56,7 +56,7 @@ extern crate log;
 extern crate bincode;
 extern crate ethcore_io as io;
 extern crate ethcore_network as network;
-extern crate ethcore_bytes as bytes;
+extern crate parity_bytes as bytes;
 extern crate ethcore_transaction as transaction;
 extern crate ethereum_types;
 extern crate ethcore;
@@ -64,8 +64,10 @@ extern crate hashdb;
 extern crate heapsize;
 extern crate futures;
 extern crate itertools;
+extern crate keccak_hasher;
 extern crate memorydb;
 extern crate patricia_trie as trie;
+extern crate patricia_trie_ethereum as ethtrie;
 extern crate plain_hasher;
 extern crate rand;
 extern crate rlp;
@@ -75,14 +77,15 @@ extern crate rlp_derive;
 extern crate serde;
 extern crate smallvec;
 extern crate stats;
-extern crate time;
 extern crate vm;
 extern crate keccak_hash as hash;
-extern crate triehash;
+extern crate triehash_ethereum as triehash;
 extern crate kvdb;
-extern crate kvdb_memorydb;
-extern crate kvdb_rocksdb;
 extern crate memory_cache;
+#[macro_use]
+extern crate error_chain;
 
+#[cfg(test)]
+extern crate kvdb_memorydb;
 #[cfg(test)]
 extern crate tempdir;