Merge pull request #445 from ethcore/beta-patched

Beta patch to 0.9.1
ignore transition tests for now, make travis build green again
2016-02-16 10:49:49 +01:00 · 2016-02-16 07:38:34 +03:00 · 2016-02-16 07:05:26 +03:00 · 2016-02-16 07:02:00 +03:00 · 2016-02-16 03:37:07 +03:00 · 2016-02-16 03:33:36 +03:00
500 changed files with 11804 additions and 84764 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,11 +0,0 @@
-root = true
-[*]
-indent_style=tab
-indent_size=tab
-tab_width=4
-end_of_line=lf
-charset=utf-8
-trim_trailing_whitespace=true
-max_line_length=120
-insert_final_newline=true
-
--- a/.gitignore
+++ b/.gitignore
@@ -7,12 +7,12 @@
 # Executables
 *.exe

-# Cargo lock in subs
-**/Cargo.lock
-
 # Generated by Cargo
 **/target/

+# libs cargo lock
+/*/Cargo.lock
+
 # vim stuff
 *.swp

@@ -26,7 +26,3 @@

 # jetbrains ide stuff
 .idea
-*.iml
-
-# Build artifacts
-out/
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,82 +8,56 @@ branches:
  - /^stable-.*$/
  - /^beta$/
  - /^stable$/
-git:
-  depth: 3
 matrix:
  fast_finish: true
-  allow_failures:
-  - rust: nightly
  include:
-  - rust: stable
-    env: FEATURES="--features travis-beta" RUN_TESTS="true"
-  # - rust: beta
-    # env: FEATURES="--features travis-beta" RUN_TESTS="true"
-  - rust: stable
-    env: FEATURES="--features travis-beta" RUN_BUILD="true"
-  - rust: beta
-    env: FEATURES="--features travis-beta" RUN_BUILD="true"
-  - rust: stable
-    env: FEATURES="--features travis-beta" RUN_COVERAGE="true"
-  # - rust: nightly
-    # env: FEATURES="--features travis-nightly" RUN_BENCHES="true"
  - rust: nightly
-    env: FEATURES="--features travis-nightly" RUN_TESTS="true"
-env:
-  global:
-  # GH_TOKEN
-  - secure: bumJASbZSU8bxJ0EyPUJmu16AiV9EXOpyOj86Jlq/Ty9CfwGqsSXt96uDyE+OUJf34RUFQMsw0nk37/zC4lcn6kqk2wpuH3N/o85Zo/cVZY/NusBWLQqtT5VbYWsV+u2Ua4Tmmsw8yVYQhYwU2ZOejNpflL+Cs9XGgORp1L+/gMRMC2y5Se6ZhwnKPQlRJ8LGsG1dzjQULxzADIt3/zuspNBS8a2urJwlHfGMkvHDoUWCviP/GXoSqw3TZR7FmKyxE19I8n9+iSvm9+oZZquvcgfUxMHn8Gq/b44UbPvjtFOg2yam4xdWXF/RyWCHdc/R9EHorSABeCbefIsm+zcUF3/YQxwpSxM4IZEeH2rTiC7dcrsKw3XsO16xFQz5YI5Bay+CT/wTdMmJd7DdYz7Dyf+pOvcM9WOf/zorxYWSBOMYy0uzbusU2iyIghQ82s7E/Ahg+WARtPgkuTLSB5aL1oCTBKHqQscMr7lo5Ti6RpWLxEdTQMBznc+bMr+6dEtkEcG9zqc6cE9XX+ox3wTU6+HVMfQ1ltCntJ4UKcw3A6INEbw9wgocQa812CIASQ2fE+SCAbz6JxBjIAlFUnD1lUB7S8PdMPwn9plfQgKQ2A5YZqg6FnBdf0rQXIJYxQWKHXj/rBHSUCT0tHACDlzTA+EwWggvkP5AGIxRxm8jhw=
-  - TARGETS="-p ethkey -p ethstore -p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity -p ethjson -p ethcore-dapps -p ethcore-signer"
-  - ARCHIVE_SUFFIX="-${TRAVIS_OS_NAME}-${TRAVIS_TAG}"
-  - KCOV_FEATURES=""
-  - KCOV_CMD="./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /usr/,/.cargo,/root/.multirust,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests,ethstore/tests target/kcov"
-  - RUN_TESTS="false"
-  - RUN_COVERAGE="false"
-  - RUN_BUILD="false"
-  - RUN_BENCHES="false"
-  - RUST_BACKTRACE="1"
+    env: FEATURES="--features ethcore/json-tests" KCOV_FEATURES="" TARGETS="-p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity" ARCHIVE_SUFFIX="-${TRAVIS_OS_NAME}-${TRAVIS_TAG}"
 cache:
  apt: true
  directories:
-  - $TRAVIS_BUILD_DIR/target
-  - $HOME/.cargo
+  - target/debug/deps
+  - target/debug/build
+  - target/release/deps
+  - target/release/build
 addons:
  apt:
    packages:
    - libcurl4-openssl-dev
    - libelf-dev
    - libdw-dev
-
+before_script: |
+  sudo add-apt-repository "deb http://ppa.launchpad.net/giskou/librocksdb/ubuntu trusty main" &&
+  sudo apt-get update &&
+  sudo apt-get install -y --force-yes librocksdb
 script:
-  - if [ "$RUN_TESTS" = "true" ]; then cargo test --release --verbose ${FEATURES} ${TARGETS}; fi
-  - if [ "$RUN_BENCHES" = "true" ]; then cargo bench --no-run ${FEATURES} ${TARGETS}; fi
-  - if [ "$RUN_BUILD" = "true" ]; then cargo build --release --verbose ${FEATURES}; fi
-  - if [ "$RUN_BUILD" = "true" ]; then tar cvzf parity${ARCHIVE_SUFFIX}.tar.gz -C target/release parity; fi
-
+- cargo build --release --verbose ${FEATURES}
+- cargo test --release --verbose ${FEATURES} ${TARGETS}
+- cargo bench --no-run ${FEATURES} ${TARGETS}
+- tar cvzf parity${ARCHIVE_SUFFIX}.tar.gz -C target/release parity
 after_success: |
-  [ "$RUN_COVERAGE" = "true" ] &&
  wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
  tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && make install DESTDIR=../tmp && cd ../.. &&
  cargo test --no-run ${KCOV_FEATURES} ${TARGETS} &&
-  $KCOV_CMD target/debug/deps/ethkey-* &&
-  $KCOV_CMD target/debug/deps/ethstore-* &&
-  $KCOV_CMD target/debug/deps/ethcore_util-* &&
-  $KCOV_CMD target/debug/deps/ethash-* &&
-  $KCOV_CMD target/debug/deps/ethcore-* &&
-  $KCOV_CMD target/debug/deps/ethsync-* &&
-  $KCOV_CMD target/debug/deps/ethcore_rpc-* &&
-  $KCOV_CMD target/debug/deps/ethcore_dapps-* &&
-  $KCOV_CMD target/debug/deps/ethcore_signer-* &&
-  $KCOV_CMD target/debug/deps/ethjson-* &&
-  $KCOV_CMD target/debug/parity-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethcore_util-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethash-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethcore-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethsync-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/deps/ethcore_rpc-* &&
+  ./kcov-master/tmp/usr/local/bin/kcov --coveralls-id=${TRAVIS_JOB_ID} --exclude-pattern /.cargo,/root/.multirust target/kcov target/debug/parity-* &&
  [ $TRAVIS_BRANCH = master ] &&
  [ $TRAVIS_PULL_REQUEST = false ] &&
-  [ $TRAVIS_RUST_VERSION = stable ] &&
+  [ $TRAVIS_RUST_VERSION = nightly ] &&
  cargo doc --no-deps --verbose ${KCOV_FEATURES} ${TARGETS} &&
  echo '<meta http-equiv=refresh content=0;url=ethcore/index.html>' > target/doc/index.html &&
  pip install --user ghp-import &&
  /home/travis/.local/bin/ghp-import -n target/doc &&
  git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
+env:
+  global:
+  - secure: 3sUjNi9mhdL5h1GTm8LONnDN/SYvUHT+WSkMl93h3nYiLCQXk8eZaPS98AS7oOaTsfW4UvnwckVFCFl49ttInsv4cd/TkAxmrJHe6kPyS9/4NWUdmP8BjicbBvL/ioSdXMECMEYzPDLV+I3KhtC2LcB6ceDEl/XwMOJlzbGf7RbtcXGVQgMLqSYY1YKjQA4vbT5nFgIS/sZu3Z9yFgN0GafnihKcizqoHhdJjs/zxmX+qJepnC6o3V6KcFnS7QHhM1JOr85twE6S422UlvNaEb5ovwLPqmOl5+fA+6shbx4AxFTY6E9Iors+OVY/JliFhrqOdCt0i2P1FUHN4kbGZQkf0rphN/ZOI2uKNFTOyXiPvppfo/ZemKmcqkwkqP9+lf5QqYmtE6hsAYagxn49xJZILl8tAYbdqxF5gxa+TEVrfsBFtz/Sv3q8QhKQNPAmjEcKyMatyEreLUIFEpFTGIco8jN4eXeSoLRdJ+Z75ihttfQWhNfUDgNL30iQLy0AgFSsh/cyb5M8y9lxrGDzDTogvaiKGwr/V45sPkcXWCkmOgMdINqBB6ZtdL3bGHdyjmYj+y3btjf3aP11k++BL0fXIaKn25aS/p/9iyGb1FyGCM03o4ZRQ3YhTOvfMRfRGf6nWbaMx9upv8o5ShSdysewhrnh3082r7u896ny1Ho=
+  - secure: 0/FeVvFl3AhBW0TCPoujY9zOAYoUNMlAz3XjC04vlc4Ksfx0lGU3KFi97LlALxMWV0lfwQc7ixSe2vTgQVQuLVSU9XEW40fQgEjJlmLca2RcRx1kfzJDypuWSiCME7MWmLPH0ac4COdTDS1z5WGggv5YB7GQPCzFvcmOOaPYtF29ngCtkyB2HmNkY/W3omHFEk7Si6bsmOSHZiOAhivPl6ixnGpFyTEKPyraMMqPIj5rbEGkzgeLTiXf2ur143n/tnSr8tmP1MfQi9yS8/ONidMqnxUeuLkeNnb82zj9pVJhVXq0xF44WXJ8Za1jm0ByiTakgqpm8Juk822qjvtNulJ1XZW/fyZQZaN1dy3uq5Ud3W8wS9M7VIVl8CoXozzDpIsdPeUAtkAxeHBsZqL1vAH2yC1YJA7HPySMYzCjYqkJ2r62xYk0gXmNXphfU+F/X/rHzHsTMJPONJ54HQwu12m7zVlKIYBGHgEXg/HAM/g4ljUzl6WWR/nHH/tQM8ND/8FpHluJSZJWacq/1QNhVdTq2x6cqws2fs5A7nVpccR9+6RRgYgv6+YS2LxvFzByuZveGGoKif+uMECXN876j40araUqU528Yz9i8bHJlnM3coRBndaLNWByLcUyXCB9r9IUosUu41rr+L2mVzkSDm0GicuNCzqvzYQ9Q6QY4uQ=
+  - secure: DglvLR27MrBKQO/8s7ZfGqfimXk1Iq5MreCTc+ZkWMkZ0sDP76YBUPq5j25hcg0Z09z09O2Q5OUOyYkhVD4AnRjoRLUplHdpDE9CBSz2vUGpMpzhgAqzBc6SDsEmWU2JlAPBraIODXQdP/Qo6tYY4zn3vwd/VFKo27GTb5b60WAkTVvT/0YPWycEXFIa7sNMgjNI0EnT+Se5USDYwb6MM1T9JxJot0q3WtOnsVyroCHJp4QDicpS8eQIu3Tl+SLE4d0EoJ4YYLOI+jWOybipuO1xM1xlHq/gpWfjKqbJh24xtAds524dN7ujfjAhyO2zQbuTOfi7QVOj/Go0tGYxNxobR4pYG783Aiq3Quj0GzSrLEAatkk5tGOcuVJ98EYIg3WPJuC93waTTXcS0xDyy09XHxWxZ/5PiXorRZjpHvnZfRF0X4Mus6jUJ7hqDuOUiF5BI1RHomHvJQQHUrLdmh7OHyrer3YUpKRs65tww6H+VM+lKNa3MnMkB5+or/co14svs7I4pni9S+aZg//bwuxGVXchK6bjLCP1X99Ar4fA5EGsTVdjp3PRqutM/P3RqNGkwTczat/PNZ8fFAD9y7pDs2L6YkqpflTC9d6vKTSl6gORGw6ltLUJs23ON6xRNIBMw1cXp67wN57vF46TPt1i3ZlIQsYn0pAVNKavbZE=

 deploy:
  provider: releases
@@ -95,14 +69,9 @@ deploy:
    tags: true

 notifications:
-  webhooks:
-    urls:
-      - https://hooks.slack.com/services/${SLACK_WEBHOOK}
-    on_success: always
-    on_failure: always
-    on_start: never
-
-notifications:
-  slack:
-    rooms:
-      - ethcore:4EGxt9WP6AS7uX4JKXSfR9vi#chatops
+ webhooks:
+   urls:
+     - https://hooks.slack.com/services/${SLACK_WEBHOOK}
+   on_success: always
+   on_failure: always
+   on_start: never
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,64 +1,28 @@
 [package]
 description = "Ethcore client."
 name = "parity"
-version = "1.2.2"
+version = "0.9.1"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
-build = "build.rs"
-
-[build-dependencies]
-rustc_version = "0.1"
-syntex = "*"
-ethcore-ipc-codegen = { path = "ipc/codegen" }

 [dependencies]
 log = "0.3"
 env_logger = "0.3"
 rustc-serialize = "0.3"
 docopt = "0.6"
-time = "0.1"
-ctrlc = { git = "https://github.com/ethcore/rust-ctrlc.git" }
-fdlimit = { path = "util/fdlimit" }
-num_cpus = "0.2"
-number_prefix = "0.2"
-rpassword = "0.2.1"
-clippy = { version = "0.0.77", optional = true}
-ethcore = { path = "ethcore" }
+docopt_macros = "0.6"
+ctrlc = "1.0"
+clippy = "0.0.41"
 ethcore-util = { path = "util" }
+ethcore = { path = "ethcore" }
 ethsync = { path = "sync" }
-ethcore-devtools = { path = "devtools" }
 ethcore-rpc = { path = "rpc", optional = true }
-ethcore-signer = { path = "signer", optional = true }
-ethcore-dapps = { path = "dapps", optional = true }
-semver = "0.2"
-ethcore-ipc-nano = { path = "ipc/nano" }
-ethcore-ipc = { path = "ipc/rpc" }
-json-ipc-server = { git = "https://github.com/ethcore/json-ipc-server.git" }
-ansi_term = "0.7"
-
-[target.'cfg(windows)'.dependencies]
-winapi = "0.2"
-
-[target.'cfg(not(windows))'.dependencies]
-daemonize = "0.2"
-
-[dependencies.hyper]
-version = "0.8"
-default-features = false
+fdlimit = { path = "util/fdlimit" }

 [features]
-default = ["rpc", "dapps", "ethcore-signer"]
+default = ["rpc"]
 rpc = ["ethcore-rpc"]
-dapps = ["ethcore-dapps"]
-dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "ethcore-rpc/dev",
-"ethcore-dapps/dev", "ethcore-signer/dev"]
-travis-beta = ["ethcore/json-tests"]
-travis-nightly = ["ethcore/json-tests", "dev"]

 [[bin]]
 path = "parity/main.rs"
 name = "parity"
-
-[profile.release]
-debug = true
-lto = false
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
-# [Parity](https://ethcore.io/parity.html)
-### Fast, light, and robust Ethereum implementation
+# ethcore

-[![Build Status][travis-image]][travis-url] [![Coverage Status][coveralls-image]][coveralls-url] [![Join the chat at https://gitter.im/trogdoro/xiki][gitter-image]][gitter-url] [![GPLv3][license-image]][license-url]
+[![Build Status][travis-image]][travis-url] [![Coverage Status][coveralls-image]][coveralls-url] [![Join the chat at https://gitter.im/trogdoro/xiki][gitter-image]][gitter-url]

 [travis-image]: https://travis-ci.org/ethcore/parity.svg?branch=master
 [travis-url]: https://travis-ci.org/ethcore/parity
@@ -9,80 +8,70 @@
 [coveralls-url]: https://coveralls.io/github/ethcore/parity?branch=master
 [gitter-image]: https://badges.gitter.im/Join%20Chat.svg
 [gitter-url]: https://gitter.im/ethcore/parity?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
-[license-image]: https://img.shields.io/badge/license-GPL%20v3-green.svg
-[license-url]: http://www.gnu.org/licenses/gpl-3.0.en.html

-[Internal Documentation](http://ethcore.github.io/parity/ethcore/index.html)
+[Documentation](http://ethcore.github.io/parity/ethcore/index.html)

----
+### Building from source

-## About Parity
-
-Parity's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing Parity using the sophisticated and
-cutting-edge Rust programming language. Parity is licensed under the GPLv3, and can be used for all your Ethereum needs.
-
-By default, Parity will run a JSONRPC server on `127.0.0.1:8545`. This is fully configurable and supports a number
-of RPC APIs.
-
-Parity also runs a server for running decentralized apps, or "Dapps", on `http://127.0.0.1:8080`.
-This includes a few useful Dapps, including Ethereum Wallet, Maker OTC, and a node status page.
-In a near-future release, it will be easy to install Dapps and use them through this web interface.
-
-If you run into an issue while using parity, feel free to file one in this repository
-or hop on our [gitter chat room]([gitter-url]) to ask a question. We are glad to help!
-
-Parity's current release is 1.2. You can download it at https://ethcore.io/parity.html or follow the instructions
-below to build from source.
-
----
-
-## Build dependencies
-
-Parity is fully compatible with Stable Rust.
-
-We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have rustup, you can install it like this:
-
- Linux and OSX:
-	```bash
-	$ curl https://sh.rustup.rs -sSf | sh
-	```
-
- Windows
-
-    Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the rustup installer from
-	https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe, start "VS2015 x64 Native Tools Command Prompt", and use the following command to install and set up the msvc toolchain:
-    ```
-	$ rustup default stable-x86_64-pc-windows-msvc
-    ```
-
-Once you have rustup, install parity or download and build from source
-
----
-
-## Quick install
+##### Ubuntu 14.04, 15.04, 15.10

 ```bash
-cargo install --git https://github.com/ethcore/parity.git parity
+# install rocksdb
+add-apt-repository ppa:ethcore/ethcore
+apt-get update
+apt-get install -y --force-yes librocksdb-dev
+
+# install multirust
+curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes
+
+# install nightly and make it default
+multirust update nightly
+multirust default nightly
+
+# download and build parity
+git clone https://github.com/ethcore/parity
+cd parity
+cargo build --release
 ```

----
-
-## Build from source
+##### Other Linux

 ```bash
-# download Parity code
-$ git clone https://github.com/ethcore/parity
-$ cd parity
+# install rocksdb
+git clone --tag v4.1 --depth=1 https://github.com/facebook/rocksdb.git
+cd rocksdb
+make shared_lib 
+sudo cp -a librocksdb.so* /usr/lib 
+sudo ldconfig 
+cd ..

-# build in release mode
-$ cargo build --release
+# install rust nightly
+curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sudo sh -s -- --yes
+
+# install nightly and make it default
+sudo multirust update nightly
+sudo multirust default nightly
+
+# download and build parity
+git clone https://github.com/ethcore/parity
+cd parity
+cargo build --release
 ```

-This will produce an executable in the `./target/release` subdirectory.
+##### OSX with Homebrew

-To get started, just run
 ```bash
-$ ./target/release/parity
+# install rocksdb && multirust
+brew update
+brew install rocksdb
+brew install multirust
+
+# install nightly and make it default
+multirust update nightly && multirust default nightly
+
+# download and build parity
+git clone https://github.com/ethcore/parity
+cd parity
+cargo build --release
 ```

-and parity will begin syncing the Ethereum blockchain.
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,50 +0,0 @@
-environment:
-  matrix:
-  - TARGET: x86_64-pc-windows-msvc
-  cert:
-    secure: ESPpYVVAMG1fbJx6kq4ct/g9SQTXac4Hs6xXr6Oh4Zrk2dwYglNjxmzErdPnvu7gs/gekzrJ6KEQHYRc+5+4dKg6rRADQ681NLVx9vOggBs=
-  certpass:
-    secure: 0BgXJqxq9Ei34/hZ7121FQ==
-  keyfile: C:\users\appveyor\Certificates.p12
-
-branches:
-  only:
-    - master
-    - /^beta-.*$/
-    - /^stable-.*$/
-    - /^beta$/
-    - /^stable$/
-
-install:
-  - git submodule update --init --recursive
-  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.9.0-x86_64-pc-windows-msvc.exe"
-  - ps: Start-FileDownload "https://github.com/ethcore/win-build/raw/master/SimpleFC.dll" -FileName nsis\SimpleFC.dll
-  - ps: Start-FileDownload "https://github.com/ethcore/win-build/raw/master/vc_redist.x64.exe" -FileName nsis\vc_redist.x64.exe
-  - rust-1.9.0-x86_64-pc-windows-msvc.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
-  - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin;C:\Program Files (x86)\NSIS;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin
-  - rustc -V
-  - cargo -V
-
-build: off
-
-test_script:
-  - cargo test --verbose --release
-
-after_test:
-  - cargo build --verbose --release
-  - ps: if($env:cert) { Start-FileDownload $env:cert -FileName $env:keyfile }
-  - ps: if($env:cert) { signtool sign /f $env:keyfile /p $env:certpass target\release\parity.exe }
-  - makensis.exe nsis\installer.nsi
-  - ps: if($env:cert) { signtool sign /f $env:keyfile /p $env:certpass nsis\installer.exe }
-
-artifacts:
-  - path: nsis\installer.exe
-    name: Windows Installer (x86_64)
-  - path: target\release\parity.exe
-    name: Windows Executable (x86_64)
-  - path: target\release\parity.pdb
-    name: Windows Executable Debug Symbols (x86_64)
-
-cache:
-  - target
-  - C:\users\appveyor\.cargo -> appveyor.yml
--- a/build.rs
+++ b/build.rs
@@ -1,49 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate rustc_version;
-extern crate syntex;
-extern crate ethcore_ipc_codegen as codegen;
-
-use std::env;
-use std::path::Path;
-use rustc_version::{version_meta, Channel};
-
-fn main() {
-	if let Channel::Nightly = version_meta().channel {
-		println!("cargo:rustc-cfg=nightly");
-	}
-
-	let out_dir = env::var_os("OUT_DIR").unwrap();
-
-	// ipc pass
-	{
-		let src = Path::new("parity/hypervisor/service.rs.in");
-		let dst = Path::new(&out_dir).join("hypervisor_service_ipc.rs");
-		let mut registry = syntex::Registry::new();
-		codegen::register(&mut registry);
-		registry.expand("", &src, &dst).unwrap();
-	}
-
-	// serialization pass
-	{
-		let src = Path::new(&out_dir).join("hypervisor_service_ipc.rs");
-		let dst = Path::new(&out_dir).join("hypervisor_service_cg.rs");
-		let mut registry = syntex::Registry::new();
-		codegen::register(&mut registry);
-		registry.expand("", &src, &dst).unwrap();
-	}
-}
--- a/cov.sh
+++ b/cov.sh
@@ -15,29 +15,7 @@ if ! type kcov > /dev/null; then
 	exit 1
 fi

-cargo test \
-	-p ethkey \
-	-p ethstore \
-	-p ethash \
-	-p ethcore-util \
-	-p ethcore \
-	-p ethsync \
-	-p ethcore-rpc \
-	-p parity \
-	-p ethcore-signer \
-	-p ethcore-dapps \
-	--no-run || exit $?
-rm -rf target/coverage
+cargo test --features ethcore/json-tests -p ethcore --no-run || exit $?
 mkdir -p target/coverage
-
-EXCLUDE="~/.multirust,rocksdb,secp256k1,src/tests,util/json-tests,util/src/network/tests,sync/src/tests,ethcore/src/tests,ethcore/src/evm/tests,ethstore/tests"
-kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethkey-*
-kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethstore-*
-kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethcore-*
-kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethash-*
-kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethcore_util-*
-kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethsync-*
-kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethcore_rpc-*
-kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethcore_signer-*
-kcov --exclude-pattern $EXCLUDE --include-pattern src --verify target/coverage target/debug/deps/ethcore_dapps-*
+kcov --exclude-pattern ~/.multirust,rocksdb,secp256k1 --include-pattern src --verify target/coverage target/debug/deps/ethcore*
 xdg-open target/coverage/index.html
--- a/dapps/Cargo.toml
+++ b/dapps/Cargo.toml
@@ -1,41 +0,0 @@
-[package]
-description = "Parity Dapps crate"
-name = "ethcore-dapps"
-version = "1.2.0"
-license = "GPL-3.0"
-authors = ["Ethcore <admin@ethcore.io"]
-build = "build.rs"
-
-[lib]
-
-[dependencies]
-log = "0.3"
-jsonrpc-core = "2.0"
-jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git" }
-hyper = { default-features = false, git = "https://github.com/ethcore/hyper" }
-url = "1.0"
-rustc-serialize = "0.3"
-serde = "0.7.0"
-serde_json = "0.7.0"
-serde_macros = { version = "0.7.0", optional = true }
-ethcore-rpc = { path = "../rpc" }
-ethcore-util = { path = "../util" }
-parity-dapps = { git = "https://github.com/ethcore/parity-dapps-rs.git", version = "0.3" }
-# List of apps
-parity-dapps-status = { git = "https://github.com/ethcore/parity-dapps-status-rs.git", version = "0.5.1" }
-parity-dapps-builtins = { git = "https://github.com/ethcore/parity-dapps-builtins-rs.git", version = "0.5.2" }
-parity-dapps-wallet = { git = "https://github.com/ethcore/parity-dapps-wallet-rs.git", version = "0.6.0", optional = true }
-parity-dapps-dao = { git = "https://github.com/ethcore/parity-dapps-dao-rs.git", version = "0.4.0", optional = true }
-parity-dapps-makerotc = { git = "https://github.com/ethcore/parity-dapps-makerotc-rs.git", version = "0.3.0", optional = true }
-mime_guess = { version = "1.6.1" }
-clippy = { version = "0.0.77", optional = true}
-
-[build-dependencies]
-serde_codegen = { version = "0.7.0", optional = true }
-syntex = "*"
-
-[features]
-default = ["serde_codegen", "extra-dapps"]
-extra-dapps = ["parity-dapps-wallet"]
-nightly = ["serde_macros"]
-dev = ["clippy", "ethcore-rpc/dev", "ethcore-util/dev"]
--- a/dapps/build.rs
+++ b/dapps/build.rs
@@ -1,45 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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(not(feature = "serde_macros"))]
-mod inner {
-    extern crate syntex;
-    extern crate serde_codegen;
-
-    use std::env;
-    use std::path::Path;
-
-    pub fn main() {
-        let out_dir = env::var_os("OUT_DIR").unwrap();
-
-        let src = Path::new("./src/api/mod.rs.in");
-        let dst = Path::new(&out_dir).join("mod.rs");
-
-        let mut registry = syntex::Registry::new();
-
-        serde_codegen::register(&mut registry);
-        registry.expand("", &src, &dst).unwrap();
-    }
-}
-
-#[cfg(feature = "serde_macros")]
-mod inner {
-    pub fn main() {}
-}
-
-fn main() {
-    inner::main();
-}
--- a/dapps/src/api/api.rs
+++ b/dapps/src/api/api.rs
@@ -1,69 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 endpoint::{Endpoint, Endpoints, EndpointInfo, Handler, EndpointPath};
-
-use api::response::as_json;
-
-pub struct RestApi {
-	endpoints: Arc<Endpoints>,
-}
-
-#[derive(Debug, PartialEq, Serialize, Deserialize)]
-pub struct App {
-	pub id: String,
-	pub name: String,
-	pub description: String,
-	pub version: String,
-	pub author: String,
-	#[serde(rename="iconUrl")]
-	pub icon_url: String,
-}
-
-impl App {
-	fn from_info(id: &str, info: &EndpointInfo) -> Self {
-		App {
-			id: id.to_owned(),
-			name: info.name.to_owned(),
-			description: info.description.to_owned(),
-			version: info.version.to_owned(),
-			author: info.author.to_owned(),
-			icon_url: info.icon_url.to_owned(),
-		}
-	}
-}
-
-impl RestApi {
-	pub fn new(endpoints: Arc<Endpoints>) -> Box<Endpoint> {
-		Box::new(RestApi {
-			endpoints: endpoints
-		})
-	}
-
-	fn list_apps(&self) -> Vec<App> {
-		self.endpoints.iter().filter_map(|(ref k, ref e)| {
-			e.info().map(|ref info| App::from_info(k, info))
-		}).collect()
-	}
-}
-
-impl Endpoint for RestApi {
-	fn to_handler(&self, _path: EndpointPath) -> Box<Handler> {
-		as_json(&self.list_apps())
-	}
-}
-
--- a/dapps/src/api/mod.rs
+++ b/dapps/src/api/mod.rs
@@ -1,28 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! REST API
-
-#![warn(missing_docs)]
-#![cfg_attr(feature="nightly", feature(custom_derive, custom_attribute, plugin))]
-#![cfg_attr(feature="nightly", plugin(serde_macros, clippy))]
-
-#[cfg(feature = "serde_macros")]
-include!("mod.rs.in");
-
-#[cfg(not(feature = "serde_macros"))]
-include!(concat!(env!("OUT_DIR"), "/mod.rs"));
-
--- a/dapps/src/api/mod.rs.in
+++ b/dapps/src/api/mod.rs.in
@@ -1,21 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-mod api;
-mod response;
-
-pub use self::api::RestApi;
-pub use self::api::App;
--- a/dapps/src/api/response.rs
+++ b/dapps/src/api/response.rs
@@ -1,23 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 endpoint::{ContentHandler, Handler};
-
-pub fn as_json<T : Serialize>(val: &T) -> Box<Handler> {
-	Box::new(ContentHandler::new(serde_json::to_string(val).unwrap(), "application/json".to_owned()))
-}
--- a/dapps/src/apps/fs.rs
+++ b/dapps/src/apps/fs.rs
@@ -1,116 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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;
-use std::io;
-use std::io::Read;
-use std::fs;
-use std::path::PathBuf;
-use page::LocalPageEndpoint;
-use endpoint::{Endpoints, EndpointInfo};
-use api::App;
-
-struct LocalDapp {
-	id: String,
-	path: PathBuf,
-	info: EndpointInfo,
-}
-
-fn local_dapps(dapps_path: String) -> Vec<LocalDapp> {
-	let files = fs::read_dir(dapps_path.as_str());
-	if let Err(e) = files {
-		warn!(target: "dapps", "Unable to load local dapps from: {}. Reason: {:?}", dapps_path, e);
-		return vec![];
-	}
-
-	let files = files.expect("Check is done earlier");
-	files.map(|dir| {
-			let entry = try!(dir);
-			let file_type = try!(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)| {
-			// try to get manifest file
-			let info = read_manifest(&name, path.clone());
-			LocalDapp {
-				id: name,
-				path: path,
-				info: info,
-			}
-		})
-		.collect()
-}
-
-fn read_manifest(name: &str, mut path: PathBuf) -> EndpointInfo {
-	path.push("manifest.json");
-
-	fs::File::open(path.clone())
-		.map_err(|e| format!("{:?}", e))
-		.and_then(|mut f| {
-			// Reat file
-			let mut s = String::new();
-			try!(f.read_to_string(&mut s).map_err(|e| format!("{:?}", e)));
-			// Try to deserialize manifest
-			serde_json::from_str::<App>(&s).map_err(|e| format!("{:?}", e))
-		})
-		.map(|app| EndpointInfo {
-			name: app.name,
-			description: app.description,
-			version: app.version,
-			author: app.author,
-			icon_url: app.icon_url,
-		})
-		.unwrap_or_else(|e| {
-			warn!(target: "dapps", "Cannot read manifest file at: {:?}. Error: {:?}", path, e);
-
-			EndpointInfo {
-				name: name.into(),
-				description: name.into(),
-				version: "0.0.0".into(),
-				author: "?".into(),
-				icon_url: "icon.png".into(),
-			}
-		})
-}
-
-pub fn local_endpoints(dapps_path: String) -> Endpoints {
-	let mut pages = Endpoints::new();
-	for dapp in local_dapps(dapps_path) {
-		pages.insert(
-			dapp.id,
-			Box::new(LocalPageEndpoint::new(dapp.path, dapp.info))
-		);
-	}
-	pages
-}
--- a/dapps/src/apps/mod.rs
+++ b/dapps/src/apps/mod.rs
@@ -1,87 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use endpoint::{Endpoints, Endpoint};
-use page::PageEndpoint;
-use proxypac::ProxyPac;
-use parity_dapps::WebApp;
-
-mod fs;
-
-extern crate parity_dapps_status;
-extern crate parity_dapps_builtins;
-
-pub const DAPPS_DOMAIN : &'static str = ".parity";
-pub const RPC_PATH : &'static str =  "rpc";
-pub const API_PATH : &'static str =  "api";
-pub const UTILS_PATH : &'static str =  "parity-utils";
-
-pub fn main_page() -> &'static str {
-	"/home/"
-}
-
-pub fn utils() -> Box<Endpoint> {
-	Box::new(PageEndpoint::with_prefix(parity_dapps_builtins::App::default(), UTILS_PATH.to_owned()))
-}
-
-pub fn all_endpoints(dapps_path: String) -> Endpoints {
-	// fetch fs dapps at first to avoid overwriting builtins
-	let mut pages = fs::local_endpoints(dapps_path);
-	// Home page needs to be safe embed
-	// because we use Cross-Origin LocalStorage.
-	// TODO [ToDr] Account naming should be moved to parity.
-	pages.insert("home".into(), Box::new(
-		PageEndpoint::new_safe_to_embed(parity_dapps_builtins::App::default())
-	));
-	pages.insert("proxy".into(), ProxyPac::boxed());
-	insert::<parity_dapps_status::App>(&mut pages, "parity");
-	insert::<parity_dapps_status::App>(&mut pages, "status");
-
-	// Optional dapps
-	wallet_page(&mut pages);
-	daodapp_page(&mut pages);
-	makerotc_page(&mut pages);
-
-	pages
-}
-
-#[cfg(feature = "parity-dapps-wallet")]
-fn wallet_page(pages: &mut Endpoints) {
-	extern crate parity_dapps_wallet;
-	insert::<parity_dapps_wallet::App>(pages, "wallet");
-}
-#[cfg(not(feature = "parity-dapps-wallet"))]
-fn wallet_page(_pages: &mut Endpoints) {}
-
-#[cfg(feature = "parity-dapps-dao")]
-fn daodapp_page(pages: &mut Endpoints) {
-	extern crate parity_dapps_dao;
-	insert::<parity_dapps_dao::App>(pages, "dao");
-}
-#[cfg(not(feature = "parity-dapps-dao"))]
-fn daodapp_page(_pages: &mut Endpoints) {}
-
-#[cfg(feature = "parity-dapps-makerotc")]
-fn makerotc_page(pages: &mut Endpoints) {
-	extern crate parity_dapps_makerotc;
-	insert::<parity_dapps_makerotc::App>(pages, "makerotc");
-}
-#[cfg(not(feature = "parity-dapps-makerotc"))]
-fn makerotc_page(_pages: &mut Endpoints) {}
-
-fn insert<T : WebApp + Default + 'static>(pages: &mut Endpoints, id: &str) {
-	pages.insert(id.to_owned(), Box::new(PageEndpoint::new(T::default())));
-}
--- a/dapps/src/endpoint.rs
+++ b/dapps/src/endpoint.rs
@@ -1,99 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 hyper::status::StatusCode;
-use hyper::{header, server, Decoder, Encoder, Next};
-use hyper::net::HttpStream;
-
-use std::io::Write;
-use std::collections::BTreeMap;
-
-#[derive(Debug, PartialEq, Default, Clone)]
-pub struct EndpointPath {
-	pub app_id: String,
-	pub host: String,
-	pub port: u16,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub struct EndpointInfo {
-	pub name: String,
-	pub description: String,
-	pub version: String,
-	pub author: String,
-	pub icon_url: String,
-}
-
-pub trait Endpoint : Send + Sync {
-	fn info(&self) -> Option<&EndpointInfo> { None }
-
-	fn to_handler(&self, path: EndpointPath) -> Box<server::Handler<HttpStream> + Send>;
-}
-
-pub type Endpoints = BTreeMap<String, Box<Endpoint>>;
-pub type Handler = server::Handler<HttpStream> + Send;
-
-pub struct ContentHandler {
-	content: String,
-	mimetype: String,
-	write_pos: usize,
-}
-
-impl ContentHandler {
-	pub fn new(content: String, mimetype: String) -> Self {
-		ContentHandler {
-			content: content,
-			mimetype: mimetype,
-			write_pos: 0
-		}
-	}
-}
-
-impl server::Handler<HttpStream> for ContentHandler {
-	fn on_request(&mut self, _request: server::Request<HttpStream>) -> Next {
-		Next::write()
-	}
-
-	fn on_request_readable(&mut self, _decoder: &mut Decoder<HttpStream>) -> Next {
-		Next::write()
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		res.set_status(StatusCode::Ok);
-		res.headers_mut().set(header::ContentType(self.mimetype.parse().unwrap()));
-		Next::write()
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		let bytes = self.content.as_bytes();
-		if self.write_pos == bytes.len() {
-			return Next::end();
-		}
-
-		match encoder.write(&bytes[self.write_pos..]) {
-			Ok(bytes) => {
-				self.write_pos += bytes;
-				Next::write()
-			},
-			Err(e) => match e.kind() {
-				::std::io::ErrorKind::WouldBlock => Next::write(),
-				_ => Next::end()
-			},
-		}
-	}
-}
--- a/dapps/src/lib.rs
+++ b/dapps/src/lib.rs
@@ -1,177 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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
-//! ```
-//! extern crate jsonrpc_core;
-//! extern crate ethcore_dapps;
-//!
-//! use std::sync::Arc;
-//! use jsonrpc_core::IoHandler;
-//! use ethcore_dapps::*;
-//!
-//! struct SayHello;
-//! impl MethodCommand for SayHello {
-//! 	fn execute(&self, _params: Params) -> Result<Value, Error> {
-//! 		Ok(Value::String("hello".to_string()))
-//! 	}
-//! }
-//!
-//! fn main() {
-//! 	let io = IoHandler::new();
-//! 	io.add_method("say_hello", SayHello);
-//! 	let _server = Server::start_unsecure_http(
-//! 		&"127.0.0.1:3030".parse().unwrap(),
-//! 		Arc::new(io)
-//! 	);
-//! }
-//! ```
-//!
-#![warn(missing_docs)]
-#![cfg_attr(feature="nightly", plugin(clippy))]
-
-#[macro_use]
-extern crate log;
-extern crate url;
-extern crate hyper;
-extern crate serde;
-extern crate serde_json;
-extern crate jsonrpc_core;
-extern crate jsonrpc_http_server;
-extern crate parity_dapps;
-extern crate ethcore_rpc;
-extern crate mime_guess;
-
-mod endpoint;
-mod apps;
-mod page;
-mod router;
-mod rpc;
-mod api;
-mod proxypac;
-
-use std::sync::{Arc, Mutex};
-use std::net::SocketAddr;
-use std::collections::HashMap;
-use jsonrpc_core::{IoHandler, IoDelegate};
-use router::auth::{Authorization, NoAuth, HttpBasicAuth};
-use ethcore_rpc::Extendable;
-
-static DAPPS_DOMAIN : &'static str = ".parity";
-
-/// Webapps HTTP+RPC server build.
-pub struct ServerBuilder {
-	dapps_path: String,
-	handler: Arc<IoHandler>,
-}
-
-impl Extendable for ServerBuilder {
-	fn add_delegate<D: Send + Sync + 'static>(&self, delegate: IoDelegate<D>) {
-		self.handler.add_delegate(delegate);
-	}
-}
-
-impl ServerBuilder {
-	/// Construct new dapps server
-	pub fn new(dapps_path: String) -> Self {
-		ServerBuilder {
-			dapps_path: dapps_path,
-			handler: Arc::new(IoHandler::new())
-		}
-	}
-
-	/// Asynchronously start server with no authentication,
-	/// returns result with `Server` handle on success or an error.
-	pub fn start_unsecure_http(&self, addr: &SocketAddr) -> Result<Server, ServerError> {
-		Server::start_http(addr, NoAuth, self.handler.clone(), self.dapps_path.clone())
-	}
-
-	/// Asynchronously start server with `HTTP Basic Authentication`,
-	/// return result with `Server` handle on success or an error.
-	pub fn start_basic_auth_http(&self, addr: &SocketAddr, username: &str, password: &str) -> Result<Server, ServerError> {
-		Server::start_http(addr, HttpBasicAuth::single_user(username, password), self.handler.clone(), self.dapps_path.clone())
-	}
-}
-
-/// Webapps HTTP server.
-pub struct Server {
-	server: Option<hyper::server::Listening>,
-	panic_handler: Arc<Mutex<Option<Box<Fn() -> () + Send>>>>,
-}
-
-impl Server {
-	fn start_http<A: Authorization + 'static>(addr: &SocketAddr, authorization: A, handler: Arc<IoHandler>, dapps_path: String) -> Result<Server, ServerError> {
-		let panic_handler = Arc::new(Mutex::new(None));
-		let authorization = Arc::new(authorization);
-		let endpoints = Arc::new(apps::all_endpoints(dapps_path));
-		let special = Arc::new({
-			let mut special = HashMap::new();
-			special.insert(router::SpecialEndpoint::Rpc, rpc::rpc(handler, panic_handler.clone()));
-			special.insert(router::SpecialEndpoint::Api, api::RestApi::new(endpoints.clone()));
-			special.insert(router::SpecialEndpoint::Utils, apps::utils());
-			special
-		});
-
-		try!(hyper::Server::http(addr))
-			.handle(move |_| router::Router::new(
-				apps::main_page(),
-				endpoints.clone(),
-				special.clone(),
-				authorization.clone(),
-			))
-			.map(|(l, srv)| {
-
-				::std::thread::spawn(move || {
-					srv.run();
-				});
-
-				Server {
-					server: Some(l),
-					panic_handler: panic_handler,
-				}
-			})
-			.map_err(ServerError::from)
-	}
-
-	/// Set callback for panics.
-	pub fn set_panic_handler<F>(&self, handler: F) where F : Fn() -> () + Send + 'static {
-		*self.panic_handler.lock().unwrap() = Some(Box::new(handler));
-	}
-}
-
-impl Drop for Server {
-	fn drop(&mut self) {
-		self.server.take().unwrap().close()
-	}
-}
-
-/// Webapp Server startup error
-#[derive(Debug)]
-pub enum ServerError {
-	/// Wrapped `std::io::Error`
-	IoError(std::io::Error),
-	/// Other `hyper` error
-	Other(hyper::error::Error),
-}
-
-impl From<hyper::error::Error> for ServerError {
-	fn from(err: hyper::error::Error) -> Self {
-		match err {
-			hyper::error::Error::Io(e) => ServerError::IoError(e),
-			e => ServerError::Other(e),
-		}
-	}
-}
--- a/dapps/src/page/builtin.rs
+++ b/dapps/src/page/builtin.rs
@@ -1,154 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 page::handler;
-use std::sync::Arc;
-use endpoint::{Endpoint, EndpointInfo, EndpointPath, Handler};
-use parity_dapps::{WebApp, File, Info};
-
-pub struct PageEndpoint<T : WebApp + 'static> {
-	/// Content of the files
-	pub app: Arc<T>,
-	/// Prefix to strip from the path (when `None` deducted from `app_id`)
-	pub prefix: Option<String>,
-	/// Safe to be loaded in frame by other origin. (use wisely!)
-	safe_to_embed: bool,
-	info: EndpointInfo,
-}
-
-impl<T: WebApp + 'static> PageEndpoint<T> {
-	/// Creates new `PageEndpoint` for builtin (compile time) Dapp.
-	pub fn new(app: T) -> Self {
-		let info = app.info();
-		PageEndpoint {
-			app: Arc::new(app),
-			prefix: None,
-			safe_to_embed: false,
-			info: EndpointInfo::from(info),
-		}
-	}
-
-	/// Create new `PageEndpoint` and specify prefix that should be removed before looking for a file.
-	/// It's used only for special endpoints (i.e. `/parity-utils/`)
-	/// So `/parity-utils/inject.js` will be resolved to `/inject.js` is prefix is set.
-	pub fn with_prefix(app: T, prefix: String) -> Self {
-		let info = app.info();
-		PageEndpoint {
-			app: Arc::new(app),
-			prefix: Some(prefix),
-			safe_to_embed: false,
-			info: EndpointInfo::from(info),
-		}
-	}
-
-	/// Creates new `PageEndpoint` which can be safely used in iframe
-	/// even from different origin. It might be dangerous (clickjacking).
-	/// Use wisely!
-	pub fn new_safe_to_embed(app: T) -> Self {
-		let info = app.info();
-		PageEndpoint {
-			app: Arc::new(app),
-			prefix: None,
-			safe_to_embed: true,
-			info: EndpointInfo::from(info),
-		}
-	}
-}
-
-impl<T: WebApp> Endpoint for PageEndpoint<T> {
-
-	fn info(&self) -> Option<&EndpointInfo> {
-		Some(&self.info)
-	}
-
-	fn to_handler(&self, path: EndpointPath) -> Box<Handler> {
-		Box::new(handler::PageHandler {
-			app: BuiltinDapp::new(self.app.clone()),
-			prefix: self.prefix.clone(),
-			path: path,
-			file: None,
-			safe_to_embed: self.safe_to_embed,
-		})
-	}
-}
-
-impl From<Info> for EndpointInfo {
-	fn from(info: Info) -> Self {
-		EndpointInfo {
-			name: info.name.into(),
-			description: info.description.into(),
-			author: info.author.into(),
-			icon_url: info.icon_url.into(),
-			version: info.version.into(),
-		}
-	}
-}
-
-struct BuiltinDapp<T: WebApp + 'static> {
-	app: Arc<T>,
-}
-
-impl<T: WebApp + 'static> BuiltinDapp<T> {
-	fn new(app: Arc<T>) -> Self {
-		BuiltinDapp {
-			app: app,
-		}
-	}
-}
-
-impl<T: WebApp + 'static> handler::Dapp for BuiltinDapp<T> {
-	type DappFile = BuiltinDappFile<T>;
-
-	fn file(&self, path: &str) -> Option<Self::DappFile> {
-		self.app.file(path).map(|_| {
-			BuiltinDappFile {
-				app: self.app.clone(),
-				path: path.into(),
-				write_pos: 0,
-			}
-		})
-	}
-}
-
-struct BuiltinDappFile<T: WebApp + 'static> {
-	app: Arc<T>,
-	path: String,
-	write_pos: usize,
-}
-
-impl<T: WebApp + 'static> BuiltinDappFile<T> {
-	fn file(&self) -> &File {
-		self.app.file(&self.path).expect("Check is done when structure is created.")
-	}
-}
-
-impl<T: WebApp + 'static> handler::DappFile for BuiltinDappFile<T> {
-	fn content_type(&self) -> &str {
-		self.file().content_type
-	}
-
-	fn is_drained(&self) -> bool {
-		self.write_pos == self.file().content.len()
-	}
-
-	fn next_chunk(&mut self) -> &[u8] {
-		&self.file().content[self.write_pos..]
-	}
-
-	fn bytes_written(&mut self, bytes: usize) {
-		self.write_pos += bytes;
-	}
-}
--- a/dapps/src/page/handler.rs
+++ b/dapps/src/page/handler.rs
@@ -1,207 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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::Write;
-use hyper::header;
-use hyper::server;
-use hyper::uri::RequestUri;
-use hyper::net::HttpStream;
-use hyper::status::StatusCode;
-use hyper::{Decoder, Encoder, Next};
-use endpoint::EndpointPath;
-
-/// Represents a file that can be sent to client.
-/// Implementation should keep track of bytes already sent internally.
-pub trait DappFile: Send {
-	/// Returns a content-type of this file.
-	fn content_type(&self) -> &str;
-
-	/// Checks if all bytes from that file were written.
-	fn is_drained(&self) -> bool;
-
-	/// Fetch next chunk to write to the client.
-	fn next_chunk(&mut self) -> &[u8];
-
-	/// How many files have been written to the client.
-	fn bytes_written(&mut self, bytes: usize);
-}
-
-/// Dapp as a (dynamic) set of files.
-pub trait Dapp: Send + 'static {
-	/// File type
-	type DappFile: DappFile;
-
-	/// Returns file under given path.
-	fn file(&self, path: &str) -> Option<Self::DappFile>;
-}
-
-/// A handler for a single webapp.
-/// Resolves correct paths and serves as a plumbing code between
-/// hyper server and dapp.
-pub struct PageHandler<T: Dapp> {
-	/// A Dapp.
-	pub app: T,
-	/// File currently being served (or `None` if file does not exist).
-	pub file: Option<T::DappFile>,
-	/// Optional prefix to strip from path.
-	pub prefix: Option<String>,
-	/// Requested path.
-	pub path: EndpointPath,
-	/// Flag indicating if the file can be safely embeded (put in iframe).
-	pub safe_to_embed: bool,
-}
-
-impl<T: Dapp> PageHandler<T> {
-	fn extract_path(&self, path: &str) -> String {
-		let app_id = &self.path.app_id;
-		let prefix = "/".to_owned() + self.prefix.as_ref().unwrap_or(app_id);
-		let prefix_with_slash = prefix.clone() + "/";
-		let query_pos = path.find('?').unwrap_or_else(|| path.len());
-
-		// Index file support
-		match path == "/" || path == &prefix || path == &prefix_with_slash {
-			true => "index.html".to_owned(),
-			false => if path.starts_with(&prefix_with_slash) {
-				path[prefix_with_slash.len()..query_pos].to_owned()
-			} else if path.starts_with("/") {
-				path[1..query_pos].to_owned()
-			} else {
-				path[0..query_pos].to_owned()
-			}
-		}
-	}
-}
-
-impl<T: Dapp> server::Handler<HttpStream> for PageHandler<T> {
-	fn on_request(&mut self, req: server::Request<HttpStream>) -> Next {
-		self.file = match *req.uri() {
-			RequestUri::AbsolutePath(ref path) => {
-				self.app.file(&self.extract_path(path))
-			},
-			RequestUri::AbsoluteUri(ref url) => {
-				self.app.file(&self.extract_path(url.path()))
-			},
-			_ => None,
-		};
-		Next::write()
-	}
-
-	fn on_request_readable(&mut self, _decoder: &mut Decoder<HttpStream>) -> Next {
-		Next::write()
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		if let Some(ref f) = self.file {
-			res.set_status(StatusCode::Ok);
-			res.headers_mut().set(header::ContentType(f.content_type().parse().unwrap()));
-			if !self.safe_to_embed {
-				res.headers_mut().set_raw("X-Frame-Options", vec![b"SAMEORIGIN".to_vec()]);
-			}
-			Next::write()
-		} else {
-			res.set_status(StatusCode::NotFound);
-			Next::write()
-		}
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		match self.file {
-			None => Next::end(),
-			Some(ref f) if f.is_drained() => Next::end(),
-			Some(ref mut f) => match encoder.write(f.next_chunk()) {
-				Ok(bytes) => {
-					f.bytes_written(bytes);
-					Next::write()
-				},
-				Err(e) => match e.kind() {
-					::std::io::ErrorKind::WouldBlock => Next::write(),
-					_ => Next::end(),
-				},
-			}
-		}
-	}
-}
-
-
-
-#[cfg(test)]
-mod test {
-	use super::*;
-
-	pub struct TestWebAppFile;
-
-	impl DappFile for TestWebAppFile {
-		fn content_type(&self) -> &str {
-			unimplemented!()
-		}
-
-		fn is_drained(&self) -> bool {
-			unimplemented!()
-		}
-
-		fn next_chunk(&mut self) -> &[u8] {
-			unimplemented!()
-		}
-
-		fn bytes_written(&mut self, _bytes: usize) {
-			unimplemented!()
-		}
-	}
-
-	#[derive(Default)]
-	pub struct TestWebapp;
-
-	impl Dapp for TestWebapp {
-		type DappFile = TestWebAppFile;
-
-		fn file(&self, _path: &str) -> Option<Self::DappFile> {
-			None
-		}
-	}
-}
-
-#[test]
-fn should_extract_path_with_appid() {
-
-	// given
-	let path1 = "/";
-	let path2= "/test.css";
-	let path3 = "/app/myfile.txt";
-	let path4 = "/app/myfile.txt?query=123";
-	let page_handler = PageHandler {
-		app: test::TestWebapp,
-		prefix: None,
-		path: EndpointPath {
-			app_id: "app".to_owned(),
-			host: "".to_owned(),
-			port: 8080
-		},
-		file: None,
-		safe_to_embed: true,
-	};
-
-	// when
-	let res1 = page_handler.extract_path(path1);
-	let res2 = page_handler.extract_path(path2);
-	let res3 = page_handler.extract_path(path3);
-	let res4 = page_handler.extract_path(path4);
-
-	// then
-	assert_eq!(&res1, "index.html");
-	assert_eq!(&res2, "test.css");
-	assert_eq!(&res3, "myfile.txt");
-	assert_eq!(&res4, "myfile.txt");
-}
--- a/dapps/src/page/local.rs
+++ b/dapps/src/page/local.rs
@@ -1,118 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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::io::{Seek, Read, SeekFrom};
-use std::fs;
-use std::path::PathBuf;
-use page::handler;
-use endpoint::{Endpoint, EndpointInfo, EndpointPath, Handler};
-
-pub struct LocalPageEndpoint {
-	path: PathBuf,
-	info: EndpointInfo,
-}
-
-impl LocalPageEndpoint {
-	pub fn new(path: PathBuf, info: EndpointInfo) -> Self {
-		LocalPageEndpoint {
-			path: path,
-			info: info,
-		}
-	}
-}
-
-impl Endpoint for LocalPageEndpoint {
-	fn info(&self) -> Option<&EndpointInfo> {
-		Some(&self.info)
-	}
-
-	fn to_handler(&self, path: EndpointPath) -> Box<Handler> {
-		Box::new(handler::PageHandler {
-			app: LocalDapp::new(self.path.clone()),
-			prefix: None,
-			path: path,
-			file: None,
-			safe_to_embed: false,
-		})
-	}
-}
-
-struct LocalDapp {
-	path: PathBuf,
-}
-
-impl LocalDapp {
-	fn new(path: PathBuf) -> Self {
-		LocalDapp {
-			path: path
-		}
-	}
-}
-
-impl handler::Dapp for LocalDapp {
-	type DappFile = LocalFile;
-
-	fn file(&self, file_path: &str) -> Option<Self::DappFile> {
-		let mut path = self.path.clone();
-		for part in file_path.split('/') {
-			path.push(part);
-		}
-		// Check if file exists
-		fs::File::open(path.clone()).ok().map(|file| {
-			let content_type = mime_guess::guess_mime_type(path);
-			let len = file.metadata().ok().map_or(0, |meta| meta.len());
-			LocalFile {
-				content_type: content_type.to_string(),
-				buffer: [0; 4096],
-				file: file,
-				pos: 0,
-				len: len,
-			}
-		})
-	}
-}
-
-struct LocalFile {
-	content_type: String,
-	buffer: [u8; 4096],
-	file: fs::File,
-	len: u64,
-	pos: u64,
-}
-
-impl handler::DappFile for LocalFile {
-	fn content_type(&self) -> &str {
-		&self.content_type
-	}
-
-	fn is_drained(&self) -> bool {
-		self.pos == self.len
-	}
-
-	fn next_chunk(&mut self) -> &[u8] {
-		let _ = self.file.seek(SeekFrom::Start(self.pos));
-		if let Ok(n) = self.file.read(&mut self.buffer) {
-			&self.buffer[0..n]
-		} else {
-			&self.buffer[0..0]
-		}
-	}
-
-	fn bytes_written(&mut self, bytes: usize) {
-		self.pos += bytes as u64;
-	}
-}
--- a/dapps/src/page/mod.rs
+++ b/dapps/src/page/mod.rs
@@ -1,24 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-
-mod builtin;
-mod local;
-mod handler;
-
-pub use self::local::LocalPageEndpoint;
-pub use self::builtin::PageEndpoint;
-
--- a/dapps/src/proxypac.rs
+++ b/dapps/src/proxypac.rs
@@ -1,48 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 endpoint::{Endpoint, Handler, ContentHandler, EndpointPath};
-use apps::DAPPS_DOMAIN;
-
-pub struct ProxyPac;
-
-impl ProxyPac {
-	pub fn boxed() -> Box<Endpoint> {
-		Box::new(ProxyPac)
-	}
-}
-
-impl Endpoint for ProxyPac {
-	fn to_handler(&self, path: EndpointPath) -> Box<Handler> {
-		let content = format!(
-r#"
-function FindProxyForURL(url, host) {{
-	if (shExpMatch(host, "*{0}"))
-	{{
-		return "PROXY {1}:{2}";
-	}}
-
-	return "DIRECT";
-}}
-"#,
-			DAPPS_DOMAIN, path.host, path.port);
-		Box::new(ContentHandler::new(content, "application/javascript".to_owned()))
-	}
-}
-
-
--- a/dapps/src/router/auth.rs
+++ b/dapps/src/router/auth.rs
@@ -1,161 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! HTTP Authorization implementations
-
-use std::io::Write;
-use std::collections::HashMap;
-use hyper::{header, server, Decoder, Encoder, Next};
-use hyper::net::HttpStream;
-use hyper::status::StatusCode;
-
-/// Authorization result
-pub enum Authorized {
-	/// Authorization was successful.
-	Yes,
-	/// Unsuccessful authorization. Handler for further work is returned.
-	No(Box<server::Handler<HttpStream> + Send>),
-}
-
-/// Authorization interface
-pub trait Authorization : Send + Sync {
-	/// Checks if authorization is valid.
-	fn is_authorized(&self, req: &server::Request<HttpStream>)-> Authorized;
-}
-
-/// HTTP Basic Authorization handler
-pub struct HttpBasicAuth {
-	users: HashMap<String, String>,
-}
-
-/// No-authorization implementation (authorization disabled)
-pub struct NoAuth;
-
-impl Authorization for NoAuth {
-	fn is_authorized(&self, _req: &server::Request<HttpStream>)-> Authorized {
-		Authorized::Yes
-	}
-}
-
-impl Authorization for HttpBasicAuth {
-	fn is_authorized(&self, req: &server::Request<HttpStream>) -> Authorized {
-		let auth = self.check_auth(&req);
-
-		match auth {
-			Access::Denied => {
-				Authorized::No(Box::new(UnauthorizedHandler { write_pos: 0 }))
-			},
-			Access::AuthRequired => {
-				Authorized::No(Box::new(AuthRequiredHandler))
-			},
-			Access::Granted => {
-				Authorized::Yes
-			},
-		}
-	}
-}
-
-#[derive(Debug)]
-enum Access {
-	Granted,
-	Denied,
-	AuthRequired,
-}
-
-impl HttpBasicAuth {
-	/// Creates `HttpBasicAuth` instance with only one user.
-	pub fn single_user(username: &str, password: &str) -> Self {
-		let mut users = HashMap::new();
-		users.insert(username.to_owned(), password.to_owned());
-		HttpBasicAuth {
-			users: users
-		}
-	}
-
-	fn is_authorized(&self, username: &str, password: &str) -> bool {
-		self.users.get(&username.to_owned()).map_or(false, |pass| pass == password)
-	}
-
-	fn check_auth(&self, req: &server::Request<HttpStream>) -> Access {
-		match req.headers().get::<header::Authorization<header::Basic>>() {
-			Some(&header::Authorization(
-				header::Basic { ref username, password: Some(ref password) }
-			)) if self.is_authorized(username, password) => Access::Granted,
-			Some(_) => Access::Denied,
-			None => Access::AuthRequired,
-		}
-	}
-}
-
-pub struct UnauthorizedHandler {
-	write_pos: usize,
-}
-
-impl server::Handler<HttpStream> for UnauthorizedHandler {
-	fn on_request(&mut self, _request: server::Request<HttpStream>) -> Next {
-		Next::write()
-	}
-
-	fn on_request_readable(&mut self, _decoder: &mut Decoder<HttpStream>) -> Next {
-		Next::write()
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		res.set_status(StatusCode::Unauthorized);
-		Next::write()
-	}
-
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		let response = "Unauthorized".as_bytes();
-
-		if self.write_pos == response.len() {
-			return Next::end();
-		}
-
-		match encoder.write(&response[self.write_pos..]) {
-			Ok(bytes) => {
-				self.write_pos += bytes;
-				Next::write()
-			},
-			Err(e) => match e.kind() {
-				::std::io::ErrorKind::WouldBlock => Next::write(),
-				_ => Next::end()
-			},
-		}
-	}
-}
-
-pub struct AuthRequiredHandler;
-
-impl server::Handler<HttpStream> for AuthRequiredHandler {
-	fn on_request(&mut self, _request: server::Request<HttpStream>) -> Next {
-		Next::write()
-	}
-
-	fn on_request_readable(&mut self, _decoder: &mut Decoder<HttpStream>) -> Next {
-		Next::write()
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		res.set_status(StatusCode::Unauthorized);
-		res.headers_mut().set_raw("WWW-Authenticate", vec![b"Basic realm=\"Parity\"".to_vec()]);
-		Next::write()
-	}
-
-	fn on_response_writable(&mut self, _encoder: &mut Encoder<HttpStream>) -> Next {
-		Next::end()
-	}
-}
--- a/dapps/src/router/mod.rs
+++ b/dapps/src/router/mod.rs
@@ -1,255 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Router implementation
-//! Processes request handling authorization and dispatching it to proper application.
-
-mod url;
-mod redirect;
-pub mod auth;
-
-use DAPPS_DOMAIN;
-use std::sync::Arc;
-use std::collections::HashMap;
-use url::Host;
-use hyper;
-use hyper::{server, uri, header};
-use hyper::{Next, Encoder, Decoder};
-use hyper::net::HttpStream;
-use apps;
-use endpoint::{Endpoint, Endpoints, EndpointPath};
-use self::url::Url;
-use self::auth::{Authorization, Authorized};
-use self::redirect::Redirection;
-
-/// Special endpoints are accessible on every domain (every dapp)
-#[derive(Debug, PartialEq, Hash, Eq)]
-pub enum SpecialEndpoint {
-	Rpc,
-	Api,
-	Utils,
-	None,
-}
-
-pub struct Router<A: Authorization + 'static> {
-	main_page: &'static str,
-	endpoints: Arc<Endpoints>,
-	special: Arc<HashMap<SpecialEndpoint, Box<Endpoint>>>,
-	authorization: Arc<A>,
-	handler: Box<server::Handler<HttpStream> + Send>,
-}
-
-impl<A: Authorization + 'static> server::Handler<HttpStream> for Router<A> {
-
-	fn on_request(&mut self, req: server::Request<HttpStream>) -> Next {
-		// Check authorization
-		let auth = self.authorization.is_authorized(&req);
-
-		// Choose proper handler depending on path / domain
-		self.handler = match auth {
-			Authorized::No(handler) => handler,
-			Authorized::Yes => {
-				let url = extract_url(&req);
-				let endpoint = extract_endpoint(&url);
-
-				match endpoint {
-					// First check special endpoints
-					(ref path, ref endpoint) if self.special.contains_key(endpoint) => {
-						self.special.get(endpoint).unwrap().to_handler(path.clone().unwrap_or_default())
-					},
-					// Then delegate to dapp
-					(Some(ref path), _) if self.endpoints.contains_key(&path.app_id) => {
-						self.endpoints.get(&path.app_id).unwrap().to_handler(path.clone())
-					},
-					// Redirection to main page
-					_ if *req.method() == hyper::method::Method::Get => {
-						Redirection::new(self.main_page)
-					},
-					// RPC by default
-					_ => {
-						self.special.get(&SpecialEndpoint::Rpc).unwrap().to_handler(EndpointPath::default())
-					}
-				}
-			}
-		};
-
-		// Delegate on_request to proper handler
-		self.handler.on_request(req)
-	}
-
-	/// This event occurs each time the `Request` is ready to be read from.
-	fn on_request_readable(&mut self, decoder: &mut Decoder<HttpStream>) -> Next {
-		self.handler.on_request_readable(decoder)
-	}
-
-	/// This event occurs after the first time this handled signals `Next::write()`.
-	fn on_response(&mut self, response: &mut server::Response) -> Next {
-		self.handler.on_response(response)
-	}
-
-	/// This event occurs each time the `Response` is ready to be written to.
-	fn on_response_writable(&mut self, encoder: &mut Encoder<HttpStream>) -> Next {
-		self.handler.on_response_writable(encoder)
-	}
-}
-
-impl<A: Authorization> Router<A> {
-	pub fn new(
-		main_page: &'static str,
-		endpoints: Arc<Endpoints>,
-		special: Arc<HashMap<SpecialEndpoint, Box<Endpoint>>>,
-		authorization: Arc<A>) -> Self {
-
-		let handler = special.get(&SpecialEndpoint::Rpc).unwrap().to_handler(EndpointPath::default());
-		Router {
-			main_page: main_page,
-			endpoints: endpoints,
-			special: special,
-			authorization: authorization,
-			handler: handler,
-		}
-	}
-}
-
-fn extract_url(req: &server::Request<HttpStream>) -> Option<Url> {
-	match *req.uri() {
-		uri::RequestUri::AbsoluteUri(ref url) => {
-			match Url::from_generic_url(url.clone()) {
-				Ok(url) => Some(url),
-				_ => None,
-			}
-		},
-		uri::RequestUri::AbsolutePath(ref path) => {
-			// Attempt to prepend the Host header (mandatory in HTTP/1.1)
-			let url_string = match req.headers().get::<header::Host>() {
-				Some(ref host) => {
-					format!("http://{}:{}{}", host.hostname, host.port.unwrap_or(80), path)
-				},
-				None => return None,
-			};
-
-			match Url::parse(&url_string) {
-				Ok(url) => Some(url),
-				_ => None,
-			}
-		},
-		_ => None,
-	}
-}
-
-fn extract_endpoint(url: &Option<Url>) -> (Option<EndpointPath>, SpecialEndpoint) {
-	fn special_endpoint(url: &Url) -> SpecialEndpoint {
-		if url.path.len() <= 1 {
-			return SpecialEndpoint::None;
-		}
-
-		match url.path[0].as_ref() {
-			apps::RPC_PATH => SpecialEndpoint::Rpc,
-			apps::API_PATH => SpecialEndpoint::Api,
-			apps::UTILS_PATH => SpecialEndpoint::Utils,
-			_ => SpecialEndpoint::None,
-		}
-	}
-
-	match *url {
-		Some(ref url) => match url.host {
-			Host::Domain(ref domain) if domain.ends_with(DAPPS_DOMAIN) => {
-				let len = domain.len() - DAPPS_DOMAIN.len();
-				let id = domain[0..len].to_owned();
-
-				(Some(EndpointPath {
-					app_id: id,
-					host: domain.clone(),
-					port: url.port,
-				}), special_endpoint(url))
-			},
-			_ if url.path.len() > 1 => {
-				let id = url.path[0].clone();
-				(Some(EndpointPath {
-					app_id: id.clone(),
-					host: format!("{}", url.host),
-					port: url.port,
-				}), special_endpoint(url))
-			},
-			_ => (None, special_endpoint(url)),
-		},
-		_ => (None, SpecialEndpoint::None)
-	}
-}
-
-#[test]
-fn should_extract_endpoint() {
-	assert_eq!(extract_endpoint(&None), (None, SpecialEndpoint::None));
-
-	// With path prefix
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://localhost:8080/status/index.html").ok()),
-		(Some(EndpointPath {
-			app_id: "status".to_owned(),
-			host: "localhost".to_owned(),
-			port: 8080,
-		}), SpecialEndpoint::None)
-	);
-
-	// With path prefix
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://localhost:8080/rpc/").ok()),
-		(Some(EndpointPath {
-			app_id: "rpc".to_owned(),
-			host: "localhost".to_owned(),
-			port: 8080,
-		}), SpecialEndpoint::Rpc)
-	);
-
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://my.status.parity/parity-utils/inject.js").ok()),
-		(Some(EndpointPath {
-			app_id: "my.status".to_owned(),
-			host: "my.status.parity".to_owned(),
-			port: 80,
-		}), SpecialEndpoint::Utils)
-	);
-
-	// By Subdomain
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://my.status.parity/test.html").ok()),
-		(Some(EndpointPath {
-			app_id: "my.status".to_owned(),
-			host: "my.status.parity".to_owned(),
-			port: 80,
-		}), SpecialEndpoint::None)
-	);
-
-	// RPC by subdomain
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://my.status.parity/rpc/").ok()),
-		(Some(EndpointPath {
-			app_id: "my.status".to_owned(),
-			host: "my.status.parity".to_owned(),
-			port: 80,
-		}), SpecialEndpoint::Rpc)
-	);
-
-	// API by subdomain
-	assert_eq!(
-		extract_endpoint(&Url::parse("http://my.status.parity/api/").ok()),
-		(Some(EndpointPath {
-			app_id: "my.status".to_owned(),
-			host: "my.status.parity".to_owned(),
-			port: 80,
-		}), SpecialEndpoint::Api)
-	);
-}
--- a/dapps/src/router/redirect.rs
+++ b/dapps/src/router/redirect.rs
@@ -1,55 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! HTTP Redirection hyper handler
-
-use hyper::{header, server, Decoder, Encoder, Next};
-use hyper::net::HttpStream;
-use hyper::status::StatusCode;
-
-pub struct Redirection {
-	to_url: &'static str
-}
-
-impl Redirection {
-	pub fn new(url: &'static str) -> Box<Self> {
-		Box::new(Redirection {
-			to_url: url
-		})
-	}
-}
-
-impl server::Handler<HttpStream> for Redirection {
-	fn on_request(&mut self, _request: server::Request<HttpStream>) -> Next {
-		Next::write()
-	}
-
-	fn on_request_readable(&mut self, _decoder: &mut Decoder<HttpStream>) -> Next {
-		Next::write()
-	}
-
-	fn on_response(&mut self, res: &mut server::Response) -> Next {
-		res.set_status(StatusCode::MovedPermanently);
-		res.headers_mut().set(header::Location(self.to_url.to_owned()));
-		Next::write()
-	}
-	fn on_response_writable(&mut self, _encoder: &mut Encoder<HttpStream>) -> Next {
-		Next::end()
-	}
-}
-
-
-
--- a/dapps/src/router/url.rs
+++ b/dapps/src/router/url.rs
@@ -1,145 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! HTTP/HTTPS URL type. Based on URL type from Iron library.
-
-use url::Host;
-use url::{self};
-
-/// HTTP/HTTPS URL type for Iron.
-#[derive(PartialEq, Eq, Clone, Debug)]
-pub struct Url {
-	/// Raw url of url
-	pub raw: url::Url,
-
-	/// The host field of the URL, probably a domain.
-	pub host: Host,
-
-	/// The connection port.
-	pub port: u16,
-
-	/// The URL path, the resource to be accessed.
-	///
-	/// A *non-empty* vector encoding the parts of the URL path.
-	/// Empty entries of `""` correspond to trailing slashes.
-	pub path: Vec<String>,
-
-	/// The URL username field, from the userinfo section of the URL.
-	///
-	/// `None` if the `@` character was not part of the input OR
-	/// if a blank username was provided.
-	/// Otherwise, a non-empty string.
-	pub username: Option<String>,
-
-	/// The URL password field, from the userinfo section of the URL.
-	///
-	/// `None` if the `@` character was not part of the input OR
-	/// if a blank password was provided.
-	/// Otherwise, a non-empty string.
-	pub password: Option<String>,
-}
-
-impl Url {
-	/// Create a URL from a string.
-	///
-	/// The input must be a valid URL with a special scheme for this to succeed.
-	///
-	/// HTTP and HTTPS are special schemes.
-	///
-	/// See: http://url.spec.whatwg.org/#special-scheme
-	pub fn parse(input: &str) -> Result<Url, String> {
-		// Parse the string using rust-url, then convert.
-		match url::Url::parse(input) {
-			Ok(raw_url) => Url::from_generic_url(raw_url),
-			Err(e) => Err(format!("{}", e))
-		}
-	}
-
-	/// Create a `Url` from a `rust-url` `Url`.
-	pub fn from_generic_url(raw_url: url::Url) -> Result<Url, String> {
-		// Map empty usernames to None.
-		let username = match raw_url.username() {
-			"" => None,
-			username => Some(username.to_owned())
-		};
-
-		// Map empty passwords to None.
-		let password = match raw_url.password() {
-			Some(password) if !password.is_empty() => Some(password.to_owned()),
-			_ => None,
-		};
-
-		let port = try!(raw_url.port_or_known_default().ok_or_else(|| format!("Unknown port for scheme: `{}`", raw_url.scheme())));
-		let host = try!(raw_url.host().ok_or_else(|| "Valid host, because only data:, mailto: protocols does not have host.".to_owned())).to_owned();
-		let path = try!(raw_url.path_segments().ok_or_else(|| "Valid path segments. In HTTP we won't get cannot-be-a-base URLs".to_owned()))
-					.map(|part| part.to_owned()).collect();
-
-		Ok(Url {
-			port: port,
-			host: host,
-			path: path,
-			raw: raw_url,
-			username: username,
-			password: password,
-		})
-	}
-}
-
-#[cfg(test)]
-mod test {
-    use super::Url;
-
-    #[test]
-    fn test_default_port() {
-        assert_eq!(Url::parse("http://example.com/wow").unwrap().port, 80u16);
-        assert_eq!(Url::parse("https://example.com/wow").unwrap().port, 443u16);
-    }
-
-    #[test]
-    fn test_explicit_port() {
-        assert_eq!(Url::parse("http://localhost:3097").unwrap().port, 3097u16);
-    }
-
-    #[test]
-    fn test_empty_username() {
-        assert!(Url::parse("http://@example.com").unwrap().username.is_none());
-        assert!(Url::parse("http://:password@example.com").unwrap().username.is_none());
-    }
-
-    #[test]
-    fn test_not_empty_username() {
-        let user = Url::parse("http://john:pass@example.com").unwrap().username;
-        assert_eq!(user.unwrap(), "john");
-
-        let user = Url::parse("http://john:@example.com").unwrap().username;
-        assert_eq!(user.unwrap(), "john");
-    }
-
-    #[test]
-    fn test_empty_password() {
-        assert!(Url::parse("http://michael@example.com").unwrap().password.is_none());
-        assert!(Url::parse("http://:@example.com").unwrap().password.is_none());
-    }
-
-    #[test]
-    fn test_not_empty_password() {
-        let pass = Url::parse("http://michael:pass@example.com").unwrap().password;
-        assert_eq!(pass.unwrap(), "pass");
-
-        let pass = Url::parse("http://:pass@example.com").unwrap().password;
-        assert_eq!(pass.unwrap(), "pass");
-    }
-}
--- a/dapps/src/rpc.rs
+++ b/dapps/src/rpc.rs
@@ -1,41 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::sync::{Arc, Mutex};
-use jsonrpc_core::IoHandler;
-use jsonrpc_http_server::{ServerHandler, PanicHandler, AccessControlAllowOrigin};
-use endpoint::{Endpoint, EndpointPath, Handler};
-
-pub fn rpc(handler: Arc<IoHandler>, panic_handler: Arc<Mutex<Option<Box<Fn() -> () + Send>>>>) -> Box<Endpoint> {
-	Box::new(RpcEndpoint {
-		handler: handler,
-		panic_handler: panic_handler,
-		cors_domain: vec![AccessControlAllowOrigin::Null],
-	})
-}
-
-struct RpcEndpoint {
-	handler: Arc<IoHandler>,
-	panic_handler: Arc<Mutex<Option<Box<Fn() -> () + Send>>>>,
-	cors_domain: Vec<AccessControlAllowOrigin>,
-}
-
-impl Endpoint for RpcEndpoint {
-	fn to_handler(&self, _path: EndpointPath) -> Box<Handler> {
-		let panic_handler = PanicHandler { handler: self.panic_handler.clone() };
-		Box::new(ServerHandler::new(self.handler.clone(), self.cors_domain.clone(), panic_handler))
-	}
-}
--- a/db/Cargo.toml
+++ b/db/Cargo.toml
@@ -1,26 +0,0 @@
-[package]
-description = "Ethcore Database"
-homepage = "http://ethcore.io"
-license = "GPL-3.0"
-name = "ethcore-db"
-version = "1.2.0"
-authors = ["Ethcore <admin@ethcore.io>"]
-build = "build.rs"
-
-[build-dependencies]
-syntex = "*"
-ethcore-ipc-codegen = { path = "../ipc/codegen" }
-
-[dependencies]
-clippy = { version = "0.0.77", optional = true}
-ethcore-devtools = { path = "../devtools" }
-ethcore-ipc = { path = "../ipc/rpc" }
-rocksdb = { git = "https://github.com/ethcore/rust-rocksdb" }
-semver = "0.2"
-ethcore-ipc-nano = { path = "../ipc/nano" }
-nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" }
-crossbeam = "0.2"
-ethcore-util = { path = "../util" }
-
-[features]
-dev = ["clippy"]
--- a/db/build.rs
+++ b/db/build.rs
@@ -1,43 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 syntex;
-extern crate ethcore_ipc_codegen as codegen;
-
-use std::env;
-use std::path::Path;
-
-pub fn main() {
-	let out_dir = env::var_os("OUT_DIR").unwrap();
-
-	// ipc pass
-	{
-		let src = Path::new("src/lib.rs.in");
-		let dst = Path::new(&out_dir).join("lib.intermediate.rs.in");
-		let mut registry = syntex::Registry::new();
-		codegen::register(&mut registry);
-		registry.expand("", &src, &dst).unwrap();
-	}
-
-	// binary serialization pass
-	{
-		let src = Path::new(&out_dir).join("lib.intermediate.rs.in");
-		let dst = Path::new(&out_dir).join("lib.rs");
-		let mut registry = syntex::Registry::new();
-		codegen::register(&mut registry);
-		registry.expand("", &src, &dst).unwrap();
-	}
-}
--- a/db/src/database.rs
+++ b/db/src/database.rs
@@ -1,573 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Ethcore rocksdb ipc service
-
-use traits::*;
-use rocksdb::{DB, Writable, WriteBatch, IteratorMode, DBIterator,
-IndexType, Options, DBCompactionStyle, BlockBasedOptions, Direction};
-use std::sync::{RwLock, Arc};
-use std::convert::From;
-use ipc::IpcConfig;
-use std::mem;
-use ipc::binary::BinaryConvertError;
-use std::collections::{VecDeque, HashMap, BTreeMap};
-
-impl From<String> for Error {
-	fn from(s: String) -> Error {
-		Error::RocksDb(s)
-	}
-}
-
-enum WriteCacheEntry {
-	Remove,
-	Write(Vec<u8>),
-}
-
-pub struct WriteCache {
-	entries: HashMap<Vec<u8>, WriteCacheEntry>,
-	preferred_len: usize,
-}
-
-const FLUSH_BATCH_SIZE: usize = 4096;
-
-impl WriteCache {
-	fn new(cache_len: usize) -> WriteCache {
-		WriteCache {
-			entries: HashMap::new(),
-			preferred_len: cache_len,
-		}
-	}
-
-	fn write(&mut self, key: Vec<u8>, val: Vec<u8>) {
-		self.entries.insert(key, WriteCacheEntry::Write(val));
-	}
-
-	fn remove(&mut self, key: Vec<u8>) {
-		self.entries.insert(key, WriteCacheEntry::Remove);
-	}
-
-	fn get(&self, key: &Vec<u8>) -> Option<Vec<u8>> {
-		self.entries.get(key).and_then(
-			|vec_ref| match vec_ref {
-				&WriteCacheEntry::Write(ref val) => Some(val.clone()),
-				&WriteCacheEntry::Remove => None
-			})
-	}
-
-	/// WriteCache should be locked for this
-	fn flush(&mut self, db: &DB, amount: usize) -> Result<(), Error> {
-		let batch = WriteBatch::new();
-		let mut removed_so_far = 0;
-		while removed_so_far < amount {
-			if self.entries.len() == 0 { break; }
-			let removed_key = {
-				let (key, cache_entry) = self.entries.iter().nth(0)
-				.expect("if entries.len == 0, we should have break in the loop, still we got here somehow");
-
-				match *cache_entry {
-					WriteCacheEntry::Write(ref val) => {
-						try!(batch.put(&key, val));
-					},
-					WriteCacheEntry::Remove => {
-						try!(batch.delete(&key));
-					},
-				}
-				key.clone()
-			};
-
-			self.entries.remove(&removed_key);
-
-			removed_so_far = removed_so_far + 1;
-		}
-		if removed_so_far > 0 {
-			try!(db.write(batch));
-		}
-		Ok(())
-	}
-
-	/// flushes until cache is empty
-	fn flush_all(&mut self, db: &DB) -> Result<(), Error> {
-		while !self.is_empty() { try!(self.flush(db, FLUSH_BATCH_SIZE)); }
-		Ok(())
-	}
-
-	fn is_empty(&self) -> bool {
-		self.entries.is_empty()
-	}
-
-	fn try_shrink(&mut self, db: &DB) -> Result<(), Error> {
-		if self.entries.len() > self.preferred_len {
-			try!(self.flush(db, FLUSH_BATCH_SIZE));
-		}
-		Ok(())
-	}
-}
-
-pub struct Database {
-	db: RwLock<Option<DB>>,
-	/// Iterators - dont't use between threads!
-	iterators: RwLock<BTreeMap<IteratorHandle, DBIterator>>,
-	write_cache: RwLock<WriteCache>,
-}
-
-unsafe impl Send for Database {}
-unsafe impl Sync for Database {}
-
-impl Database {
-	pub fn new() -> Database {
-		Database {
-			db: RwLock::new(None),
-			iterators: RwLock::new(BTreeMap::new()),
-			write_cache: RwLock::new(WriteCache::new(DEFAULT_CACHE_LEN)),
-		}
-	}
-
-	pub fn flush(&self) -> Result<(), Error> {
-		let mut cache_lock = self.write_cache.write().unwrap();
-		let db_lock = self.db.read().unwrap();
-		if db_lock.is_none() { return Ok(()); }
-		let db = db_lock.as_ref().unwrap();
-
-		try!(cache_lock.try_shrink(&db));
-		Ok(())
-	}
-
-	pub fn flush_all(&self) -> Result<(), Error> {
-		let mut cache_lock = self.write_cache.write().unwrap();
-		let db_lock = self.db.read().unwrap();
-		if db_lock.is_none() { return Ok(()); }
-		let db = db_lock.as_ref().expect("we should have exited with Ok(()) on the previous step");
-
-		try!(cache_lock.flush_all(&db));
-		Ok(())
-
-	}
-}
-
-impl Drop for Database {
-	fn drop(&mut self) {
-		self.flush().unwrap();
-	}
-}
-
-#[derive(Ipc)]
-impl DatabaseService for Database {
-	fn open(&self, config: DatabaseConfig, path: String) -> Result<(), Error> {
-		let mut db = self.db.write().unwrap();
-		if db.is_some() { return Err(Error::AlreadyOpen); }
-
-		let mut opts = Options::new();
-		opts.set_max_open_files(256);
-		opts.create_if_missing(true);
-		opts.set_use_fsync(false);
-		opts.set_compaction_style(DBCompactionStyle::DBUniversalCompaction);
-		if let Some(size) = config.prefix_size {
-			let mut block_opts = BlockBasedOptions::new();
-			block_opts.set_index_type(IndexType::HashSearch);
-			opts.set_block_based_table_factory(&block_opts);
-			opts.set_prefix_extractor_fixed_size(size);
-		}
-		*db = Some(try!(DB::open(&opts, &path)));
-
-		Ok(())
-	}
-
-	/// Opens database in the specified path with the default config
-	fn open_default(&self, path: String) -> Result<(), Error> {
-		self.open(DatabaseConfig::default(), path)
-	}
-
-	fn close(&self) -> Result<(), Error> {
-		try!(self.flush_all());
-
-		let mut db = self.db.write().unwrap();
-		if db.is_none() { return Err(Error::IsClosed); }
-
-		*db = None;
-		Ok(())
-	}
-
-	fn put(&self, key: &[u8], value: &[u8]) -> Result<(), Error> {
-		let mut cache_lock = self.write_cache.write().unwrap();
-		cache_lock.write(key.to_vec(), value.to_vec());
-		Ok(())
-	}
-
-	fn delete(&self, key: &[u8]) -> Result<(), Error> {
-		let mut cache_lock = self.write_cache.write().unwrap();
-		cache_lock.remove(key.to_vec());
-		Ok(())
-	}
-
-	fn write(&self, transaction: DBTransaction) -> Result<(), Error> {
-		let mut cache_lock = self.write_cache.write().unwrap();
-
-		let mut writes = transaction.writes.borrow_mut();
-		for kv in writes.drain(..) {
-			cache_lock.write(kv.key, kv.value);
-		}
-
-		let mut removes = transaction.removes.borrow_mut();
-		for k in removes.drain(..) {
-			cache_lock.remove(k);
-		}
-		Ok(())
-	}
-
-	fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Error> {
-		{
-			let key_vec = key.to_vec();
-			let cache_hit = self.write_cache.read().unwrap().get(&key_vec);
-
-			if cache_hit.is_some() {
-				return Ok(Some(cache_hit.expect("cache_hit.is_some() = true, still there is none somehow here")))
-			}
-		}
-		let db_lock = self.db.read().unwrap();
-		let db = try!(db_lock.as_ref().ok_or(Error::IsClosed));
-
-		match try!(db.get(key)) {
-			Some(db_vec) => {
-				Ok(Some(db_vec.to_vec()))
-			},
-			None => Ok(None),
-		}
-	}
-
-	fn get_by_prefix(&self, prefix: &[u8]) -> Result<Option<Vec<u8>>, Error> {
-		let db_lock = self.db.read().unwrap();
-		let db = try!(db_lock.as_ref().ok_or(Error::IsClosed));
-
-		let mut iter = db.iterator(IteratorMode::From(prefix, Direction::Forward));
-		match iter.next() {
-			// TODO: use prefix_same_as_start read option (not availabele in C API currently)
-			Some((k, v)) => if k[0 .. prefix.len()] == prefix[..] { Ok(Some(v.to_vec())) } else { Ok(None) },
-			_ => Ok(None)
-		}
-	}
-
-	fn is_empty(&self) -> Result<bool, Error> {
-		let db_lock = self.db.read().unwrap();
-		let db = try!(db_lock.as_ref().ok_or(Error::IsClosed));
-
-		Ok(db.iterator(IteratorMode::Start).next().is_none())
-	}
-
-	fn iter(&self) -> Result<IteratorHandle, Error> {
-		let db_lock = self.db.read().unwrap();
-		let db = try!(db_lock.as_ref().ok_or(Error::IsClosed));
-
-		let mut iterators = self.iterators.write().unwrap();
-		let next_iterator = iterators.keys().last().unwrap_or(&0) + 1;
-		iterators.insert(next_iterator, db.iterator(IteratorMode::Start));
-		Ok(next_iterator)
-	}
-
-	fn iter_next(&self, handle: IteratorHandle) -> Option<KeyValue>
-	{
-		let mut iterators = self.iterators.write().unwrap();
-		let mut iterator = match iterators.get_mut(&handle) {
-			Some(some_iterator) => some_iterator,
-			None => { return None; },
-		};
-
-		iterator.next().and_then(|(some_key, some_val)| {
-			Some(KeyValue {
-				key: some_key.to_vec(),
-				value: some_val.to_vec(),
-			})
-		})
-	}
-
-	fn dispose_iter(&self, handle: IteratorHandle) -> Result<(), Error> {
-		let mut iterators = self.iterators.write().unwrap();
-		iterators.remove(&handle);
-		Ok(())
-	}
-}
-
-// TODO : put proper at compile-time
-impl IpcConfig for Database {}
-
-/// Database iterator
-pub struct DatabaseIterator {
-	client: Arc<DatabaseClient<::nanomsg::Socket>>,
-	handle: IteratorHandle,
-}
-
-impl Iterator for DatabaseIterator {
-	type Item = (Vec<u8>, Vec<u8>);
-
-	fn next(&mut self) -> Option<Self::Item> {
-		self.client.iter_next(self.handle).and_then(|kv| Some((kv.key, kv.value)))
-	}
-}
-
-impl Drop for DatabaseIterator {
-	fn drop(&mut self) {
-		self.client.dispose_iter(self.handle).unwrap();
-	}
-}
-
-#[cfg(test)]
-mod test {
-
-	use super::Database;
-	use traits::*;
-	use devtools::*;
-
-	#[test]
-	fn can_be_created() {
-		let db = Database::new();
-		assert!(db.is_empty().is_err());
-	}
-
-	#[test]
-	fn can_be_open_empty() {
-		let db = Database::new();
-		let path = RandomTempPath::create_dir();
-		db.open_default(path.as_str().to_owned()).unwrap();
-
-		assert!(db.is_empty().is_ok());
-	}
-
-	#[test]
-	fn can_store_key() {
-		let db = Database::new();
-		let path = RandomTempPath::create_dir();
-		db.open_default(path.as_str().to_owned()).unwrap();
-
-		db.put("xxx".as_bytes(), "1".as_bytes()).unwrap();
-		db.flush_all().unwrap();
-		assert!(!db.is_empty().unwrap());
-	}
-
-	#[test]
-	fn can_retrieve() {
-		let db = Database::new();
-		let path = RandomTempPath::create_dir();
-		db.open_default(path.as_str().to_owned()).unwrap();
-		db.put("xxx".as_bytes(), "1".as_bytes()).unwrap();
-		db.close().unwrap();
-
-		db.open_default(path.as_str().to_owned()).unwrap();
-		assert_eq!(db.get("xxx".as_bytes()).unwrap().unwrap(), "1".as_bytes().to_vec());
-	}
-}
-
-#[cfg(test)]
-mod write_cache_tests {
-	use super::Database;
-	use traits::*;
-	use devtools::*;
-
-	#[test]
-	fn cache_write_flush() {
-		let db = Database::new();
-		let path = RandomTempPath::create_dir();
-
-		db.open_default(path.as_str().to_owned()).unwrap();
-		db.put("100500".as_bytes(), "1".as_bytes()).unwrap();
-		db.delete("100500".as_bytes()).unwrap();
-		db.flush_all().unwrap();
-
-		let val = db.get("100500".as_bytes()).unwrap();
-		assert!(val.is_none());
-	}
-
-}
-
-#[cfg(test)]
-mod client_tests {
-	use super::{DatabaseClient, Database};
-	use traits::*;
-	use devtools::*;
-	use nanoipc;
-	use std::sync::Arc;
-	use std::sync::atomic::{Ordering, AtomicBool};
-	use crossbeam;
-	use run_worker;
-
-	fn init_worker(addr: &str) -> nanoipc::Worker<Database> {
-		let mut worker = nanoipc::Worker::<Database>::new(&Arc::new(Database::new()));
-		worker.add_duplex(addr).unwrap();
-		worker
-	}
-
-	#[test]
-	fn can_call_handshake() {
-		let url = "ipc:///tmp/parity-db-ipc-test-10.ipc";
-		let worker_should_exit = Arc::new(AtomicBool::new(false));
-		let worker_is_ready = Arc::new(AtomicBool::new(false));
-		let c_worker_should_exit = worker_should_exit.clone();
-		let c_worker_is_ready = worker_is_ready.clone();
-
-		::std::thread::spawn(move || {
-			let mut worker = init_worker(url);
-			while !c_worker_should_exit.load(Ordering::Relaxed) {
-				worker.poll();
-				c_worker_is_ready.store(true, Ordering::Relaxed);
-			}
-		});
-
-		while !worker_is_ready.load(Ordering::Relaxed) { }
-		let client = nanoipc::init_duplex_client::<DatabaseClient<_>>(url).unwrap();
-
-		let hs = client.handshake();
-
-		worker_should_exit.store(true, Ordering::Relaxed);
-		assert!(hs.is_ok());
-	}
-
-	#[test]
-	fn can_open_db() {
-		let url = "ipc:///tmp/parity-db-ipc-test-20.ipc";
-		let path = RandomTempPath::create_dir();
-
-		let worker_should_exit = Arc::new(AtomicBool::new(false));
-		let worker_is_ready = Arc::new(AtomicBool::new(false));
-		let c_worker_should_exit = worker_should_exit.clone();
-		let c_worker_is_ready = worker_is_ready.clone();
-
-		::std::thread::spawn(move || {
-			let mut worker = init_worker(url);
-			while !c_worker_should_exit.load(Ordering::Relaxed) {
-				worker.poll();
-				c_worker_is_ready.store(true, Ordering::Relaxed);
-			}
-		});
-
-		while !worker_is_ready.load(Ordering::Relaxed) { }
-		let client = nanoipc::init_duplex_client::<DatabaseClient<_>>(url).unwrap();
-
-		client.open_default(path.as_str().to_owned()).unwrap();
-		assert!(client.is_empty().unwrap());
-		worker_should_exit.store(true, Ordering::Relaxed);
-	}
-
-	#[test]
-	fn can_put() {
-		let url = "ipc:///tmp/parity-db-ipc-test-30.ipc";
-		let path = RandomTempPath::create_dir();
-
-		crossbeam::scope(move |scope| {
-			let stop = Arc::new(AtomicBool::new(false));
-			run_worker(scope, stop.clone(), url);
-			let client = nanoipc::init_client::<DatabaseClient<_>>(url).unwrap();
-			client.open_default(path.as_str().to_owned()).unwrap();
-			client.put("xxx".as_bytes(), "1".as_bytes()).unwrap();
-			client.close().unwrap();
-
-			stop.store(true, Ordering::Relaxed);
-		});
-	}
-
-	#[test]
-	fn can_put_and_read() {
-		let url = "ipc:///tmp/parity-db-ipc-test-40.ipc";
-		let path = RandomTempPath::create_dir();
-
-		crossbeam::scope(move |scope| {
-			let stop = Arc::new(AtomicBool::new(false));
-			run_worker(scope, stop.clone(), url);
-			let client = nanoipc::init_client::<DatabaseClient<_>>(url).unwrap();
-
-			client.open_default(path.as_str().to_owned()).unwrap();
-			client.put("xxx".as_bytes(), "1".as_bytes()).unwrap();
-			client.close().unwrap();
-
-			client.open_default(path.as_str().to_owned()).unwrap();
-			assert_eq!(client.get("xxx".as_bytes()).unwrap().unwrap(), "1".as_bytes().to_vec());
-
-			stop.store(true, Ordering::Relaxed);
-		});
-	}
-
-	#[test]
-	fn can_read_empty() {
-		let url = "ipc:///tmp/parity-db-ipc-test-45.ipc";
-		let path = RandomTempPath::create_dir();
-
-		crossbeam::scope(move |scope| {
-			let stop = Arc::new(AtomicBool::new(false));
-			run_worker(scope, stop.clone(), url);
-			let client = nanoipc::init_client::<DatabaseClient<_>>(url).unwrap();
-
-			client.open_default(path.as_str().to_owned()).unwrap();
-			assert!(client.get("xxx".as_bytes()).unwrap().is_none());
-
-			stop.store(true, Ordering::Relaxed);
-		});
-	}
-
-
-	#[test]
-	fn can_commit_client_transaction() {
-		let url = "ipc:///tmp/parity-db-ipc-test-60.ipc";
-		let path = RandomTempPath::create_dir();
-
-		crossbeam::scope(move |scope| {
-			let stop = Arc::new(AtomicBool::new(false));
-			run_worker(scope, stop.clone(), url);
-			let client = nanoipc::init_client::<DatabaseClient<_>>(url).unwrap();
-			client.open_default(path.as_str().to_owned()).unwrap();
-
-			let transaction = DBTransaction::new();
-			transaction.put("xxx".as_bytes(), "1".as_bytes());
-			client.write(transaction).unwrap();
-
-			client.close().unwrap();
-
-			client.open_default(path.as_str().to_owned()).unwrap();
-			assert_eq!(client.get("xxx".as_bytes()).unwrap().unwrap(), "1".as_bytes().to_vec());
-
-			stop.store(true, Ordering::Relaxed);
-		});
-	}
-
-	#[test]
-	fn key_write_read_ipc() {
-		let url = "ipc:///tmp/parity-db-ipc-test-70.ipc";
-		let path = RandomTempPath::create_dir();
-
-		crossbeam::scope(|scope| {
-			let stop = StopGuard::new();
-			run_worker(&scope, stop.share(), url);
-
-			let client = nanoipc::init_client::<DatabaseClient<_>>(url).unwrap();
-
-			client.open_default(path.as_str().to_owned()).unwrap();
-			let mut batch = Vec::new();
-			for _ in 0..100 {
-				batch.push((random_str(256).as_bytes().to_vec(), random_str(256).as_bytes().to_vec()));
-				batch.push((random_str(256).as_bytes().to_vec(), random_str(2048).as_bytes().to_vec()));
-				batch.push((random_str(2048).as_bytes().to_vec(), random_str(2048).as_bytes().to_vec()));
-				batch.push((random_str(2048).as_bytes().to_vec(), random_str(256).as_bytes().to_vec()));
-			}
-
-			for &(ref k, ref v) in batch.iter() {
-				client.put(k, v).unwrap();
-			}
-			client.close().unwrap();
-
-			client.open_default(path.as_str().to_owned()).unwrap();
-			for &(ref k, ref v) in batch.iter() {
-				assert_eq!(v, &client.get(k).unwrap().unwrap());
-			}
-		});
-	}
-}
--- a/db/src/lib.rs
+++ b/db/src/lib.rs
@@ -1,20 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-//! Database ipc service
-
-#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues
-include!(concat!(env!("OUT_DIR"), "/lib.rs"));
--- a/db/src/lib.rs.in
+++ b/db/src/lib.rs.in
@@ -1,89 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate ethcore_ipc as ipc;
-extern crate rocksdb;
-extern crate ethcore_devtools as devtools;
-extern crate semver;
-extern crate ethcore_ipc_nano as nanoipc;
-extern crate nanomsg;
-extern crate crossbeam;
-extern crate ethcore_util as util;
-
-pub mod database;
-pub mod traits;
-
-pub use traits::{DatabaseService, DBTransaction, Error};
-pub use database::{Database, DatabaseClient, DatabaseIterator};
-
-use std::sync::Arc;
-use std::sync::atomic::*;
-use std::path::PathBuf;
-
-pub type DatabaseNanoClient = DatabaseClient<::nanomsg::Socket>;
-pub type DatabaseConnection = nanoipc::GuardedSocket<DatabaseNanoClient>;
-
-#[derive(Debug)]
-pub enum ServiceError {
-	Io(std::io::Error),
-	Socket(nanoipc::SocketError),
-}
-
-impl std::convert::From<std::io::Error> for ServiceError {
-	fn from(io_error: std::io::Error) -> ServiceError { ServiceError::Io(io_error) }
-}
-
-impl std::convert::From<nanoipc::SocketError> for ServiceError {
-	fn from(socket_error: nanoipc::SocketError) -> ServiceError { ServiceError::Socket(socket_error) }
-}
-
-pub fn blocks_service_url(db_path: &str) -> Result<String, std::io::Error> {
-	let mut path = PathBuf::from(db_path);
-	try!(::std::fs::create_dir_all(db_path));
-	path.push("blocks.ipc");
-	Ok(format!("ipc://{}", path.to_str().unwrap()))
-}
-
-pub fn extras_service_url(db_path: &str) -> Result<String, ::std::io::Error> {
-	let mut path = PathBuf::from(db_path);
-	try!(::std::fs::create_dir_all(db_path));
-	path.push("extras.ipc");
-	Ok(format!("ipc://{}", path.to_str().unwrap()))
-}
-
-pub fn blocks_client(db_path: &str) -> Result<DatabaseConnection, ServiceError> {
-	let url = try!(blocks_service_url(db_path));
-	let client = try!(nanoipc::init_client::<DatabaseClient<_>>(&url));
-	Ok(client)
-}
-
-pub fn extras_client(db_path: &str) -> Result<DatabaseConnection, ServiceError> {
-	let url = try!(extras_service_url(db_path));
-	let client = try!(nanoipc::init_client::<DatabaseClient<_>>(&url));
-	Ok(client)
-}
-
-// for tests
-pub fn run_worker(scope: &crossbeam::Scope, stop: Arc<AtomicBool>, socket_path: &str) {
-	let socket_path = socket_path.to_owned();
-	scope.spawn(move || {
-		let mut worker = nanoipc::Worker::new(&Arc::new(Database::new()));
-		worker.add_reqrep(&socket_path).unwrap();
-		while !stop.load(Ordering::Relaxed) {
-			worker.poll();
-		}
-	});
-}
--- a/db/src/traits.rs
+++ b/db/src/traits.rs
@@ -1,132 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Ethcore database trait
-
-use std::mem;
-use ipc::binary::BinaryConvertError;
-use std::collections::VecDeque;
-use std::cell::RefCell;
-
-pub type IteratorHandle = u32;
-
-pub const DEFAULT_CACHE_LEN: usize = 12288;
-
-#[derive(Binary)]
-pub struct KeyValue {
-	pub key: Vec<u8>,
-	pub value: Vec<u8>,
-}
-
-	#[derive(Debug, Binary)]
-	pub enum Error {
-	AlreadyOpen,
-	IsClosed,
-	RocksDb(String),
-	TransactionUnknown,
-	IteratorUnknown,
-	UncommitedTransactions,
-}
-
-/// Database configuration
-#[derive(Binary)]
-pub struct DatabaseConfig {
-	/// Optional prefix size in bytes. Allows lookup by partial key.
-	pub prefix_size: Option<usize>,
-	/// write cache length
-	pub cache: usize,
-}
-
-impl Default for DatabaseConfig {
-	fn default() -> DatabaseConfig {
-		DatabaseConfig {
-			prefix_size: None,
-			cache: DEFAULT_CACHE_LEN,
-		}
-	}
-}
-
-impl DatabaseConfig {
-	fn with_prefix(prefix: usize) -> DatabaseConfig {
-		DatabaseConfig {
-			prefix_size: Some(prefix),
-			cache: DEFAULT_CACHE_LEN,
-		}
-	}
-}
-
-	pub trait DatabaseService : Sized {
-	/// Opens database in the specified path
-	fn open(&self, config: DatabaseConfig, path: String) -> Result<(), Error>;
-
-	/// Opens database in the specified path with the default config
-	fn open_default(&self, path: String) -> Result<(), Error>;
-
-	/// Closes database
-	fn close(&self) -> Result<(), Error>;
-
-	/// Insert a key-value pair in the transaction. Any existing value value will be overwritten.
-	fn put(&self, key: &[u8], value: &[u8]) -> Result<(), Error>;
-
-	/// Delete value by key.
-	fn delete(&self, key: &[u8]) -> Result<(), Error>;
-
-	/// Get value by key.
-	fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Error>;
-
-	/// Get value by partial key. Prefix size should match configured prefix size.
-	fn get_by_prefix(&self, prefix: &[u8]) -> Result<Option<Vec<u8>>, Error>;
-
-	/// Check if there is anything in the database.
-	fn is_empty(&self) -> Result<bool, Error>;
-
-	/// Get handle to iterate through keys
-	fn iter(&self) -> Result<IteratorHandle, Error>;
-
-	/// Next key-value for the the given iterator
-	fn iter_next(&self, iterator: IteratorHandle) -> Option<KeyValue>;
-
-	/// Dispose iteration that is no longer needed
-	fn dispose_iter(&self, handle: IteratorHandle) -> Result<(), Error>;
-
-	/// Write client transaction
-	fn write(&self, transaction: DBTransaction) -> Result<(), Error>;
-}
-
-#[derive(Binary)]
-pub struct DBTransaction {
-	pub writes: RefCell<Vec<KeyValue>>,
-	pub removes: RefCell<Vec<Vec<u8>>>,
-}
-
-impl DBTransaction {
-	pub fn new() -> DBTransaction {
-		DBTransaction {
-			writes: RefCell::new(Vec::new()),
-			removes: RefCell::new(Vec::new()),
-		}
-	}
-
-	pub fn put(&self, key: &[u8], value: &[u8]) {
-		let mut brw = self.writes.borrow_mut();
-		brw.push(KeyValue { key: key.to_vec(), value: value.to_vec() });
-	}
-
-	pub fn delete(&self, key: &[u8]) {
-		let mut brw = self.removes.borrow_mut();
-		brw.push(key.to_vec());
-	}
-}
--- a/devtools/Cargo.toml
+++ b/devtools/Cargo.toml
@@ -1,16 +0,0 @@
-[package]
-description = "Ethcore development/test/build tools"
-homepage = "http://ethcore.io"
-license = "GPL-3.0"
-name = "ethcore-devtools"
-version = "1.2.0"
-authors = ["Ethcore <admin@ethcore.io>"]
-
-[dependencies]
-rand = "0.3"
-
-[features]
-
-[lib]
-path = "src/lib.rs"
-test = true
--- a/devtools/src/lib.rs
+++ b/devtools/src/lib.rs
@@ -1,28 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-//! dev-tools
-
-
-extern crate rand;
-
-pub mod random_path;
-pub mod test_socket;
-pub mod stop_guard;
-
-pub use random_path::*;
-pub use test_socket::*;
-pub use stop_guard::*;
--- a/devtools/src/random_path.rs
+++ b/devtools/src/random_path.rs
@@ -1,99 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-//! Random path
-
-use std::path::*;
-use std::fs;
-use std::env;
-use rand::random;
-
-pub struct RandomTempPath {
-	path: PathBuf
-}
-
-pub fn random_filename() -> String {
-	random_str(8)
-}
-
-pub fn random_str(len: usize) -> String {
-	(0..len).map(|_| ((random::<f32>() * 26.0) as u8 + 97) as char).collect()
-}
-
-impl RandomTempPath {
-	pub fn new() -> RandomTempPath {
-		let mut dir = env::temp_dir();
-		dir.push(random_filename());
-		RandomTempPath {
-			path: dir.clone()
-		}
-	}
-
-	pub fn create_dir() -> RandomTempPath {
-		let mut dir = env::temp_dir();
-		dir.push(random_filename());
-		fs::create_dir_all(dir.as_path()).unwrap();
-		RandomTempPath {
-			path: dir.clone()
-		}
-	}
-
-	pub fn as_path(&self) -> &PathBuf {
-		&self.path
-	}
-
-	pub fn as_str(&self) -> &str {
-		self.path.to_str().unwrap()
-	}
-
-	pub fn new_in(&self, name: &str) -> String {
-		let mut path = self.path.clone();
-		path.push(name);
-		path.to_str().unwrap().to_owned()
-	}
-}
-
-impl Drop for RandomTempPath {
-	fn drop(&mut self) {
-		if let Err(e) = fs::remove_dir_all(self.as_path()) {
-			panic!("Failed to remove temp directory. Here's what prevented this from happening:  ({})", e);
-		}
-	}
-}
-
-#[test]
-fn creates_dir() {
-	let temp = RandomTempPath::create_dir();
-	assert!(fs::metadata(temp.as_path()).unwrap().is_dir());
-}
-
-#[test]
-fn destroys_dir() {
-	let path_buf = {
-		let temp = RandomTempPath::create_dir();
-		assert!(fs::metadata(temp.as_path()).unwrap().is_dir());
-		let path_buf = temp.as_path().to_path_buf();
-		path_buf
-	};
-
-	assert!(fs::metadata(&path_buf).is_err());
-}
-
-#[test]
-fn provides_random() {
-	let temp = RandomTempPath::create_dir();
-	assert!(temp.as_path().to_str().is_some());
-}
--- a/devtools/src/stop_guard.rs
+++ b/devtools/src/stop_guard.rs
@@ -1,45 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-//! Stop guard mod
-
-use std::sync::Arc;
-use std::sync::atomic::*;
-
-/// Stop guard that will set a stop flag on drop
-pub struct StopGuard {
-	flag: Arc<AtomicBool>,
-}
-
-impl StopGuard {
-	/// Create a stop guard
-	pub fn new() -> StopGuard {
-		StopGuard {
-			flag: Arc::new(AtomicBool::new(false))
-		}
-	}
-
-	/// Share stop guard between the threads
-	pub fn share(&self) -> Arc<AtomicBool> {
-		self.flag.clone()
-	}
-}
-
-impl Drop for StopGuard {
-	fn drop(&mut self) {
-		self.flag.store(true, Ordering::Relaxed)
-	}
-}
--- a/devtools/src/test_socket.rs
+++ b/devtools/src/test_socket.rs
@@ -1,94 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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::cmp;
-
-pub struct TestSocket {
-	pub read_buffer: Vec<u8>,
-	pub write_buffer: Vec<u8>,
-	pub cursor: usize,
-	pub buf_size: usize,
-}
-
-impl Default for TestSocket {
-	fn default() -> Self {
-		TestSocket::new()
-	}
-}
-
-impl TestSocket {
-	pub fn new() -> Self {
-		TestSocket {
-			read_buffer: vec![],
-			write_buffer: vec![],
-			cursor: 0,
-			buf_size: 0,
-		}
-	}
-
-	pub fn new_buf(buf_size: usize) -> TestSocket {
-		TestSocket {
-			read_buffer: vec![],
-			write_buffer: vec![],
-			cursor: 0,
-			buf_size: buf_size,
-		}
-	}
-
-	pub fn new_ready(data: Vec<u8>) -> TestSocket {
-		TestSocket {
-			read_buffer: data,
-			write_buffer: vec![],
-			cursor: 0,
-			buf_size: 0,
-		}
-	}
-}
-
-impl Read for TestSocket {
-	fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
-		let end_position = cmp::min(self.read_buffer.len(), self.cursor+buf.len());
-		let len = cmp::max(end_position - self.cursor, 0);
-		match len {
-			0 => Ok(0),
-			_ => {
-				for i in self.cursor..end_position {
-					buf[i-self.cursor] = self.read_buffer[i];
-				}
-				self.cursor = self.cursor + buf.len();
-				Ok(len)
-			}
-		}
-	}
-}
-
-impl Write for TestSocket {
-	fn write(&mut self, buf: &[u8]) -> Result<usize> {
-		if self.buf_size == 0 || buf.len() < self.buf_size {
-			self.write_buffer.extend(buf.iter().cloned());
-			Ok(buf.len())
-		}
-		else {
-			self.write_buffer.extend(buf.iter().take(self.buf_size).cloned());
-			Ok(self.buf_size)
-		}
-	}
-
-	fn flush(&mut self) -> Result<()> {
-		unimplemented!();
-	}
-}
--- a/doc.sh
+++ b/doc.sh
@@ -1,14 +1,4 @@
 #!/bin/sh
 # generate documentation only for partiy and ethcore libraries

-cargo doc --no-deps --verbose \
-	-p ethkey \
-	-p ethstore \
-	-p ethash \
-	-p ethcore-util \
-	-p ethcore \
-	-p ethsync \
-	-p ethcore-rpc \
-	-p ethcore-signer \
-	-p ethcore-dapps \
-	-p parity \
+cargo doc --no-deps --verbose -p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -1,29 +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 -s -- --disable-sudo
-# show backtraces
-ENV RUST_BACKTRACE 1
-# set compiler
-ENV CXX g++
-ENV CC gcc
-# show tools
-RUN rustc -vV && \
-cargo -V && \
-gcc -v &&\
-g++ -v
-# build parity
-RUN git clone https://github.com/ethcore/parity && \
-	cd parity&&\
-	git checkout beta && \
-        git pull && \
-        ls -a&&\
-        cargo build --release --verbose && \
-	ls /build/parity/target/release/parity &&	\
-	strip /build/parity/target/release/parity
-RUN file /build/parity/target/release/parity
--- a/docker/ubuntu-aarch64/Dockerfile
+++ b/docker/ubuntu-aarch64/Dockerfile
@@ -1,49 +0,0 @@
-FROM ubuntu:14.04
-WORKDIR /build
-# install tools and dependencies
-RUN apt-get -y update && \
-        apt-get install -y --force-yes --no-install-recommends \
-        curl git make g++ gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
-        libc6-arm64-cross libc6-dev-arm64-cross wget file ca-certificates \
-        binutils-aarch64-linux-gnu \
-        && \
-    apt-get clean
-
-# install rustup
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
-
-# rustup directory
-ENV PATH /root/.cargo/bin:$PATH
-
-ENV RUST_TARGETS="aarch64-unknown-linux-gnu"
-
-# multirust add arm--linux-gnuabhf toolchain
-RUN rustup target add aarch64-unknown-linux-gnu
-
-# show backtraces
-ENV RUST_BACKTRACE 1
-
-# set compilers
-ENV CXX aarch64-linux-gnu-g++
-ENV CC aarch64-linux-gnu-gcc
-
-# show tools
- RUN rustc -vV && \
- cargo -V && \
- gcc -v &&\
- g++ -v
-
-# build parity
-RUN git clone https://github.com/ethcore/parity && \
-        cd parity && \
-        git checkout beta && \
-        git pull && \
-        mkdir -p .cargo && \
-        echo '[target.aarch64-unknown-linux-gnu]\n\
-        linker = "aarch64-linux-gnu-gcc"\n'\
-        >>.cargo/config && \
-        cat .cargo/config && \
-        cargo build --target aarch64-unknown-linux-gnu --release --verbose && \
-        ls /build/parity/target/aarch64-unknown-linux-gnu/release/parity &&     \
-        /usr/bin/aarch64-linux-gnu-strip /build/parity/target/aarch64-unknown-linux-gnu/release/parity
-RUN file /build/parity/target/aarch64-unknown-linux-gnu/release/parity
--- a/docker/ubuntu-arm/Dockerfile
+++ b/docker/ubuntu-arm/Dockerfile
@@ -1,49 +0,0 @@
-FROM ubuntu:14.04
-WORKDIR /build
-# install tools and dependencies
-RUN apt-get -y update && \
-        apt-get install -y --force-yes --no-install-recommends \
-        curl git make g++ gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
-        libc6-dev-armhf-cross wget file ca-certificates \
-        binutils-arm-linux-gnueabihf \
-        && \
-    apt-get clean
-
-# install rustup
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
-
-# rustup directory
-ENV PATH /root/.cargo/bin:$PATH
-
-ENV RUST_TARGETS="arm-unknown-linux-gnueabihf"
-
-# multirust add arm--linux-gnuabhf toolchain
-RUN rustup target add armv7-unknown-linux-gnueabihf
-
-# show backtraces
-ENV RUST_BACKTRACE 1
-
-# set compilers
-ENV CXX arm-linux-gnueabihf-g++
-ENV CC arm-linux-gnueabihf-gcc
-
-# show tools
- RUN rustc -vV && \
- cargo -V && \
- gcc -v &&\
- g++ -v
-
-# build parity
-RUN git clone https://github.com/ethcore/parity && \
-        cd parity && \
-        git checkout beta && \
-        git pull && \
-        mkdir -p .cargo && \
-        echo '[target.armv7-unknown-linux-gnueabihf]\n\
-        linker = "arm-linux-gnueabihf-gcc"\n'\
-        >>.cargo/config && \
-        cat .cargo/config && \
-        cargo build --target armv7-unknown-linux-gnueabihf --release --verbose && \
-        ls /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity && \
-        /usr/bin/arm-linux-gnueabihf-strip /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity
-RUN file /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity
--- a/docker/ubuntu-dev/Dockerfile
+++ b/docker/ubuntu-dev/Dockerfile
@@ -8,8 +8,7 @@ RUN apt-get update && \
 	# add-apt-repository
 	software-properties-common \
 	curl \
-	g++ \
-	wget \
+	wget \ 
 	git \
 	# evmjit dependencies
 	zlib1g-dev \
@@ -18,8 +17,9 @@ RUN apt-get update && \
 # cmake, llvm and rocksdb ppas. then update ppas
 RUN add-apt-repository -y "ppa:george-edison55/cmake-3.x" && \
 	add-apt-repository "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main" && \
+	add-apt-repository "deb http://ppa.launchpad.net/giskou/librocksdb/ubuntu trusty main" && \
 	apt-get update && \
-	apt-get install -y --force-yes cmake llvm-3.7-dev
+	apt-get install -y --force-yes cmake llvm-3.7-dev librocksdb

 # install evmjit
 RUN git clone https://github.com/debris/evmjit && \
@@ -27,11 +27,14 @@ RUN git clone https://github.com/debris/evmjit && \
 	mkdir build && cd build && \
 	cmake .. && make && make install && cd

-# install rustup
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+# install multirust
+RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes

-# rustup directory
-ENV PATH /root/.cargo/bin:$PATH
+# install nightly and make it default
+RUN multirust update nightly && multirust default nightly
+
+# export rust LIBRARY_PATH
+ENV LIBRARY_PATH /usr/local/lib

 # show backtraces
 ENV RUST_BACKTRACE 1
--- a/docker/ubuntu-jit/Dockerfile
+++ b/docker/ubuntu-jit/Dockerfile
@@ -1,55 +1,46 @@
 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
+	apt-get install -y \
+	# make
+	build-essential \
+	# add-apt-repository
+	software-properties-common \
+	curl \
+	wget \ 
+	git \
+	# evmjit dependencies
+	zlib1g-dev \
+	libedit-dev

-# cmake and llvm ppas. then update ppas
+# cmake, llvm and rocksdb ppas. then update ppas
 RUN add-apt-repository -y "ppa:george-edison55/cmake-3.x" && \
-        add-apt-repository "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main" && \
-        apt-get update && \
-        apt-get install -y --force-yes cmake llvm-3.7-dev
+	add-apt-repository "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main" && \
+	add-apt-repository "deb http://ppa.launchpad.net/giskou/librocksdb/ubuntu trusty main" && \
+	apt-get update && \
+	apt-get install -y --force-yes cmake llvm-3.7-dev librocksdb

 # install evmjit
 RUN git clone https://github.com/debris/evmjit && \
-        cd evmjit && \
-        mkdir build && cd build && \
-        cmake .. && make && make install && cd
+	cd evmjit && \
+	mkdir build && cd build && \
+	cmake .. && make && make install && cd

-# install rustup
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+# install multirust
+RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes

-# rustup directory
-ENV PATH /root/.cargo/bin:$PATH
+# install nightly and make it default
+RUN multirust update nightly && multirust default nightly
+
+# export rust LIBRARY_PATH
+ENV LIBRARY_PATH /usr/local/lib

 # show backtraces
 ENV RUST_BACKTRACE 1

-# show tools
-RUN rustc -vV && \
-cargo -V && \
-gcc -v &&\
-g++ -v
-
 # build parity
+# TODO: add jit feature
 RUN git clone https://github.com/ethcore/parity && \
-        cd parity && \
-        git checkout beta && \
-        git pull && \
-        cargo build --release --features ethcore/jit --verbose && \
-        ls /build/parity/target/release/parity &&       \
-        strip /build/parity/target/release/parity
-RUN file /build/parity/target/release/parity
+	cd parity && \
+	cargo install --features rpc
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -1,35 +1,31 @@
 FROM ubuntu:14.04
-WORKDIR /build
+
 # install tools and dependencies
 RUN apt-get update && \
-        apt-get install -y \
-        g++ \
-        curl \
-        git \
-        file \
-        binutils
+	apt-get install -y \
+	curl \
+	git \
+	# add-apt-repository
+	software-properties-common

-# install rustup
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+# rocksdb ppas. then update ppas
+RUN add-apt-repository "deb http://ppa.launchpad.net/giskou/librocksdb/ubuntu trusty main" && \
+	apt-get update && \
+	apt-get install -y --force-yes librocksdb

-# rustup directory
-ENV PATH /root/.cargo/bin:$PATH
+# install multirust
+RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes
+
+# install nightly and make it default
+RUN multirust update nightly && multirust default nightly
+
+# export rust LIBRARY_PATH
+ENV LIBRARY_PATH /usr/local/lib

 # show backtraces
 ENV RUST_BACKTRACE 1

-# show tools
-RUN rustc -vV && \
-cargo -V && \
-gcc -v &&\
-g++ -v
-
 # build parity
 RUN git clone https://github.com/ethcore/parity && \
-        cd parity && \
-        git checkout beta && \
-        git pull && \
-        cargo build --release --verbose && \
-        ls /build/parity/target/release/parity && \
-        strip /build/parity/target/release/parity
-RUN file /build/parity/target/release/parity
+	cd parity && \
+	cargo install --features rpc
--- a/ethash/Cargo.toml
+++ b/ethash/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "ethash"
-version = "1.2.0"
+version = "0.9.1"
 authors = ["arkpar <arkadiy@ethcore.io"]

 [lib]

 [dependencies]
 log = "0.3"
+lru-cache = "0.0"
 sha3 = { path = "../util/sha3" }
-primal = "0.2.3"
--- a/ethash/src/compute.rs
+++ b/ethash/src/compute.rs
@@ -19,39 +19,33 @@

 // TODO: fix endianess for big endian

-use primal::is_prime;
-use std::cell::Cell;
-use std::sync::Mutex;
 use std::mem;
 use std::ptr;
+use sizes::{CACHE_SIZES, DAG_SIZES};
 use sha3;
 use std::slice;
 use std::path::PathBuf;
-use std::io::{self, Read, Write};
+use std::io::{Read, Write, self};
 use std::fs::{self, File};

 pub const ETHASH_EPOCH_LENGTH: u64 = 30000;
 pub const ETHASH_CACHE_ROUNDS: usize = 3;
 pub const ETHASH_MIX_BYTES: usize = 128;
-pub const ETHASH_ACCESSES: usize = 64;
-pub const ETHASH_DATASET_PARENTS: u32 = 256;
+pub const ETHASH_ACCESSES:usize =  64;
+pub const ETHASH_DATASET_PARENTS:u32 = 256;

-const DATASET_BYTES_INIT: u64 = 1 << 30;
-const DATASET_BYTES_GROWTH: u64 = 1 << 23;
-const CACHE_BYTES_INIT: u64 = 1 << 24;
-const CACHE_BYTES_GROWTH: u64 = 1 << 17;
 const NODE_WORDS: usize = 64 / 4;
 const NODE_BYTES: usize = 64;
 const MIX_WORDS: usize = ETHASH_MIX_BYTES / 4;
 const MIX_NODES: usize = MIX_WORDS / NODE_WORDS;
-const FNV_PRIME: u32 = 0x01000193;
+const FNV_PRIME: u32 =  0x01000193;

 /// Computation result
 pub struct ProofOfWork {
 	/// Difficulty boundary
 	pub value: H256,
 	/// Mix
-	pub mix_hash: H256,
+	pub mix_hash: H256
 }

 struct Node {
@@ -59,7 +53,7 @@ struct Node {
 }

 impl Default for Node {
-	fn default() -> Self {
+	fn default() -> Self { 
 		Node { bytes: [0u8; NODE_BYTES] }
 	}
 }
@@ -87,7 +81,6 @@ pub type H256 = [u8; 32];
 pub struct Light {
 	block_number: u64,
 	cache: Vec<Node>,
-	seed_compute: Mutex<SeedHashCompute>,
 }

 /// Light cache structur
@@ -104,19 +97,19 @@ impl Light {
 		light_compute(self, header_hash, nonce)
 	}

-	pub fn file_path(seed_hash: H256) -> PathBuf {
+	pub fn file_path(block_number: u64) -> PathBuf {
 		let mut home = ::std::env::home_dir().unwrap();
 		home.push(".ethash");
 		home.push("light");
+		let seed_hash = get_seedhash(block_number);
 		home.push(to_hex(&seed_hash));
 		home
 	}

 	pub fn from_file(block_number: u64) -> io::Result<Light> {
-		let seed_compute = SeedHashCompute::new();
-		let path = Light::file_path(seed_compute.get_seedhash(block_number));
+		let path = Light::file_path(block_number);
 		let mut file = try!(File::open(path));
-
+		
 		let cache_size = get_cache_size(block_number);
 		if try!(file.metadata()).len() != cache_size as u64 {
 			return Err(io::Error::new(io::ErrorKind::Other, "Cache file size mismatch"));
@@ -129,68 +122,21 @@ impl Light {
 		Ok(Light {
 			cache: nodes,
 			block_number: block_number,
-			seed_compute: Mutex::new(seed_compute),
 		})
 	}

 	pub fn to_file(&self) -> io::Result<()> {
-		let seed_compute = self.seed_compute.lock().unwrap();
-		let path = Light::file_path(seed_compute.get_seedhash(self.block_number));
+		let path = Light::file_path(self.block_number);
 		try!(fs::create_dir_all(path.parent().unwrap()));
 		let mut file = try!(File::create(path));
-
+		
 		let cache_size = self.cache.len() * NODE_BYTES;
 		let buf = unsafe { slice::from_raw_parts(self.cache.as_ptr() as *const u8, cache_size) };
-		try!(file.write(buf));
+		try!(file.write(buf)); 
 		Ok(())
 	}
 }

-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);
-		self.prev_seedhash.set([0u8; 32]);
-	}
-
-	#[inline]
-	pub fn get_seedhash(&self, block_number: u64) -> H256 {
-		let epoch = block_number / ETHASH_EPOCH_LENGTH;
-		if epoch < self.prev_epoch.get() {
-			// can't build on previous hash if requesting an older block
-			self.reset_cache();
-		}
-		if epoch > self.prev_epoch.get() {
-			let seed_hash = SeedHashCompute::resume_compute_seedhash(self.prev_seedhash.get(), self.prev_epoch.get(), epoch);
-			self.prev_seedhash.set(seed_hash);
-			self.prev_epoch.set(epoch);
-		}
-		self.prev_seedhash.get()
-	}
-
-	#[inline]
-	pub fn resume_compute_seedhash(mut hash: H256, start_epoch: u64, end_epoch: u64) -> H256 {
-		for _ in start_epoch..end_epoch {
-			unsafe { sha3::sha3_256(hash[..].as_mut_ptr(), 32, hash[..].as_ptr(), 32) };
-		}
-		hash
-	}
-}
-
-
 #[inline]
 fn fnv_hash(x: u32, y: u32) -> u32 {
 	return x.wrapping_mul(FNV_PRIME) ^ y;
@@ -203,24 +149,25 @@ fn sha3_512(input: &[u8], output: &mut [u8]) {

 #[inline]
 fn get_cache_size(block_number: u64) -> usize {
-	let mut sz: u64 = CACHE_BYTES_INIT + CACHE_BYTES_GROWTH * (block_number / ETHASH_EPOCH_LENGTH);
-	sz = sz - NODE_BYTES as u64;
-	while !is_prime(sz / NODE_BYTES as u64) {
-		sz = sz - 2 * NODE_BYTES as u64;
-	}
-	sz as usize
+	assert!(block_number / ETHASH_EPOCH_LENGTH < 2048);
+	return CACHE_SIZES[(block_number / ETHASH_EPOCH_LENGTH) as usize] as usize;
 }

 #[inline]
 fn get_data_size(block_number: u64) -> usize {
-	let mut sz: u64 = DATASET_BYTES_INIT + DATASET_BYTES_GROWTH * (block_number / ETHASH_EPOCH_LENGTH);
-	sz = sz - ETHASH_MIX_BYTES as u64;
-	while !is_prime(sz / ETHASH_MIX_BYTES as u64) {
-		sz = sz - 2 * ETHASH_MIX_BYTES as u64;
-	}
-	sz as usize
+	assert!(block_number / ETHASH_EPOCH_LENGTH < 2048);
+	return DAG_SIZES[(block_number / ETHASH_EPOCH_LENGTH) as usize] as usize;
 }

+#[inline]
+fn get_seedhash(block_number: u64) -> H256 {
+	let epochs = block_number / ETHASH_EPOCH_LENGTH;
+	let mut ret: H256 = [0u8; 32];
+	for _ in 0..epochs {
+		unsafe { sha3::sha3_256(ret[..].as_mut_ptr(), 32, ret[..].as_ptr(), 32) };
+	}
+	ret
+}

 /// Difficulty quick check for POW preverification
 ///
@@ -251,12 +198,12 @@ pub fn light_compute(light: &Light, header_hash: &H256, nonce: u64) -> ProofOfWo
 	hash_compute(light, full_size, header_hash, nonce)
 }

-fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64) -> ProofOfWork {
+fn hash_compute(light: &Light, full_size: usize,  header_hash: &H256, nonce: u64) -> ProofOfWork {
 	if full_size % MIX_WORDS != 0 {
 		panic!("Unaligned full size");
 	}
 	// pack hash and nonce together into first 40 bytes of s_mix
-	let mut s_mix: [Node; MIX_NODES + 1] = [Node::default(), Node::default(), Node::default()];
+	let mut s_mix: [Node; MIX_NODES + 1] = [ Node::default(), Node::default(), Node::default() ];
 	unsafe { ptr::copy_nonoverlapping(header_hash.as_ptr(), s_mix.get_unchecked_mut(0).bytes.as_mut_ptr(), 32) };
 	unsafe { ptr::copy_nonoverlapping(mem::transmute(&nonce), s_mix.get_unchecked_mut(0).bytes[32..].as_mut_ptr(), 8) };

@@ -297,7 +244,7 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 		ptr::copy_nonoverlapping(mix.get_unchecked_mut(0).bytes.as_ptr(), buf[64..].as_mut_ptr(), 32);
 		ptr::copy_nonoverlapping(mix.get_unchecked_mut(0).bytes.as_ptr(), mix_hash.as_mut_ptr(), 32);
 		let mut value: H256 = [0u8; 32];
-		sha3::sha3_256(value.as_mut_ptr(), value.len(), buf.as_ptr(), buf.len());
+		sha3::sha3_256(value.as_mut_ptr(), value.len(),  buf.as_ptr(), buf.len());
 		ProofOfWork {
 			mix_hash: mix_hash,
 			value: value,
@@ -327,9 +274,7 @@ fn calculate_dag_item(node_index: u32, light: &Light) -> Node {
 }

 fn light_new(block_number: u64) -> Light {
-
-	let seed_compute = SeedHashCompute::new();
-	let seedhash = seed_compute.get_seedhash(block_number);
+	let seedhash = get_seedhash(block_number);
 	let cache_size = get_cache_size(block_number);

 	if cache_size % NODE_BYTES != 0 {
@@ -344,13 +289,13 @@ fn light_new(block_number: u64) -> Light {
 		for i in 1..num_nodes {
 			sha3::sha3_512(nodes.get_unchecked_mut(i).bytes.as_mut_ptr(), NODE_BYTES, nodes.get_unchecked(i - 1).bytes.as_ptr(), NODE_BYTES);
 		}
-
+		
 		for _ in 0..ETHASH_CACHE_ROUNDS {
 			for i in 0..num_nodes {
 				let idx = *nodes.get_unchecked_mut(i).as_words().get_unchecked(0) as usize % num_nodes;
 				let mut data = nodes.get_unchecked((num_nodes - 1 + i) % num_nodes).clone();
 				for w in 0..NODE_WORDS {
-					*data.as_words_mut().get_unchecked_mut(w) ^= *nodes.get_unchecked(idx).as_words().get_unchecked(w);
+					*data.as_words_mut().get_unchecked_mut(w) ^= *nodes.get_unchecked(idx).as_words().get_unchecked(w) ;
 				}
 				sha3_512(&data.bytes, &mut nodes.get_unchecked_mut(i).bytes);
 			}
@@ -360,11 +305,10 @@ fn light_new(block_number: u64) -> Light {
 	Light {
 		cache: nodes,
 		block_number: block_number,
-		seed_compute: Mutex::new(seed_compute),
 	}
 }

-static CHARS: &'static [u8] = b"0123456789abcdef";
+static CHARS: &'static[u8] = b"0123456789abcdef";
 fn to_hex(bytes: &[u8]) -> String {
 	let mut v = Vec::with_capacity(bytes.len() * 2);
 	for &byte in bytes.iter() {
@@ -372,38 +316,15 @@ fn to_hex(bytes: &[u8]) -> String {
 		v.push(CHARS[(byte & 0xf) as usize]);
 	}

-	unsafe { String::from_utf8_unchecked(v) }
-}
-
-#[test]
-fn test_get_cache_size() {
-	// https://github.com/ethereum/wiki/wiki/Ethash/ef6b93f9596746a088ea95d01ca2778be43ae68f#data-sizes
-	assert_eq!(16776896usize, get_cache_size(0));
-	assert_eq!(16776896usize, get_cache_size(1));
-	assert_eq!(16776896usize, get_cache_size(ETHASH_EPOCH_LENGTH - 1));
-	assert_eq!(16907456usize, get_cache_size(ETHASH_EPOCH_LENGTH));
-	assert_eq!(16907456usize, get_cache_size(ETHASH_EPOCH_LENGTH + 1));
-	assert_eq!(284950208usize, get_cache_size(2046 * ETHASH_EPOCH_LENGTH));
-	assert_eq!(285081536usize, get_cache_size(2047 * ETHASH_EPOCH_LENGTH));
-	assert_eq!(285081536usize, get_cache_size(2048 * ETHASH_EPOCH_LENGTH - 1));
-}
-
-#[test]
-fn test_get_data_size() {
-	// https://github.com/ethereum/wiki/wiki/Ethash/ef6b93f9596746a088ea95d01ca2778be43ae68f#data-sizes
-	assert_eq!(1073739904usize, get_data_size(0));
-	assert_eq!(1073739904usize, get_data_size(1));
-	assert_eq!(1073739904usize, get_data_size(ETHASH_EPOCH_LENGTH - 1));
-	assert_eq!(1082130304usize, get_data_size(ETHASH_EPOCH_LENGTH));
-	assert_eq!(1082130304usize, get_data_size(ETHASH_EPOCH_LENGTH + 1));
-	assert_eq!(18236833408usize, get_data_size(2046 * ETHASH_EPOCH_LENGTH));
-	assert_eq!(18245220736usize, get_data_size(2047 * ETHASH_EPOCH_LENGTH));
+	unsafe {
+		String::from_utf8_unchecked(v)
+	}
 }

 #[test]
 fn test_difficulty_test() {
-	let hash = [0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b, 0x5b, 0xf2, 0xbe, 0xe4, 0x0a, 0xb3, 0x35, 0x8a, 0xa6, 0x87, 0x73, 0xa8, 0xd0, 0x9f, 0x5e, 0x59, 0x5e, 0xab, 0x55, 0x94, 0x05, 0x52, 0x7d, 0x72];
-	let mix_hash = [0x1f, 0xff, 0x04, 0xce, 0xc9, 0x41, 0x73, 0xfd, 0x59, 0x1e, 0x3d, 0x89, 0x60, 0xce, 0x6b, 0xdf, 0x8b, 0x19, 0x71, 0x04, 0x8c, 0x71, 0xff, 0x93, 0x7b, 0xb2, 0xd3, 0x2a, 0x64, 0x31, 0xab, 0x6d];
+	let hash = [0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b, 0x5b, 0xf2, 0xbe, 0xe4, 0x0a, 0xb3, 0x35, 0x8a, 0xa6, 0x87, 0x73, 0xa8, 0xd0, 0x9f, 0x5e, 0x59, 0x5e, 0xab, 0x55, 0x94, 0x05,  0x52, 0x7d, 0x72];
+	let mix_hash = [0x1f, 0xff, 0x04, 0xce, 0xc9, 0x41, 0x73, 0xfd, 0x59, 0x1e, 0x3d, 0x89, 0x60, 0xce, 0x6b, 0xdf, 0x8b, 0x19, 0x71, 0x04, 0x8c, 0x71, 0xff, 0x93, 0x7b, 0xb2, 0xd3, 0x2a, 0x64, 0x31, 0xab, 0x6d ]; 
 	let nonce = 0xd7b3ac70a301a249;
 	let boundary_good = [0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0x9b, 0x6c, 0x69, 0xbc, 0x2c, 0xe2, 0xa2, 0x4a, 0x8e, 0x95, 0x69, 0xef, 0xc7, 0xd7, 0x1b, 0x33, 0x35, 0xdf, 0x36, 0x8c, 0x9a, 0xe9, 0x7e, 0x53, 0x84];
 	assert_eq!(quick_get_difficulty(&hash, nonce, &mix_hash)[..], boundary_good[..]);
@@ -413,8 +334,8 @@ fn test_difficulty_test() {

 #[test]
 fn test_light_compute() {
-	let hash = [0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b, 0x5b, 0xf2, 0xbe, 0xe4, 0x0a, 0xb3, 0x35, 0x8a, 0xa6, 0x87, 0x73, 0xa8, 0xd0, 0x9f, 0x5e, 0x59, 0x5e, 0xab, 0x55, 0x94, 0x05, 0x52, 0x7d, 0x72];
-	let mix_hash = [0x1f, 0xff, 0x04, 0xce, 0xc9, 0x41, 0x73, 0xfd, 0x59, 0x1e, 0x3d, 0x89, 0x60, 0xce, 0x6b, 0xdf, 0x8b, 0x19, 0x71, 0x04, 0x8c, 0x71, 0xff, 0x93, 0x7b, 0xb2, 0xd3, 0x2a, 0x64, 0x31, 0xab, 0x6d];
+	let hash = [0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b, 0x5b, 0xf2, 0xbe, 0xe4, 0x0a, 0xb3, 0x35, 0x8a, 0xa6, 0x87, 0x73, 0xa8, 0xd0, 0x9f, 0x5e, 0x59, 0x5e, 0xab, 0x55, 0x94, 0x05,  0x52, 0x7d, 0x72];
+	let mix_hash = [0x1f, 0xff, 0x04, 0xce, 0xc9, 0x41, 0x73, 0xfd, 0x59, 0x1e, 0x3d, 0x89, 0x60, 0xce, 0x6b, 0xdf, 0x8b, 0x19, 0x71, 0x04, 0x8c, 0x71, 0xff, 0x93, 0x7b, 0xb2, 0xd3, 0x2a, 0x64, 0x31, 0xab, 0x6d ]; 
 	let boundary = [0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0x9b, 0x6c, 0x69, 0xbc, 0x2c, 0xe2, 0xa2, 0x4a, 0x8e, 0x95, 0x69, 0xef, 0xc7, 0xd7, 0x1b, 0x33, 0x35, 0xdf, 0x36, 0x8c, 0x9a, 0xe9, 0x7e, 0x53, 0x84];
 	let nonce = 0xd7b3ac70a301a249;
 	// difficulty = 0x085657254bd9u64;
@@ -423,34 +344,3 @@ fn test_light_compute() {
 	assert_eq!(result.mix_hash[..], mix_hash[..]);
 	assert_eq!(result.value[..], boundary[..]);
 }
-
-#[test]
-fn test_seed_compute_once() {
-	let seed_compute = SeedHashCompute::new();
-	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.get_seedhash(486382), hash);
-}
-
-#[test]
-fn test_seed_compute_zero() {
-	let seed_compute = SeedHashCompute::new();
-	assert_eq!(seed_compute.get_seedhash(0), [0u8; 32]);
-}
-
-#[test]
-fn test_seed_compute_after_older() {
-	let seed_compute = SeedHashCompute::new();
-	// calculating an older value first shouldn't affect the result
-	let _ = seed_compute.get_seedhash(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];
-	assert_eq!(seed_compute.get_seedhash(486382), hash);
-}
-
-#[test]
-fn test_seed_compute_after_newer() {
-	let seed_compute = SeedHashCompute::new();
-	// calculating an newer value first shouldn't affect the result
-	let _ = seed_compute.get_seedhash(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];
-	assert_eq!(seed_compute.get_seedhash(486382), hash);
-}
--- a/ethash/src/lib.rs
+++ b/ethash/src/lib.rs
@@ -16,40 +16,29 @@

 //! Ethash implementation
 //! See https://github.com/ethereum/wiki/wiki/Ethash
-extern crate primal;
 extern crate sha3;
+extern crate lru_cache;
 #[macro_use]
 extern crate log;
+mod sizes;
 mod compute;

-use std::mem;
+use lru_cache::LruCache;
 use compute::Light;
-pub use compute::{ETHASH_EPOCH_LENGTH, H256, ProofOfWork, SeedHashCompute, quick_get_difficulty};
+pub use compute::{quick_get_difficulty, H256, ProofOfWork, ETHASH_EPOCH_LENGTH};

 use std::sync::{Arc, Mutex};

-struct LightCache {
-	recent_epoch: Option<u64>,
-	recent: Option<Arc<Light>>,
-	prev_epoch: Option<u64>,
-	prev: Option<Arc<Light>>,
-}
-
-/// Light/Full cache manager.
+/// Lighy/Full cache manager
 pub struct EthashManager {
-	cache: Mutex<LightCache>,
+	lights: Mutex<LruCache<u64, Arc<Light>>>
 }

 impl EthashManager {
 	/// Create a new new instance of ethash manager
 	pub fn new() -> EthashManager {
-		EthashManager {
-			cache: Mutex::new(LightCache {
-				recent_epoch: None,
-				recent: None,
-				prev_epoch: None,
-				prev: None,
-			}),
+		EthashManager { 
+			lights: Mutex::new(LruCache::new(2))
 		}
 	}

@@ -61,28 +50,12 @@ impl EthashManager {
 	pub fn compute_light(&self, block_number: u64, header_hash: &H256, nonce: u64) -> ProofOfWork {
 		let epoch = block_number / ETHASH_EPOCH_LENGTH;
 		let light = {
-			let mut lights = self.cache.lock().unwrap();
-			let light = match lights.recent_epoch.clone() {
-				Some(ref e) if *e == epoch => lights.recent.clone(),
-				_ => match lights.prev_epoch.clone() {
-					Some(e) if e == epoch => {
-						// swap
-						let t = lights.prev_epoch;
-						lights.prev_epoch = lights.recent_epoch;
-						lights.recent_epoch = t;
-						let t = lights.prev.clone();
-						lights.prev = lights.recent.clone();
-						lights.recent = t;
-						lights.recent.clone()
-					}
-					_ => None,
-				},
-			};
-			match light {
+			let mut lights = self.lights.lock().unwrap();
+			match lights.get_mut(&epoch).map(|l| l.clone()) {
 				None => {
 					let light = match Light::from_file(block_number) {
 						Ok(light) => Arc::new(light),
-						Err(e) => {
+						Err(e) => { 
 							debug!("Light cache file not found for {}:{}", block_number, e);
 							let light = Light::new(block_number);
 							if let Err(e) = light.to_file() {
@@ -91,29 +64,12 @@ impl EthashManager {
 							Arc::new(light)
 						}
 					};
-					lights.prev_epoch = mem::replace(&mut lights.recent_epoch, Some(epoch));
-					lights.prev = mem::replace(&mut lights.recent, Some(light.clone()));
+					lights.insert(epoch, light.clone());
 					light
 				}
-				Some(light) => light,
+				Some(light) => light
 			}
 		};
 		light.compute(header_hash, nonce)
 	}
 }
-
-#[test]
-fn test_lru() {
-	let ethash = EthashManager::new();
-	let hash = [0u8; 32];
-	ethash.compute_light(1, &hash, 1);
-	ethash.compute_light(50000, &hash, 1);
-	assert_eq!(ethash.cache.lock().unwrap().recent_epoch.unwrap(), 1);
-	assert_eq!(ethash.cache.lock().unwrap().prev_epoch.unwrap(), 0);
-	ethash.compute_light(1, &hash, 1);
-	assert_eq!(ethash.cache.lock().unwrap().recent_epoch.unwrap(), 0);
-	assert_eq!(ethash.cache.lock().unwrap().prev_epoch.unwrap(), 1);
-	ethash.compute_light(70000, &hash, 1);
-	assert_eq!(ethash.cache.lock().unwrap().recent_epoch.unwrap(), 2);
-	assert_eq!(ethash.cache.lock().unwrap().prev_epoch.unwrap(), 0);
-}
--- a/ethash/src/sizes.rs
+++ b/ethash/src/sizes.rs
@@ -0,0 +1,788 @@
+// Copyright 2015, 2016 Ethcore (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/>.
+
+// 2048 Epochs (~20 years) worth of tabulated DAG sizes
+
+// Generated with the following Mathematica Code:
+
+// GetCacheSizes[n_] := Module[{
+//        CacheSizeBytesInit = 2^24,
+//        CacheGrowth = 2^17,
+//        HashBytes = 64,
+//        j = 0},
+//       Reap[
+//         While[j < n,
+//           Module[{i =
+//             Floor[(CacheSizeBytesInit + CacheGrowth * j) / HashBytes]},
+//             While[! PrimeQ[i], i--];
+//             Sow[i*HashBytes]; j++]]]][[2]][[1]]
+pub const DAG_SIZES: [u64; 2048] = [
+	1073739904u64, 1082130304u64, 1090514816u64, 1098906752u64, 1107293056u64,
+	1115684224u64, 1124070016u64, 1132461952u64, 1140849536u64, 1149232768u64,
+	1157627776u64, 1166013824u64, 1174404736u64, 1182786944u64, 1191180416u64,
+	1199568512u64, 1207958912u64, 1216345216u64, 1224732032u64, 1233124736u64,
+	1241513344u64, 1249902464u64, 1258290304u64, 1266673792u64, 1275067264u64,
+	1283453312u64, 1291844992u64, 1300234112u64, 1308619904u64, 1317010048u64,
+	1325397376u64, 1333787776u64, 1342176128u64, 1350561664u64, 1358954368u64,
+	1367339392u64, 1375731584u64, 1384118144u64, 1392507008u64, 1400897408u64,
+	1409284736u64, 1417673344u64, 1426062464u64, 1434451072u64, 1442839168u64,
+	1451229056u64, 1459615616u64, 1468006016u64, 1476394112u64, 1484782976u64,
+	1493171584u64, 1501559168u64, 1509948032u64, 1518337664u64, 1526726528u64,
+	1535114624u64, 1543503488u64, 1551892096u64, 1560278656u64, 1568669056u64,
+	1577056384u64, 1585446272u64, 1593831296u64, 1602219392u64, 1610610304u64,
+	1619000192u64, 1627386752u64, 1635773824u64, 1644164224u64, 1652555648u64,
+	1660943488u64, 1669332608u64, 1677721216u64, 1686109312u64, 1694497664u64,
+	1702886272u64, 1711274624u64, 1719661184u64, 1728047744u64, 1736434816u64,
+	1744829056u64, 1753218944u64, 1761606272u64, 1769995904u64, 1778382464u64,
+	1786772864u64, 1795157888u64, 1803550592u64, 1811937664u64, 1820327552u64,
+	1828711552u64, 1837102976u64, 1845488768u64, 1853879936u64, 1862269312u64,
+	1870656896u64, 1879048064u64, 1887431552u64, 1895825024u64, 1904212096u64,
+	1912601216u64, 1920988544u64, 1929379456u64, 1937765504u64, 1946156672u64,
+	1954543232u64, 1962932096u64, 1971321728u64, 1979707264u64, 1988093056u64,
+	1996487552u64, 2004874624u64, 2013262208u64, 2021653888u64, 2030039936u64,
+	2038430848u64, 2046819968u64, 2055208576u64, 2063596672u64, 2071981952u64,
+	2080373632u64, 2088762752u64, 2097149056u64, 2105539712u64, 2113928576u64,
+	2122315136u64, 2130700672u64, 2139092608u64, 2147483264u64, 2155872128u64,
+	2164257664u64, 2172642176u64, 2181035392u64, 2189426048u64, 2197814912u64,
+	2206203008u64, 2214587264u64, 2222979712u64, 2231367808u64, 2239758208u64,
+	2248145024u64, 2256527744u64, 2264922752u64, 2273312128u64, 2281701248u64,
+	2290086272u64, 2298476672u64, 2306867072u64, 2315251072u64, 2323639168u64,
+	2332032128u64, 2340420224u64, 2348808064u64, 2357196416u64, 2365580416u64,
+	2373966976u64, 2382363008u64, 2390748544u64, 2399139968u64, 2407530368u64,
+	2415918976u64, 2424307328u64, 2432695424u64, 2441084288u64, 2449472384u64,
+	2457861248u64, 2466247808u64, 2474637184u64, 2483026816u64, 2491414144u64,
+	2499803776u64, 2508191872u64, 2516582272u64, 2524970368u64, 2533359232u64,
+	2541743488u64, 2550134144u64, 2558525056u64, 2566913408u64, 2575301504u64,
+	2583686528u64, 2592073856u64, 2600467328u64, 2608856192u64, 2617240448u64,
+	2625631616u64, 2634022016u64, 2642407552u64, 2650796416u64, 2659188352u64,
+	2667574912u64, 2675965312u64, 2684352896u64, 2692738688u64, 2701130624u64,
+	2709518464u64, 2717907328u64, 2726293376u64, 2734685056u64, 2743073152u64,
+	2751462016u64, 2759851648u64, 2768232832u64, 2776625536u64, 2785017728u64,
+	2793401984u64, 2801794432u64, 2810182016u64, 2818571648u64, 2826959488u64,
+	2835349376u64, 2843734144u64, 2852121472u64, 2860514432u64, 2868900992u64,
+	2877286784u64, 2885676928u64, 2894069632u64, 2902451584u64, 2910843008u64,
+	2919234688u64, 2927622784u64, 2936011648u64, 2944400768u64, 2952789376u64,
+	2961177728u64, 2969565568u64, 2977951616u64, 2986338944u64, 2994731392u64,
+	3003120256u64, 3011508352u64, 3019895936u64, 3028287104u64, 3036675968u64,
+	3045063808u64, 3053452928u64, 3061837696u64, 3070228352u64, 3078615424u64,
+	3087003776u64, 3095394944u64, 3103782272u64, 3112173184u64, 3120562048u64,
+	3128944768u64, 3137339264u64, 3145725056u64, 3154109312u64, 3162505088u64,
+	3170893184u64, 3179280256u64, 3187669376u64, 3196056704u64, 3204445568u64,
+	3212836736u64, 3221224064u64, 3229612928u64, 3238002304u64, 3246391168u64,
+	3254778496u64, 3263165824u64, 3271556224u64, 3279944576u64, 3288332416u64,
+	3296719232u64, 3305110912u64, 3313500032u64, 3321887104u64, 3330273152u64,
+	3338658944u64, 3347053184u64, 3355440512u64, 3363827072u64, 3372220288u64,
+	3380608384u64, 3388997504u64, 3397384576u64, 3405774208u64, 3414163072u64,
+	3422551936u64, 3430937984u64, 3439328384u64, 3447714176u64, 3456104576u64,
+	3464493952u64, 3472883584u64, 3481268864u64, 3489655168u64, 3498048896u64,
+	3506434432u64, 3514826368u64, 3523213952u64, 3531603584u64, 3539987072u64,
+	3548380288u64, 3556763264u64, 3565157248u64, 3573545344u64, 3581934464u64,
+	3590324096u64, 3598712704u64, 3607098752u64, 3615488384u64, 3623877248u64,
+	3632265856u64, 3640646528u64, 3649043584u64, 3657430144u64, 3665821568u64,
+	3674207872u64, 3682597504u64, 3690984832u64, 3699367808u64, 3707764352u64,
+	3716152448u64, 3724541056u64, 3732925568u64, 3741318016u64, 3749706368u64,
+	3758091136u64, 3766481536u64, 3774872704u64, 3783260032u64, 3791650432u64,
+	3800036224u64, 3808427648u64, 3816815488u64, 3825204608u64, 3833592704u64,
+	3841981568u64, 3850370432u64, 3858755968u64, 3867147904u64, 3875536256u64,
+	3883920512u64, 3892313728u64, 3900702592u64, 3909087872u64, 3917478784u64,
+	3925868416u64, 3934256512u64, 3942645376u64, 3951032192u64, 3959422336u64,
+	3967809152u64, 3976200064u64, 3984588416u64, 3992974976u64, 4001363584u64,
+	4009751168u64, 4018141312u64, 4026530432u64, 4034911616u64, 4043308928u64,
+	4051695488u64, 4060084352u64, 4068472448u64, 4076862848u64, 4085249408u64,
+	4093640576u64, 4102028416u64, 4110413696u64, 4118805632u64, 4127194496u64,
+	4135583104u64, 4143971968u64, 4152360832u64, 4160746112u64, 4169135744u64,
+	4177525888u64, 4185912704u64, 4194303616u64, 4202691968u64, 4211076736u64,
+	4219463552u64, 4227855488u64, 4236246656u64, 4244633728u64, 4253022848u64,
+	4261412224u64, 4269799808u64, 4278184832u64, 4286578048u64, 4294962304u64,
+	4303349632u64, 4311743104u64, 4320130432u64, 4328521088u64, 4336909184u64,
+	4345295488u64, 4353687424u64, 4362073472u64, 4370458496u64, 4378852736u64,
+	4387238528u64, 4395630208u64, 4404019072u64, 4412407424u64, 4420790656u64,
+	4429182848u64, 4437571456u64, 4445962112u64, 4454344064u64, 4462738048u64,
+	4471119232u64, 4479516544u64, 4487904128u64, 4496289664u64, 4504682368u64,
+	4513068416u64, 4521459584u64, 4529846144u64, 4538232704u64, 4546619776u64,
+	4555010176u64, 4563402112u64, 4571790208u64, 4580174464u64, 4588567936u64,
+	4596957056u64, 4605344896u64, 4613734016u64, 4622119808u64, 4630511488u64,
+	4638898816u64, 4647287936u64, 4655675264u64, 4664065664u64, 4672451968u64,
+	4680842624u64, 4689231488u64, 4697620352u64, 4706007424u64, 4714397056u64,
+	4722786176u64, 4731173248u64, 4739562368u64, 4747951744u64, 4756340608u64,
+	4764727936u64, 4773114496u64, 4781504384u64, 4789894784u64, 4798283648u64,
+	4806667648u64, 4815059584u64, 4823449472u64, 4831835776u64, 4840226176u64,
+	4848612224u64, 4857003392u64, 4865391488u64, 4873780096u64, 4882169728u64,
+	4890557312u64, 4898946944u64, 4907333248u64, 4915722368u64, 4924110976u64,
+	4932499328u64, 4940889728u64, 4949276032u64, 4957666432u64, 4966054784u64,
+	4974438016u64, 4982831488u64, 4991221376u64, 4999607168u64, 5007998848u64,
+	5016386432u64, 5024763776u64, 5033164672u64, 5041544576u64, 5049941888u64,
+	5058329728u64, 5066717056u64, 5075107456u64, 5083494272u64, 5091883904u64,
+	5100273536u64, 5108662144u64, 5117048192u64, 5125436032u64, 5133827456u64,
+	5142215296u64, 5150605184u64, 5158993024u64, 5167382144u64, 5175769472u64,
+	5184157568u64, 5192543872u64, 5200936064u64, 5209324928u64, 5217711232u64,
+	5226102656u64, 5234490496u64, 5242877312u64, 5251263872u64, 5259654016u64,
+	5268040832u64, 5276434304u64, 5284819328u64, 5293209728u64, 5301598592u64,
+	5309986688u64, 5318374784u64, 5326764416u64, 5335151488u64, 5343542144u64,
+	5351929472u64, 5360319872u64, 5368706944u64, 5377096576u64, 5385484928u64,
+	5393871232u64, 5402263424u64, 5410650496u64, 5419040384u64, 5427426944u64,
+	5435816576u64, 5444205952u64, 5452594816u64, 5460981376u64, 5469367936u64,
+	5477760896u64, 5486148736u64, 5494536832u64, 5502925952u64, 5511315328u64,
+	5519703424u64, 5528089984u64, 5536481152u64, 5544869504u64, 5553256064u64,
+	5561645696u64, 5570032768u64, 5578423936u64, 5586811264u64, 5595193216u64,
+	5603585408u64, 5611972736u64, 5620366208u64, 5628750464u64, 5637143936u64,
+	5645528192u64, 5653921408u64, 5662310272u64, 5670694784u64, 5679082624u64,
+	5687474048u64, 5695864448u64, 5704251008u64, 5712641408u64, 5721030272u64,
+	5729416832u64, 5737806208u64, 5746194304u64, 5754583936u64, 5762969984u64,
+	5771358592u64, 5779748224u64, 5788137856u64, 5796527488u64, 5804911232u64,
+	5813300608u64, 5821692544u64, 5830082176u64, 5838468992u64, 5846855552u64,
+	5855247488u64, 5863636096u64, 5872024448u64, 5880411008u64, 5888799872u64,
+	5897186432u64, 5905576832u64, 5913966976u64, 5922352768u64, 5930744704u64,
+	5939132288u64, 5947522432u64, 5955911296u64, 5964299392u64, 5972688256u64,
+	5981074304u64, 5989465472u64, 5997851008u64, 6006241408u64, 6014627968u64,
+	6023015552u64, 6031408256u64, 6039796096u64, 6048185216u64, 6056574848u64,
+	6064963456u64, 6073351808u64, 6081736064u64, 6090128768u64, 6098517632u64,
+	6106906496u64, 6115289216u64, 6123680896u64, 6132070016u64, 6140459648u64,
+	6148849024u64, 6157237376u64, 6165624704u64, 6174009728u64, 6182403712u64,
+	6190792064u64, 6199176064u64, 6207569792u64, 6215952256u64, 6224345216u64,
+	6232732544u64, 6241124224u64, 6249510272u64, 6257899136u64, 6266287744u64,
+	6274676864u64, 6283065728u64, 6291454336u64, 6299843456u64, 6308232064u64,
+	6316620928u64, 6325006208u64, 6333395584u64, 6341784704u64, 6350174848u64,
+	6358562176u64, 6366951296u64, 6375337856u64, 6383729536u64, 6392119168u64,
+	6400504192u64, 6408895616u64, 6417283456u64, 6425673344u64, 6434059136u64,
+	6442444672u64, 6450837376u64, 6459223424u64, 6467613056u64, 6476004224u64,
+	6484393088u64, 6492781952u64, 6501170048u64, 6509555072u64, 6517947008u64,
+	6526336384u64, 6534725504u64, 6543112832u64, 6551500672u64, 6559888768u64,
+	6568278656u64, 6576662912u64, 6585055616u64, 6593443456u64, 6601834112u64,
+	6610219648u64, 6618610304u64, 6626999168u64, 6635385472u64, 6643777408u64,
+	6652164224u64, 6660552832u64, 6668941952u64, 6677330048u64, 6685719424u64,
+	6694107776u64, 6702493568u64, 6710882176u64, 6719274112u64, 6727662976u64,
+	6736052096u64, 6744437632u64, 6752825984u64, 6761213824u64, 6769604224u64,
+	6777993856u64, 6786383488u64, 6794770816u64, 6803158144u64, 6811549312u64,
+	6819937664u64, 6828326528u64, 6836706176u64, 6845101696u64, 6853491328u64,
+	6861880448u64, 6870269312u64, 6878655104u64, 6887046272u64, 6895433344u64,
+	6903822208u64, 6912212864u64, 6920596864u64, 6928988288u64, 6937377152u64,
+	6945764992u64, 6954149248u64, 6962544256u64, 6970928768u64, 6979317376u64,
+	6987709312u64, 6996093824u64, 7004487296u64, 7012875392u64, 7021258624u64,
+	7029652352u64, 7038038912u64, 7046427776u64, 7054818944u64, 7063207808u64,
+	7071595136u64, 7079980928u64, 7088372608u64, 7096759424u64, 7105149824u64,
+	7113536896u64, 7121928064u64, 7130315392u64, 7138699648u64, 7147092352u64,
+	7155479168u64, 7163865728u64, 7172249984u64, 7180648064u64, 7189036672u64,
+	7197424768u64, 7205810816u64, 7214196608u64, 7222589824u64, 7230975104u64,
+	7239367552u64, 7247755904u64, 7256145536u64, 7264533376u64, 7272921472u64,
+	7281308032u64, 7289694848u64, 7298088832u64, 7306471808u64, 7314864512u64,
+	7323253888u64, 7331643008u64, 7340029568u64, 7348419712u64, 7356808832u64,
+	7365196672u64, 7373585792u64, 7381973888u64, 7390362752u64, 7398750592u64,
+	7407138944u64, 7415528576u64, 7423915648u64, 7432302208u64, 7440690304u64,
+	7449080192u64, 7457472128u64, 7465860992u64, 7474249088u64, 7482635648u64,
+	7491023744u64, 7499412608u64, 7507803008u64, 7516192384u64, 7524579968u64,
+	7532967296u64, 7541358464u64, 7549745792u64, 7558134656u64, 7566524032u64,
+	7574912896u64, 7583300992u64, 7591690112u64, 7600075136u64, 7608466816u64,
+	7616854912u64, 7625244544u64, 7633629824u64, 7642020992u64, 7650410368u64,
+	7658794112u64, 7667187328u64, 7675574912u64, 7683961984u64, 7692349568u64,
+	7700739712u64, 7709130368u64, 7717519232u64, 7725905536u64, 7734295424u64,
+	7742683264u64, 7751069056u64, 7759457408u64, 7767849088u64, 7776238208u64,
+	7784626816u64, 7793014912u64, 7801405312u64, 7809792128u64, 7818179968u64,
+	7826571136u64, 7834957184u64, 7843347328u64, 7851732352u64, 7860124544u64,
+	7868512384u64, 7876902016u64, 7885287808u64, 7893679744u64, 7902067072u64,
+	7910455936u64, 7918844288u64, 7927230848u64, 7935622784u64, 7944009344u64,
+	7952400256u64, 7960786048u64, 7969176704u64, 7977565312u64, 7985953408u64,
+	7994339968u64, 8002730368u64, 8011119488u64, 8019508096u64, 8027896192u64,
+	8036285056u64, 8044674688u64, 8053062272u64, 8061448832u64, 8069838464u64,
+	8078227328u64, 8086616704u64, 8095006592u64, 8103393664u64, 8111783552u64,
+	8120171392u64, 8128560256u64, 8136949376u64, 8145336704u64, 8153726848u64,
+	8162114944u64, 8170503296u64, 8178891904u64, 8187280768u64, 8195669632u64,
+	8204058496u64, 8212444544u64, 8220834176u64, 8229222272u64, 8237612672u64,
+	8246000768u64, 8254389376u64, 8262775168u64, 8271167104u64, 8279553664u64,
+	8287944064u64, 8296333184u64, 8304715136u64, 8313108352u64, 8321497984u64,
+	8329885568u64, 8338274432u64, 8346663296u64, 8355052928u64, 8363441536u64,
+	8371828352u64, 8380217984u64, 8388606592u64, 8396996224u64, 8405384576u64,
+	8413772672u64, 8422161536u64, 8430549376u64, 8438939008u64, 8447326592u64,
+	8455715456u64, 8464104832u64, 8472492928u64, 8480882048u64, 8489270656u64,
+	8497659776u64, 8506045312u64, 8514434944u64, 8522823808u64, 8531208832u64,
+	8539602304u64, 8547990656u64, 8556378752u64, 8564768384u64, 8573154176u64,
+	8581542784u64, 8589933952u64, 8598322816u64, 8606705024u64, 8615099264u64,
+	8623487872u64, 8631876992u64, 8640264064u64, 8648653952u64, 8657040256u64,
+	8665430656u64, 8673820544u64, 8682209152u64, 8690592128u64, 8698977152u64,
+	8707374464u64, 8715763328u64, 8724151424u64, 8732540032u64, 8740928384u64,
+	8749315712u64, 8757704576u64, 8766089344u64, 8774480768u64, 8782871936u64,
+	8791260032u64, 8799645824u64, 8808034432u64, 8816426368u64, 8824812928u64,
+	8833199488u64, 8841591424u64, 8849976448u64, 8858366336u64, 8866757248u64,
+	8875147136u64, 8883532928u64, 8891923328u64, 8900306816u64, 8908700288u64,
+	8917088384u64, 8925478784u64, 8933867392u64, 8942250368u64, 8950644608u64,
+	8959032704u64, 8967420544u64, 8975809664u64, 8984197504u64, 8992584064u64,
+	9000976256u64, 9009362048u64, 9017752448u64, 9026141312u64, 9034530688u64,
+	9042917504u64, 9051307904u64, 9059694208u64, 9068084864u64, 9076471424u64,
+	9084861824u64, 9093250688u64, 9101638528u64, 9110027648u64, 9118416512u64,
+	9126803584u64, 9135188096u64, 9143581312u64, 9151969664u64, 9160356224u64,
+	9168747136u64, 9177134464u64, 9185525632u64, 9193910144u64, 9202302848u64,
+	9210690688u64, 9219079552u64, 9227465344u64, 9235854464u64, 9244244864u64,
+	9252633472u64, 9261021824u64, 9269411456u64, 9277799296u64, 9286188928u64,
+	9294574208u64, 9302965888u64, 9311351936u64, 9319740032u64, 9328131968u64,
+	9336516736u64, 9344907392u64, 9353296768u64, 9361685888u64, 9370074752u64,
+	9378463616u64, 9386849408u64, 9395239808u64, 9403629184u64, 9412016512u64,
+	9420405376u64, 9428795008u64, 9437181568u64, 9445570688u64, 9453960832u64,
+	9462346624u64, 9470738048u64, 9479121536u64, 9487515008u64, 9495903616u64,
+	9504289664u64, 9512678528u64, 9521067904u64, 9529456256u64, 9537843584u64,
+	9546233728u64, 9554621312u64, 9563011456u64, 9571398784u64, 9579788672u64,
+	9588178304u64, 9596567168u64, 9604954496u64, 9613343104u64, 9621732992u64,
+	9630121856u64, 9638508416u64, 9646898816u64, 9655283584u64, 9663675776u64,
+	9672061312u64, 9680449664u64, 9688840064u64, 9697230464u64, 9705617536u64,
+	9714003584u64, 9722393984u64, 9730772608u64, 9739172224u64, 9747561088u64,
+	9755945344u64, 9764338816u64, 9772726144u64, 9781116544u64, 9789503872u64,
+	9797892992u64, 9806282624u64, 9814670464u64, 9823056512u64, 9831439232u64,
+	9839833984u64, 9848224384u64, 9856613504u64, 9865000576u64, 9873391232u64,
+	9881772416u64, 9890162816u64, 9898556288u64, 9906940544u64, 9915333248u64,
+	9923721088u64, 9932108672u64, 9940496512u64, 9948888448u64, 9957276544u64,
+	9965666176u64, 9974048384u64, 9982441088u64, 9990830464u64, 9999219584u64,
+	10007602816u64, 10015996544u64, 10024385152u64, 10032774016u64, 10041163648u64,
+	10049548928u64, 10057940096u64, 10066329472u64, 10074717824u64, 10083105152u64,
+	10091495296u64, 10099878784u64, 10108272256u64, 10116660608u64, 10125049216u64,
+	10133437312u64, 10141825664u64, 10150213504u64, 10158601088u64, 10166991232u64,
+	10175378816u64, 10183766144u64, 10192157312u64, 10200545408u64, 10208935552u64,
+	10217322112u64, 10225712768u64, 10234099328u64, 10242489472u64, 10250876032u64,
+	10259264896u64, 10267656064u64, 10276042624u64, 10284429184u64, 10292820352u64,
+	10301209472u64, 10309598848u64, 10317987712u64, 10326375296u64, 10334763392u64,
+	10343153536u64, 10351541632u64, 10359930752u64, 10368318592u64, 10376707456u64,
+	10385096576u64, 10393484672u64, 10401867136u64, 10410262144u64, 10418647424u64,
+	10427039104u64, 10435425664u64, 10443810176u64, 10452203648u64, 10460589952u64,
+	10468982144u64, 10477369472u64, 10485759104u64, 10494147712u64, 10502533504u64,
+	10510923392u64, 10519313536u64, 10527702656u64, 10536091264u64, 10544478592u64,
+	10552867712u64, 10561255808u64, 10569642368u64, 10578032768u64, 10586423168u64,
+	10594805632u64, 10603200128u64, 10611588992u64, 10619976064u64, 10628361344u64,
+	10636754048u64, 10645143424u64, 10653531776u64, 10661920384u64, 10670307968u64,
+	10678696832u64, 10687086464u64, 10695475072u64, 10703863168u64, 10712246144u64,
+	10720639616u64, 10729026688u64, 10737414784u64, 10745806208u64, 10754190976u64,
+	10762581376u64, 10770971264u64, 10779356288u64, 10787747456u64, 10796135552u64,
+	10804525184u64, 10812915584u64, 10821301888u64, 10829692288u64, 10838078336u64,
+	10846469248u64, 10854858368u64, 10863247232u64, 10871631488u64, 10880023424u64,
+	10888412032u64, 10896799616u64, 10905188992u64, 10913574016u64, 10921964672u64,
+	10930352768u64, 10938742912u64, 10947132544u64, 10955518592u64, 10963909504u64,
+	10972298368u64, 10980687488u64, 10989074816u64, 10997462912u64, 11005851776u64,
+	11014241152u64, 11022627712u64, 11031017344u64, 11039403904u64, 11047793024u64,
+	11056184704u64, 11064570752u64, 11072960896u64, 11081343872u64, 11089737856u64,
+	11098128256u64, 11106514816u64, 11114904448u64, 11123293568u64, 11131680128u64,
+	11140065152u64, 11148458368u64, 11156845696u64, 11165236864u64, 11173624192u64,
+	11182013824u64, 11190402688u64, 11198790784u64, 11207179136u64, 11215568768u64,
+	11223957376u64, 11232345728u64, 11240734592u64, 11249122688u64, 11257511296u64,
+	11265899648u64, 11274285952u64, 11282675584u64, 11291065472u64, 11299452544u64,
+	11307842432u64, 11316231296u64, 11324616832u64, 11333009024u64, 11341395584u64,
+	11349782656u64, 11358172288u64, 11366560384u64, 11374950016u64, 11383339648u64,
+	11391721856u64, 11400117376u64, 11408504192u64, 11416893568u64, 11425283456u64,
+	11433671552u64, 11442061184u64, 11450444672u64, 11458837888u64, 11467226752u64,
+	11475611776u64, 11484003968u64, 11492392064u64, 11500780672u64, 11509169024u64,
+	11517550976u64, 11525944448u64, 11534335616u64, 11542724224u64, 11551111808u64,
+	11559500672u64, 11567890304u64, 11576277376u64, 11584667008u64, 11593056128u64,
+	11601443456u64, 11609830016u64, 11618221952u64, 11626607488u64, 11634995072u64,
+	11643387776u64, 11651775104u64, 11660161664u64, 11668552576u64, 11676940928u64,
+	11685330304u64, 11693718656u64, 11702106496u64, 11710496128u64, 11718882688u64,
+	11727273088u64, 11735660416u64, 11744050048u64, 11752437376u64, 11760824704u64,
+	11769216128u64, 11777604736u64, 11785991296u64, 11794381952u64, 11802770048u64,
+	11811157888u64, 11819548544u64, 11827932544u64, 11836324736u64, 11844713344u64,
+	11853100928u64, 11861486464u64, 11869879936u64, 11878268032u64, 11886656896u64,
+	11895044992u64, 11903433088u64, 11911822976u64, 11920210816u64, 11928600448u64,
+	11936987264u64, 11945375872u64, 11953761152u64, 11962151296u64, 11970543488u64,
+	11978928512u64, 11987320448u64, 11995708288u64, 12004095104u64, 12012486272u64,
+	12020875136u64, 12029255552u64, 12037652096u64, 12046039168u64, 12054429568u64,
+	12062813824u64, 12071206528u64, 12079594624u64, 12087983744u64, 12096371072u64,
+	12104759936u64, 12113147264u64, 12121534592u64, 12129924992u64, 12138314624u64,
+	12146703232u64, 12155091584u64, 12163481216u64, 12171864704u64, 12180255872u64,
+	12188643968u64, 12197034112u64, 12205424512u64, 12213811328u64, 12222199424u64,
+	12230590336u64, 12238977664u64, 12247365248u64, 12255755392u64, 12264143488u64,
+	12272531584u64, 12280920448u64, 12289309568u64, 12297694592u64, 12306086528u64,
+	12314475392u64, 12322865024u64, 12331253632u64, 12339640448u64, 12348029312u64,
+	12356418944u64, 12364805248u64, 12373196672u64, 12381580928u64, 12389969024u64,
+	12398357632u64, 12406750592u64, 12415138432u64, 12423527552u64, 12431916416u64,
+	12440304512u64, 12448692352u64, 12457081216u64, 12465467776u64, 12473859968u64,
+	12482245504u64, 12490636672u64, 12499025536u64, 12507411584u64, 12515801728u64,
+	12524190592u64, 12532577152u64, 12540966272u64, 12549354368u64, 12557743232u64,
+	12566129536u64, 12574523264u64, 12582911872u64, 12591299456u64, 12599688064u64,
+	12608074624u64, 12616463488u64, 12624845696u64, 12633239936u64, 12641631616u64,
+	12650019968u64, 12658407296u64, 12666795136u64, 12675183232u64, 12683574656u64,
+	12691960192u64, 12700350592u64, 12708740224u64, 12717128576u64, 12725515904u64,
+	12733906816u64, 12742295168u64, 12750680192u64, 12759071872u64, 12767460736u64,
+	12775848832u64, 12784236928u64, 12792626816u64, 12801014656u64, 12809404288u64,
+	12817789312u64, 12826181504u64, 12834568832u64, 12842954624u64, 12851345792u64,
+	12859732352u64, 12868122496u64, 12876512128u64, 12884901248u64, 12893289088u64,
+	12901672832u64, 12910067584u64, 12918455168u64, 12926842496u64, 12935232896u64,
+	12943620736u64, 12952009856u64, 12960396928u64, 12968786816u64, 12977176192u64,
+	12985563776u64, 12993951104u64, 13002341504u64, 13010730368u64, 13019115392u64,
+	13027506304u64, 13035895168u64, 13044272512u64, 13052673152u64, 13061062528u64,
+	13069446272u64, 13077838976u64, 13086227072u64, 13094613632u64, 13103000192u64,
+	13111393664u64, 13119782528u64, 13128157568u64, 13136559232u64, 13144945024u64,
+	13153329536u64, 13161724288u64, 13170111872u64, 13178502784u64, 13186884736u64,
+	13195279744u64, 13203667072u64, 13212057472u64, 13220445824u64, 13228832128u64,
+	13237221248u64, 13245610624u64, 13254000512u64, 13262388352u64, 13270777472u64,
+	13279166336u64, 13287553408u64, 13295943296u64, 13304331904u64, 13312719488u64,
+	13321108096u64, 13329494656u64, 13337885824u64, 13346274944u64, 13354663808u64,
+	13363051136u64, 13371439232u64, 13379825024u64, 13388210816u64, 13396605056u64,
+	13404995456u64, 13413380224u64, 13421771392u64, 13430159744u64, 13438546048u64,
+	13446937216u64, 13455326848u64, 13463708288u64, 13472103808u64, 13480492672u64,
+	13488875648u64, 13497269888u64, 13505657728u64, 13514045312u64, 13522435712u64,
+	13530824576u64, 13539210112u64, 13547599232u64, 13555989376u64, 13564379008u64,
+	13572766336u64, 13581154432u64, 13589544832u64, 13597932928u64, 13606320512u64,
+	13614710656u64, 13623097472u64, 13631477632u64, 13639874944u64, 13648264064u64,
+	13656652928u64, 13665041792u64, 13673430656u64, 13681818496u64, 13690207616u64,
+	13698595712u64, 13706982272u64, 13715373184u64, 13723762048u64, 13732150144u64,
+	13740536704u64, 13748926592u64, 13757316224u64, 13765700992u64, 13774090112u64,
+	13782477952u64, 13790869376u64, 13799259008u64, 13807647872u64, 13816036736u64,
+	13824425344u64, 13832814208u64, 13841202304u64, 13849591424u64, 13857978752u64,
+	13866368896u64, 13874754688u64, 13883145344u64, 13891533184u64, 13899919232u64,
+	13908311168u64, 13916692096u64, 13925085056u64, 13933473152u64, 13941866368u64,
+	13950253696u64, 13958643584u64, 13967032192u64, 13975417216u64, 13983807616u64,
+	13992197504u64, 14000582272u64, 14008973696u64, 14017363072u64, 14025752192u64,
+	14034137984u64, 14042528384u64, 14050918016u64, 14059301504u64, 14067691648u64,
+	14076083584u64, 14084470144u64, 14092852352u64, 14101249664u64, 14109635968u64,
+	14118024832u64, 14126407552u64, 14134804352u64, 14143188608u64, 14151577984u64,
+	14159968384u64, 14168357248u64, 14176741504u64, 14185127296u64, 14193521024u64,
+	14201911424u64, 14210301824u64, 14218685056u64, 14227067264u64, 14235467392u64,
+	14243855488u64, 14252243072u64, 14260630144u64, 14269021568u64, 14277409408u64,
+	14285799296u64, 14294187904u64, 14302571392u64, 14310961792u64, 14319353728u64,
+	14327738752u64, 14336130944u64, 14344518784u64, 14352906368u64, 14361296512u64,
+	14369685376u64, 14378071424u64, 14386462592u64, 14394848128u64, 14403230848u64,
+	14411627392u64, 14420013952u64, 14428402304u64, 14436793472u64, 14445181568u64,
+	14453569664u64, 14461959808u64, 14470347904u64, 14478737024u64, 14487122816u64,
+	14495511424u64, 14503901824u64, 14512291712u64, 14520677504u64, 14529064832u64,
+	14537456768u64, 14545845632u64, 14554234496u64, 14562618496u64, 14571011456u64,
+	14579398784u64, 14587789184u64, 14596172672u64, 14604564608u64, 14612953984u64,
+	14621341312u64, 14629724288u64, 14638120832u64, 14646503296u64, 14654897536u64,
+	14663284864u64, 14671675264u64, 14680061056u64, 14688447616u64, 14696835968u64,
+	14705228416u64, 14713616768u64, 14722003328u64, 14730392192u64, 14738784128u64,
+	14747172736u64, 14755561088u64, 14763947648u64, 14772336512u64, 14780725376u64,
+	14789110144u64, 14797499776u64, 14805892736u64, 14814276992u64, 14822670208u64,
+	14831056256u64, 14839444352u64, 14847836032u64, 14856222848u64, 14864612992u64,
+	14872997504u64, 14881388672u64, 14889775744u64, 14898165376u64, 14906553472u64,
+	14914944896u64, 14923329664u64, 14931721856u64, 14940109696u64, 14948497024u64,
+	14956887424u64, 14965276544u64, 14973663616u64, 14982053248u64, 14990439808u64,
+	14998830976u64, 15007216768u64, 15015605888u64, 15023995264u64, 15032385152u64,
+	15040768384u64, 15049154944u64, 15057549184u64, 15065939072u64, 15074328448u64,
+	15082715008u64, 15091104128u64, 15099493504u64, 15107879296u64, 15116269184u64,
+	15124659584u64, 15133042304u64, 15141431936u64, 15149824384u64, 15158214272u64,
+	15166602368u64, 15174991232u64, 15183378304u64, 15191760512u64, 15200154496u64,
+	15208542592u64, 15216931712u64, 15225323392u64, 15233708416u64, 15242098048u64,
+	15250489216u64, 15258875264u64, 15267265408u64, 15275654528u64, 15284043136u64,
+	15292431488u64, 15300819584u64, 15309208192u64, 15317596544u64, 15325986176u64,
+	15334374784u64, 15342763648u64, 15351151744u64, 15359540608u64, 15367929728u64,
+	15376318336u64, 15384706432u64, 15393092992u64, 15401481856u64, 15409869952u64,
+	15418258816u64, 15426649984u64, 15435037568u64, 15443425664u64, 15451815296u64,
+	15460203392u64, 15468589184u64, 15476979328u64, 15485369216u64, 15493755776u64,
+	15502146944u64, 15510534272u64, 15518924416u64, 15527311232u64, 15535699072u64,
+	15544089472u64, 15552478336u64, 15560866688u64, 15569254528u64, 15577642624u64,
+	15586031488u64, 15594419072u64, 15602809472u64, 15611199104u64, 15619586432u64,
+	15627975296u64, 15636364928u64, 15644753792u64, 15653141888u64, 15661529216u64,
+	15669918848u64, 15678305152u64, 15686696576u64, 15695083136u64, 15703474048u64,
+	15711861632u64, 15720251264u64, 15728636288u64, 15737027456u64, 15745417088u64,
+	15753804928u64, 15762194048u64, 15770582656u64, 15778971008u64, 15787358336u64,
+	15795747712u64, 15804132224u64, 15812523392u64, 15820909696u64, 15829300096u64,
+	15837691264u64, 15846071936u64, 15854466944u64, 15862855808u64, 15871244672u64,
+	15879634816u64, 15888020608u64, 15896409728u64, 15904799104u64, 15913185152u64,
+	15921577088u64, 15929966464u64, 15938354816u64, 15946743424u64, 15955129472u64,
+	15963519872u64, 15971907968u64, 15980296064u64, 15988684928u64, 15997073024u64,
+	16005460864u64, 16013851264u64, 16022241152u64, 16030629248u64, 16039012736u64,
+	16047406976u64, 16055794816u64, 16064181376u64, 16072571264u64, 16080957824u64,
+	16089346688u64, 16097737856u64, 16106125184u64, 16114514816u64, 16122904192u64,
+	16131292544u64, 16139678848u64, 16148066944u64, 16156453504u64, 16164839552u64,
+	16173236096u64, 16181623424u64, 16190012032u64, 16198401152u64, 16206790528u64,
+	16215177344u64, 16223567744u64, 16231956352u64, 16240344704u64, 16248731008u64,
+	16257117824u64, 16265504384u64, 16273898624u64, 16282281856u64, 16290668672u64,
+	16299064192u64, 16307449216u64, 16315842176u64, 16324230016u64, 16332613504u64,
+	16341006464u64, 16349394304u64, 16357783168u64, 16366172288u64, 16374561664u64,
+	16382951296u64, 16391337856u64, 16399726208u64, 16408116352u64, 16416505472u64,
+	16424892032u64, 16433282176u64, 16441668224u64, 16450058624u64, 16458448768u64,
+	16466836864u64, 16475224448u64, 16483613056u64, 16492001408u64, 16500391808u64,
+	16508779648u64, 16517166976u64, 16525555328u64, 16533944192u64, 16542330752u64,
+	16550719616u64, 16559110528u64, 16567497088u64, 16575888512u64, 16584274816u64,
+	16592665472u64, 16601051008u64, 16609442944u64, 16617832064u64, 16626218624u64,
+	16634607488u64, 16642996096u64, 16651385728u64, 16659773824u64, 16668163712u64,
+	16676552576u64, 16684938112u64, 16693328768u64, 16701718144u64, 16710095488u64,
+	16718492288u64, 16726883968u64, 16735272832u64, 16743661184u64, 16752049792u64,
+	16760436608u64, 16768827008u64, 16777214336u64, 16785599104u64, 16793992832u64,
+	16802381696u64, 16810768768u64, 16819151744u64, 16827542656u64, 16835934848u64,
+	16844323712u64, 16852711552u64, 16861101952u64, 16869489536u64, 16877876864u64,
+	16886265728u64, 16894653056u64, 16903044736u64, 16911431296u64, 16919821696u64,
+	16928207488u64, 16936592768u64, 16944987776u64, 16953375616u64, 16961763968u64,
+	16970152832u64, 16978540928u64, 16986929536u64, 16995319168u64, 17003704448u64,
+	17012096896u64, 17020481152u64, 17028870784u64, 17037262208u64, 17045649536u64,
+	17054039936u64, 17062426496u64, 17070814336u64, 17079205504u64, 17087592064u64,
+	17095978112u64, 17104369024u64, 17112759424u64, 17121147776u64, 17129536384u64,
+	17137926016u64, 17146314368u64, 17154700928u64, 17163089792u64, 17171480192u64,
+	17179864192u64, 17188256896u64, 17196644992u64, 17205033856u64, 17213423488u64,
+	17221811072u64, 17230198912u64, 17238588032u64, 17246976896u64, 17255360384u64,
+	17263754624u64, 17272143232u64, 17280530048u64, 17288918912u64, 17297309312u64,
+	17305696384u64, 17314085504u64, 17322475136u64, 17330863744u64, 17339252096u64,
+	17347640192u64, 17356026496u64, 17364413824u64, 17372796544u64, 17381190016u64,
+	17389583488u64, 17397972608u64, 17406360704u64, 17414748544u64, 17423135872u64,
+	17431527296u64, 17439915904u64, 17448303232u64, 17456691584u64, 17465081728u64,
+	17473468288u64, 17481857408u64, 17490247552u64, 17498635904u64, 17507022464u64,
+	17515409024u64, 17523801728u64, 17532189824u64, 17540577664u64, 17548966016u64,
+	17557353344u64, 17565741184u64, 17574131584u64, 17582519168u64, 17590907008u64,
+	17599296128u64, 17607687808u64, 17616076672u64, 17624455808u64, 17632852352u64,
+	17641238656u64, 17649630848u64, 17658018944u64, 17666403968u64, 17674794112u64,
+	17683178368u64, 17691573376u64, 17699962496u64, 17708350592u64, 17716739968u64,
+	17725126528u64, 17733517184u64, 17741898112u64, 17750293888u64, 17758673024u64,
+	17767070336u64, 17775458432u64, 17783848832u64, 17792236928u64, 17800625536u64,
+	17809012352u64, 17817402752u64, 17825785984u64, 17834178944u64, 17842563968u64,
+	17850955648u64, 17859344512u64, 17867732864u64, 17876119424u64, 17884511872u64,
+	17892900224u64, 17901287296u64, 17909677696u64, 17918058112u64, 17926451072u64,
+	17934843776u64, 17943230848u64, 17951609216u64, 17960008576u64, 17968397696u64,
+	17976784256u64, 17985175424u64, 17993564032u64, 18001952128u64, 18010339712u64,
+	18018728576u64, 18027116672u64, 18035503232u64, 18043894144u64, 18052283264u64,
+	18060672128u64, 18069056384u64, 18077449856u64, 18085837184u64, 18094225792u64,
+	18102613376u64, 18111004544u64, 18119388544u64, 18127781248u64, 18136170368u64,
+	18144558976u64, 18152947328u64, 18161336192u64, 18169724288u64, 18178108544u64,
+	18186498944u64, 18194886784u64, 18203275648u64, 18211666048u64, 18220048768u64,
+	18228444544u64, 18236833408u64, 18245220736u64
+];
+
+// Generated with the following Mathematica Code:
+
+// GetCacheSizes[n_] := Module[{
+//         DataSetSizeBytesInit = 2^30,
+//         MixBytes = 128,
+//         DataSetGrowth = 2^23,
+//         HashBytes = 64,
+//         CacheMultiplier = 1024,
+//         j = 0},
+//     Reap[
+//       While[j < n,
+//        Module[{i = Floor[(DataSetSizeBytesInit + DataSetGrowth * j) / (CacheMultiplier * HashBytes)]},
+//         While[! PrimeQ[i], i--];
+//         Sow[i*HashBytes]; j++]]]][[2]][[1]]
+pub const CACHE_SIZES: [u64; 2048] = [
+	16776896u64, 16907456u64, 17039296u64, 17170112u64, 17301056u64, 17432512u64, 17563072u64,
+	17693888u64, 17824192u64, 17955904u64, 18087488u64, 18218176u64, 18349504u64, 18481088u64,
+	18611392u64, 18742336u64, 18874304u64, 19004224u64, 19135936u64, 19267264u64, 19398208u64,
+	19529408u64, 19660096u64, 19791424u64, 19922752u64, 20053952u64, 20184896u64, 20315968u64,
+	20446912u64, 20576576u64, 20709184u64, 20840384u64, 20971072u64, 21102272u64, 21233216u64,
+	21364544u64, 21494848u64, 21626816u64, 21757376u64, 21887552u64, 22019392u64, 22151104u64,
+	22281536u64, 22412224u64, 22543936u64, 22675264u64, 22806464u64, 22935872u64, 23068096u64,
+	23198272u64, 23330752u64, 23459008u64, 23592512u64, 23723968u64, 23854912u64, 23986112u64,
+	24116672u64, 24247616u64, 24378688u64, 24509504u64, 24640832u64, 24772544u64, 24903488u64,
+	25034432u64, 25165376u64, 25296704u64, 25427392u64, 25558592u64, 25690048u64, 25820096u64,
+	25951936u64, 26081728u64, 26214208u64, 26345024u64, 26476096u64, 26606656u64, 26737472u64,
+	26869184u64, 26998208u64, 27131584u64, 27262528u64, 27393728u64, 27523904u64, 27655744u64,
+	27786688u64, 27917888u64, 28049344u64, 28179904u64, 28311488u64, 28441792u64, 28573504u64,
+	28700864u64, 28835648u64, 28966208u64, 29096768u64, 29228608u64, 29359808u64, 29490752u64,
+	29621824u64, 29752256u64, 29882816u64, 30014912u64, 30144448u64, 30273728u64, 30406976u64,
+	30538432u64, 30670784u64, 30799936u64, 30932672u64, 31063744u64, 31195072u64, 31325248u64,
+	31456192u64, 31588288u64, 31719232u64, 31850432u64, 31981504u64, 32110784u64, 32243392u64,
+	32372672u64, 32505664u64, 32636608u64, 32767808u64, 32897344u64, 33029824u64, 33160768u64,
+	33289664u64, 33423296u64, 33554368u64, 33683648u64, 33816512u64, 33947456u64, 34076992u64,
+	34208704u64, 34340032u64, 34471744u64, 34600256u64, 34734016u64, 34864576u64, 34993984u64,
+	35127104u64, 35258176u64, 35386688u64, 35518528u64, 35650624u64, 35782336u64, 35910976u64,
+	36044608u64, 36175808u64, 36305728u64, 36436672u64, 36568384u64, 36699968u64, 36830656u64,
+	36961984u64, 37093312u64, 37223488u64, 37355072u64, 37486528u64, 37617472u64, 37747904u64,
+	37879232u64, 38009792u64, 38141888u64, 38272448u64, 38403392u64, 38535104u64, 38660672u64,
+	38795584u64, 38925632u64, 39059264u64, 39190336u64, 39320768u64, 39452096u64, 39581632u64,
+	39713984u64, 39844928u64, 39974848u64, 40107968u64, 40238144u64, 40367168u64, 40500032u64,
+	40631744u64, 40762816u64, 40894144u64, 41023552u64, 41155904u64, 41286208u64, 41418304u64,
+	41547712u64, 41680448u64, 41811904u64, 41942848u64, 42073792u64, 42204992u64, 42334912u64,
+	42467008u64, 42597824u64, 42729152u64, 42860096u64, 42991552u64, 43122368u64, 43253696u64,
+	43382848u64, 43515712u64, 43646912u64, 43777088u64, 43907648u64, 44039104u64, 44170432u64,
+	44302144u64, 44433344u64, 44564288u64, 44694976u64, 44825152u64, 44956864u64, 45088448u64,
+	45219008u64, 45350464u64, 45481024u64, 45612608u64, 45744064u64, 45874496u64, 46006208u64,
+	46136768u64, 46267712u64, 46399424u64, 46529344u64, 46660672u64, 46791488u64, 46923328u64,
+	47053504u64, 47185856u64, 47316928u64, 47447872u64, 47579072u64, 47710144u64, 47839936u64,
+	47971648u64, 48103232u64, 48234176u64, 48365248u64, 48496192u64, 48627136u64, 48757312u64,
+	48889664u64, 49020736u64, 49149248u64, 49283008u64, 49413824u64, 49545152u64, 49675712u64,
+	49807168u64, 49938368u64, 50069056u64, 50200256u64, 50331584u64, 50462656u64, 50593472u64,
+	50724032u64, 50853952u64, 50986048u64, 51117632u64, 51248576u64, 51379904u64, 51510848u64,
+	51641792u64, 51773248u64, 51903296u64, 52035136u64, 52164032u64, 52297664u64, 52427968u64,
+	52557376u64, 52690112u64, 52821952u64, 52952896u64, 53081536u64, 53213504u64, 53344576u64,
+	53475776u64, 53608384u64, 53738816u64, 53870528u64, 54000832u64, 54131776u64, 54263744u64,
+	54394688u64, 54525248u64, 54655936u64, 54787904u64, 54918592u64, 55049152u64, 55181248u64,
+	55312064u64, 55442752u64, 55574336u64, 55705024u64, 55836224u64, 55967168u64, 56097856u64,
+	56228672u64, 56358592u64, 56490176u64, 56621888u64, 56753728u64, 56884928u64, 57015488u64,
+	57146816u64, 57278272u64, 57409216u64, 57540416u64, 57671104u64, 57802432u64, 57933632u64,
+	58064576u64, 58195264u64, 58326976u64, 58457408u64, 58588864u64, 58720192u64, 58849984u64,
+	58981696u64, 59113024u64, 59243456u64, 59375552u64, 59506624u64, 59637568u64, 59768512u64,
+	59897792u64, 60030016u64, 60161984u64, 60293056u64, 60423872u64, 60554432u64, 60683968u64,
+	60817216u64, 60948032u64, 61079488u64, 61209664u64, 61341376u64, 61471936u64, 61602752u64,
+	61733696u64, 61865792u64, 61996736u64, 62127808u64, 62259136u64, 62389568u64, 62520512u64,
+	62651584u64, 62781632u64, 62910784u64, 63045056u64, 63176128u64, 63307072u64, 63438656u64,
+	63569216u64, 63700928u64, 63831616u64, 63960896u64, 64093888u64, 64225088u64, 64355392u64,
+	64486976u64, 64617664u64, 64748608u64, 64879424u64, 65009216u64, 65142464u64, 65273792u64,
+	65402816u64, 65535424u64, 65666752u64, 65797696u64, 65927744u64, 66060224u64, 66191296u64,
+	66321344u64, 66453056u64, 66584384u64, 66715328u64, 66846656u64, 66977728u64, 67108672u64,
+	67239104u64, 67370432u64, 67501888u64, 67631296u64, 67763776u64, 67895104u64, 68026304u64,
+	68157248u64, 68287936u64, 68419264u64, 68548288u64, 68681408u64, 68811968u64, 68942912u64,
+	69074624u64, 69205568u64, 69337024u64, 69467584u64, 69599168u64, 69729472u64, 69861184u64,
+	69989824u64, 70122944u64, 70253888u64, 70385344u64, 70515904u64, 70647232u64, 70778816u64,
+	70907968u64, 71040832u64, 71171648u64, 71303104u64, 71432512u64, 71564992u64, 71695168u64,
+	71826368u64, 71958464u64, 72089536u64, 72219712u64, 72350144u64, 72482624u64, 72613568u64,
+	72744512u64, 72875584u64, 73006144u64, 73138112u64, 73268672u64, 73400128u64, 73530944u64,
+	73662272u64, 73793344u64, 73924544u64, 74055104u64, 74185792u64, 74316992u64, 74448832u64,
+	74579392u64, 74710976u64, 74841664u64, 74972864u64, 75102784u64, 75233344u64, 75364544u64,
+	75497024u64, 75627584u64, 75759296u64, 75890624u64, 76021696u64, 76152256u64, 76283072u64,
+	76414144u64, 76545856u64, 76676672u64, 76806976u64, 76937792u64, 77070016u64, 77200832u64,
+	77331392u64, 77462464u64, 77593664u64, 77725376u64, 77856448u64, 77987776u64, 78118336u64,
+	78249664u64, 78380992u64, 78511424u64, 78642496u64, 78773056u64, 78905152u64, 79033664u64,
+	79166656u64, 79297472u64, 79429568u64, 79560512u64, 79690816u64, 79822784u64, 79953472u64,
+	80084672u64, 80214208u64, 80346944u64, 80477632u64, 80608576u64, 80740288u64, 80870848u64,
+	81002048u64, 81133504u64, 81264448u64, 81395648u64, 81525952u64, 81657536u64, 81786304u64,
+	81919808u64, 82050112u64, 82181312u64, 82311616u64, 82443968u64, 82573376u64, 82705984u64,
+	82835776u64, 82967744u64, 83096768u64, 83230528u64, 83359552u64, 83491264u64, 83622464u64,
+	83753536u64, 83886016u64, 84015296u64, 84147776u64, 84277184u64, 84409792u64, 84540608u64,
+	84672064u64, 84803008u64, 84934336u64, 85065152u64, 85193792u64, 85326784u64, 85458496u64,
+	85589312u64, 85721024u64, 85851968u64, 85982656u64, 86112448u64, 86244416u64, 86370112u64,
+	86506688u64, 86637632u64, 86769344u64, 86900672u64, 87031744u64, 87162304u64, 87293632u64,
+	87424576u64, 87555392u64, 87687104u64, 87816896u64, 87947968u64, 88079168u64, 88211264u64,
+	88341824u64, 88473152u64, 88603712u64, 88735424u64, 88862912u64, 88996672u64, 89128384u64,
+	89259712u64, 89390272u64, 89521984u64, 89652544u64, 89783872u64, 89914816u64, 90045376u64,
+	90177088u64, 90307904u64, 90438848u64, 90569152u64, 90700096u64, 90832832u64, 90963776u64,
+	91093696u64, 91223744u64, 91356992u64, 91486784u64, 91618496u64, 91749824u64, 91880384u64,
+	92012224u64, 92143552u64, 92273344u64, 92405696u64, 92536768u64, 92666432u64, 92798912u64,
+	92926016u64, 93060544u64, 93192128u64, 93322816u64, 93453632u64, 93583936u64, 93715136u64,
+	93845056u64, 93977792u64, 94109504u64, 94240448u64, 94371776u64, 94501184u64, 94632896u64,
+	94764224u64, 94895552u64, 95023424u64, 95158208u64, 95287744u64, 95420224u64, 95550016u64,
+	95681216u64, 95811904u64, 95943872u64, 96075328u64, 96203584u64, 96337856u64, 96468544u64,
+	96599744u64, 96731072u64, 96860992u64, 96992576u64, 97124288u64, 97254848u64, 97385536u64,
+	97517248u64, 97647808u64, 97779392u64, 97910464u64, 98041408u64, 98172608u64, 98303168u64,
+	98434496u64, 98565568u64, 98696768u64, 98827328u64, 98958784u64, 99089728u64, 99220928u64,
+	99352384u64, 99482816u64, 99614272u64, 99745472u64, 99876416u64, 100007104u64,
+	100138048u64, 100267072u64, 100401088u64, 100529984u64, 100662592u64, 100791872u64,
+	100925248u64, 101056064u64, 101187392u64, 101317952u64, 101449408u64, 101580608u64,
+	101711296u64, 101841728u64, 101973824u64, 102104896u64, 102235712u64, 102366016u64,
+	102498112u64, 102628672u64, 102760384u64, 102890432u64, 103021888u64, 103153472u64,
+	103284032u64, 103415744u64, 103545152u64, 103677248u64, 103808576u64, 103939648u64,
+	104070976u64, 104201792u64, 104332736u64, 104462528u64, 104594752u64, 104725952u64,
+	104854592u64, 104988608u64, 105118912u64, 105247808u64, 105381184u64, 105511232u64,
+	105643072u64, 105774784u64, 105903296u64, 106037056u64, 106167872u64, 106298944u64,
+	106429504u64, 106561472u64, 106691392u64, 106822592u64, 106954304u64, 107085376u64,
+	107216576u64, 107346368u64, 107478464u64, 107609792u64, 107739712u64, 107872192u64,
+	108003136u64, 108131392u64, 108265408u64, 108396224u64, 108527168u64, 108657344u64,
+	108789568u64, 108920384u64, 109049792u64, 109182272u64, 109312576u64, 109444928u64,
+	109572928u64, 109706944u64, 109837888u64, 109969088u64, 110099648u64, 110230976u64,
+	110362432u64, 110492992u64, 110624704u64, 110755264u64, 110886208u64, 111017408u64,
+	111148864u64, 111279296u64, 111410752u64, 111541952u64, 111673024u64, 111803456u64,
+	111933632u64, 112066496u64, 112196416u64, 112328512u64, 112457792u64, 112590784u64,
+	112715968u64, 112852672u64, 112983616u64, 113114944u64, 113244224u64, 113376448u64,
+	113505472u64, 113639104u64, 113770304u64, 113901376u64, 114031552u64, 114163264u64,
+	114294592u64, 114425536u64, 114556864u64, 114687424u64, 114818624u64, 114948544u64,
+	115080512u64, 115212224u64, 115343296u64, 115473472u64, 115605184u64, 115736128u64,
+	115867072u64, 115997248u64, 116128576u64, 116260288u64, 116391488u64, 116522944u64,
+	116652992u64, 116784704u64, 116915648u64, 117046208u64, 117178304u64, 117308608u64,
+	117440192u64, 117569728u64, 117701824u64, 117833024u64, 117964096u64, 118094656u64,
+	118225984u64, 118357312u64, 118489024u64, 118617536u64, 118749632u64, 118882112u64,
+	119012416u64, 119144384u64, 119275328u64, 119406016u64, 119537344u64, 119668672u64,
+	119798464u64, 119928896u64, 120061376u64, 120192832u64, 120321728u64, 120454336u64,
+	120584512u64, 120716608u64, 120848192u64, 120979136u64, 121109056u64, 121241408u64,
+	121372352u64, 121502912u64, 121634752u64, 121764416u64, 121895744u64, 122027072u64,
+	122157632u64, 122289088u64, 122421184u64, 122550592u64, 122682944u64, 122813888u64,
+	122945344u64, 123075776u64, 123207488u64, 123338048u64, 123468736u64, 123600704u64,
+	123731264u64, 123861952u64, 123993664u64, 124124608u64, 124256192u64, 124386368u64,
+	124518208u64, 124649024u64, 124778048u64, 124911296u64, 125041088u64, 125173696u64,
+	125303744u64, 125432896u64, 125566912u64, 125696576u64, 125829056u64, 125958592u64,
+	126090304u64, 126221248u64, 126352832u64, 126483776u64, 126615232u64, 126746432u64,
+	126876608u64, 127008704u64, 127139392u64, 127270336u64, 127401152u64, 127532224u64,
+	127663552u64, 127794752u64, 127925696u64, 128055232u64, 128188096u64, 128319424u64,
+	128449856u64, 128581312u64, 128712256u64, 128843584u64, 128973632u64, 129103808u64,
+	129236288u64, 129365696u64, 129498944u64, 129629888u64, 129760832u64, 129892288u64,
+	130023104u64, 130154048u64, 130283968u64, 130416448u64, 130547008u64, 130678336u64,
+	130807616u64, 130939456u64, 131071552u64, 131202112u64, 131331776u64, 131464384u64,
+	131594048u64, 131727296u64, 131858368u64, 131987392u64, 132120256u64, 132250816u64,
+	132382528u64, 132513728u64, 132644672u64, 132774976u64, 132905792u64, 133038016u64,
+	133168832u64, 133299392u64, 133429312u64, 133562048u64, 133692992u64, 133823296u64,
+	133954624u64, 134086336u64, 134217152u64, 134348608u64, 134479808u64, 134607296u64,
+	134741056u64, 134872384u64, 135002944u64, 135134144u64, 135265472u64, 135396544u64,
+	135527872u64, 135659072u64, 135787712u64, 135921472u64, 136052416u64, 136182848u64,
+	136313792u64, 136444864u64, 136576448u64, 136707904u64, 136837952u64, 136970048u64,
+	137099584u64, 137232064u64, 137363392u64, 137494208u64, 137625536u64, 137755712u64,
+	137887424u64, 138018368u64, 138149824u64, 138280256u64, 138411584u64, 138539584u64,
+	138672832u64, 138804928u64, 138936128u64, 139066688u64, 139196864u64, 139328704u64,
+	139460032u64, 139590208u64, 139721024u64, 139852864u64, 139984576u64, 140115776u64,
+	140245696u64, 140376512u64, 140508352u64, 140640064u64, 140769856u64, 140902336u64,
+	141032768u64, 141162688u64, 141294016u64, 141426496u64, 141556544u64, 141687488u64,
+	141819584u64, 141949888u64, 142080448u64, 142212544u64, 142342336u64, 142474432u64,
+	142606144u64, 142736192u64, 142868288u64, 142997824u64, 143129408u64, 143258944u64,
+	143392448u64, 143523136u64, 143653696u64, 143785024u64, 143916992u64, 144045632u64,
+	144177856u64, 144309184u64, 144440768u64, 144570688u64, 144701888u64, 144832448u64,
+	144965056u64, 145096384u64, 145227584u64, 145358656u64, 145489856u64, 145620928u64,
+	145751488u64, 145883072u64, 146011456u64, 146144704u64, 146275264u64, 146407232u64,
+	146538176u64, 146668736u64, 146800448u64, 146931392u64, 147062336u64, 147193664u64,
+	147324224u64, 147455936u64, 147586624u64, 147717056u64, 147848768u64, 147979456u64,
+	148110784u64, 148242368u64, 148373312u64, 148503232u64, 148635584u64, 148766144u64,
+	148897088u64, 149028416u64, 149159488u64, 149290688u64, 149420224u64, 149551552u64,
+	149683136u64, 149814976u64, 149943616u64, 150076352u64, 150208064u64, 150338624u64,
+	150470464u64, 150600256u64, 150732224u64, 150862784u64, 150993088u64, 151125952u64,
+	151254976u64, 151388096u64, 151519168u64, 151649728u64, 151778752u64, 151911104u64,
+	152042944u64, 152174144u64, 152304704u64, 152435648u64, 152567488u64, 152698816u64,
+	152828992u64, 152960576u64, 153091648u64, 153222976u64, 153353792u64, 153484096u64,
+	153616192u64, 153747008u64, 153878336u64, 154008256u64, 154139968u64, 154270912u64,
+	154402624u64, 154533824u64, 154663616u64, 154795712u64, 154926272u64, 155057984u64,
+	155188928u64, 155319872u64, 155450816u64, 155580608u64, 155712064u64, 155843392u64,
+	155971136u64, 156106688u64, 156237376u64, 156367424u64, 156499264u64, 156630976u64,
+	156761536u64, 156892352u64, 157024064u64, 157155008u64, 157284416u64, 157415872u64,
+	157545536u64, 157677248u64, 157810496u64, 157938112u64, 158071744u64, 158203328u64,
+	158334656u64, 158464832u64, 158596288u64, 158727616u64, 158858048u64, 158988992u64,
+	159121216u64, 159252416u64, 159381568u64, 159513152u64, 159645632u64, 159776192u64,
+	159906496u64, 160038464u64, 160169536u64, 160300352u64, 160430656u64, 160563008u64,
+	160693952u64, 160822208u64, 160956352u64, 161086784u64, 161217344u64, 161349184u64,
+	161480512u64, 161611456u64, 161742272u64, 161873216u64, 162002752u64, 162135872u64,
+	162266432u64, 162397888u64, 162529216u64, 162660032u64, 162790976u64, 162922048u64,
+	163052096u64, 163184576u64, 163314752u64, 163446592u64, 163577408u64, 163707968u64,
+	163839296u64, 163969984u64, 164100928u64, 164233024u64, 164364224u64, 164494912u64,
+	164625856u64, 164756672u64, 164887616u64, 165019072u64, 165150016u64, 165280064u64,
+	165412672u64, 165543104u64, 165674944u64, 165805888u64, 165936832u64, 166067648u64,
+	166198336u64, 166330048u64, 166461248u64, 166591552u64, 166722496u64, 166854208u64,
+	166985408u64, 167116736u64, 167246656u64, 167378368u64, 167508416u64, 167641024u64,
+	167771584u64, 167903168u64, 168034112u64, 168164032u64, 168295744u64, 168427456u64,
+	168557632u64, 168688448u64, 168819136u64, 168951616u64, 169082176u64, 169213504u64,
+	169344832u64, 169475648u64, 169605952u64, 169738048u64, 169866304u64, 169999552u64,
+	170131264u64, 170262464u64, 170393536u64, 170524352u64, 170655424u64, 170782016u64,
+	170917696u64, 171048896u64, 171179072u64, 171310784u64, 171439936u64, 171573184u64,
+	171702976u64, 171835072u64, 171966272u64, 172097216u64, 172228288u64, 172359232u64,
+	172489664u64, 172621376u64, 172747712u64, 172883264u64, 173014208u64, 173144512u64,
+	173275072u64, 173407424u64, 173539136u64, 173669696u64, 173800768u64, 173931712u64,
+	174063424u64, 174193472u64, 174325696u64, 174455744u64, 174586816u64, 174718912u64,
+	174849728u64, 174977728u64, 175109696u64, 175242688u64, 175374272u64, 175504832u64,
+	175636288u64, 175765696u64, 175898432u64, 176028992u64, 176159936u64, 176291264u64,
+	176422592u64, 176552512u64, 176684864u64, 176815424u64, 176946496u64, 177076544u64,
+	177209152u64, 177340096u64, 177470528u64, 177600704u64, 177731648u64, 177864256u64,
+	177994816u64, 178126528u64, 178257472u64, 178387648u64, 178518464u64, 178650176u64,
+	178781888u64, 178912064u64, 179044288u64, 179174848u64, 179305024u64, 179436736u64,
+	179568448u64, 179698496u64, 179830208u64, 179960512u64, 180092608u64, 180223808u64,
+	180354752u64, 180485696u64, 180617152u64, 180748096u64, 180877504u64, 181009984u64,
+	181139264u64, 181272512u64, 181402688u64, 181532608u64, 181663168u64, 181795136u64,
+	181926592u64, 182057536u64, 182190016u64, 182320192u64, 182451904u64, 182582336u64,
+	182713792u64, 182843072u64, 182976064u64, 183107264u64, 183237056u64, 183368384u64,
+	183494848u64, 183631424u64, 183762752u64, 183893824u64, 184024768u64, 184154816u64,
+	184286656u64, 184417984u64, 184548928u64, 184680128u64, 184810816u64, 184941248u64,
+	185072704u64, 185203904u64, 185335616u64, 185465408u64, 185596352u64, 185727296u64,
+	185859904u64, 185989696u64, 186121664u64, 186252992u64, 186383552u64, 186514112u64,
+	186645952u64, 186777152u64, 186907328u64, 187037504u64, 187170112u64, 187301824u64,
+	187429184u64, 187562048u64, 187693504u64, 187825472u64, 187957184u64, 188087104u64,
+	188218304u64, 188349376u64, 188481344u64, 188609728u64, 188743616u64, 188874304u64,
+	189005248u64, 189136448u64, 189265088u64, 189396544u64, 189528128u64, 189660992u64,
+	189791936u64, 189923264u64, 190054208u64, 190182848u64, 190315072u64, 190447424u64,
+	190577984u64, 190709312u64, 190840768u64, 190971328u64, 191102656u64, 191233472u64,
+	191364032u64, 191495872u64, 191626816u64, 191758016u64, 191888192u64, 192020288u64,
+	192148928u64, 192282176u64, 192413504u64, 192542528u64, 192674752u64, 192805952u64,
+	192937792u64, 193068608u64, 193198912u64, 193330496u64, 193462208u64, 193592384u64,
+	193723456u64, 193854272u64, 193985984u64, 194116672u64, 194247232u64, 194379712u64,
+	194508352u64, 194641856u64, 194772544u64, 194900672u64, 195035072u64, 195166016u64,
+	195296704u64, 195428032u64, 195558592u64, 195690304u64, 195818176u64, 195952576u64,
+	196083392u64, 196214336u64, 196345792u64, 196476736u64, 196607552u64, 196739008u64,
+	196869952u64, 197000768u64, 197130688u64, 197262784u64, 197394368u64, 197523904u64,
+	197656384u64, 197787584u64, 197916608u64, 198049472u64, 198180544u64, 198310208u64,
+	198442432u64, 198573632u64, 198705088u64, 198834368u64, 198967232u64, 199097792u64,
+	199228352u64, 199360192u64, 199491392u64, 199621696u64, 199751744u64, 199883968u64,
+	200014016u64, 200146624u64, 200276672u64, 200408128u64, 200540096u64, 200671168u64,
+	200801984u64, 200933312u64, 201062464u64, 201194944u64, 201326144u64, 201457472u64,
+	201588544u64, 201719744u64, 201850816u64, 201981632u64, 202111552u64, 202244032u64,
+	202374464u64, 202505152u64, 202636352u64, 202767808u64, 202898368u64, 203030336u64,
+	203159872u64, 203292608u64, 203423296u64, 203553472u64, 203685824u64, 203816896u64,
+	203947712u64, 204078272u64, 204208192u64, 204341056u64, 204472256u64, 204603328u64,
+	204733888u64, 204864448u64, 204996544u64, 205125568u64, 205258304u64, 205388864u64,
+	205517632u64, 205650112u64, 205782208u64, 205913536u64, 206044736u64, 206176192u64,
+	206307008u64, 206434496u64, 206569024u64, 206700224u64, 206831168u64, 206961856u64,
+	207093056u64, 207223616u64, 207355328u64, 207486784u64, 207616832u64, 207749056u64,
+	207879104u64, 208010048u64, 208141888u64, 208273216u64, 208404032u64, 208534336u64,
+	208666048u64, 208796864u64, 208927424u64, 209059264u64, 209189824u64, 209321792u64,
+	209451584u64, 209582656u64, 209715136u64, 209845568u64, 209976896u64, 210106432u64,
+	210239296u64, 210370112u64, 210501568u64, 210630976u64, 210763712u64, 210894272u64,
+	211024832u64, 211156672u64, 211287616u64, 211418176u64, 211549376u64, 211679296u64,
+	211812032u64, 211942592u64, 212074432u64, 212204864u64, 212334016u64, 212467648u64,
+	212597824u64, 212727616u64, 212860352u64, 212991424u64, 213120832u64, 213253952u64,
+	213385024u64, 213515584u64, 213645632u64, 213777728u64, 213909184u64, 214040128u64,
+	214170688u64, 214302656u64, 214433728u64, 214564544u64, 214695232u64, 214826048u64,
+	214956992u64, 215089088u64, 215219776u64, 215350592u64, 215482304u64, 215613248u64,
+	215743552u64, 215874752u64, 216005312u64, 216137024u64, 216267328u64, 216399296u64,
+	216530752u64, 216661696u64, 216790592u64, 216923968u64, 217054528u64, 217183168u64,
+	217316672u64, 217448128u64, 217579072u64, 217709504u64, 217838912u64, 217972672u64,
+	218102848u64, 218233024u64, 218364736u64, 218496832u64, 218627776u64, 218759104u64,
+	218888896u64, 219021248u64, 219151936u64, 219281728u64, 219413056u64, 219545024u64,
+	219675968u64, 219807296u64, 219938624u64, 220069312u64, 220200128u64, 220331456u64,
+	220461632u64, 220592704u64, 220725184u64, 220855744u64, 220987072u64, 221117888u64,
+	221249216u64, 221378368u64, 221510336u64, 221642048u64, 221772736u64, 221904832u64,
+	222031808u64, 222166976u64, 222297536u64, 222428992u64, 222559936u64, 222690368u64,
+	222820672u64, 222953152u64, 223083968u64, 223213376u64, 223345984u64, 223476928u64,
+	223608512u64, 223738688u64, 223869376u64, 224001472u64, 224132672u64, 224262848u64,
+	224394944u64, 224524864u64, 224657344u64, 224788288u64, 224919488u64, 225050432u64,
+	225181504u64, 225312704u64, 225443776u64, 225574592u64, 225704768u64, 225834176u64,
+	225966784u64, 226097216u64, 226229824u64, 226360384u64, 226491712u64, 226623424u64,
+	226754368u64, 226885312u64, 227015104u64, 227147456u64, 227278528u64, 227409472u64,
+	227539904u64, 227669696u64, 227802944u64, 227932352u64, 228065216u64, 228196288u64,
+	228326464u64, 228457792u64, 228588736u64, 228720064u64, 228850112u64, 228981056u64,
+	229113152u64, 229243328u64, 229375936u64, 229505344u64, 229636928u64, 229769152u64,
+	229894976u64, 230030272u64, 230162368u64, 230292416u64, 230424512u64, 230553152u64,
+	230684864u64, 230816704u64, 230948416u64, 231079616u64, 231210944u64, 231342016u64,
+	231472448u64, 231603776u64, 231733952u64, 231866176u64, 231996736u64, 232127296u64,
+	232259392u64, 232388672u64, 232521664u64, 232652608u64, 232782272u64, 232914496u64,
+	233043904u64, 233175616u64, 233306816u64, 233438528u64, 233569984u64, 233699776u64,
+	233830592u64, 233962688u64, 234092224u64, 234221888u64, 234353984u64, 234485312u64,
+	234618304u64, 234749888u64, 234880832u64, 235011776u64, 235142464u64, 235274048u64,
+	235403456u64, 235535936u64, 235667392u64, 235797568u64, 235928768u64, 236057152u64,
+	236190272u64, 236322752u64, 236453312u64, 236583616u64, 236715712u64, 236846528u64,
+	236976448u64, 237108544u64, 237239104u64, 237371072u64, 237501632u64, 237630784u64,
+	237764416u64, 237895232u64, 238026688u64, 238157632u64, 238286912u64, 238419392u64,
+	238548032u64, 238681024u64, 238812608u64, 238941632u64, 239075008u64, 239206336u64,
+	239335232u64, 239466944u64, 239599168u64, 239730496u64, 239861312u64, 239992384u64,
+	240122816u64, 240254656u64, 240385856u64, 240516928u64, 240647872u64, 240779072u64,
+	240909632u64, 241040704u64, 241171904u64, 241302848u64, 241433408u64, 241565248u64,
+	241696192u64, 241825984u64, 241958848u64, 242088256u64, 242220224u64, 242352064u64,
+	242481856u64, 242611648u64, 242744896u64, 242876224u64, 243005632u64, 243138496u64,
+	243268672u64, 243400384u64, 243531712u64, 243662656u64, 243793856u64, 243924544u64,
+	244054592u64, 244187072u64, 244316608u64, 244448704u64, 244580032u64, 244710976u64,
+	244841536u64, 244972864u64, 245104448u64, 245233984u64, 245365312u64, 245497792u64,
+	245628736u64, 245759936u64, 245889856u64, 246021056u64, 246152512u64, 246284224u64,
+	246415168u64, 246545344u64, 246675904u64, 246808384u64, 246939584u64, 247070144u64,
+	247199552u64, 247331648u64, 247463872u64, 247593536u64, 247726016u64, 247857088u64,
+	247987648u64, 248116928u64, 248249536u64, 248380736u64, 248512064u64, 248643008u64,
+	248773312u64, 248901056u64, 249036608u64, 249167552u64, 249298624u64, 249429184u64,
+	249560512u64, 249692096u64, 249822784u64, 249954112u64, 250085312u64, 250215488u64,
+	250345792u64, 250478528u64, 250608704u64, 250739264u64, 250870976u64, 251002816u64,
+	251133632u64, 251263552u64, 251395136u64, 251523904u64, 251657792u64, 251789248u64,
+	251919424u64, 252051392u64, 252182464u64, 252313408u64, 252444224u64, 252575552u64,
+	252706624u64, 252836032u64, 252968512u64, 253099712u64, 253227584u64, 253361728u64,
+	253493056u64, 253623488u64, 253754432u64, 253885504u64, 254017216u64, 254148032u64,
+	254279488u64, 254410432u64, 254541376u64, 254672576u64, 254803264u64, 254933824u64,
+	255065792u64, 255196736u64, 255326528u64, 255458752u64, 255589952u64, 255721408u64,
+	255851072u64, 255983296u64, 256114624u64, 256244416u64, 256374208u64, 256507712u64,
+	256636096u64, 256768832u64, 256900544u64, 257031616u64, 257162176u64, 257294272u64,
+	257424448u64, 257555776u64, 257686976u64, 257818432u64, 257949632u64, 258079552u64,
+	258211136u64, 258342464u64, 258473408u64, 258603712u64, 258734656u64, 258867008u64,
+	258996544u64, 259127744u64, 259260224u64, 259391296u64, 259522112u64, 259651904u64,
+	259784384u64, 259915328u64, 260045888u64, 260175424u64, 260308544u64, 260438336u64,
+	260570944u64, 260700992u64, 260832448u64, 260963776u64, 261092672u64, 261226304u64,
+	261356864u64, 261487936u64, 261619648u64, 261750592u64, 261879872u64, 262011968u64,
+	262143424u64, 262274752u64, 262404416u64, 262537024u64, 262667968u64, 262799296u64,
+	262928704u64, 263061184u64, 263191744u64, 263322944u64, 263454656u64, 263585216u64,
+	263716672u64, 263847872u64, 263978944u64, 264108608u64, 264241088u64, 264371648u64,
+	264501184u64, 264632768u64, 264764096u64, 264895936u64, 265024576u64, 265158464u64,
+	265287488u64, 265418432u64, 265550528u64, 265681216u64, 265813312u64, 265943488u64,
+	266075968u64, 266206144u64, 266337728u64, 266468032u64, 266600384u64, 266731072u64,
+	266862272u64, 266993344u64, 267124288u64, 267255616u64, 267386432u64, 267516992u64,
+	267648704u64, 267777728u64, 267910592u64, 268040512u64, 268172096u64, 268302784u64,
+	268435264u64, 268566208u64, 268696256u64, 268828096u64, 268959296u64, 269090368u64,
+	269221312u64, 269352256u64, 269482688u64, 269614784u64, 269745856u64, 269876416u64,
+	270007616u64, 270139328u64, 270270272u64, 270401216u64, 270531904u64, 270663616u64,
+	270791744u64, 270924736u64, 271056832u64, 271186112u64, 271317184u64, 271449536u64,
+	271580992u64, 271711936u64, 271843136u64, 271973056u64, 272105408u64, 272236352u64,
+	272367296u64, 272498368u64, 272629568u64, 272759488u64, 272891456u64, 273022784u64,
+	273153856u64, 273284672u64, 273415616u64, 273547072u64, 273677632u64, 273808448u64,
+	273937088u64, 274071488u64, 274200896u64, 274332992u64, 274463296u64, 274595392u64,
+	274726208u64, 274857536u64, 274988992u64, 275118656u64, 275250496u64, 275382208u64,
+	275513024u64, 275643968u64, 275775296u64, 275906368u64, 276037184u64, 276167872u64,
+	276297664u64, 276429376u64, 276560576u64, 276692672u64, 276822976u64, 276955072u64,
+	277085632u64, 277216832u64, 277347008u64, 277478848u64, 277609664u64, 277740992u64,
+	277868608u64, 278002624u64, 278134336u64, 278265536u64, 278395328u64, 278526784u64,
+	278657728u64, 278789824u64, 278921152u64, 279052096u64, 279182912u64, 279313088u64,
+	279443776u64, 279576256u64, 279706048u64, 279838528u64, 279969728u64, 280099648u64,
+	280230976u64, 280361408u64, 280493632u64, 280622528u64, 280755392u64, 280887104u64,
+	281018176u64, 281147968u64, 281278912u64, 281411392u64, 281542592u64, 281673152u64,
+	281803712u64, 281935552u64, 282066496u64, 282197312u64, 282329024u64, 282458816u64,
+	282590272u64, 282720832u64, 282853184u64, 282983744u64, 283115072u64, 283246144u64,
+	283377344u64, 283508416u64, 283639744u64, 283770304u64, 283901504u64, 284032576u64,
+	284163136u64, 284294848u64, 284426176u64, 284556992u64, 284687296u64, 284819264u64,
+	284950208u64, 285081536u64
+];
+
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -3,43 +3,27 @@ description = "Ethcore library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore"
-version = "1.2.0"
+version = "0.9.1"
 authors = ["Ethcore <admin@ethcore.io>"]
-build = "build.rs"
-
-[build-dependencies]
-syntex = "*"
-"ethcore-ipc-codegen" = { path = "../ipc/codegen" }

 [dependencies]
 log = "0.3"
 env_logger = "0.3"
 rustc-serialize = "0.3"
-heapsize = "0.3"
+rocksdb = "0.3"
+heapsize = "0.2.0"
 rust-crypto = "0.2.34"
 time = "0.1"
 ethcore-util = { path = "../util" }
 evmjit = { path = "../evmjit", optional = true }
 ethash = { path = "../ethash" }
 num_cpus = "0.2"
-clippy = { version = "0.0.77", optional = true}
-crossbeam = "0.2.9"
-lazy_static = "0.2"
-ethcore-devtools = { path = "../devtools" }
-ethjson = { path = "../json" }
-bloomchain = "0.1"
-"ethcore-ipc" = { path = "../ipc/rpc" }
-rayon = "0.3.1"
-ethstore = { path = "../ethstore" }
-
-[dependencies.hyper]
-git = "https://github.com/ethcore/hyper"
-default-features = false
+clippy = "0.0.41"
+crossbeam = "0.1.5"
+lazy_static = "0.1"

 [features]
 jit = ["evmjit"]
 evm-debug = []
 json-tests = []
 test-heavy = []
-dev = ["clippy"]
-default = []
--- a/ethcore/build.rs
+++ b/ethcore/build.rs
@@ -1,33 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 syntex;
-extern crate ethcore_ipc_codegen as codegen;
-
-use std::env;
-use std::path::Path;
-
-fn main() {
-	let out_dir = env::var_os("OUT_DIR").unwrap();
-	// serialization pass
-	{
-		let src = Path::new("src/types/mod.rs.in");
-		let dst = Path::new(&out_dir).join("types.rs");
-		let mut registry = syntex::Registry::new();
-		codegen::register(&mut registry);
-		registry.expand("", &src, &dst).unwrap();
-	}
-}
--- a/ethcore/res/ethereum/daohardfork_test.json
+++ b/ethcore/res/ethereum/daohardfork_test.json
@@ -1,162 +0,0 @@
-{
-	"name": "DAO hard-fork consensus test",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"gasLimitBoundDivisor": "0x0400",
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"blockReward": "0x4563918244F40000",
-				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"frontierCompatibilityModeLimit": "0x5",
-				"daoHardforkTransition": "0x8",
-				"daoHardforkBeneficiary": "0xbf4ed7b27f1d666546e30d74d50d173d20bca754",
-				"daoHardforkAccounts": [  
-					"0xd4fe7bc31cedb7bfb8a345f31e668033056b2728",
-					"0xb3fb0e5aba0e20e5c49d252dfd30e102b171a425",
-					"0x2c19c7f9ae8b751e37aeb2d93a699722395ae18f",
-					"0xecd135fa4f61a655311e86238c92adcd779555d2",
-					"0x1975bd06d486162d5dc297798dfc41edd5d160a7",
-					"0xa3acf3a1e16b1d7c315e23510fdd7847b48234f6",
-					"0x319f70bab6845585f412ec7724b744fec6095c85",
-					"0x06706dd3f2c9abf0a21ddcc6941d9b86f0596936",
-					"0x5c8536898fbb74fc7445814902fd08422eac56d0",
-					"0x6966ab0d485353095148a2155858910e0965b6f9",
-					"0x779543a0491a837ca36ce8c635d6154e3c4911a6",
-					"0x2a5ed960395e2a49b1c758cef4aa15213cfd874c",
-					"0x5c6e67ccd5849c0d29219c4f95f1a7a93b3f5dc5",
-					"0x9c50426be05db97f5d64fc54bf89eff947f0a321",
-					"0x200450f06520bdd6c527622a273333384d870efb",
-					"0xbe8539bfe837b67d1282b2b1d61c3f723966f049",
-					"0x6b0c4d41ba9ab8d8cfb5d379c69a612f2ced8ecb",
-					"0xf1385fb24aad0cd7432824085e42aff90886fef5",
-					"0xd1ac8b1ef1b69ff51d1d401a476e7e612414f091",
-					"0x8163e7fb499e90f8544ea62bbf80d21cd26d9efd",
-					"0x51e0ddd9998364a2eb38588679f0d2c42653e4a6",
-					"0x627a0a960c079c21c34f7612d5d230e01b4ad4c7",
-					"0xf0b1aa0eb660754448a7937c022e30aa692fe0c5",
-					"0x24c4d950dfd4dd1902bbed3508144a54542bba94",
-					"0x9f27daea7aca0aa0446220b98d028715e3bc803d",
-					"0xa5dc5acd6a7968a4554d89d65e59b7fd3bff0f90",
-					"0xd9aef3a1e38a39c16b31d1ace71bca8ef58d315b",
-					"0x63ed5a272de2f6d968408b4acb9024f4cc208ebf",
-					"0x6f6704e5a10332af6672e50b3d9754dc460dfa4d",
-					"0x77ca7b50b6cd7e2f3fa008e24ab793fd56cb15f6",
-					"0x492ea3bb0f3315521c31f273e565b868fc090f17",
-					"0x0ff30d6de14a8224aa97b78aea5388d1c51c1f00",
-					"0x9ea779f907f0b315b364b0cfc39a0fde5b02a416",
-					"0xceaeb481747ca6c540a000c1f3641f8cef161fa7",
-					"0xcc34673c6c40e791051898567a1222daf90be287",
-					"0x579a80d909f346fbfb1189493f521d7f48d52238",
-					"0xe308bd1ac5fda103967359b2712dd89deffb7973",
-					"0x4cb31628079fb14e4bc3cd5e30c2f7489b00960c",
-					"0xac1ecab32727358dba8962a0f3b261731aad9723",
-					"0x4fd6ace747f06ece9c49699c7cabc62d02211f75",
-					"0x440c59b325d2997a134c2c7c60a8c61611212bad",
-					"0x4486a3d68fac6967006d7a517b889fd3f98c102b",
-					"0x9c15b54878ba618f494b38f0ae7443db6af648ba",
-					"0x27b137a85656544b1ccb5a0f2e561a5703c6a68f",
-					"0x21c7fdb9ed8d291d79ffd82eb2c4356ec0d81241",
-					"0x23b75c2f6791eef49c69684db4c6c1f93bf49a50",
-					"0x1ca6abd14d30affe533b24d7a21bff4c2d5e1f3b",
-					"0xb9637156d330c0d605a791f1c31ba5890582fe1c",
-					"0x6131c42fa982e56929107413a9d526fd99405560",
-					"0x1591fc0f688c81fbeb17f5426a162a7024d430c2",
-					"0x542a9515200d14b68e934e9830d91645a980dd7a",
-					"0xc4bbd073882dd2add2424cf47d35213405b01324",
-					"0x782495b7b3355efb2833d56ecb34dc22ad7dfcc4",
-					"0x58b95c9a9d5d26825e70a82b6adb139d3fd829eb",
-					"0x3ba4d81db016dc2890c81f3acec2454bff5aada5",
-					"0xb52042c8ca3f8aa246fa79c3feaa3d959347c0ab",
-					"0xe4ae1efdfc53b73893af49113d8694a057b9c0d1",
-					"0x3c02a7bc0391e86d91b7d144e61c2c01a25a79c5",
-					"0x0737a6b837f97f46ebade41b9bc3e1c509c85c53",
-					"0x97f43a37f595ab5dd318fb46e7a155eae057317a",
-					"0x52c5317c848ba20c7504cb2c8052abd1fde29d03",
-					"0x4863226780fe7c0356454236d3b1c8792785748d",
-					"0x5d2b2e6fcbe3b11d26b525e085ff818dae332479",
-					"0x5f9f3392e9f62f63b8eac0beb55541fc8627f42c",
-					"0x057b56736d32b86616a10f619859c6cd6f59092a",
-					"0x9aa008f65de0b923a2a4f02012ad034a5e2e2192",
-					"0x304a554a310c7e546dfe434669c62820b7d83490",
-					"0x914d1b8b43e92723e64fd0a06f5bdb8dd9b10c79",
-					"0x4deb0033bb26bc534b197e61d19e0733e5679784",
-					"0x07f5c1e1bc2c93e0402f23341973a0e043f7bf8a",
-					"0x35a051a0010aba705c9008d7a7eff6fb88f6ea7b",
-					"0x4fa802324e929786dbda3b8820dc7834e9134a2a",
-					"0x9da397b9e80755301a3b32173283a91c0ef6c87e",
-					"0x8d9edb3054ce5c5774a420ac37ebae0ac02343c6",
-					"0x0101f3be8ebb4bbd39a2e3b9a3639d4259832fd9",
-					"0x5dc28b15dffed94048d73806ce4b7a4612a1d48f",
-					"0xbcf899e6c7d9d5a215ab1e3444c86806fa854c76",
-					"0x12e626b0eebfe86a56d633b9864e389b45dcb260",
-					"0xa2f1ccba9395d7fcb155bba8bc92db9bafaeade7",
-					"0xec8e57756626fdc07c63ad2eafbd28d08e7b0ca5",
-					"0xd164b088bd9108b60d0ca3751da4bceb207b0782",
-					"0x6231b6d0d5e77fe001c2a460bd9584fee60d409b",
-					"0x1cba23d343a983e9b5cfd19496b9a9701ada385f",
-					"0xa82f360a8d3455c5c41366975bde739c37bfeb8a",
-					"0x9fcd2deaff372a39cc679d5c5e4de7bafb0b1339",
-					"0x005f5cee7a43331d5a3d3eec71305925a62f34b6",
-					"0x0e0da70933f4c7849fc0d203f5d1d43b9ae4532d",
-					"0xd131637d5275fd1a68a3200f4ad25c71a2a9522e",
-					"0xbc07118b9ac290e4622f5e77a0853539789effbe",
-					"0x47e7aa56d6bdf3f36be34619660de61275420af8",
-					"0xacd87e28b0c9d1254e868b81cba4cc20d9a32225",
-					"0xadf80daec7ba8dcf15392f1ac611fff65d94f880",
-					"0x5524c55fb03cf21f549444ccbecb664d0acad706",
-					"0x40b803a9abce16f50f36a77ba41180eb90023925",
-					"0xfe24cdd8648121a43a7c86d289be4dd2951ed49f",
-					"0x17802f43a0137c506ba92291391a8a8f207f487d",
-					"0x253488078a4edf4d6f42f113d1e62836a942cf1a",
-					"0x86af3e9626fce1957c82e88cbf04ddf3a2ed7915",
-					"0xb136707642a4ea12fb4bae820f03d2562ebff487",
-					"0xdbe9b615a3ae8709af8b93336ce9b477e4ac0940",
-					"0xf14c14075d6c4ed84b86798af0956deef67365b5",
-					"0xca544e5c4687d109611d0f8f928b53a25af72448",
-					"0xaeeb8ff27288bdabc0fa5ebb731b6f409507516c",
-					"0xcbb9d3703e651b0d496cdefb8b92c25aeb2171f7",
-					"0x6d87578288b6cb5549d5076a207456a1f6a63dc0",
-					"0xb2c6f0dfbb716ac562e2d85d6cb2f8d5ee87603e",
-					"0xaccc230e8a6e5be9160b8cdf2864dd2a001c28b6",
-					"0x2b3455ec7fedf16e646268bf88846bd7a2319bb2",
-					"0x4613f3bca5c44ea06337a9e439fbc6d42e501d0a",
-					"0xd343b217de44030afaa275f54d31a9317c7f441e",
-					"0x84ef4b2357079cd7a7c69fd7a37cd0609a679106",
-					"0xda2fef9e4a3230988ff17df2165440f37e8b1708",
-					"0xf4c64518ea10f995918a454158c6b61407ea345c",
-					"0x7602b46df5390e432ef1c307d4f2c9ff6d65cc97",
-					"0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
-					"0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
-				]
-			}
-		}
-	},
-	"params": {
-		"accountStartNonce": "0x00",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID" : "0x1"
-	},
-	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x0000000000000042",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
-		"difficulty": "0x400000000",
-		"author": "0x0000000000000000000000000000000000000000",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
-		"gasLimit": "0x1388"
-	},
-	"accounts": {
-		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }
-	}
-}
--- a/ethcore/res/ethereum/frontier-dogmatic.json
+++ b/ethcore/res/ethereum/frontier-dogmatic.json
--- a/ethcore/res/ethereum/frontier.json
+++ b/ethcore/res/ethereum/frontier.json
@@ -1,152 +1,24 @@
 {
-	"name": "Frontier/Homestead",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"gasLimitBoundDivisor": "0x0400",
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"blockReward": "0x4563918244F40000",
-				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"frontierCompatibilityModeLimit": "0x118c30",
-				"daoHardforkTransition": "0x1d4c00",
-				"daoHardforkBeneficiary": "0xbf4ed7b27f1d666546e30d74d50d173d20bca754",
-				"daoHardforkAccounts": [  
-					"0xd4fe7bc31cedb7bfb8a345f31e668033056b2728",
-					"0xb3fb0e5aba0e20e5c49d252dfd30e102b171a425",
-					"0x2c19c7f9ae8b751e37aeb2d93a699722395ae18f",
-					"0xecd135fa4f61a655311e86238c92adcd779555d2",
-					"0x1975bd06d486162d5dc297798dfc41edd5d160a7",
-					"0xa3acf3a1e16b1d7c315e23510fdd7847b48234f6",
-					"0x319f70bab6845585f412ec7724b744fec6095c85",
-					"0x06706dd3f2c9abf0a21ddcc6941d9b86f0596936",
-					"0x5c8536898fbb74fc7445814902fd08422eac56d0",
-					"0x6966ab0d485353095148a2155858910e0965b6f9",
-					"0x779543a0491a837ca36ce8c635d6154e3c4911a6",
-					"0x2a5ed960395e2a49b1c758cef4aa15213cfd874c",
-					"0x5c6e67ccd5849c0d29219c4f95f1a7a93b3f5dc5",
-					"0x9c50426be05db97f5d64fc54bf89eff947f0a321",
-					"0x200450f06520bdd6c527622a273333384d870efb",
-					"0xbe8539bfe837b67d1282b2b1d61c3f723966f049",
-					"0x6b0c4d41ba9ab8d8cfb5d379c69a612f2ced8ecb",
-					"0xf1385fb24aad0cd7432824085e42aff90886fef5",
-					"0xd1ac8b1ef1b69ff51d1d401a476e7e612414f091",
-					"0x8163e7fb499e90f8544ea62bbf80d21cd26d9efd",
-					"0x51e0ddd9998364a2eb38588679f0d2c42653e4a6",
-					"0x627a0a960c079c21c34f7612d5d230e01b4ad4c7",
-					"0xf0b1aa0eb660754448a7937c022e30aa692fe0c5",
-					"0x24c4d950dfd4dd1902bbed3508144a54542bba94",
-					"0x9f27daea7aca0aa0446220b98d028715e3bc803d",
-					"0xa5dc5acd6a7968a4554d89d65e59b7fd3bff0f90",
-					"0xd9aef3a1e38a39c16b31d1ace71bca8ef58d315b",
-					"0x63ed5a272de2f6d968408b4acb9024f4cc208ebf",
-					"0x6f6704e5a10332af6672e50b3d9754dc460dfa4d",
-					"0x77ca7b50b6cd7e2f3fa008e24ab793fd56cb15f6",
-					"0x492ea3bb0f3315521c31f273e565b868fc090f17",
-					"0x0ff30d6de14a8224aa97b78aea5388d1c51c1f00",
-					"0x9ea779f907f0b315b364b0cfc39a0fde5b02a416",
-					"0xceaeb481747ca6c540a000c1f3641f8cef161fa7",
-					"0xcc34673c6c40e791051898567a1222daf90be287",
-					"0x579a80d909f346fbfb1189493f521d7f48d52238",
-					"0xe308bd1ac5fda103967359b2712dd89deffb7973",
-					"0x4cb31628079fb14e4bc3cd5e30c2f7489b00960c",
-					"0xac1ecab32727358dba8962a0f3b261731aad9723",
-					"0x4fd6ace747f06ece9c49699c7cabc62d02211f75",
-					"0x440c59b325d2997a134c2c7c60a8c61611212bad",
-					"0x4486a3d68fac6967006d7a517b889fd3f98c102b",
-					"0x9c15b54878ba618f494b38f0ae7443db6af648ba",
-					"0x27b137a85656544b1ccb5a0f2e561a5703c6a68f",
-					"0x21c7fdb9ed8d291d79ffd82eb2c4356ec0d81241",
-					"0x23b75c2f6791eef49c69684db4c6c1f93bf49a50",
-					"0x1ca6abd14d30affe533b24d7a21bff4c2d5e1f3b",
-					"0xb9637156d330c0d605a791f1c31ba5890582fe1c",
-					"0x6131c42fa982e56929107413a9d526fd99405560",
-					"0x1591fc0f688c81fbeb17f5426a162a7024d430c2",
-					"0x542a9515200d14b68e934e9830d91645a980dd7a",
-					"0xc4bbd073882dd2add2424cf47d35213405b01324",
-					"0x782495b7b3355efb2833d56ecb34dc22ad7dfcc4",
-					"0x58b95c9a9d5d26825e70a82b6adb139d3fd829eb",
-					"0x3ba4d81db016dc2890c81f3acec2454bff5aada5",
-					"0xb52042c8ca3f8aa246fa79c3feaa3d959347c0ab",
-					"0xe4ae1efdfc53b73893af49113d8694a057b9c0d1",
-					"0x3c02a7bc0391e86d91b7d144e61c2c01a25a79c5",
-					"0x0737a6b837f97f46ebade41b9bc3e1c509c85c53",
-					"0x97f43a37f595ab5dd318fb46e7a155eae057317a",
-					"0x52c5317c848ba20c7504cb2c8052abd1fde29d03",
-					"0x4863226780fe7c0356454236d3b1c8792785748d",
-					"0x5d2b2e6fcbe3b11d26b525e085ff818dae332479",
-					"0x5f9f3392e9f62f63b8eac0beb55541fc8627f42c",
-					"0x057b56736d32b86616a10f619859c6cd6f59092a",
-					"0x9aa008f65de0b923a2a4f02012ad034a5e2e2192",
-					"0x304a554a310c7e546dfe434669c62820b7d83490",
-					"0x914d1b8b43e92723e64fd0a06f5bdb8dd9b10c79",
-					"0x4deb0033bb26bc534b197e61d19e0733e5679784",
-					"0x07f5c1e1bc2c93e0402f23341973a0e043f7bf8a",
-					"0x35a051a0010aba705c9008d7a7eff6fb88f6ea7b",
-					"0x4fa802324e929786dbda3b8820dc7834e9134a2a",
-					"0x9da397b9e80755301a3b32173283a91c0ef6c87e",
-					"0x8d9edb3054ce5c5774a420ac37ebae0ac02343c6",
-					"0x0101f3be8ebb4bbd39a2e3b9a3639d4259832fd9",
-					"0x5dc28b15dffed94048d73806ce4b7a4612a1d48f",
-					"0xbcf899e6c7d9d5a215ab1e3444c86806fa854c76",
-					"0x12e626b0eebfe86a56d633b9864e389b45dcb260",
-					"0xa2f1ccba9395d7fcb155bba8bc92db9bafaeade7",
-					"0xec8e57756626fdc07c63ad2eafbd28d08e7b0ca5",
-					"0xd164b088bd9108b60d0ca3751da4bceb207b0782",
-					"0x6231b6d0d5e77fe001c2a460bd9584fee60d409b",
-					"0x1cba23d343a983e9b5cfd19496b9a9701ada385f",
-					"0xa82f360a8d3455c5c41366975bde739c37bfeb8a",
-					"0x9fcd2deaff372a39cc679d5c5e4de7bafb0b1339",
-					"0x005f5cee7a43331d5a3d3eec71305925a62f34b6",
-					"0x0e0da70933f4c7849fc0d203f5d1d43b9ae4532d",
-					"0xd131637d5275fd1a68a3200f4ad25c71a2a9522e",
-					"0xbc07118b9ac290e4622f5e77a0853539789effbe",
-					"0x47e7aa56d6bdf3f36be34619660de61275420af8",
-					"0xacd87e28b0c9d1254e868b81cba4cc20d9a32225",
-					"0xadf80daec7ba8dcf15392f1ac611fff65d94f880",
-					"0x5524c55fb03cf21f549444ccbecb664d0acad706",
-					"0x40b803a9abce16f50f36a77ba41180eb90023925",
-					"0xfe24cdd8648121a43a7c86d289be4dd2951ed49f",
-					"0x17802f43a0137c506ba92291391a8a8f207f487d",
-					"0x253488078a4edf4d6f42f113d1e62836a942cf1a",
-					"0x86af3e9626fce1957c82e88cbf04ddf3a2ed7915",
-					"0xb136707642a4ea12fb4bae820f03d2562ebff487",
-					"0xdbe9b615a3ae8709af8b93336ce9b477e4ac0940",
-					"0xf14c14075d6c4ed84b86798af0956deef67365b5",
-					"0xca544e5c4687d109611d0f8f928b53a25af72448",
-					"0xaeeb8ff27288bdabc0fa5ebb731b6f409507516c",
-					"0xcbb9d3703e651b0d496cdefb8b92c25aeb2171f7",
-					"0x6d87578288b6cb5549d5076a207456a1f6a63dc0",
-					"0xb2c6f0dfbb716ac562e2d85d6cb2f8d5ee87603e",
-					"0xaccc230e8a6e5be9160b8cdf2864dd2a001c28b6",
-					"0x2b3455ec7fedf16e646268bf88846bd7a2319bb2",
-					"0x4613f3bca5c44ea06337a9e439fbc6d42e501d0a",
-					"0xd343b217de44030afaa275f54d31a9317c7f441e",
-					"0x84ef4b2357079cd7a7c69fd7a37cd0609a679106",
-					"0xda2fef9e4a3230988ff17df2165440f37e8b1708",
-					"0xf4c64518ea10f995918a454158c6b61407ea345c",
-					"0x7602b46df5390e432ef1c307d4f2c9ff6d65cc97",
-					"0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
-					"0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
-				]
-			}
-		}
-	},
+	"name": "Frontier",
+	"engineName": "Ethash",
 	"params": {
 		"accountStartNonce": "0x00",
+		"frontierCompatibilityModeLimit": "0x10c8e0",
 		"maximumExtraDataSize": "0x20",
+		"tieBreakingGas": false,
 		"minGasLimit": "0x1388",
+		"gasLimitBoundDivisor": "0x0400",
+		"minimumDifficulty": "0x020000",
+		"difficultyBoundDivisor": "0x0800",
+		"durationLimit": "0x0d",
+		"blockReward": "0x4563918244F40000",
+		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"networkID" : "0x1"
 	},
 	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x0000000000000042",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
+		"nonce": "0x0000000000000042",
 		"difficulty": "0x400000000",
+		"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
 		"author": "0x0000000000000000000000000000000000000000",
 		"timestamp": "0x00",
 		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -158,13 +30,13 @@
 		"enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303",
 		"enode://de471bccee3d042261d52e9bff31458daecc406142b401d4cd848f677479f73104b9fdeb090af9583d3391b7f10cb2ba9e26865dd5fca4fcdc0fb1e3b723c786@54.94.239.50:30303",
 		"enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303",
-		"enode://248f12bc8b18d5289358085520ac78cd8076485211e6d96ab0bc93d6cd25442db0ce3a937dc404f64f207b0b9aed50e25e98ce32af5ac7cb321ff285b97de485@zero.parity.io:30303"
+		"enode://859bbe6926fc161d218f62bd2efe0b4f6980205c00a5b928ccee39c94c440b73a054ece5db36beddd71963fbd296af61ec72a591f72a2299f9a046bd6d6ce1a9@parity-node-zero.ethcore.io:30303"
 	],
 	"accounts": {
-		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "linear": { "base": 3000, "word": 0 } } },
+		"0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "linear": { "base": 60, "word": 12 } } },
+		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "linear": { "base": 600, "word": 120 } } },
+		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "linear": { "base": 15, "word": 3 } } },
 		"3282791d6fd713f1e94f4bfd565eaa78b3a0599d": {
 			"balance": "1337000000000000000000"
 		},
--- a/ethcore/res/ethereum/frontier_like_test.json
+++ b/ethcore/res/ethereum/frontier_like_test.json
@@ -1,152 +1,24 @@
 {
-	"name": "Frontier (Test)",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"gasLimitBoundDivisor": "0x0400",
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"blockReward": "0x4563918244F40000",
-				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"frontierCompatibilityModeLimit": "0x118c30",
-				"daoHardforkTransition": "0x1d4c00",
-				"daoHardforkBeneficiary": "0xbf4ed7b27f1d666546e30d74d50d173d20bca754",
-				"daoHardforkAccounts": [  
-					"0xd4fe7bc31cedb7bfb8a345f31e668033056b2728",
-					"0xb3fb0e5aba0e20e5c49d252dfd30e102b171a425",
-					"0x2c19c7f9ae8b751e37aeb2d93a699722395ae18f",
-					"0xecd135fa4f61a655311e86238c92adcd779555d2",
-					"0x1975bd06d486162d5dc297798dfc41edd5d160a7",
-					"0xa3acf3a1e16b1d7c315e23510fdd7847b48234f6",
-					"0x319f70bab6845585f412ec7724b744fec6095c85",
-					"0x06706dd3f2c9abf0a21ddcc6941d9b86f0596936",
-					"0x5c8536898fbb74fc7445814902fd08422eac56d0",
-					"0x6966ab0d485353095148a2155858910e0965b6f9",
-					"0x779543a0491a837ca36ce8c635d6154e3c4911a6",
-					"0x2a5ed960395e2a49b1c758cef4aa15213cfd874c",
-					"0x5c6e67ccd5849c0d29219c4f95f1a7a93b3f5dc5",
-					"0x9c50426be05db97f5d64fc54bf89eff947f0a321",
-					"0x200450f06520bdd6c527622a273333384d870efb",
-					"0xbe8539bfe837b67d1282b2b1d61c3f723966f049",
-					"0x6b0c4d41ba9ab8d8cfb5d379c69a612f2ced8ecb",
-					"0xf1385fb24aad0cd7432824085e42aff90886fef5",
-					"0xd1ac8b1ef1b69ff51d1d401a476e7e612414f091",
-					"0x8163e7fb499e90f8544ea62bbf80d21cd26d9efd",
-					"0x51e0ddd9998364a2eb38588679f0d2c42653e4a6",
-					"0x627a0a960c079c21c34f7612d5d230e01b4ad4c7",
-					"0xf0b1aa0eb660754448a7937c022e30aa692fe0c5",
-					"0x24c4d950dfd4dd1902bbed3508144a54542bba94",
-					"0x9f27daea7aca0aa0446220b98d028715e3bc803d",
-					"0xa5dc5acd6a7968a4554d89d65e59b7fd3bff0f90",
-					"0xd9aef3a1e38a39c16b31d1ace71bca8ef58d315b",
-					"0x63ed5a272de2f6d968408b4acb9024f4cc208ebf",
-					"0x6f6704e5a10332af6672e50b3d9754dc460dfa4d",
-					"0x77ca7b50b6cd7e2f3fa008e24ab793fd56cb15f6",
-					"0x492ea3bb0f3315521c31f273e565b868fc090f17",
-					"0x0ff30d6de14a8224aa97b78aea5388d1c51c1f00",
-					"0x9ea779f907f0b315b364b0cfc39a0fde5b02a416",
-					"0xceaeb481747ca6c540a000c1f3641f8cef161fa7",
-					"0xcc34673c6c40e791051898567a1222daf90be287",
-					"0x579a80d909f346fbfb1189493f521d7f48d52238",
-					"0xe308bd1ac5fda103967359b2712dd89deffb7973",
-					"0x4cb31628079fb14e4bc3cd5e30c2f7489b00960c",
-					"0xac1ecab32727358dba8962a0f3b261731aad9723",
-					"0x4fd6ace747f06ece9c49699c7cabc62d02211f75",
-					"0x440c59b325d2997a134c2c7c60a8c61611212bad",
-					"0x4486a3d68fac6967006d7a517b889fd3f98c102b",
-					"0x9c15b54878ba618f494b38f0ae7443db6af648ba",
-					"0x27b137a85656544b1ccb5a0f2e561a5703c6a68f",
-					"0x21c7fdb9ed8d291d79ffd82eb2c4356ec0d81241",
-					"0x23b75c2f6791eef49c69684db4c6c1f93bf49a50",
-					"0x1ca6abd14d30affe533b24d7a21bff4c2d5e1f3b",
-					"0xb9637156d330c0d605a791f1c31ba5890582fe1c",
-					"0x6131c42fa982e56929107413a9d526fd99405560",
-					"0x1591fc0f688c81fbeb17f5426a162a7024d430c2",
-					"0x542a9515200d14b68e934e9830d91645a980dd7a",
-					"0xc4bbd073882dd2add2424cf47d35213405b01324",
-					"0x782495b7b3355efb2833d56ecb34dc22ad7dfcc4",
-					"0x58b95c9a9d5d26825e70a82b6adb139d3fd829eb",
-					"0x3ba4d81db016dc2890c81f3acec2454bff5aada5",
-					"0xb52042c8ca3f8aa246fa79c3feaa3d959347c0ab",
-					"0xe4ae1efdfc53b73893af49113d8694a057b9c0d1",
-					"0x3c02a7bc0391e86d91b7d144e61c2c01a25a79c5",
-					"0x0737a6b837f97f46ebade41b9bc3e1c509c85c53",
-					"0x97f43a37f595ab5dd318fb46e7a155eae057317a",
-					"0x52c5317c848ba20c7504cb2c8052abd1fde29d03",
-					"0x4863226780fe7c0356454236d3b1c8792785748d",
-					"0x5d2b2e6fcbe3b11d26b525e085ff818dae332479",
-					"0x5f9f3392e9f62f63b8eac0beb55541fc8627f42c",
-					"0x057b56736d32b86616a10f619859c6cd6f59092a",
-					"0x9aa008f65de0b923a2a4f02012ad034a5e2e2192",
-					"0x304a554a310c7e546dfe434669c62820b7d83490",
-					"0x914d1b8b43e92723e64fd0a06f5bdb8dd9b10c79",
-					"0x4deb0033bb26bc534b197e61d19e0733e5679784",
-					"0x07f5c1e1bc2c93e0402f23341973a0e043f7bf8a",
-					"0x35a051a0010aba705c9008d7a7eff6fb88f6ea7b",
-					"0x4fa802324e929786dbda3b8820dc7834e9134a2a",
-					"0x9da397b9e80755301a3b32173283a91c0ef6c87e",
-					"0x8d9edb3054ce5c5774a420ac37ebae0ac02343c6",
-					"0x0101f3be8ebb4bbd39a2e3b9a3639d4259832fd9",
-					"0x5dc28b15dffed94048d73806ce4b7a4612a1d48f",
-					"0xbcf899e6c7d9d5a215ab1e3444c86806fa854c76",
-					"0x12e626b0eebfe86a56d633b9864e389b45dcb260",
-					"0xa2f1ccba9395d7fcb155bba8bc92db9bafaeade7",
-					"0xec8e57756626fdc07c63ad2eafbd28d08e7b0ca5",
-					"0xd164b088bd9108b60d0ca3751da4bceb207b0782",
-					"0x6231b6d0d5e77fe001c2a460bd9584fee60d409b",
-					"0x1cba23d343a983e9b5cfd19496b9a9701ada385f",
-					"0xa82f360a8d3455c5c41366975bde739c37bfeb8a",
-					"0x9fcd2deaff372a39cc679d5c5e4de7bafb0b1339",
-					"0x005f5cee7a43331d5a3d3eec71305925a62f34b6",
-					"0x0e0da70933f4c7849fc0d203f5d1d43b9ae4532d",
-					"0xd131637d5275fd1a68a3200f4ad25c71a2a9522e",
-					"0xbc07118b9ac290e4622f5e77a0853539789effbe",
-					"0x47e7aa56d6bdf3f36be34619660de61275420af8",
-					"0xacd87e28b0c9d1254e868b81cba4cc20d9a32225",
-					"0xadf80daec7ba8dcf15392f1ac611fff65d94f880",
-					"0x5524c55fb03cf21f549444ccbecb664d0acad706",
-					"0x40b803a9abce16f50f36a77ba41180eb90023925",
-					"0xfe24cdd8648121a43a7c86d289be4dd2951ed49f",
-					"0x17802f43a0137c506ba92291391a8a8f207f487d",
-					"0x253488078a4edf4d6f42f113d1e62836a942cf1a",
-					"0x86af3e9626fce1957c82e88cbf04ddf3a2ed7915",
-					"0xb136707642a4ea12fb4bae820f03d2562ebff487",
-					"0xdbe9b615a3ae8709af8b93336ce9b477e4ac0940",
-					"0xf14c14075d6c4ed84b86798af0956deef67365b5",
-					"0xca544e5c4687d109611d0f8f928b53a25af72448",
-					"0xaeeb8ff27288bdabc0fa5ebb731b6f409507516c",
-					"0xcbb9d3703e651b0d496cdefb8b92c25aeb2171f7",
-					"0x6d87578288b6cb5549d5076a207456a1f6a63dc0",
-					"0xb2c6f0dfbb716ac562e2d85d6cb2f8d5ee87603e",
-					"0xaccc230e8a6e5be9160b8cdf2864dd2a001c28b6",
-					"0x2b3455ec7fedf16e646268bf88846bd7a2319bb2",
-					"0x4613f3bca5c44ea06337a9e439fbc6d42e501d0a",
-					"0xd343b217de44030afaa275f54d31a9317c7f441e",
-					"0x84ef4b2357079cd7a7c69fd7a37cd0609a679106",
-					"0xda2fef9e4a3230988ff17df2165440f37e8b1708",
-					"0xf4c64518ea10f995918a454158c6b61407ea345c",
-					"0x7602b46df5390e432ef1c307d4f2c9ff6d65cc97",
-					"0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
-					"0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
-				]
-			}
-		}
-	},
+	"engineName": "Frontier (Test)",
+	"engineName": "Ethash",
 	"params": {
 		"accountStartNonce": "0x00",
+		"frontierCompatibilityModeLimit": "0x10c8e0",
 		"maximumExtraDataSize": "0x20",
+		"tieBreakingGas": false,
 		"minGasLimit": "0x1388",
+		"gasLimitBoundDivisor": "0x0400",
+		"minimumDifficulty": "0x020000",
+		"difficultyBoundDivisor": "0x0800",
+		"durationLimit": "0x0d",
+		"blockReward": "0x4563918244F40000",
+		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"networkID" : "0x1"
 	},
 	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x0000000000000042",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
+		"nonce": "0x0000000000000042",
 		"difficulty": "0x400000000",
+		"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
 		"author": "0x0000000000000000000000000000000000000000",
 		"timestamp": "0x00",
 		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -154,9 +26,9 @@
 		"gasLimit": "0x1388"
 	},
 	"accounts": {
-		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }
+		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "linear": { "base": 3000, "word": 0 } } },
+		"0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "linear": { "base": 60, "word": 12 } } },
+		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "linear": { "base": 600, "word": 120 } } },
+		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "linear": { "base": 15, "word": 3 } } }
 	}
 }
--- a/ethcore/res/ethereum/frontier_test.json
+++ b/ethcore/res/ethereum/frontier_test.json
@@ -1,32 +1,24 @@
 {
-	"name": "Frontier (Test)",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"gasLimitBoundDivisor": "0x0400",
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"blockReward": "0x4563918244F40000",
-				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"frontierCompatibilityModeLimit": "0xffffffffffffffff"
-			}
-		}
-	},
+	"engineName": "Frontier (Test)",
+	"engineName": "Ethash",
 	"params": {
 		"accountStartNonce": "0x00",
+		"frontierCompatibilityModeLimit": "0xffffffffffffffff",
 		"maximumExtraDataSize": "0x20",
+		"tieBreakingGas": false,
 		"minGasLimit": "0x1388",
+		"gasLimitBoundDivisor": "0x0400",
+		"minimumDifficulty": "0x020000",
+		"difficultyBoundDivisor": "0x0800",
+		"durationLimit": "0x0d",
+		"blockReward": "0x4563918244F40000",
+		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"networkID" : "0x1"
 	},
 	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x0000000000000042",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
+		"nonce": "0x0000000000000042",
 		"difficulty": "0x400000000",
+		"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
 		"author": "0x0000000000000000000000000000000000000000",
 		"timestamp": "0x00",
 		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -34,9 +26,9 @@
 		"gasLimit": "0x1388"
 	},
 	"accounts": {
-		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }
+		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "linear": { "base": 3000, "word": 0 } } },
+		"0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "linear": { "base": 60, "word": 12 } } },
+		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "linear": { "base": 600, "word": 120 } } },
+		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "linear": { "base": 15, "word": 3 } } }
 	}
 }
--- a/ethcore/res/ethereum/homestead_test.json
+++ b/ethcore/res/ethereum/homestead_test.json
@@ -1,32 +1,24 @@
 {
 	"name": "Homestead (Test)",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"gasLimitBoundDivisor": "0x0400",
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"blockReward": "0x4563918244F40000",
-				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-				"frontierCompatibilityModeLimit": "0x0"
-			}
-		}
-	},
+	"engineName": "Ethash",
 	"params": {
 		"accountStartNonce": "0x00",
+		"frontierCompatibilityModeLimit": 0,
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
+		"tieBreakingGas": false,
+		"gasLimitBoundDivisor": "0x0400",
+		"minimumDifficulty": "0x020000",
+		"difficultyBoundDivisor": "0x0800",
+		"durationLimit": "0x0d",
+		"blockReward": "0x4563918244F40000",
+		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"networkID" : "0x1"
 	},
 	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x0000000000000042",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
+		"nonce": "0x0000000000000042",
 		"difficulty": "0x400000000",
+		"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
 		"author": "0x0000000000000000000000000000000000000000",
 		"timestamp": "0x00",
 		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -34,9 +26,9 @@
 		"gasLimit": "0x1388"
 	},
 	"accounts": {
-		"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }
+		"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "linear": { "base": 3000, "word": 0 } } },
+		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "linear": { "base": 60, "word": 12 } } },
+		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "linear": { "base": 600, "word": 120 } } },
+		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "linear": { "base": 15, "word": 3 } } }
 	}
 }
--- a/ethcore/res/ethereum/morden.json
+++ b/ethcore/res/ethereum/morden.json
@@ -1,47 +1,35 @@
 {
 	"name": "Morden",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"gasLimitBoundDivisor": "0x0400",
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"blockReward": "0x4563918244F40000",
-				"registrar": "",
-				"frontierCompatibilityModeLimit": "0x789b0"
-			}
-		}
-	},
+	"engineName": "Ethash",
 	"params": {
 		"accountStartNonce": "0x0100000",
+		"frontierCompatibilityModeLimit": "0x10c8e0",
 		"maximumExtraDataSize": "0x20",
+		"tieBreakingGas": false,
 		"minGasLimit": "0x1388",
+		"gasLimitBoundDivisor": "0x0400",
+		"minimumDifficulty": "0x020000",
+		"difficultyBoundDivisor": "0x0800",
+		"durationLimit": "0x0d",
+		"blockReward": "0x4563918244F40000",
+		"registrar": "",
 		"networkID" : "0x2"
 	},
 	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x00006d6f7264656e",
-				"mixHash": "0x00000000000000000000000000000000000000647572616c65787365646c6578"
-			}
-		},
+		"nonce": "0x00006d6f7264656e",
 		"difficulty": "0x20000",
+		"mixHash": "0x00000000000000000000000000000000000000647572616c65787365646c6578",
 		"author": "0x0000000000000000000000000000000000000000",
 		"timestamp": "0x00",
 		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
 		"extraData": "0x",
 		"gasLimit": "0x2fefd8"
 	},
-	"nodes": [
-		"enode://e731347db0521f3476e6bbbb83375dcd7133a1601425ebd15fd10f3835fd4c304fba6282087ca5a0deeafadf0aa0d4fd56c3323331901c1f38bd181c283e3e35@128.199.55.137:30303",
-		"enode://ceb5c0f85eb994dbe9693bf46d99b03f6b838d17cc74e68d5eb003171ff39e5f120b17f965b267c319303f94d80b9d994b77062fb1486d76ce95d9f3d8fe1cb4@46.101.122.141:30303"
-	],
 	"accounts": {
-		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "linear": { "base": 3000, "word": 0 } } },
+		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "linear": { "base": 60, "word": 12 } } },
+		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "linear": { "base": 600, "word": 120 } } },
+		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "linear": { "base": 15, "word": 3 } } },
 		"102e61f5d8f9bc71d0ad4a084df4e65e05ce0e1c": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
 	}
 }
--- a/ethcore/res/ethereum/olympic.json
+++ b/ethcore/res/ethereum/olympic.json
@@ -1,31 +1,24 @@
 {
 	"name": "Olympic",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"gasLimitBoundDivisor": "0x0400",
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x08",
-				"blockReward": "0x14D1120D7B160000",
-				"registrar": "5e70c0bbcd5636e0f9f9316e9f8633feb64d4050"
-			}
-		}
-	},
+	"engineName": "Ethash",
 	"params": {
 		"accountStartNonce": "0x00",
+		"frontierCompatibilityModeLimit": "0xffffffffffffffff",
 		"maximumExtraDataSize": "0x0400",
+		"tieBreakingGas": false,
 		"minGasLimit": "125000",
+		"gasLimitBoundDivisor": "0x0400",
+		"minimumDifficulty": "0x020000",
+		"difficultyBoundDivisor": "0x0800",
+		"durationLimit": "0x08",
+		"blockReward": "0x14D1120D7B160000",
+		"registrar": "5e70c0bbcd5636e0f9f9316e9f8633feb64d4050",
 		"networkID" : "0x0"
 	},
 	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x000000000000002a",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
+		"nonce": "0x000000000000002a",
 		"difficulty": "0x20000",
+		"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
 		"author": "0x0000000000000000000000000000000000000000",
 		"timestamp": "0x00",
 		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -33,10 +26,10 @@
 		"gasLimit": "0x2fefd8"
 	},
 	"accounts": {
-		"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "linear": { "base": 3000, "word": 0 } } },
+		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "linear": { "base": 60, "word": 12 } } },
+		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "linear": { "base": 600, "word": 120 } } },
+		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "linear": { "base": 15, "word": 3 } } },
 		"dbdbdb2cbd23b783741e8d7fcf51e459b497e4a6": { "balance": "1606938044258990275541962092341162602522202993782792835301376" },
 		"e6716f9544a56c530d868e4bfbacb172315bdead": { "balance": "1606938044258990275541962092341162602522202993782792835301376" },
 		"b9c015918bdaba24b4ff057a92a3873d6eb201be": { "balance": "1606938044258990275541962092341162602522202993782792835301376" },
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
--- a/ethcore/res/null.json
+++ b/ethcore/res/null.json
@@ -1,33 +0,0 @@
-{
-	"name": "Morden",
-	"engine": {
-		"Null": null
-	},
-	"params": {
-		"accountStartNonce": "0x0",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID" : "0x2"
-	},
-	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x00006d6f7264656e",
-				"mixHash": "0x00000000000000000000000000000000000000647572616c65787365646c6578"
-			}
-		},
-		"difficulty": "0x20000",
-		"author": "0x0000000000000000000000000000000000000000",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "0x",
-		"gasLimit": "0x2fefd8"
-	},
-	"accounts": {
-		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "0", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "0", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "0", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "0", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "0" }
-	}
-}
--- a/ethcore/res/null_morden.json
+++ b/ethcore/res/null_morden.json
@@ -1,22 +1,24 @@
 {
 	"name": "Morden",
-	"engine": {
-		"Null": null
-	},
+	"engineName": "NullEngine",
 	"params": {
 		"accountStartNonce": "0x0100000",
+		"frontierCompatibilityModeLimit": "0xfffa2990",
 		"maximumExtraDataSize": "0x20",
+		"tieBreakingGas": false,
 		"minGasLimit": "0x1388",
+		"gasLimitBoundDivisor": "0x0400",
+		"minimumDifficulty": "0x020000",
+		"difficultyBoundDivisor": "0x0800",
+		"durationLimit": "0x0d",
+		"blockReward": "0x4563918244F40000",
+		"registrar": "",
 		"networkID" : "0x2"
 	},
 	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x00006d6f7264656e",
-				"mixHash": "0x00000000000000000000000000000000000000647572616c65787365646c6578"
-			}
-		},
+		"nonce": "0x00006d6f7264656e",
 		"difficulty": "0x20000",
+		"mixHash": "0x00000000000000000000000000000000000000647572616c65787365646c6578",
 		"author": "0x0000000000000000000000000000000000000000",
 		"timestamp": "0x00",
 		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -24,10 +26,10 @@
 		"gasLimit": "0x2fefd8"
 	},
 	"accounts": {
-		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "linear": { "base": 3000, "word": 0 } } },
+		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "linear": { "base": 60, "word": 12 } } },
+		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "linear": { "base": 600, "word": 120 } } },
+		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "linear": { "base": 15, "word": 3 } } },
 		"102e61f5d8f9bc71d0ad4a084df4e65e05ce0e1c": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
 	}
 }
--- a/ethcore/res/test_authority.json
+++ b/ethcore/res/test_authority.json
@@ -1,39 +0,0 @@
-{
-	"name": "TestAuthority",
-	"engine": {
-		"BasicAuthority": {
-			"params": {
-				"gasLimitBoundDivisor": "0x0400",
-				"durationLimit": "0x0d",
-				"authorities" : ["0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6"]
-			}
-		}
-	},
-	"params": {
-		"accountStartNonce": "0x0100000",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID" : "0x69"
-	},
-	"genesis": {
-		"seal": {
-			"generic": {
-				"fields": 1,
-				"rlp": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa"
-			}
-		},
-		"difficulty": "0x20000",
-		"author": "0x0000000000000000000000000000000000000000",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "0x",
-		"gasLimit": "0x2fefd8"
-	},
-	"accounts": {
-		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
-	}
-}
--- a/ethcore/src/account.rs
+++ b/ethcore/src/account.rs
@@ -51,6 +51,8 @@ impl Account {
 		}
 	}

+	#[cfg(test)]
+	#[cfg(feature = "json-tests")]
 	/// General constructor.
 	pub fn from_pod(pod: PodAccount) -> Account {
 		Account {
@@ -90,10 +92,10 @@ impl Account {

 	/// Create a new contract account.
 	/// NOTE: make sure you use `init_code` on this before `commit`ing.
-	pub fn new_contract(balance: U256, nonce: U256) -> Account {
+	pub fn new_contract(balance: U256) -> Account {
 		Account {
 			balance: balance,
-			nonce: nonce,
+			nonce: U256::from(0u8),
 			storage_root: SHA3_NULL_RLP,
 			storage_overlay: RefCell::new(HashMap::new()),
 			code_hash: None,
@@ -108,12 +110,6 @@ impl Account {
 		self.code_cache = code;
 	}

-	/// Reset this account's code to the given code.
-	pub fn reset_code(&mut self, code: Bytes) {
-		self.code_hash = None;
-		self.init_code(code);
-	}
-
 	/// Set (and cache) the contents of the trie's storage at `key` to `value`.
 	pub fn set_storage(&mut self, key: H256, value: H256) {
 		self.storage_overlay.borrow_mut().insert(key, (Filth::Dirty, value));
@@ -122,12 +118,7 @@ impl Account {
 	/// Get (and cache) the contents of the trie's storage at `key`.
 	pub fn storage_at(&self, db: &AccountDB, key: &H256) -> H256 {
 		self.storage_overlay.borrow_mut().entry(key.clone()).or_insert_with(||{
-			let db = SecTrieDB::new(db, &self.storage_root)
-				.expect("Account storage_root initially set to zero (valid) and only altered by SecTrieDBMut. \
-				SecTrieDBMut would not set it to an invalid state root. Therefore the root is valid and DB creation \
-				using it will not fail.");
-
-			(Filth::Clean, H256::from(db.get(key.bytes()).map_or(U256::zero(), |v| -> U256 {decode(v)})))
+			(Filth::Clean, H256::from(SecTrieDB::new(db, &self.storage_root).get(key.bytes()).map_or(U256::zero(), |v| -> U256 {decode(v)})))
 		}).1.clone()
 	}

@@ -147,7 +138,7 @@ impl Account {
 	/// get someone who knows to call `note_code`.
 	pub fn code(&self) -> Option<&[u8]> {
 		match self.code_hash {
-			Some(c) if c == SHA3_EMPTY && self.code_cache.is_empty() => Some(&self.code_cache),
+			Some(SHA3_EMPTY) | None if self.code_cache.is_empty() => Some(&self.code_cache),
 			Some(_) if !self.code_cache.is_empty() => Some(&self.code_cache),
 			None => Some(&self.code_cache),
 			_ => None,
@@ -172,16 +163,16 @@ impl Account {
 		!self.code_cache.is_empty() || (self.code_cache.is_empty() && self.code_hash == Some(SHA3_EMPTY))
 	}

-	/// Provide a database to get `code_hash`. Should not be called if it is a contract without code.
+	/// Provide a database to lookup `code_hash`. Should not be called if it is a contract without code.
 	pub fn cache_code(&mut self, db: &AccountDB) -> bool {
 		// TODO: fill out self.code_cache;
 		trace!("Account::cache_code: ic={}; self.code_hash={:?}, self.code_cache={}", self.is_cached(), self.code_hash, self.code_cache.pretty());
 		self.is_cached() ||
 			match self.code_hash {
-				Some(ref h) => match db.get(h) {
+				Some(ref h) => match db.lookup(h) {
 					Some(x) => { self.code_cache = x.to_vec(); true },
 					_ => {
-						warn!("Failed reverse get of {}", h);
+						warn!("Failed reverse lookup of {}", h);
 						false
 					},
 				},
@@ -192,11 +183,11 @@ impl Account {
 	#[cfg(test)]
 	/// Determine whether there are any un-`commit()`-ed storage-setting operations.
 	pub fn storage_is_clean(&self) -> bool { self.storage_overlay.borrow().iter().find(|&(_, &(f, _))| f == Filth::Dirty).is_none() }
-
+	
 	#[cfg(test)]
 	/// return the storage root associated with this account or None if it has been altered via the overlay.
 	pub fn storage_root(&self) -> Option<&H256> { if self.storage_is_clean() {Some(&self.storage_root)} else {None} }
-
+	
 	/// return the storage overlay.
 	pub fn storage_overlay(&self) -> Ref<HashMap<H256, (Filth, H256)>> { self.storage_overlay.borrow() }

@@ -207,18 +198,11 @@ impl Account {
 	pub fn add_balance(&mut self, x: &U256) { self.balance = self.balance + *x; }

 	/// Increment the nonce of the account by one.
-	/// Panics if balance is less than `x`
-	pub fn sub_balance(&mut self, x: &U256) {
-		assert!(self.balance >= *x);
-		self.balance = self.balance - *x;
-	}
+	pub fn sub_balance(&mut self, x: &U256) { self.balance = self.balance - *x; }

 	/// Commit the `storage_overlay` to the backing DB and update `storage_root`.
 	pub fn commit_storage(&mut self, db: &mut AccountDBMut) {
-		let mut t = SecTrieDBMut::from_existing(db, &mut self.storage_root)
-			.expect("Account storage_root initially set to zero (valid) and only altered by SecTrieDBMut. \
-				SecTrieDBMut would not set it to an invalid state root. Therefore the root is valid and DB creation \
-				using it will not fail.");
+		let mut t = SecTrieDBMut::from_existing(db, &mut self.storage_root);
 		for (k, &mut (ref mut f, ref mut v)) in self.storage_overlay.borrow_mut().iter_mut() {
 			if f == &Filth::Dirty {
 				// cast key and value to trait type,
@@ -273,7 +257,7 @@ mod tests {
 		let mut db = MemoryDB::new();
 		let mut db = AccountDBMut::new(&mut db, &Address::new());
 		let rlp = {
-			let mut a = Account::new_contract(69.into(), 0.into());
+			let mut a = Account::new_contract(U256::from(69u8));
 			a.set_storage(H256::from(&U256::from(0x00u64)), H256::from(&U256::from(0x1234u64)));
 			a.commit_storage(&mut db);
 			a.init_code(vec![]);
@@ -293,7 +277,7 @@ mod tests {
 		let mut db = AccountDBMut::new(&mut db, &Address::new());

 		let rlp = {
-			let mut a = Account::new_contract(69.into(), 0.into());
+			let mut a = Account::new_contract(U256::from(69u8));
 			a.init_code(vec![0x55, 0x44, 0xffu8]);
 			a.commit_code(&mut db);
 			a.rlp()
@@ -308,10 +292,10 @@ mod tests {

 	#[test]
 	fn commit_storage() {
-		let mut a = Account::new_contract(69.into(), 0.into());
+		let mut a = Account::new_contract(U256::from(69u8));
 		let mut db = MemoryDB::new();
 		let mut db = AccountDBMut::new(&mut db, &Address::new());
-		a.set_storage(0.into(), 0x1234.into());
+		a.set_storage(x!(0), x!(0x1234));
 		assert_eq!(a.storage_root(), None);
 		a.commit_storage(&mut db);
 		assert_eq!(a.storage_root().unwrap().hex(), "c57e1afb758b07f8d2c8f13a3b6e44fa5ff94ab266facc5a4fd3f062426e50b2");
@@ -319,21 +303,21 @@ mod tests {

 	#[test]
 	fn commit_remove_commit_storage() {
-		let mut a = Account::new_contract(69.into(), 0.into());
+		let mut a = Account::new_contract(U256::from(69u8));
 		let mut db = MemoryDB::new();
 		let mut db = AccountDBMut::new(&mut db, &Address::new());
-		a.set_storage(0.into(), 0x1234.into());
+		a.set_storage(x!(0), x!(0x1234));
 		a.commit_storage(&mut db);
-		a.set_storage(1.into(), 0x1234.into());
+		a.set_storage(x!(1), x!(0x1234));
 		a.commit_storage(&mut db);
-		a.set_storage(1.into(), 0.into());
+		a.set_storage(x!(1), x!(0));
 		a.commit_storage(&mut db);
 		assert_eq!(a.storage_root().unwrap().hex(), "c57e1afb758b07f8d2c8f13a3b6e44fa5ff94ab266facc5a4fd3f062426e50b2");
 	}

 	#[test]
 	fn commit_code() {
-		let mut a = Account::new_contract(69.into(), 0.into());
+		let mut a = Account::new_contract(U256::from(69u8));
 		let mut db = MemoryDB::new();
 		let mut db = AccountDBMut::new(&mut db, &Address::new());
 		a.init_code(vec![0x55, 0x44, 0xffu8]);
@@ -342,21 +326,6 @@ mod tests {
 		assert_eq!(a.code_hash().hex(), "af231e631776a517ca23125370d542873eca1fb4d613ed9b5d5335a46ae5b7eb");
 	}

-	#[test]
-	fn reset_code() {
-		let mut a = Account::new_contract(69.into(), 0.into());
-		let mut db = MemoryDB::new();
-		let mut db = AccountDBMut::new(&mut db, &Address::new());
-		a.init_code(vec![0x55, 0x44, 0xffu8]);
-		assert_eq!(a.code_hash(), SHA3_EMPTY);
-		a.commit_code(&mut db);
-		assert_eq!(a.code_hash().hex(), "af231e631776a517ca23125370d542873eca1fb4d613ed9b5d5335a46ae5b7eb");
-		a.reset_code(vec![0x55]);
-		assert_eq!(a.code_hash(), SHA3_EMPTY);
-		a.commit_code(&mut db);
-		assert_eq!(a.code_hash().hex(), "37bf2238b11b68cdc8382cece82651b59d3c3988873b6e0f33d79694aa45f1be");
-	}
-
 	#[test]
 	fn rlpio() {
 		let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new());
@@ -369,6 +338,8 @@ mod tests {

 	#[test]
 	fn new_account() {
+		use rustc_serialize::hex::ToHex;
+
 		let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new());
 		assert_eq!(a.rlp().to_hex(), "f8448045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
 		assert_eq!(a.balance(), &U256::from(69u8));
@@ -379,6 +350,8 @@ mod tests {

 	#[test]
 	fn create_account() {
+		use rustc_serialize::hex::ToHex;
+
 		let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new());
 		assert_eq!(a.rlp().to_hex(), "f8448045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
 	}
--- a/ethcore/src/account_db.rs
+++ b/ethcore/src/account_db.rs
@@ -13,14 +13,17 @@ pub struct AccountDB<'db> {

 #[inline]
 fn combine_key<'a>(address: &'a H256, key: &'a H256) -> H256 {
-	address ^ key
+	let mut addr_hash = address.sha3();
+	// preserve 96 bits of original key for db lookup
+	addr_hash[0..12].clone_from_slice(&[0u8; 12]); 
+	&addr_hash ^ key
 }

 impl<'db> AccountDB<'db> {
 	pub fn new(db: &'db HashDB, address: &Address) -> AccountDB<'db> {
 		AccountDB {
 			db: db,
-			address: address.into(),
+			address: x!(address.clone()),
 		}
 	}
 }
@@ -30,18 +33,18 @@ impl<'db> HashDB for AccountDB<'db>{
 		unimplemented!()
 	}

-	fn get(&self, key: &H256) -> Option<&[u8]> {
+	fn lookup(&self, key: &H256) -> Option<&[u8]> {
 		if key == &SHA3_NULL_RLP {
 			return Some(&NULL_RLP_STATIC);
 		}
-		self.db.get(&combine_key(&self.address, key))
+		self.db.lookup(&combine_key(&self.address, key))
 	}

-	fn contains(&self, key: &H256) -> bool {
+	fn exists(&self, key: &H256) -> bool {
 		if key == &SHA3_NULL_RLP {
 			return true;
 		}
-		self.db.contains(&combine_key(&self.address, key))
+		self.db.exists(&combine_key(&self.address, key))
 	}

 	fn insert(&mut self, _value: &[u8]) -> H256 {
@@ -52,7 +55,7 @@ impl<'db> HashDB for AccountDB<'db>{
 		unimplemented!()
 	}

-	fn remove(&mut self, _key: &H256) {
+	fn kill(&mut self, _key: &H256) {
 		unimplemented!()
 	}
 }
@@ -67,7 +70,7 @@ impl<'db> AccountDBMut<'db> {
 	pub fn new(db: &'db mut HashDB, address: &Address) -> AccountDBMut<'db> {
 		AccountDBMut {
 			db: db,
-			address: address.into(),
+			address: x!(address.clone()),
 		}
 	}

@@ -82,24 +85,21 @@ impl<'db> HashDB for AccountDBMut<'db>{
 		unimplemented!()
 	}

-	fn get(&self, key: &H256) -> Option<&[u8]> {
+	fn lookup(&self, key: &H256) -> Option<&[u8]> {
 		if key == &SHA3_NULL_RLP {
 			return Some(&NULL_RLP_STATIC);
 		}
-		self.db.get(&combine_key(&self.address, key))
+		self.db.lookup(&combine_key(&self.address, key))
 	}

-	fn contains(&self, key: &H256) -> bool {
+	fn exists(&self, key: &H256) -> bool {
 		if key == &SHA3_NULL_RLP {
 			return true;
 		}
-		self.db.contains(&combine_key(&self.address, key))
+		self.db.exists(&combine_key(&self.address, key))
 	}

 	fn insert(&mut self, value: &[u8]) -> H256 {
-		if value == &NULL_RLP {
-			return SHA3_NULL_RLP.clone();
-		}
 		let k = value.sha3();
 		let ak = combine_key(&self.address, &k);
 		self.db.emplace(ak, value.to_vec());
@@ -107,19 +107,13 @@ impl<'db> HashDB for AccountDBMut<'db>{
 	}

 	fn emplace(&mut self, key: H256, value: Bytes) {
-		if key == SHA3_NULL_RLP {
-			return;
-		}
 		let key = combine_key(&self.address, &key);
 		self.db.emplace(key, value.to_vec())
 	}

-	fn remove(&mut self, key: &H256) {
-		if key == &SHA3_NULL_RLP {
-			return;
-		}
+	fn kill(&mut self, key: &H256) {
 		let key = combine_key(&self.address, key);
-		self.db.remove(&key)
+		self.db.kill(&key)
 	}
 }

--- a/ethcore/src/types/account_diff.rs
+++ b/ethcore/src/types/account_diff.rs
@@ -17,48 +17,10 @@
 //! Diff between two accounts.

 use util::*;
+#[cfg(test)]
+use pod_account::*;

-#[derive(Debug, PartialEq, Eq, Clone)]
-/// Diff type for specifying a change (or not).
-pub enum Diff<T> where T: Eq {
-	/// Both sides are the same.
-	Same,
-	/// Left (pre, source) side doesn't include value, right side (post, destination) does.
-	Born(T),
-	/// Both sides include data; it chaged value between them.
-	Changed(T, T),
-	/// Left (pre, source) side does include value, right side (post, destination) does not.
-	Died(T),
-}
-
-impl<T> Diff<T> where T: Eq {
-	/// Construct new object with given `pre` and `post`.
-	pub fn new(pre: T, post: T) -> Self { if pre == post { Diff::Same } else { Diff::Changed(pre, post) } }
-
-	/// Get the before value, if there is one.
-	pub fn pre(&self) -> Option<&T> { match *self { Diff::Died(ref x) | Diff::Changed(ref x, _) => Some(x), _ => None } }
-
-	/// Get the after value, if there is one.
-	pub fn post(&self) -> Option<&T> { match *self { Diff::Born(ref x) | Diff::Changed(_, ref x) => Some(x), _ => None } }
-
-	/// Determine whether there was a change or not.
-	pub fn is_same(&self) -> bool { match *self { Diff::Same => true, _ => false }}
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-/// Account diff.
-pub struct AccountDiff {
-	/// Change in balance, allowed to be `Diff::Same`.
-	pub balance: Diff<U256>,
-	/// Change in nonce, allowed to be `Diff::Same`.
-	pub nonce: Diff<U256>,					// Allowed to be Same
-	/// Change in code, allowed to be `Diff::Same`.
-	pub code: Diff<Bytes>,					// Allowed to be Same
-	/// Change in storage, values are not allowed to be `Diff::Same`.
-	pub storage: BTreeMap<H256, Diff<H256>>,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
+#[derive(Debug,Clone,PartialEq,Eq)]
 /// Change in existance type. 
 // TODO: include other types of change.
 pub enum Existance {
@@ -81,6 +43,19 @@ impl fmt::Display for Existance {
 	}
 }

+#[derive(Debug,Clone,PartialEq,Eq)]
+/// Account diff.
+pub struct AccountDiff {
+	/// Change in balance, allowed to be `Diff::Same`.
+	pub balance: Diff<U256>,
+	/// Change in nonce, allowed to be `Diff::Same`.
+	pub nonce: Diff<U256>,					// Allowed to be Same
+	/// Change in code, allowed to be `Diff::Same`.
+	pub code: Diff<Bytes>,					// Allowed to be Same
+	/// Change in storage, values are not allowed to be `Diff::Same`.
+	pub storage: BTreeMap<H256, Diff<H256>>,
+}
+
 impl AccountDiff {
 	/// Get `Existance` projection.
 	pub fn existance(&self) -> Existance {
@@ -90,6 +65,47 @@ impl AccountDiff {
 			_ => Existance::Alive,
 		}
 	}
+
+	#[cfg(test)]
+	/// Determine difference between two optionally existant `Account`s. Returns None
+	/// if they are the same.
+	pub fn diff_pod(pre: Option<&PodAccount>, post: Option<&PodAccount>) -> Option<AccountDiff> {
+		match (pre, post) {
+			(None, Some(x)) => Some(AccountDiff {
+				balance: Diff::Born(x.balance),
+				nonce: Diff::Born(x.nonce),
+				code: Diff::Born(x.code.clone()),
+				storage: x.storage.iter().map(|(k, v)| (k.clone(), Diff::Born(v.clone()))).collect(),
+			}),
+			(Some(x), None) => Some(AccountDiff {
+				balance: Diff::Died(x.balance),
+				nonce: Diff::Died(x.nonce),
+				code: Diff::Died(x.code.clone()),
+				storage: x.storage.iter().map(|(k, v)| (k.clone(), Diff::Died(v.clone()))).collect(),
+			}),
+			(Some(pre), Some(post)) => {
+				let storage: Vec<_> = pre.storage.keys().merge(post.storage.keys())
+					.filter(|k| pre.storage.get(k).unwrap_or(&H256::new()) != post.storage.get(k).unwrap_or(&H256::new()))
+					.collect();
+				let r = AccountDiff {
+					balance: Diff::new(pre.balance, post.balance),
+					nonce: Diff::new(pre.nonce, post.nonce),
+					code: Diff::new(pre.code.clone(), post.code.clone()),
+					storage: storage.into_iter().map(|k|
+						(k.clone(), Diff::new(
+							pre.storage.get(&k).cloned().unwrap_or_else(H256::new),
+							post.storage.get(&k).cloned().unwrap_or_else(H256::new)
+						))).collect(),
+				};
+				if r.balance.is_same() && r.nonce.is_same() && r.code.is_same() && r.storage.is_empty() {
+					None
+				} else {
+					Some(r)
+				}
+			},
+			_ => None,
+		}
+	}
 }

 // TODO: refactor into something nicer.
--- a/ethcore/src/account_provider.rs
+++ b/ethcore/src/account_provider.rs
@@ -1,272 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-//! Account management.
-
-use std::fmt;
-use std::sync::RwLock;
-use std::collections::HashMap;
-use util::{Address as H160, H256, H520};
-use ethstore::{SecretStore, Error as SSError, SafeAccount, EthStore};
-use ethstore::dir::{KeyDirectory};
-use ethstore::ethkey::{Address as SSAddress, Message as SSMessage, Secret as SSSecret, Random, Generator};
-
-/// Type of unlock.
-#[derive(Clone)]
-enum Unlock {
-	/// If account is unlocked temporarily, it should be locked after first usage.
-	Temp,
-	/// Account unlocked permantently can always sign message.
-	/// Use with caution.
-	Perm,
-}
-
-/// Data associated with account.
-#[derive(Clone)]
-struct AccountData {
-	unlock: Unlock,
-	password: String,
-}
-
-/// `AccountProvider` errors.
-#[derive(Debug)]
-pub enum Error {
-	/// Returned when account is not unlocked.
-	NotUnlocked,
-	/// Returned when signing fails.
-	SStore(SSError),
-}
-
-impl fmt::Display for Error {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		match *self {
-			Error::NotUnlocked => write!(f, "Account is locked"),
-			Error::SStore(ref e) => write!(f, "{}", e),
-		}
-	}
-}
-
-impl From<SSError> for Error {
-	fn from(e: SSError) -> Self {
-		Error::SStore(e)
-	}
-}
-
-macro_rules! impl_bridge_type {
-	($name: ident, $size: expr, $core: ident, $store: ident) => {
-		/// Primitive
-		pub struct $name([u8; $size]);
-
-		impl From<[u8; $size]> for $name {
-			fn from(s: [u8; $size]) -> Self {
-				$name(s)
-			}
-		}
-
-		impl From<$core> for $name {
-			fn from(s: $core) -> Self {
-				$name(s.0)
-			}
-		}
-
-		impl From<$store> for $name {
-			fn from(s: $store) -> Self {
-				$name(s.into())
-			}
-		}
-
-		impl Into<$core> for $name {
-			fn into(self) -> $core {
-				$core(self.0)
-			}
-		}
-
-		impl Into<$store> for $name {
-			fn into(self) -> $store {
-				$store::from(self.0)
-			}
-		}
-	}
-}
-
-impl_bridge_type!(Secret, 32, H256, SSSecret);
-impl_bridge_type!(Message, 32, H256, SSMessage);
-impl_bridge_type!(Address, 20, H160, SSAddress);
-
-
-struct NullDir;
-
-impl KeyDirectory for NullDir {
-	fn load(&self) -> Result<Vec<SafeAccount>, SSError> {
-		Ok(vec![])
-	}
-
-	fn insert(&self, _account: SafeAccount) -> Result<(), SSError> {
-		Ok(())
-	}
-
-	fn remove(&self, _address: &SSAddress) -> Result<(), SSError> {
-		Ok(())
-	}
-}
-
-/// Account management.
-/// Responsible for unlocking accounts.
-pub struct AccountProvider {
-	unlocked: RwLock<HashMap<SSAddress, AccountData>>,
-	sstore: Box<SecretStore>,
-}
-
-impl AccountProvider {
-	/// Creates new account provider.
-	pub fn new(sstore: Box<SecretStore>) -> Self {
-		AccountProvider {
-			unlocked: RwLock::new(HashMap::new()),
-			sstore: sstore,
-		}
-	}
-
-	/// Creates not disk backed provider.
-	pub fn transient_provider() -> Self {
-		AccountProvider {
-			unlocked: RwLock::new(HashMap::new()),
-			sstore: Box::new(EthStore::open(Box::new(NullDir)).unwrap())
-		}
-	}
-
-	/// Creates new random account.
-	pub fn new_account(&self, password: &str) -> Result<H160, Error> {
-		let secret = Random.generate().unwrap().secret().clone();
-		let address = try!(self.sstore.insert_account(secret, password));
-		Ok(Address::from(address).into())
-	}
-
-	/// Inserts new account into underlying store.
-	/// Does not unlock account!
-	pub fn insert_account<S>(&self, secret: S, password: &str) -> Result<H160, Error> where Secret: From<S> {
-		let s = Secret::from(secret);
-		let address = try!(self.sstore.insert_account(s.into(), password));
-		Ok(Address::from(address).into())
-	}
-
-	/// Returns addresses of all accounts.
-	pub fn accounts(&self) -> Vec<H160> {
-		self.sstore.accounts().into_iter().map(|a| H160(a.into())).collect()
-	}
-
-	/// Helper method used for unlocking accounts.
-	fn unlock_account<A>(&self, account: A, password: String, unlock: Unlock) -> Result<(), Error> where Address: From<A> {
-		let a = Address::from(account);
-		let account = a.into();
-		// verify password by signing dump message
-		// result may be discarded
-		let _ = try!(self.sstore.sign(&account, &password, &Default::default()));
-
-		// check if account is already unlocked pernamently, if it is, do nothing
-		{
-			let unlocked = self.unlocked.read().unwrap();
-			if let Some(data) = unlocked.get(&account) {
-				if let Unlock::Perm = data.unlock {
-					return Ok(())
-				}
-			}
-		}
-
-		let data = AccountData {
-			unlock: unlock,
-			password: password,
-		};
-
-		let mut unlocked = self.unlocked.write().unwrap();
-		unlocked.insert(account, data);
-		Ok(())
-	}
-
-	/// Unlocks account permanently.
-	pub fn unlock_account_permanently<A>(&self, account: A, password: String) -> Result<(), Error> where Address: From<A> {
-		self.unlock_account(account, password, Unlock::Perm)
-	}
-
-	/// Unlocks account temporarily (for one signing).
-	pub fn unlock_account_temporarily<A>(&self, account: A, password: String) -> Result<(), Error> where Address: From<A> {
-		self.unlock_account(account, password, Unlock::Temp)
-	}
-
-	/// Checks if given account is unlocked
-	pub fn is_unlocked<A>(&self, account: A) -> bool where Address: From<A> {
-		let account = Address::from(account).into();
-		let unlocked = self.unlocked.read().unwrap();
-		unlocked.get(&account).is_some()
-	}
-
-	/// Signs the message. Account must be unlocked.
-	pub fn sign<A, M>(&self, account: A, message: M) -> Result<H520, Error> where Address: From<A>, Message: From<M> {
-		let account = Address::from(account).into();
-		let message = Message::from(message).into();
-
-		let data = {
-			let unlocked = self.unlocked.read().unwrap();
-			try!(unlocked.get(&account).ok_or(Error::NotUnlocked)).clone()
-		};
-
-		if let Unlock::Temp = data.unlock {
-			let mut unlocked = self.unlocked.write().unwrap();
-			unlocked.remove(&account).expect("data exists: so key must exist: qed");
-		}
-
-		let signature = try!(self.sstore.sign(&account, &data.password, &message));
-		Ok(H520(signature.into()))
-	}
-
-	/// Unlocks an account, signs the message, and locks it again.
-	pub fn sign_with_password<A, M>(&self, account: A, password: String, message: M) -> Result<H520, Error> where Address: From<A>, Message: From<M> {
-		let account = Address::from(account).into();
-		let message = Message::from(message).into();
-		let signature = try!(self.sstore.sign(&account, &password, &message));
-		Ok(H520(signature.into()))
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use super::AccountProvider;
-	use ethstore::ethkey::{Generator, Random};
-
-	#[test]
-	fn unlock_account_temp() {
-		let kp = Random.generate().unwrap();
-		let ap = AccountProvider::transient_provider();
-		assert!(ap.insert_account(kp.secret().clone(), "test").is_ok());
-		assert!(ap.unlock_account_temporarily(kp.address(), "test1".into()).is_err());
-		assert!(ap.unlock_account_temporarily(kp.address(), "test".into()).is_ok());
-		assert!(ap.sign(kp.address(), [0u8; 32]).is_ok());
-		assert!(ap.sign(kp.address(), [0u8; 32]).is_err());
-	}
-
-	#[test]
-	fn unlock_account_perm() {
-		let kp = Random.generate().unwrap();
-		let ap = AccountProvider::transient_provider();
-		assert!(ap.insert_account(kp.secret().clone(), "test").is_ok());
-		assert!(ap.unlock_account_permanently(kp.address(), "test1".into()).is_err());
-		assert!(ap.unlock_account_permanently(kp.address(), "test".into()).is_ok());
-		assert!(ap.sign(kp.address(), [0u8; 32]).is_ok());
-		assert!(ap.sign(kp.address(), [0u8; 32]).is_ok());
-		assert!(ap.unlock_account_temporarily(kp.address(), "test".into()).is_ok());
-		assert!(ap.sign(kp.address(), [0u8; 32]).is_ok());
-		assert!(ap.sign(kp.address(), [0u8; 32]).is_ok());
-	}
-}
--- a/ethcore/src/action_params.rs
+++ b/ethcore/src/action_params.rs
@@ -15,8 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Evm input params.
-use common::*;
-use ethjson;
+use util::hash::*;
+use util::uint::*;
+use util::bytes::*;

 /// Transaction value
 #[derive(Clone, Debug)]
@@ -27,15 +28,6 @@ pub enum ActionValue {
 	Apparent(U256)
 }

-impl ActionValue {
-	/// Returns action value as U256.
-	pub fn value(&self) -> U256 {
-		match *self {
-			ActionValue::Transfer(x) | ActionValue::Apparent(x) => x
-		}
-	}
-}
-
 // TODO: should be a trait, possible to avoid cloning everything from a Transaction(/View).
 /// Action (call/create) input params. Everything else should be specified in Externalities.
 #[derive(Clone, Debug)]
@@ -77,19 +69,3 @@ impl Default for ActionParams {
 		}
 	}
 }
-
-impl From<ethjson::vm::Transaction> for ActionParams {
-	fn from(t: ethjson::vm::Transaction) -> Self {
-		ActionParams {
-			code_address: Address::new(),
-			address: t.address.into(),
-			sender: t.sender.into(),
-			origin: t.origin.into(),
-			code: Some(t.code.into()),
-			data: Some(t.data.into()),
-			gas: t.gas.into(),
-			gas_price: t.gas_price.into(),
-			value: ActionValue::Transfer(t.value.into()),
-		}
-	}
-}
--- a/ethcore/src/basic_authority.rs
+++ b/ethcore/src/basic_authority.rs
@@ -1,261 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 blockchain engine that supports a basic, non-BFT proof-of-authority.
-
-use common::*;
-use account_provider::AccountProvider;
-use block::*;
-use spec::{CommonParams, Spec};
-use engine::*;
-use evm::Schedule;
-use ethjson;
-
-/// `BasicAuthority` params.
-#[derive(Debug, PartialEq)]
-pub struct BasicAuthorityParams {
-	/// Gas limit divisor.
-	pub gas_limit_bound_divisor: U256,
-	/// Block duration.
-	pub duration_limit: u64,
-	/// Valid signatories.
-	pub authorities: HashSet<Address>,
-}
-
-impl From<ethjson::spec::BasicAuthorityParams> for BasicAuthorityParams {
-	fn from(p: ethjson::spec::BasicAuthorityParams) -> Self {
-		BasicAuthorityParams {
-			gas_limit_bound_divisor: p.gas_limit_bound_divisor.into(),
-			duration_limit: p.duration_limit.into(),
-			authorities: p.authorities.into_iter().map(Into::into).collect::<HashSet<_>>(),
-		}
-	}
-}
-
-/// Engine using `BasicAuthority` proof-of-work consensus algorithm, suitable for Ethereum
-/// mainnet chains in the Olympic, Frontier and Homestead eras.
-pub struct BasicAuthority {
-	params: CommonParams,
-	our_params: BasicAuthorityParams,
-	builtins: BTreeMap<Address, Builtin>,
-}
-
-impl BasicAuthority {
-	/// Create a new instance of BasicAuthority engine
-	pub fn new(params: CommonParams, our_params: BasicAuthorityParams, builtins: BTreeMap<Address, Builtin>) -> Self {
-		BasicAuthority {
-			params: params,
-			our_params: our_params,
-			builtins: builtins,
-		}
-	}
-}
-
-impl Engine for BasicAuthority {
-	fn name(&self) -> &str { "BasicAuthority" }
-	fn version(&self) -> SemanticVersion { SemanticVersion::new(1, 0, 0) }
-	// One field - the signature
-	fn seal_fields(&self) -> usize { 1 }
-
-	fn params(&self) -> &CommonParams { &self.params }
-	fn builtins(&self) -> &BTreeMap<Address, Builtin> { &self.builtins }
-
-	/// Additional engine-specific information for the user/developer concerning `header`.
-	fn extra_info(&self, _header: &Header) -> HashMap<String, String> { hash_map!["signature".to_owned() => "TODO".to_owned()] }
-
-	fn schedule(&self, _env_info: &EnvInfo) -> Schedule {
-		Schedule::new_homestead()
-	}
-
-	fn populate_from_parent(&self, header: &mut Header, parent: &Header, gas_floor_target: U256, _gas_ceil_target: U256) {
-		header.difficulty = parent.difficulty;
-		header.gas_limit = {
-			let gas_limit = parent.gas_limit;
-			let bound_divisor = self.our_params.gas_limit_bound_divisor;
-			if gas_limit < gas_floor_target {
-				min(gas_floor_target, gas_limit + gas_limit / bound_divisor - 1.into())
-			} else {
-				max(gas_floor_target, gas_limit - gas_limit / bound_divisor + 1.into())
-			}
-		};
-		header.note_dirty();
-//		info!("ethash: populate_from_parent #{}: difficulty={} and gas_limit={}", header.number, header.difficulty, header.gas_limit);
-	}
-
-	/// Apply the block reward on finalisation of the block.
-	/// This assumes that all uncles are valid uncles (i.e. of at least one generation before the current).
-	fn on_close_block(&self, _block: &mut ExecutedBlock) {}
-
-	/// Attempt to seal the block internally.
-	///
-	/// This operation is synchronous and may (quite reasonably) not be available, in which `false` will
-	/// be returned.
-	fn generate_seal(&self, block: &ExecutedBlock, accounts: Option<&AccountProvider>) -> Option<Vec<Bytes>> {
-		if let Some(ap) = accounts {
-			let header = block.header();
-			let message = header.bare_hash();
-			// account should be pernamently unlocked, otherwise sealing will fail
-			if let Ok(signature) = ap.sign(*block.header().author(), message) {
-				return Some(vec![encode(&signature).to_vec()]);
-			} else {
-				trace!(target: "basicauthority", "generate_seal: FAIL: accounts secret key unavailable");
-			}
-		} else {
-			trace!(target: "basicauthority", "generate_seal: FAIL: accounts not provided");
-		}
-		None
-	}
-
-	fn verify_block_basic(&self, header: &Header, _block: Option<&[u8]>) -> result::Result<(), Error> {
-		// check the seal fields.
-		// TODO: pull this out into common code.
-		if header.seal.len() != self.seal_fields() {
-			return Err(From::from(BlockError::InvalidSealArity(
-				Mismatch { expected: self.seal_fields(), found: header.seal.len() }
-			)));
-		}
-		Ok(())
-	}
-
-	fn verify_block_unordered(&self, header: &Header, _block: Option<&[u8]>) -> result::Result<(), Error> {
-		// check the signature is legit.
-		let sig = try!(UntrustedRlp::new(&header.seal[0]).as_val::<H520>());
-		let signer = Address::from(try!(ec::recover(&sig, &header.bare_hash())).sha3());
-		if !self.our_params.authorities.contains(&signer) {
-			return try!(Err(BlockError::InvalidSeal));
-		}
-		Ok(())
-	}
-
-	fn verify_block_family(&self, header: &Header, parent: &Header, _block: Option<&[u8]>) -> result::Result<(), Error> {
-		// we should not calculate difficulty for genesis blocks
-		if header.number() == 0 {
-			return Err(From::from(BlockError::RidiculousNumber(OutOfBounds { min: Some(1), max: None, found: header.number() })));
-		}
-
-		// Check difficulty is correct given the two timestamps.
-		if header.difficulty() != parent.difficulty() {
-			return Err(From::from(BlockError::InvalidDifficulty(Mismatch { expected: *parent.difficulty(), found: *header.difficulty() })))
-		}
-		let gas_limit_divisor = self.our_params.gas_limit_bound_divisor;
-		let min_gas = parent.gas_limit - parent.gas_limit / gas_limit_divisor;
-		let max_gas = parent.gas_limit + parent.gas_limit / gas_limit_divisor;
-		if header.gas_limit <= min_gas || header.gas_limit >= max_gas {
-			return Err(From::from(BlockError::InvalidGasLimit(OutOfBounds { min: Some(min_gas), max: Some(max_gas), found: header.gas_limit })));
-		}
-		Ok(())
-	}
-
-	fn verify_transaction_basic(&self, t: &SignedTransaction, _header: &Header) -> result::Result<(), Error> {
-		try!(t.check_low_s());
-		Ok(())
-	}
-
-	fn verify_transaction(&self, t: &SignedTransaction, _header: &Header) -> Result<(), Error> {
-		t.sender().map(|_|()) // Perform EC recovery and cache sender
-	}
-}
-
-impl Header {
-	/// Get the none field of the header.
-	pub fn signature(&self) -> H520 {
-		decode(&self.seal()[0])
-	}
-}
-
-/// Create a new test chain spec with `BasicAuthority` consensus engine.
-pub fn new_test_authority() -> Spec { Spec::load(include_bytes!("../res/test_authority.json")) }
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-	use common::*;
-	use block::*;
-	use tests::helpers::*;
-	use account_provider::AccountProvider;
-
-	#[test]
-	fn has_valid_metadata() {
-		let engine = new_test_authority().engine;
-		assert!(!engine.name().is_empty());
-		assert!(engine.version().major >= 1);
-	}
-
-	#[test]
-	fn can_return_schedule() {
-		let engine = new_test_authority().engine;
-		let schedule = engine.schedule(&EnvInfo {
-			number: 10000000,
-			author: 0.into(),
-			timestamp: 0,
-			difficulty: 0.into(),
-			last_hashes: vec![],
-			gas_used: 0.into(),
-			gas_limit: 0.into(),
-		});
-
-		assert!(schedule.stack_limit > 0);
-	}
-
-	#[test]
-	fn can_do_seal_verification_fail() {
-		let engine = new_test_authority().engine;
-		let header: Header = Header::default();
-
-		let verify_result = engine.verify_block_basic(&header, None);
-
-		match verify_result {
-			Err(Error::Block(BlockError::InvalidSealArity(_))) => {},
-			Err(_) => { panic!("should be block seal-arity mismatch error (got {:?})", verify_result); },
-			_ => { panic!("Should be error, got Ok"); },
-		}
-	}
-
-	#[test]
-	fn can_do_signature_verification_fail() {
-		let engine = new_test_authority().engine;
-		let mut header: Header = Header::default();
-		header.set_seal(vec![rlp::encode(&Signature::zero()).to_vec()]);
-
-		let verify_result = engine.verify_block_unordered(&header, None);
-
-		match verify_result {
-			Err(Error::Util(UtilError::Crypto(CryptoError::InvalidSignature))) => {},
-			Err(_) => { panic!("should be block difficulty error (got {:?})", verify_result); },
-			_ => { panic!("Should be error, got Ok"); },
-		}
-	}
-
-	#[test]
-	fn can_generate_seal() {
-		let tap = AccountProvider::transient_provider();
-		let addr = tap.insert_account("".sha3(), "").unwrap();
-		tap.unlock_account_permanently(addr, "".into()).unwrap();
-
-		let spec = new_test_authority();
-		let engine = &spec.engine;
-		let genesis_header = spec.genesis_header();
-		let mut db_result = get_temp_journal_db();
-		let mut db = db_result.take();
-		spec.ensure_db_good(db.as_hashdb_mut());
-		let last_hashes = vec![genesis_header.hash()];
-		let vm_factory = Default::default();
-		let b = OpenBlock::new(engine.deref(), &vm_factory, false, db, &genesis_header, last_hashes, addr, (3141562.into(), 31415620.into()), vec![]).unwrap();
-		let b = b.close_and_lock();
-		let seal = engine.generate_seal(b.block(), Some(&tap)).unwrap();
-		assert!(b.try_seal(engine.deref(), seal).is_ok());
-	}
-}
--- a/ethcore/src/basic_types.rs
+++ b/ethcore/src/basic_types.rs
@@ -24,7 +24,6 @@ pub type LogBloom = H2048;
 /// Constant 2048-bit datum for 0. Often used as a default.
 pub static ZERO_LOGBLOOM: LogBloom = H2048([0x00; 256]);

-#[cfg_attr(feature="dev", allow(enum_variant_names))]
 /// Semantic boolean for when a seal/signature is included.
 pub enum Seal {
 	/// The seal/signature is included.
--- a/ethcore/src/block.rs
+++ b/ethcore/src/block.rs
@@ -16,16 +16,15 @@

 //! Blockchain block.

-#![cfg_attr(feature="dev", allow(ptr_arg))] // Because of &LastHashes -> &Vec<_>
+#![allow(ptr_arg)] // Because of &LastHashes -> &Vec<_>

 use common::*;
 use engine::*;
 use state::*;
-use verification::PreverifiedBlock;
-use trace::Trace;
-use evm::Factory as EvmFactory;
+use verification::PreVerifiedBlock;

 /// A block, encoded as it is on the block chain.
+// TODO: rename to Block
 #[derive(Default, Debug, Clone)]
 pub struct Block {
 	/// The header of this block.
@@ -38,25 +37,31 @@ pub struct Block {

 impl Block {
 	/// Returns true if the given bytes form a valid encoding of a block in RLP.
+	// TODO: implement Decoder for this and have this use that.
 	pub fn is_good(b: &[u8]) -> bool {
+		/*
+		let urlp = UntrustedRlp::new(&b);
+		if !urlp.is_list() || urlp.item_count() != 3 || urlp.size() != b.len() { return false; }
+		if urlp.val_at::<Header>(0).is_err() { return false; }
+
+		if !urlp.at(1).unwrap().is_list() { return false; }
+		if urlp.at(1).unwrap().iter().find(|i| i.as_val::<Transaction>().is_err()).is_some() {
+			return false;
+		}
+		
+		if !urlp.at(2).unwrap().is_list() { return false; }
+		if urlp.at(2).unwrap().iter().find(|i| i.as_val::<Header>().is_err()).is_some() {
+			return false;
+		}
+		true*/
 		UntrustedRlp::new(b).as_val::<Block>().is_ok()
 	}
-
-	/// Get the RLP-encoding of the block without the seal.
-	pub fn rlp_bytes(&self, seal: Seal) -> Bytes {
-		let mut block_rlp = RlpStream::new_list(3);
-		self.header.stream_rlp(&mut block_rlp, seal);
-		block_rlp.append(&self.transactions);
-		block_rlp.append(&self.uncles);
-		block_rlp.out()
-	}
 }

-
 impl Decodable for Block {
 	fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder {
 		if decoder.as_raw().len() != try!(decoder.as_rlp().payload_info()).total() {
-			return Err(DecoderError::RlpIsTooBig);
+			return Err(DecoderError::RlpIsTooBig);	
 		}
 		let d = decoder.as_rlp();
 		if d.item_count() != 3 {
@@ -71,34 +76,19 @@ impl Decodable for Block {
 }

 /// Internal type for a block's common elements.
-#[derive(Clone)]
+// TODO: rename to ExecutedBlock
+// TODO: use BareBlock
+#[derive(Debug)]
 pub struct ExecutedBlock {
 	base: Block,

 	receipts: Vec<Receipt>,
 	transactions_set: HashSet<H256>,
 	state: State,
-	traces: Option<Vec<Trace>>,
 }

-/// A set of references to `ExecutedBlock` fields that are publicly accessible.
+/// A set of references to `ExecutedBlock` fields that are publicly accessible. 
 pub struct BlockRefMut<'a> {
-	/// Block header.
-	pub header: &'a mut Header,
-	/// Block transactions.
-	pub transactions: &'a Vec<SignedTransaction>,
-	/// Block uncles.
-	pub uncles: &'a Vec<Header>,
-	/// Transaction receipts.
-	pub receipts: &'a Vec<Receipt>,
-	/// State.
-	pub state: &'a mut State,
-	/// Traces.
-	pub traces: &'a Option<Vec<Trace>>,
-}
-
-/// A set of immutable references to `ExecutedBlock` fields that are publicly accessible.
-pub struct BlockRef<'a> {
 	/// Block header.
 	pub header: &'a Header,
 	/// Block transactions.
@@ -108,56 +98,30 @@ pub struct BlockRef<'a> {
 	/// Transaction receipts.
 	pub receipts: &'a Vec<Receipt>,
 	/// State.
-	pub state: &'a State,
-	/// Traces.
-	pub traces: &'a Option<Vec<Trace>>,
+	pub state: &'a mut State,
 }

 impl ExecutedBlock {
 	/// Create a new block from the given `state`.
-	fn new(state: State, tracing: bool) -> ExecutedBlock {
-		ExecutedBlock {
-			base: Default::default(),
-			receipts: Default::default(),
-			transactions_set: Default::default(),
-			state: state,
-			traces: if tracing {Some(Vec::new())} else {None},
-		}
-	}
+	fn new(state: State) -> ExecutedBlock { ExecutedBlock { base: Default::default(), receipts: Default::default(), transactions_set: Default::default(), state: state } }

 	/// Get a structure containing individual references to all public fields.
-	pub fn fields_mut(&mut self) -> BlockRefMut {
+	pub fn fields(&mut self) -> BlockRefMut {
 		BlockRefMut {
-			header: &mut self.base.header,
+			header: &self.base.header,
 			transactions: &self.base.transactions,
 			uncles: &self.base.uncles,
 			state: &mut self.state,
 			receipts: &self.receipts,
-			traces: &self.traces,
-		}
-	}
-
-	/// Get a structure containing individual references to all public fields.
-	pub fn fields(&self) -> BlockRef {
-		BlockRef {
-			header: &self.base.header,
-			transactions: &self.base.transactions,
-			uncles: &self.base.uncles,
-			state: &self.state,
-			receipts: &self.receipts,
-			traces: &self.traces,
 		}
 	}
 }

-/// Trait for a object that is a `ExecutedBlock`.
+/// Trait for a object that is_a `ExecutedBlock`.
 pub trait IsBlock {
-	/// Get the `ExecutedBlock` associated with this object.
+	/// Get the block associated with this object.
 	fn block(&self) -> &ExecutedBlock;

-	/// Get the base `Block` object associated with this.
-	fn base(&self) -> &Block { &self.block().base }
-
 	/// Get the header associated with this object's block.
 	fn header(&self) -> &Header { &self.block().base.header }

@@ -170,95 +134,58 @@ pub trait IsBlock {
 	/// Get all information on receipts in this block.
 	fn receipts(&self) -> &Vec<Receipt> { &self.block().receipts }

-	/// Get all information concerning transaction tracing in this block.
-	fn traces(&self) -> &Option<Vec<Trace>> { &self.block().traces }
-
 	/// Get all uncles in this block.
 	fn uncles(&self) -> &Vec<Header> { &self.block().base.uncles }
 }

-/// Trait for a object that has a state database.
-pub trait Drain {
-	/// Drop this object and return the underlieing database.
-	fn drain(self) -> Box<JournalDB>;
-}
-
 impl IsBlock for ExecutedBlock {
 	fn block(&self) -> &ExecutedBlock { self }
 }

 /// Block that is ready for transactions to be added.
 ///
-/// It's a bit like a Vec<Transaction>, except that whenever a transaction is pushed, we execute it and
+/// It's a bit like a Vec<Transaction>, eccept that whenever a transaction is pushed, we execute it and
 /// maintain the system `state()`. We also archive execution receipts in preparation for later block creation.
-pub struct OpenBlock<'x> {
+pub struct OpenBlock<'x, 'y> {
 	block: ExecutedBlock,
 	engine: &'x Engine,
-	vm_factory: &'x EvmFactory,
-	last_hashes: LastHashes,
+	last_hashes: &'y LastHashes,
 }

-/// Just like `OpenBlock`, except that we've applied `Engine::on_close_block`, finished up the non-seal header fields,
+/// Just like OpenBlock, except that we've applied `Engine::on_close_block`, finished up the non-seal header fields,
 /// and collected the uncles.
 ///
-/// There is no function available to push a transaction.
-#[derive(Clone)]
-pub struct ClosedBlock {
-	block: ExecutedBlock,
-	uncle_bytes: Bytes,
-	last_hashes: LastHashes,
-	unclosed_state: State,
-}
-
-/// Just like `ClosedBlock` except that we can't reopen it and it's faster.
-///
-/// We actually store the post-`Engine::on_close_block` state, unlike in `ClosedBlock` where it's the pre.
-#[derive(Clone)]
-pub struct LockedBlock {
-	block: ExecutedBlock,
+/// There is no function available to push a transaction. If you want that you'll need to `reopen()` it.
+pub struct ClosedBlock<'x, 'y> {
+	open_block: OpenBlock<'x, 'y>,
 	uncle_bytes: Bytes,
 }

 /// A block that has a valid seal.
 ///
-/// The block's header has valid seal arguments. The block cannot be reversed into a `ClosedBlock` or `OpenBlock`.
+/// The block's header has valid seal arguments. The block cannot be reversed into a ClosedBlock or OpenBlock.
 pub struct SealedBlock {
 	block: ExecutedBlock,
 	uncle_bytes: Bytes,
 }

-impl<'x> OpenBlock<'x> {
-	#[cfg_attr(feature="dev", allow(too_many_arguments))]
-	/// Create a new `OpenBlock` ready for transaction pushing.
-	pub fn new(
-		engine: &'x Engine,
-		vm_factory: &'x EvmFactory,
-		tracing: bool,
-		db: Box<JournalDB>,
-		parent: &Header,
-		last_hashes: LastHashes,
-		author: Address,
-		gas_range_target: (U256, U256),
-		extra_data: Bytes,
-	) -> Result<Self, Error> {
-		let state = try!(State::from_existing(db, parent.state_root().clone(), engine.account_start_nonce()));
+impl<'x, 'y> OpenBlock<'x, 'y> {
+	/// Create a new OpenBlock ready for transaction pushing.
+	pub fn new<'a, 'b>(engine: &'a Engine, db: JournalDB, parent: &Header, last_hashes: &'b LastHashes, author: Address, extra_data: Bytes) -> OpenBlock<'a, 'b> {
 		let mut r = OpenBlock {
-			block: ExecutedBlock::new(state, tracing),
+			block: ExecutedBlock::new(State::from_existing(db, parent.state_root().clone(), engine.account_start_nonce())),
 			engine: engine,
-			vm_factory: vm_factory,
 			last_hashes: last_hashes,
 		};

-		r.block.base.header.parent_hash = parent.hash();
-		r.block.base.header.number = parent.number + 1;
-		r.block.base.header.author = author;
-		r.block.base.header.set_timestamp_now(parent.timestamp());
-		r.block.base.header.extra_data = extra_data;
-		r.block.base.header.note_dirty();
+		r.block.base.header.set_number(parent.number() + 1);
+		r.block.base.header.set_author(author);
+		r.block.base.header.set_extra_data(extra_data);
+		r.block.base.header.set_timestamp_now();

-		engine.populate_from_parent(&mut r.block.base.header, parent, gas_range_target.0, gas_range_target.1);
+		engine.populate_from_parent(&mut r.block.base.header, parent);
 		engine.on_new_block(&mut r.block);
-		Ok(r)
+		r
 	}

 	/// Alter the author for the block.
@@ -291,8 +218,8 @@ impl<'x> OpenBlock<'x> {
 	/// NOTE Will check chain constraints and the uncle number but will NOT check
 	/// that the header itself is actually valid.
 	pub fn push_uncle(&mut self, valid_uncle_header: Header) -> Result<(), BlockError> {
-		if self.block.base.uncles.len() + 1 > self.engine.maximum_uncle_count() {
-			return Err(BlockError::TooManyUncles(OutOfBounds{min: None, max: Some(self.engine.maximum_uncle_count()), found: self.block.base.uncles.len() + 1}));
+		if self.block.base.uncles.len() >= self.engine.maximum_uncle_count() {
+			return Err(BlockError::TooManyUncles(OutOfBounds{min: None, max: Some(self.engine.maximum_uncle_count()), found: self.block.base.uncles.len()}));
 		}
 		// TODO: check number
 		// TODO: check not a direct ancestor (use last_hashes for that)
@@ -318,140 +245,72 @@ impl<'x> OpenBlock<'x> {
 	///
 	/// If valid, it will be executed, and archived together with the receipt.
 	pub fn push_transaction(&mut self, t: SignedTransaction, h: Option<H256>) -> Result<&Receipt, Error> {
-		if self.block.transactions_set.contains(&t.hash()) {
-			return Err(From::from(TransactionError::AlreadyImported));
-		}
-
 		let env_info = self.env_info();
 //		info!("env_info says gas_used={}", env_info.gas_used);
-		match self.block.state.apply(&env_info, self.engine, self.vm_factory, &t, self.block.traces.is_some()) {
-			Ok(outcome) => {
+		match self.block.state.apply(&env_info, self.engine, &t) {
+			Ok(receipt) => {
 				self.block.transactions_set.insert(h.unwrap_or_else(||t.hash()));
 				self.block.base.transactions.push(t);
-				let t = outcome.trace;
-				self.block.traces.as_mut().map(|traces| traces.push(t.expect("self.block.traces.is_some(): so we must be tracing: qed")));
-				self.block.receipts.push(outcome.receipt);
+				self.block.receipts.push(receipt);
 				Ok(&self.block.receipts.last().unwrap())
 			}
 			Err(x) => Err(From::from(x))
 		}
 	}

-	/// Turn this into a `ClosedBlock`. A `BlockChain` must be provided in order to figure out the uncles.
-	pub fn close(self) -> ClosedBlock {
+	/// Turn this into a `ClosedBlock`. A BlockChain must be provided in order to figure out the uncles.
+	pub fn close(self) -> ClosedBlock<'x, 'y> {
 		let mut s = self;
-
-		let unclosed_state = s.block.state.clone();
-
 		s.engine.on_close_block(&mut s.block);
 		s.block.base.header.transactions_root = ordered_trie_root(s.block.base.transactions.iter().map(|ref e| e.rlp_bytes().to_vec()).collect());
-		let uncle_bytes = s.block.base.uncles.iter().fold(RlpStream::new_list(s.block.base.uncles.len()), |mut s, u| {s.append_raw(&u.rlp(Seal::With), 1); s} ).out();
+		let uncle_bytes = s.block.base.uncles.iter().fold(RlpStream::new_list(s.block.base.uncles.len()), |mut s, u| {s.append(&u.rlp(Seal::With)); s} ).out();
 		s.block.base.header.uncles_hash = uncle_bytes.sha3();
 		s.block.base.header.state_root = s.block.state.root().clone();
 		s.block.base.header.receipts_root = ordered_trie_root(s.block.receipts.iter().map(|ref r| r.rlp_bytes().to_vec()).collect());
-		s.block.base.header.log_bloom = s.block.receipts.iter().fold(LogBloom::zero(), |mut b, r| {b = &b | &r.log_bloom; b}); //TODO: use |= operator
+		s.block.base.header.log_bloom = s.block.receipts.iter().fold(LogBloom::zero(), |mut b, r| {b |= &r.log_bloom; b});
 		s.block.base.header.gas_used = s.block.receipts.last().map_or(U256::zero(), |r| r.gas_used);
 		s.block.base.header.note_dirty();

+		ClosedBlock::new(s, uncle_bytes)
+	}
+}
+
+impl<'x, 'y> IsBlock for OpenBlock<'x, 'y> {
+	fn block(&self) -> &ExecutedBlock { &self.block }
+}
+
+impl<'x, 'y> IsBlock for ClosedBlock<'x, 'y> {
+	fn block(&self) -> &ExecutedBlock { &self.open_block.block }
+}
+
+impl<'x, 'y> ClosedBlock<'x, 'y> {
+	fn new<'a, 'b>(open_block: OpenBlock<'a, 'b>, uncle_bytes: Bytes) -> ClosedBlock<'a, 'b> {
 		ClosedBlock {
-			block: s.block,
-			uncle_bytes: uncle_bytes,
-			last_hashes: s.last_hashes,
-			unclosed_state: unclosed_state,
-		}
-	}
-
-	/// Turn this into a `LockedBlock`. A BlockChain must be provided in order to figure out the uncles.
-	pub fn close_and_lock(self) -> LockedBlock {
-		let mut s = self;
-
-		s.engine.on_close_block(&mut s.block);
-		s.block.base.header.transactions_root = ordered_trie_root(s.block.base.transactions.iter().map(|ref e| e.rlp_bytes().to_vec()).collect());
-		let uncle_bytes = s.block.base.uncles.iter().fold(RlpStream::new_list(s.block.base.uncles.len()), |mut s, u| {s.append_raw(&u.rlp(Seal::With), 1); s} ).out();
-		s.block.base.header.uncles_hash = uncle_bytes.sha3();
-		s.block.base.header.state_root = s.block.state.root().clone();
-		s.block.base.header.receipts_root = ordered_trie_root(s.block.receipts.iter().map(|ref r| r.rlp_bytes().to_vec()).collect());
-		s.block.base.header.log_bloom = s.block.receipts.iter().fold(LogBloom::zero(), |mut b, r| {b = &b | &r.log_bloom; b}); //TODO: use |= operator
-		s.block.base.header.gas_used = s.block.receipts.last().map_or(U256::zero(), |r| r.gas_used);
-		s.block.base.header.note_dirty();
-
-		LockedBlock {
-			block: s.block,
+			open_block: open_block,
 			uncle_bytes: uncle_bytes,
 		}
 	}
-}

-impl<'x> IsBlock for OpenBlock<'x> {
-	fn block(&self) -> &ExecutedBlock { &self.block }
-}
-
-impl<'x> IsBlock for ClosedBlock {
-	fn block(&self) -> &ExecutedBlock { &self.block }
-}
-
-impl<'x> IsBlock for LockedBlock {
-	fn block(&self) -> &ExecutedBlock { &self.block }
-}
-
-impl ClosedBlock {
-	/// Get the hash of the header without seal arguments.
-	pub fn hash(&self) -> H256 { self.header().rlp_sha3(Seal::Without) }
-
-	/// Turn this into a `LockedBlock`, unable to be reopened again.
-	pub fn lock(self) -> LockedBlock {
-		LockedBlock {
-			block: self.block,
-			uncle_bytes: self.uncle_bytes,
-		}
-	}
-
-	/// Given an engine reference, reopen the `ClosedBlock` into an `OpenBlock`.
-	pub fn reopen<'a>(self, engine: &'a Engine, vm_factory: &'a EvmFactory) -> OpenBlock<'a> {
-		// revert rewards (i.e. set state back at last transaction's state).
-		let mut block = self.block;
-		block.state = self.unclosed_state;
-		OpenBlock {
-			block: block,
-			engine: engine,
-			vm_factory: vm_factory,
-			last_hashes: self.last_hashes,
-		}
-	}
-}
-
-impl LockedBlock {
 	/// Get the hash of the header without seal arguments.
 	pub fn hash(&self) -> H256 { self.header().rlp_sha3(Seal::Without) }

 	/// Provide a valid seal in order to turn this into a `SealedBlock`.
 	///
 	/// NOTE: This does not check the validity of `seal` with the engine.
-	pub fn seal(self, engine: &Engine, seal: Vec<Bytes>) -> Result<SealedBlock, BlockError> {
+	pub fn seal(self, seal: Vec<Bytes>) -> Result<SealedBlock, BlockError> {
 		let mut s = self;
-		if seal.len() != engine.seal_fields() {
-			return Err(BlockError::InvalidSealArity(Mismatch{expected: engine.seal_fields(), found: seal.len()}));
+		if seal.len() != s.open_block.engine.seal_fields() {
+			return Err(BlockError::InvalidSealArity(Mismatch{expected: s.open_block.engine.seal_fields(), found: seal.len()}));
 		}
-		s.block.base.header.set_seal(seal);
-		Ok(SealedBlock { block: s.block, uncle_bytes: s.uncle_bytes })
+		s.open_block.block.base.header.set_seal(seal);
+		Ok(SealedBlock { block: s.open_block.block, uncle_bytes: s.uncle_bytes })
 	}

-	/// Provide a valid seal in order to turn this into a `SealedBlock`.
-	/// This does check the validity of `seal` with the engine.
-	/// Returns the `ClosedBlock` back again if the seal is no good.
-	pub fn try_seal(self, engine: &Engine, seal: Vec<Bytes>) -> Result<SealedBlock, LockedBlock> {
-		let mut s = self;
-		s.block.base.header.set_seal(seal);
-		match engine.verify_block_seal(&s.block.base.header) {
-			Err(_) => Err(s),
-			_ => Ok(SealedBlock { block: s.block, uncle_bytes: s.uncle_bytes }),
-		}
-	}
-}
+	/// Turn this back into an `OpenBlock`.
+	pub fn reopen(self) -> OpenBlock<'x, 'y> { self.open_block }

-impl Drain for LockedBlock {
 	/// Drop this object and return the underlieing database.
-	fn drain(self) -> Box<JournalDB> { self.block.state.drop().1 }
+	pub fn drain(self) -> JournalDB { self.open_block.block.state.drop().1 }
 }

 impl SealedBlock {
@@ -463,11 +322,9 @@ impl SealedBlock {
 		block_rlp.append_raw(&self.uncle_bytes, 1);
 		block_rlp.out()
 	}
-}

-impl Drain for SealedBlock {
 	/// Drop this object and return the underlieing database.
-	fn drain(self) -> Box<JournalDB> { self.block.state.drop().1 }
+	pub fn drain(self) -> JournalDB { self.block.state.drop().1 }
 }

 impl IsBlock for SealedBlock {
@@ -475,80 +332,40 @@ impl IsBlock for SealedBlock {
 }

 /// Enact the block given by block header, transactions and uncles
-#[cfg_attr(feature="dev", allow(too_many_arguments))]
-pub fn enact(
-	header: &Header,
-	transactions: &[SignedTransaction],
-	uncles: &[Header],
-	engine: &Engine,
-	tracing: bool,
-	db: Box<JournalDB>,
-	parent: &Header,
-	last_hashes: LastHashes,
-	vm_factory: &EvmFactory
-) -> Result<LockedBlock, Error> {
+pub fn enact<'x, 'y>(header: &Header, transactions: &[SignedTransaction], uncles: &[Header], engine: &'x Engine, db: JournalDB, parent: &Header, last_hashes: &'y LastHashes) -> Result<ClosedBlock<'x, 'y>, Error> {
 	{
 		if ::log::max_log_level() >= ::log::LogLevel::Trace {
-			let s = try!(State::from_existing(db.boxed_clone(), parent.state_root().clone(), engine.account_start_nonce()));
+			let s = State::from_existing(db.clone(), parent.state_root().clone(), engine.account_start_nonce());
 			trace!("enact(): root={}, author={}, author_balance={}\n", s.root(), header.author(), s.balance(&header.author()));
 		}
 	}

-	let mut b = try!(OpenBlock::new(engine, vm_factory, tracing, db, parent, last_hashes, Address::new(), (3141562.into(), 31415620.into()), vec![]));
+	let mut b = OpenBlock::new(engine, db, parent, last_hashes, header.author().clone(), header.extra_data().clone());
 	b.set_difficulty(*header.difficulty());
 	b.set_gas_limit(*header.gas_limit());
 	b.set_timestamp(header.timestamp());
-	b.set_author(header.author().clone());
-	b.set_extra_data(header.extra_data().clone()).unwrap_or_else(|e| warn!("Couldn't set extradata: {}. Ignoring.", e));
 	for t in transactions { try!(b.push_transaction(t.clone(), None)); }
 	for u in uncles { try!(b.push_uncle(u.clone())); }
-	Ok(b.close_and_lock())
+	Ok(b.close())
 }

 /// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
-#[cfg_attr(feature="dev", allow(too_many_arguments))]
-pub fn enact_bytes(
-	block_bytes: &[u8],
-	engine: &Engine,
-	tracing: bool,
-	db: Box<JournalDB>,
-	parent: &Header,
-	last_hashes: LastHashes,
-	vm_factory: &EvmFactory
-) -> Result<LockedBlock, Error> {
+pub fn enact_bytes<'x, 'y>(block_bytes: &[u8], engine: &'x Engine, db: JournalDB, parent: &Header, last_hashes: &'y LastHashes) -> Result<ClosedBlock<'x, 'y>, Error> {
 	let block = BlockView::new(block_bytes);
 	let header = block.header();
-	enact(&header, &block.transactions(), &block.uncles(), engine, tracing, db, parent, last_hashes, vm_factory)
+	enact(&header, &block.transactions(), &block.uncles(), engine, db, parent, last_hashes)
 }

 /// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
-#[cfg_attr(feature="dev", allow(too_many_arguments))]
-pub fn enact_verified(
-	block: &PreverifiedBlock,
-	engine: &Engine,
-	tracing: bool,
-	db: Box<JournalDB>,
-	parent: &Header,
-	last_hashes: LastHashes,
-	vm_factory: &EvmFactory
-) -> Result<LockedBlock, Error> {
+pub fn enact_verified<'x, 'y>(block: &PreVerifiedBlock, engine: &'x Engine, db: JournalDB, parent: &Header, last_hashes: &'y LastHashes) -> Result<ClosedBlock<'x, 'y>, Error> {
 	let view = BlockView::new(&block.bytes);
-	enact(&block.header, &block.transactions, &view.uncles(), engine, tracing, db, parent, last_hashes, vm_factory)
+	enact(&block.header, &block.transactions, &view.uncles(), engine, db, parent, last_hashes)
 }

 /// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header. Seal the block aferwards
-#[cfg_attr(feature="dev", allow(too_many_arguments))]
-pub fn enact_and_seal(
-	block_bytes: &[u8],
-	engine: &Engine,
-	tracing: bool,
-	db: Box<JournalDB>,
-	parent: &Header,
-	last_hashes: LastHashes,
-	vm_factory: &EvmFactory
-) -> Result<SealedBlock, Error> {
+pub fn enact_and_seal(block_bytes: &[u8], engine: &Engine, db: JournalDB, parent: &Header, last_hashes: &LastHashes) -> Result<SealedBlock, Error> {
 	let header = BlockView::new(block_bytes).header_view();
-	Ok(try!(try!(enact_bytes(block_bytes, engine, tracing, db, parent, last_hashes, vm_factory)).seal(engine, header.seal())))
+	Ok(try!(try!(enact_bytes(block_bytes, engine, db, parent, last_hashes)).seal(header.seal())))
 }

 #[cfg(test)]
@@ -556,43 +373,39 @@ mod tests {
 	use tests::helpers::*;
 	use super::*;
 	use common::*;
+	use engine::*;

 	#[test]
 	fn open_block() {
 		use spec::*;
-		let spec = Spec::new_test();
-		let engine = &spec.engine;
-		let genesis_header = spec.genesis_header();
+		let engine = Spec::new_test().to_engine().unwrap();
+		let genesis_header = engine.spec().genesis_header();
 		let mut db_result = get_temp_journal_db();
 		let mut db = db_result.take();
-		spec.ensure_db_good(db.as_hashdb_mut());
+		engine.spec().ensure_db_good(&mut db);
 		let last_hashes = vec![genesis_header.hash()];
-		let vm_factory = Default::default();
-		let b = OpenBlock::new(engine.deref(), &vm_factory, false, db, &genesis_header, last_hashes, Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap();
-		let b = b.close_and_lock();
-		let _ = b.seal(engine.deref(), vec![]);
+		let b = OpenBlock::new(engine.deref(), db, &genesis_header, &last_hashes, Address::zero(), vec![]);
+		let b = b.close();
+		let _ = b.seal(vec![]);
 	}

 	#[test]
 	fn enact_block() {
 		use spec::*;
-		let spec = Spec::new_test();
-		let engine = &spec.engine;
-		let genesis_header = spec.genesis_header();
+		let engine = Spec::new_test().to_engine().unwrap();
+		let genesis_header = engine.spec().genesis_header();

 		let mut db_result = get_temp_journal_db();
 		let mut db = db_result.take();
-		spec.ensure_db_good(db.as_hashdb_mut());
-		let vm_factory = Default::default();
-		let b = OpenBlock::new(engine.deref(), &vm_factory, false, db, &genesis_header, vec![genesis_header.hash()], Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap()
-			.close_and_lock().seal(engine.deref(), vec![]).unwrap();
+		engine.spec().ensure_db_good(&mut db);
+		let b = OpenBlock::new(engine.deref(), db, &genesis_header, &vec![genesis_header.hash()], Address::zero(), vec![]).close().seal(vec![]).unwrap();
 		let orig_bytes = b.rlp_bytes();
 		let orig_db = b.drain();

 		let mut db_result = get_temp_journal_db();
 		let mut db = db_result.take();
-		spec.ensure_db_good(db.as_hashdb_mut());
-		let e = enact_and_seal(&orig_bytes, engine.deref(), false, db, &genesis_header, vec![genesis_header.hash()], &Default::default()).unwrap();
+		engine.spec().ensure_db_good(&mut db);
+		let e = enact_and_seal(&orig_bytes, engine.deref(), db, &genesis_header, &vec![genesis_header.hash()]).unwrap();

 		assert_eq!(e.rlp_bytes(), orig_bytes);

@@ -600,42 +413,4 @@ mod tests {
 		assert_eq!(orig_db.keys(), db.keys());
 		assert!(orig_db.keys().iter().filter(|k| orig_db.get(k.0) != db.get(k.0)).next() == None);
 	}
-
-	#[test]
-	fn enact_block_with_uncle() {
-		use spec::*;
-		let spec = Spec::new_test();
-		let engine = &spec.engine;
-		let genesis_header = spec.genesis_header();
-
-		let mut db_result = get_temp_journal_db();
-		let mut db = db_result.take();
-		spec.ensure_db_good(db.as_hashdb_mut());
-		let vm_factory = Default::default();
-		let mut open_block = OpenBlock::new(engine.deref(), &vm_factory, false, db, &genesis_header, vec![genesis_header.hash()], Address::zero(), (3141562.into(), 31415620.into()), vec![]).unwrap();
-		let mut uncle1_header = Header::new();
-		uncle1_header.extra_data = b"uncle1".to_vec();
-		let mut uncle2_header = Header::new();
-		uncle2_header.extra_data = b"uncle2".to_vec();
-		open_block.push_uncle(uncle1_header).unwrap();
-		open_block.push_uncle(uncle2_header).unwrap();
-		let b = open_block.close_and_lock().seal(engine.deref(), vec![]).unwrap();
-
-		let orig_bytes = b.rlp_bytes();
-		let orig_db = b.drain();
-
-		let mut db_result = get_temp_journal_db();
-		let mut db = db_result.take();
-		spec.ensure_db_good(db.as_hashdb_mut());
-		let e = enact_and_seal(&orig_bytes, engine.deref(), false, db, &genesis_header, vec![genesis_header.hash()], &Default::default()).unwrap();
-
-		let bytes = e.rlp_bytes();
-		assert_eq!(bytes, orig_bytes);
-		let uncles = BlockView::new(&bytes).uncles();
-		assert_eq!(uncles[1].extra_data, b"uncle2");
-
-		let db = e.drain();
-		assert_eq!(orig_db.keys(), db.keys());
-		assert!(orig_db.keys().iter().filter(|k| orig_db.get(k.0) != db.get(k.0)).next() == None);
-	}
 }
--- a/ethcore/src/block_queue.rs
+++ b/ethcore/src/block_queue.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

-//! A queue of blocks. Sits between network or other I/O and the `BlockChain`.
+//! A queue of blocks. Sits between network or other I/O and the BlockChain.
 //! Sorts them ready for blockchain insertion.
 use std::thread::{JoinHandle, self};
 use std::sync::atomic::{AtomicBool, Ordering as AtomicOrdering};
@@ -26,48 +26,18 @@ use views::*;
 use header::*;
 use service::*;
 use client::BlockStatus;
-use util::panics::*;
-
-known_heap_size!(0, UnverifiedBlock, VerifyingBlock, PreverifiedBlock);
-
-const MIN_MEM_LIMIT: usize = 16384;
-const MIN_QUEUE_LIMIT: usize = 512;
-
-/// Block queue configuration
-#[derive(Debug)]
-pub struct BlockQueueConfig {
-	/// Maximum number of blocks to keep in unverified queue.
-	/// When the limit is reached, is_full returns true.
-	pub max_queue_size: usize,
-	/// Maximum heap memory to use.
-	/// When the limit is reached, is_full returns true.
-	pub max_mem_use: usize,
-}
-
-impl Default for BlockQueueConfig {
-	fn default() -> Self {
-		BlockQueueConfig {
-			max_queue_size: 30000,
-			max_mem_use: 50 * 1024 * 1024,
-		}
-	}
-}

 /// Block queue status
 #[derive(Debug)]
 pub struct BlockQueueInfo {
+	/// Indicates that queue is full
+	pub full: bool,
 	/// Number of queued blocks pending verification
 	pub unverified_queue_size: usize,
 	/// Number of verified queued blocks pending import
 	pub verified_queue_size: usize,
 	/// Number of blocks being verified
 	pub verifying_queue_size: usize,
-	/// Configured maximum number of blocks in the queue
-	pub max_queue_size: usize,
-	/// Configured maximum number of bytes to use
-	pub max_mem_use: usize,
-	/// Heap memory used in bytes
-	pub mem_used: usize,
 }

 impl BlockQueueInfo {
@@ -76,97 +46,65 @@ impl BlockQueueInfo {

 	/// The size of the unverified and verifying queues.
 	pub fn incomplete_queue_size(&self) -> usize { self.unverified_queue_size + self.verifying_queue_size }
-
-	/// Indicates that queue is full
-	pub fn is_full(&self) -> bool {
-		self.unverified_queue_size + self.verified_queue_size + self.verifying_queue_size > self.max_queue_size ||
-			self.mem_used > self.max_mem_use
-	}
-
-	/// Indicates that queue is empty
-	pub fn is_empty(&self) -> bool {
-		self.unverified_queue_size + self.verified_queue_size + self.verifying_queue_size == 0
-	}
 }

-/// A queue of blocks. Sits between network or other I/O and the `BlockChain`.
+/// A queue of blocks. Sits between network or other I/O and the BlockChain.
 /// Sorts them ready for blockchain insertion.
 pub struct BlockQueue {
-	panic_handler: Arc<PanicHandler>,
 	engine: Arc<Box<Engine>>,
 	more_to_verify: Arc<Condvar>,
-	verification: Arc<Verification>,
+	verification: Arc<Mutex<Verification>>,
 	verifiers: Vec<JoinHandle<()>>,
 	deleting: Arc<AtomicBool>,
 	ready_signal: Arc<QueueSignal>,
 	empty: Arc<Condvar>,
-	processing: RwLock<HashSet<H256>>,
-	max_queue_size: usize,
-	max_mem_use: usize,
+	processing: RwLock<HashSet<H256>>
 }

-struct UnverifiedBlock {
+struct UnVerifiedBlock {
 	header: Header,
 	bytes: Bytes,
 }

 struct VerifyingBlock {
 	hash: H256,
-	block: Option<PreverifiedBlock>,
+	block: Option<PreVerifiedBlock>,
 }

 struct QueueSignal {
-	deleting: Arc<AtomicBool>,
 	signalled: AtomicBool,
 	message_channel: IoChannel<NetSyncMessage>,
 }

 impl QueueSignal {
-	#[cfg_attr(feature="dev", allow(bool_comparison))]
 	fn set(&self) {
-		// Do not signal when we are about to close
-		if self.deleting.load(AtomicOrdering::Relaxed) {
-			return;
-		}
-
 		if self.signalled.compare_and_swap(false, true, AtomicOrdering::Relaxed) == false {
-			if let Err(e) = self.message_channel.send(UserMessage(SyncMessage::BlockVerified)) {
-				debug!("Error sending BlockVerified message: {:?}", e);
-			}
+			self.message_channel.send(UserMessage(SyncMessage::BlockVerified)).expect("Error sending BlockVerified message");
 		}
 	}
-
 	fn reset(&self) {
 		self.signalled.store(false, AtomicOrdering::Relaxed);
 	}
 }

+#[derive(Default)]
 struct Verification {
-	// All locks must be captured in the order declared here.
-	unverified: Mutex<VecDeque<UnverifiedBlock>>,
-	verified: Mutex<VecDeque<PreverifiedBlock>>,
-	verifying: Mutex<VecDeque<VerifyingBlock>>,
-	bad: Mutex<HashSet<H256>>,
+	unverified: VecDeque<UnVerifiedBlock>,
+	verified: VecDeque<PreVerifiedBlock>,
+	verifying: VecDeque<VerifyingBlock>,
+	bad: HashSet<H256>,
 }

+const MAX_UNVERIFIED_QUEUE_SIZE: usize = 50000;
+
 impl BlockQueue {
 	/// Creates a new queue instance.
-	pub fn new(config: BlockQueueConfig, engine: Arc<Box<Engine>>, message_channel: IoChannel<NetSyncMessage>) -> BlockQueue {
-		let verification = Arc::new(Verification {
-			unverified: Mutex::new(VecDeque::new()),
-			verified: Mutex::new(VecDeque::new()),
-			verifying: Mutex::new(VecDeque::new()),
-			bad: Mutex::new(HashSet::new()),
-		});
+	pub fn new(engine: Arc<Box<Engine>>, message_channel: IoChannel<NetSyncMessage>) -> BlockQueue {
+		let verification = Arc::new(Mutex::new(Verification::default()));
 		let more_to_verify = Arc::new(Condvar::new());
+		let ready_signal = Arc::new(QueueSignal { signalled: AtomicBool::new(false), message_channel: message_channel });
 		let deleting = Arc::new(AtomicBool::new(false));
-		let ready_signal = Arc::new(QueueSignal {
-			deleting: deleting.clone(),
-			signalled: AtomicBool::new(false),
-			message_channel: message_channel
-		});
 		let empty = Arc::new(Condvar::new());
-		let panic_handler = PanicHandler::new_in_arc();

 		let mut verifiers: Vec<JoinHandle<()>> = Vec::new();
 		let thread_count = max(::num_cpus::get(), 3) - 2;
@@ -177,21 +115,11 @@ impl BlockQueue {
 			let ready_signal = ready_signal.clone();
 			let empty = empty.clone();
 			let deleting = deleting.clone();
-			let panic_handler = panic_handler.clone();
-			verifiers.push(
-				thread::Builder::new()
-				.name(format!("Verifier #{}", i))
-				.spawn(move || {
-					panic_handler.catch_panic(move || {
-						BlockQueue::verify(verification, engine, more_to_verify, ready_signal, deleting, empty)
-					}).unwrap()
-				})
-				.expect("Error starting block verification thread")
-			);
+			verifiers.push(thread::Builder::new().name(format!("Verifier #{}", i)).spawn(move || BlockQueue::verify(verification, engine, more_to_verify, ready_signal, deleting, empty))
+				.expect("Error starting block verification thread"));
 		}
 		BlockQueue {
 			engine: engine,
-			panic_handler: panic_handler,
 			ready_signal: ready_signal.clone(),
 			more_to_verify: more_to_verify.clone(),
 			verification: verification.clone(),
@@ -199,73 +127,68 @@ impl BlockQueue {
 			deleting: deleting.clone(),
 			processing: RwLock::new(HashSet::new()),
 			empty: empty.clone(),
-			max_queue_size: max(config.max_queue_size, MIN_QUEUE_LIMIT),
-			max_mem_use: max(config.max_mem_use, MIN_MEM_LIMIT),
 		}
 	}

-	fn verify(verification: Arc<Verification>, engine: Arc<Box<Engine>>, wait: Arc<Condvar>, ready: Arc<QueueSignal>, deleting: Arc<AtomicBool>, empty: Arc<Condvar>) {
-		while !deleting.load(AtomicOrdering::Acquire) {
+	fn verify(verification: Arc<Mutex<Verification>>, engine: Arc<Box<Engine>>, wait: Arc<Condvar>, ready: Arc<QueueSignal>, deleting: Arc<AtomicBool>, empty: Arc<Condvar>) {
+		while !deleting.load(AtomicOrdering::Relaxed) {
 			{
-				let mut unverified = verification.unverified.lock().unwrap();
+				let mut lock = verification.lock().unwrap();

-				if unverified.is_empty() && verification.verifying.lock().unwrap().is_empty() {
+				if lock.unverified.is_empty() && lock.verifying.is_empty() {
 					empty.notify_all();
 				}

-				while unverified.is_empty() && !deleting.load(AtomicOrdering::Acquire) {
-					unverified = wait.wait(unverified).unwrap();
+				while lock.unverified.is_empty() && !deleting.load(AtomicOrdering::Relaxed) {
+					lock = wait.wait(lock).unwrap();
 				}
-
-				if deleting.load(AtomicOrdering::Acquire) {
+				
+				if deleting.load(AtomicOrdering::Relaxed) {
 					return;
 				}
 			}

 			let block = {
-				let mut unverified = verification.unverified.lock().unwrap();
-				if unverified.is_empty() {
+				let mut v = verification.lock().unwrap();
+				if v.unverified.is_empty() {
 					continue;
 				}
-				let mut verifying = verification.verifying.lock().unwrap();
-				let block = unverified.pop_front().unwrap();
-				verifying.push_back(VerifyingBlock{ hash: block.header.hash(), block: None });
+				let block = v.unverified.pop_front().unwrap();
+				v.verifying.push_back(VerifyingBlock{ hash: block.header.hash(), block: None });
 				block
 			};

 			let block_hash = block.header.hash();
 			match verify_block_unordered(block.header, block.bytes, engine.deref().deref()) {
 				Ok(verified) => {
-					let mut verifying = verification.verifying.lock().unwrap();
-					for e in verifying.iter_mut() {
+					let mut v = verification.lock().unwrap();
+					for e in &mut v.verifying {
 						if e.hash == block_hash {
 							e.block = Some(verified);
 							break;
 						}
 					}
-					if !verifying.is_empty() && verifying.front().unwrap().hash == block_hash {
+					if !v.verifying.is_empty() && v.verifying.front().unwrap().hash == block_hash {
 						// we're next!
-						let mut verified = verification.verified.lock().unwrap();
-						let mut bad = verification.bad.lock().unwrap();
-						BlockQueue::drain_verifying(&mut verifying, &mut verified, &mut bad);
+						let mut vref = v.deref_mut();
+						BlockQueue::drain_verifying(&mut vref.verifying, &mut vref.verified, &mut vref.bad);
 						ready.set();
 					}
 				},
 				Err(err) => {
-					let mut verifying = verification.verifying.lock().unwrap();
-					let mut verified = verification.verified.lock().unwrap();
-					let mut bad = verification.bad.lock().unwrap();
+					let mut v = verification.lock().unwrap();
 					warn!(target: "client", "Stage 2 block verification failed for {}\nError: {:?}", block_hash, err);
-					bad.insert(block_hash.clone());
-					verifying.retain(|e| e.hash != block_hash);
-					BlockQueue::drain_verifying(&mut verifying, &mut verified, &mut bad);
+					v.bad.insert(block_hash.clone());
+					v.verifying.retain(|e| e.hash != block_hash);
+					let mut vref = v.deref_mut();
+					BlockQueue::drain_verifying(&mut vref.verifying, &mut vref.verified, &mut vref.bad);
 					ready.set();
 				}
 			}
 		}
 	}

-	fn drain_verifying(verifying: &mut VecDeque<VerifyingBlock>, verified: &mut VecDeque<PreverifiedBlock>, bad: &mut HashSet<H256>) {
+	fn drain_verifying(verifying: &mut VecDeque<VerifyingBlock>, verified: &mut VecDeque<PreVerifiedBlock>, bad: &mut HashSet<H256>) {
 		while !verifying.is_empty() && verifying.front().unwrap().block.is_some() {
 			let block = verifying.pop_front().unwrap().block.unwrap();
 			if bad.contains(&block.header.parent_hash) {
@@ -278,21 +201,19 @@ impl BlockQueue {
 	}

 	/// Clear the queue and stop verification activity.
-	pub fn clear(&self) {
-		let mut unverified = self.verification.unverified.lock().unwrap();
-		let mut verifying = self.verification.verifying.lock().unwrap();
-		let mut verified = self.verification.verified.lock().unwrap();
-		unverified.clear();
-		verifying.clear();
-		verified.clear();
+	pub fn clear(&mut self) {
+		let mut verification = self.verification.lock().unwrap();
+		verification.unverified.clear();
+		verification.verifying.clear();
+		verification.verified.clear();
 		self.processing.write().unwrap().clear();
 	}

-	/// Wait for unverified queue to be empty
-	pub fn flush(&self) {
-		let mut unverified = self.verification.unverified.lock().unwrap();
-		while !unverified.is_empty() || !self.verification.verifying.lock().unwrap().is_empty() {
-			unverified = self.empty.wait(unverified).unwrap();
+	/// Wait for queue to be empty
+	pub fn flush(&mut self) {
+		let mut verification = self.verification.lock().unwrap();
+		while !verification.unverified.is_empty() || !verification.verifying.is_empty() {
+			verification = self.empty.wait(verification).unwrap();
 		}
 	}

@@ -301,96 +222,85 @@ impl BlockQueue {
 		if self.processing.read().unwrap().contains(&hash) {
 			return BlockStatus::Queued;
 		}
-		if self.verification.bad.lock().unwrap().contains(&hash) {
+		if self.verification.lock().unwrap().bad.contains(&hash) {
 			return BlockStatus::Bad;
 		}
 		BlockStatus::Unknown
 	}

 	/// Add a block to the queue.
-	pub fn import_block(&self, bytes: Bytes) -> ImportResult {
+	pub fn import_block(&mut self, bytes: Bytes) -> ImportResult {
 		let header = BlockView::new(&bytes).header();
 		let h = header.hash();
+		if self.processing.read().unwrap().contains(&h) {
+			return Err(ImportError::AlreadyQueued);
+		}
 		{
-			if self.processing.read().unwrap().contains(&h) {
-				return Err(ImportError::AlreadyQueued.into());
+			let mut verification = self.verification.lock().unwrap();
+			if verification.bad.contains(&h) {
+				return Err(ImportError::Bad(None));
 			}

-			let mut bad = self.verification.bad.lock().unwrap();
-			if bad.contains(&h) {
-				return Err(ImportError::KnownBad.into());
-			}
-
-			if bad.contains(&header.parent_hash) {
-				bad.insert(h.clone());
-				return Err(ImportError::KnownBad.into());
+			if verification.bad.contains(&header.parent_hash) {
+				verification.bad.insert(h.clone());
+				return Err(ImportError::Bad(None));
 			}
 		}

 		match verify_block_basic(&header, &bytes, self.engine.deref().deref()) {
 			Ok(()) => {
 				self.processing.write().unwrap().insert(h.clone());
-				self.verification.unverified.lock().unwrap().push_back(UnverifiedBlock { header: header, bytes: bytes });
+				self.verification.lock().unwrap().unverified.push_back(UnVerifiedBlock { header: header, bytes: bytes });
 				self.more_to_verify.notify_all();
 				Ok(h)
 			},
 			Err(err) => {
 				warn!(target: "client", "Stage 1 block verification failed for {}\nError: {:?}", BlockView::new(&bytes).header_view().sha3(), err);
-				self.verification.bad.lock().unwrap().insert(h.clone());
-				Err(err)
+				self.verification.lock().unwrap().bad.insert(h.clone());
+				Err(From::from(err))
 			}
 		}
 	}

 	/// Mark given block and all its children as bad. Stops verification.
-	pub fn mark_as_bad(&self, block_hashes: &[H256]) {
-		if block_hashes.is_empty() {
-			return;
-		}
-		let mut verified_lock = self.verification.verified.lock().unwrap();
-		let mut verified = verified_lock.deref_mut();
-		let mut bad = self.verification.bad.lock().unwrap();
-		let mut processing = self.processing.write().unwrap();
-		bad.reserve(block_hashes.len());
-		for hash in block_hashes {
-			bad.insert(hash.clone());
-			processing.remove(&hash);
-		}
-
+	pub fn mark_as_bad(&mut self, hash: &H256) {
+		let mut verification_lock = self.verification.lock().unwrap();
+		let mut verification = verification_lock.deref_mut();
+		verification.bad.insert(hash.clone());
+		self.processing.write().unwrap().remove(&hash);
 		let mut new_verified = VecDeque::new();
-		for block in verified.drain(..) {
-			if bad.contains(&block.header.parent_hash) {
-				bad.insert(block.header.hash());
-				processing.remove(&block.header.hash());
-			} else {
+		for block in verification.verified.drain(..) {
+			if verification.bad.contains(&block.header.parent_hash) {
+				verification.bad.insert(block.header.hash());
+				self.processing.write().unwrap().remove(&block.header.hash());
+			}
+			else {
 				new_verified.push_back(block);
 			}
 		}
-		*verified = new_verified;
+		verification.verified = new_verified;
 	}

 	/// Mark given block as processed
-	pub fn mark_as_good(&self, block_hashes: &[H256]) {
-		if block_hashes.is_empty() {
-			return;
-		}
+	pub fn mark_as_good(&mut self, hashes: &[H256]) {
 		let mut processing = self.processing.write().unwrap();
-		for hash in block_hashes {
-			processing.remove(&hash);
+		for h in hashes {
+			processing.remove(&h);
 		}
+		//TODO: reward peers
 	}

 	/// Removes up to `max` verified blocks from the queue
-	pub fn drain(&self, max: usize) -> Vec<PreverifiedBlock> {
-		let mut verified = self.verification.verified.lock().unwrap();
-		let count = min(max, verified.len());
+	pub fn drain(&mut self, max: usize) -> Vec<PreVerifiedBlock> {
+		let mut verification = self.verification.lock().unwrap();
+		let count = min(max, verification.verified.len());
 		let mut result = Vec::with_capacity(count);
 		for _ in 0..count {
-			let block = verified.pop_front().unwrap();
+			let block = verification.verified.pop_front().unwrap();
 			result.push(block);
 		}
 		self.ready_signal.reset();
-		if !verified.is_empty() {
+		if !verification.verified.is_empty() {
 			self.ready_signal.set();
 		}
 		result
@@ -398,60 +308,24 @@ impl BlockQueue {

 	/// Get queue status.
 	pub fn queue_info(&self) -> BlockQueueInfo {
-		let (unverified_len, unverified_bytes) = {
-			let v = self.verification.unverified.lock().unwrap();
-			(v.len(), v.heap_size_of_children())
-		};
-		let (verifying_len, verifying_bytes) = {
-			let v = self.verification.verifying.lock().unwrap();
-			(v.len(), v.heap_size_of_children())
-		};
-		let (verified_len, verified_bytes) = {
-			let v = self.verification.verified.lock().unwrap();
-			(v.len(), v.heap_size_of_children())
-		};
+		let verification = self.verification.lock().unwrap();
 		BlockQueueInfo {
-			unverified_queue_size: unverified_len,
-			verifying_queue_size: verifying_len,
-			verified_queue_size: verified_len,
-			max_queue_size: self.max_queue_size,
-			max_mem_use: self.max_mem_use,
-			mem_used:
-				unverified_bytes
-				+ verifying_bytes
-				+ verified_bytes
-				// TODO: https://github.com/servo/heapsize/pull/50
-				//+ self.processing.read().unwrap().heap_size_of_children(),
+			full: verification.unverified.len() + verification.verifying.len() + verification.verified.len() >= MAX_UNVERIFIED_QUEUE_SIZE,
+			verified_queue_size: verification.verified.len(),
+			unverified_queue_size: verification.unverified.len(),
+			verifying_queue_size: verification.verifying.len(),
 		}
 	}
-
-	/// Optimise memory footprint of the heap fields.
-	pub fn collect_garbage(&self) {
-		{
-			self.verification.unverified.lock().unwrap().shrink_to_fit();
-			self.verification.verifying.lock().unwrap().shrink_to_fit();
-			self.verification.verified.lock().unwrap().shrink_to_fit();
-		}
-		self.processing.write().unwrap().shrink_to_fit();
-	}
-}
-
-impl MayPanic for BlockQueue {
-	fn on_panic<F>(&self, closure: F) where F: OnPanicListener {
-		self.panic_handler.on_panic(closure);
-	}
 }

 impl Drop for BlockQueue {
 	fn drop(&mut self) {
-		trace!(target: "shutdown", "[BlockQueue] Closing...");
 		self.clear();
-		self.deleting.store(true, AtomicOrdering::Release);
+		self.deleting.store(true, AtomicOrdering::Relaxed);
 		self.more_to_verify.notify_all();
 		for t in self.verifiers.drain(..) {
 			t.join().unwrap();
 		}
-		trace!(target: "shutdown", "[BlockQueue] Closed.");
 	}
 }

@@ -466,21 +340,21 @@ mod tests {

 	fn get_test_queue() -> BlockQueue {
 		let spec = get_test_spec();
-		let engine = spec.engine;
-		BlockQueue::new(BlockQueueConfig::default(), Arc::new(engine), IoChannel::disconnected())
+		let engine = spec.to_engine().unwrap();
+		BlockQueue::new(Arc::new(engine), IoChannel::disconnected())
 	}

 	#[test]
 	fn can_be_created() {
 		// TODO better test
 		let spec = Spec::new_test();
-		let engine = spec.engine;
-		let _ = BlockQueue::new(BlockQueueConfig::default(), Arc::new(engine), IoChannel::disconnected());
+		let engine = spec.to_engine().unwrap();
+		let _ = BlockQueue::new(Arc::new(engine), IoChannel::disconnected());
 	}

 	#[test]
 	fn can_import_blocks() {
-		let queue = get_test_queue();
+		let mut queue = get_test_queue();
 		if let Err(e) = queue.import_block(get_good_dummy_block()) {
 			panic!("error importing block that is valid by definition({:?})", e);
 		}
@@ -488,7 +362,7 @@ mod tests {

 	#[test]
 	fn returns_error_for_duplicates() {
-		let queue = get_test_queue();
+		let mut queue = get_test_queue();
 		if let Err(e) = queue.import_block(get_good_dummy_block()) {
 			panic!("error importing block that is valid by definition({:?})", e);
 		}
@@ -497,7 +371,7 @@ mod tests {
 		match duplicate_import {
 			Err(e) => {
 				match e {
-					Error::Import(ImportError::AlreadyQueued) => {},
+					ImportError::AlreadyQueued => {},
 					_ => { panic!("must return AlreadyQueued error"); }
 				}
 			}
@@ -507,7 +381,7 @@ mod tests {

 	#[test]
 	fn returns_ok_for_drained_duplicates() {
-		let queue = get_test_queue();
+		let mut queue = get_test_queue();
 		let block = get_good_dummy_block();
 		let hash = BlockView::new(&block).header().hash().clone();
 		if let Err(e) = queue.import_block(block) {
@@ -521,29 +395,4 @@ mod tests {
 			panic!("error importing block that has already been drained ({:?})", e);
 		}
 	}
-
-	#[test]
-	fn returns_empty_once_finished() {
-		let queue = get_test_queue();
-		queue.import_block(get_good_dummy_block()).expect("error importing block that is valid by definition");
-		queue.flush();
-		queue.drain(1);
-
-		assert!(queue.queue_info().is_empty());
-	}
-
-	#[test]
-	fn test_mem_limit() {
-		let spec = get_test_spec();
-		let engine = spec.engine;
-		let mut config = BlockQueueConfig::default();
-		config.max_mem_use = super::MIN_MEM_LIMIT;  // empty queue uses about 15000
-		let queue = BlockQueue::new(config, Arc::new(engine), IoChannel::disconnected());
-		assert!(!queue.queue_info().is_full());
-		let mut blocks = get_good_dummy_block_seq(50);
-		for b in blocks.drain(..) {
-			queue.import_block(b).unwrap();
-		}
-		assert!(queue.queue_info().is_full());
-	}
 }
--- a/ethcore/src/blockchain.rs
+++ b/ethcore/src/blockchain.rs
@@ -0,0 +1,827 @@
+// Copyright 2015, 2016 Ethcore (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/>.
+
+//! Blockchain database.
+
+use util::*;
+use rocksdb::{DB, WriteBatch, Writable};
+use header::*;
+use extras::*;
+use transaction::*;
+use views::*;
+
+/// Represents a tree route between `from` block and `to` block:
+pub struct TreeRoute {
+	/// A vector of hashes of all blocks, ordered from `from` to `to`.
+	pub blocks: Vec<H256>,
+	/// Best common ancestor of these blocks.
+	pub ancestor: H256,
+	/// An index where best common ancestor would be.
+	pub index: usize
+}
+
+/// Represents blockchain's in-memory cache size in bytes.
+#[derive(Debug)]
+pub struct CacheSize {
+	/// Blocks cache size.
+	pub blocks: usize,
+	/// BlockDetails cache size.
+	pub block_details: usize,
+	/// Transaction addresses cache size.
+	pub transaction_addresses: usize,
+	/// Logs cache size.
+	pub block_logs: usize,
+	/// Blooms cache size.
+	pub blocks_blooms: usize
+}
+
+impl CacheSize {
+	/// Total amount used by the cache.
+	fn total(&self) -> usize { self.blocks + self.block_details + self.transaction_addresses + self.block_logs + self.blocks_blooms }
+}
+
+/// Information about best block gathered together
+struct BestBlock {
+	pub hash: H256,
+	pub number: BlockNumber,
+	pub total_difficulty: U256
+}
+
+impl BestBlock {
+	fn new() -> BestBlock {
+		BestBlock {
+			hash: H256::new(),
+			number: 0,
+			total_difficulty: U256::from(0)
+		}
+	}
+}
+
+/// Interface for querying blocks by hash and by number.
+pub trait BlockProvider {
+	/// Returns true if the given block is known
+	/// (though not necessarily a part of the canon chain).
+	fn is_known(&self, hash: &H256) -> bool;
+
+	/// Get raw block data
+	fn block(&self, hash: &H256) -> Option<Bytes>;
+
+	/// Get the familial details concerning a block.
+	fn block_details(&self, hash: &H256) -> Option<BlockDetails>;
+
+	/// Get the hash of given block's number.
+	fn block_hash(&self, index: BlockNumber) -> Option<H256>;
+
+	/// Get the partial-header of a block.
+	fn block_header(&self, hash: &H256) -> Option<Header> {
+		self.block(hash).map(|bytes| BlockView::new(&bytes).header())
+	}
+
+	/// Get a list of uncles for a given block.
+	/// Returns None if block deos not exist.
+	fn uncles(&self, hash: &H256) -> Option<Vec<Header>> {
+		self.block(hash).map(|bytes| BlockView::new(&bytes).uncles())
+	}
+
+	/// Get a list of uncle hashes for a given block.
+	/// Returns None if block does not exist.
+	fn uncle_hashes(&self, hash: &H256) -> Option<Vec<H256>> {
+		self.block(hash).map(|bytes| BlockView::new(&bytes).uncle_hashes())
+	}
+
+	/// Get the number of given block's hash.
+	fn block_number(&self, hash: &H256) -> Option<BlockNumber> {
+		self.block(hash).map(|bytes| BlockView::new(&bytes).header_view().number())
+	}
+
+	/// Get a list of transactions for a given block.
+	/// Returns None if block deos not exist.
+	fn transactions(&self, hash: &H256) -> Option<Vec<SignedTransaction>> {
+		self.block(hash).map(|bytes| BlockView::new(&bytes).transactions())
+	}
+
+	/// Returns reference to genesis hash.
+	fn genesis_hash(&self) -> H256 {
+		self.block_hash(0).expect("Genesis hash should always exist")
+	}
+
+	/// Returns the header of the genesis block.
+	fn genesis_header(&self) -> Header {
+		self.block_header(&self.genesis_hash()).unwrap()
+	}
+}
+
+#[derive(Debug, Hash, Eq, PartialEq, Clone)]
+enum CacheID {
+	Block(H256),
+	Extras(ExtrasIndex, H256),
+}
+
+struct CacheManager {
+	cache_usage: VecDeque<HashSet<CacheID>>,
+	in_use: HashSet<CacheID>,
+}
+
+/// Structure providing fast access to blockchain data.
+///
+/// **Does not do input data verification.**
+pub struct BlockChain {
+	pref_cache_size: usize,
+	max_cache_size: usize,
+
+	best_block: RwLock<BestBlock>,
+
+	// block cache
+	blocks: RwLock<HashMap<H256, Bytes>>,
+
+	// extra caches
+	block_details: RwLock<HashMap<H256, BlockDetails>>,
+	block_hashes: RwLock<HashMap<BlockNumber, H256>>,
+	transaction_addresses: RwLock<HashMap<H256, TransactionAddress>>,
+	block_logs: RwLock<HashMap<H256, BlockLogBlooms>>,
+	blocks_blooms: RwLock<HashMap<H256, BlocksBlooms>>,
+
+	extras_db: DB,
+	blocks_db: DB,
+
+	cache_man: RwLock<CacheManager>,
+}
+
+impl BlockProvider for BlockChain {
+	/// Returns true if the given block is known
+	/// (though not necessarily a part of the canon chain).
+	fn is_known(&self, hash: &H256) -> bool {
+		self.query_extras_exist(hash, &self.block_details)
+	}
+
+	/// Get raw block data
+	fn block(&self, hash: &H256) -> Option<Bytes> {
+		{
+			let read = self.blocks.read().unwrap();
+			if let Some(v) = read.get(hash) {
+				return Some(v.clone());
+			}
+		}
+
+		let opt = self.blocks_db.get(hash)
+			.expect("Low level database error. Some issue with disk?");
+
+		self.note_used(CacheID::Block(hash.clone()));
+
+		match opt {
+			Some(b) => {
+				let bytes: Bytes = b.to_vec();
+				let mut write = self.blocks.write().unwrap();
+				write.insert(hash.clone(), bytes.clone());
+				Some(bytes)
+			},
+			None => None
+		}
+	}
+
+	/// Get the familial details concerning a block.
+	fn block_details(&self, hash: &H256) -> Option<BlockDetails> {
+		self.query_extras(hash, &self.block_details)
+	}
+
+	/// Get the hash of given block's number.
+	fn block_hash(&self, index: BlockNumber) -> Option<H256> {
+		self.query_extras(&index, &self.block_hashes)
+	}
+}
+
+const COLLECTION_QUEUE_SIZE: usize = 8;
+
+impl BlockChain {
+	/// Create new instance of blockchain from given Genesis
+	///
+	/// ```rust
+	/// extern crate ethcore_util as util;
+	/// extern crate ethcore;
+	/// use std::env;
+	/// use std::str::FromStr;
+	/// use ethcore::spec::*;
+	/// use ethcore::blockchain::*;
+	/// use ethcore::ethereum;
+	/// use util::hash::*;
+	/// use util::uint::*;
+	///
+	/// fn main() {
+	/// 	let spec = ethereum::new_frontier();
+	///
+	/// 	let mut dir = env::temp_dir();
+	/// 	dir.push(H32::random().hex());
+	///
+	/// 	let bc = BlockChain::new(&spec.genesis_block(), &dir);
+	///
+	/// 	let genesis_hash = "d4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3";
+	/// 	assert_eq!(bc.genesis_hash(), H256::from_str(genesis_hash).unwrap());
+	/// 	assert!(bc.is_known(&bc.genesis_hash()));
+	/// 	assert_eq!(bc.genesis_hash(), bc.block_hash(0).unwrap());
+	/// }
+	/// ```
+	pub fn new(genesis: &[u8], path: &Path) -> BlockChain {
+		// open extras db
+		let mut extras_path = path.to_path_buf();
+		extras_path.push("extras");
+		let extras_db = DB::open_default(extras_path.to_str().unwrap()).unwrap();
+
+		// open blocks db
+		let mut blocks_path = path.to_path_buf();
+		blocks_path.push("blocks");
+		let blocks_db = DB::open_default(blocks_path.to_str().unwrap()).unwrap();
+
+		let mut cache_man = CacheManager{cache_usage: VecDeque::new(), in_use: HashSet::new()};
+		(0..COLLECTION_QUEUE_SIZE).foreach(|_| cache_man.cache_usage.push_back(HashSet::new()));
+
+		let bc = BlockChain {
+			pref_cache_size: 1 << 14,
+			max_cache_size: 1 << 20,
+			best_block: RwLock::new(BestBlock::new()),
+			blocks: RwLock::new(HashMap::new()),
+			block_details: RwLock::new(HashMap::new()),
+			block_hashes: RwLock::new(HashMap::new()),
+			transaction_addresses: RwLock::new(HashMap::new()),
+			block_logs: RwLock::new(HashMap::new()),
+			blocks_blooms: RwLock::new(HashMap::new()),
+			extras_db: extras_db,
+			blocks_db: blocks_db,
+			cache_man: RwLock::new(cache_man),
+		};
+
+		// load best block
+		let best_block_hash = match bc.extras_db.get(b"best").unwrap() {
+			Some(best) => H256::from_slice(&best),
+			None => {
+				// best block does not exist
+				// we need to insert genesis into the cache
+				let block = BlockView::new(genesis);
+				let header = block.header_view();
+				let hash = block.sha3();
+
+				let details = BlockDetails {
+					number: header.number(),
+					total_difficulty: header.difficulty(),
+					parent: header.parent_hash(),
+					children: vec![]
+				};
+
+				bc.blocks_db.put(&hash, genesis).unwrap();
+
+				let batch = WriteBatch::new();
+				batch.put_extras(&hash, &details);
+				batch.put_extras(&header.number(), &hash);
+				batch.put(b"best", &hash).unwrap();
+				bc.extras_db.write(batch).unwrap();
+
+				hash
+			}
+		};
+
+		{
+			let mut best_block = bc.best_block.write().unwrap();
+			best_block.number = bc.block_number(&best_block_hash).unwrap();
+			best_block.total_difficulty = bc.block_details(&best_block_hash).unwrap().total_difficulty;
+			best_block.hash = best_block_hash;
+		}
+
+		bc
+	}
+
+	/// Set the cache configuration.
+	pub fn configure_cache(&mut self, pref_cache_size: usize, max_cache_size: usize) {
+		self.pref_cache_size = pref_cache_size;
+		self.max_cache_size = max_cache_size;
+	}
+
+	/// Returns a tree route between `from` and `to`, which is a tuple of:
+	///
+	/// - a vector of hashes of all blocks, ordered from `from` to `to`.
+	///
+	/// - common ancestor of these blocks.
+	///
+	/// - an index where best common ancestor would be
+	///
+	/// 1.) from newer to older
+	///
+	/// - bc: `A1 -> A2 -> A3 -> A4 -> A5`
+	/// - from: A5, to: A4
+	/// - route:
+	///
+	///   ```json
+	///   { blocks: [A5], ancestor: A4, index: 1 }
+	///   ```
+	///
+	/// 2.) from older to newer
+	///
+	/// - bc: `A1 -> A2 -> A3 -> A4 -> A5`
+	/// - from: A3, to: A4
+	/// - route:
+	///
+	///   ```json
+	///   { blocks: [A4], ancestor: A3, index: 0 }
+	///   ```
+	///
+	/// 3.) fork:
+	///
+	/// - bc:
+	///
+	///   ```text
+	///   A1 -> A2 -> A3 -> A4
+	///              -> B3 -> B4
+	///   ```
+	/// - from: B4, to: A4
+	/// - route:
+	///
+	///   ```json
+	///   { blocks: [B4, B3, A3, A4], ancestor: A2, index: 2 }
+	///   ```
+	pub fn tree_route(&self, from: H256, to: H256) -> Option<TreeRoute> {
+		let from_details = match self.block_details(&from) {
+			Some(h) => h,
+			None => return None,
+		};
+		let to_details = match self.block_details(&to) {
+			Some(h) => h,
+			None => return None,
+		};
+		Some(self.tree_route_aux((&from_details, &from), (&to_details, &to)))
+	}
+
+	/// Similar to `tree_route` function, but can be used to return a route
+	/// between blocks which may not be in database yet.
+	fn tree_route_aux(&self, from: (&BlockDetails, &H256), to: (&BlockDetails, &H256)) -> TreeRoute {
+		let mut from_branch = vec![];
+		let mut to_branch = vec![];
+
+		let mut from_details = from.0.clone();
+		let mut to_details = to.0.clone();
+		let mut current_from = from.1.clone();
+		let mut current_to = to.1.clone();
+
+		// reset from && to to the same level
+		while from_details.number > to_details.number {
+			from_branch.push(current_from);
+			current_from = from_details.parent.clone();
+			from_details = self.block_details(&from_details.parent).unwrap();
+		}
+
+		while to_details.number > from_details.number {
+			to_branch.push(current_to);
+			current_to = to_details.parent.clone();
+			to_details = self.block_details(&to_details.parent).unwrap();
+		}
+
+		assert_eq!(from_details.number, to_details.number);
+
+		// move to shared parent
+		while current_from != current_to {
+			from_branch.push(current_from);
+			current_from = from_details.parent.clone();
+			from_details = self.block_details(&from_details.parent).unwrap();
+
+			to_branch.push(current_to);
+			current_to = to_details.parent.clone();
+			to_details = self.block_details(&to_details.parent).unwrap();
+		}
+
+		let index = from_branch.len();
+
+		from_branch.extend(to_branch.into_iter().rev());
+
+		TreeRoute {
+			blocks: from_branch,
+			ancestor: current_from,
+			index: index
+		}
+	}
+
+	/// Inserts the block into backing cache database.
+	/// Expects the block to be valid and already verified.
+	/// If the block is already known, does nothing.
+	pub fn insert_block(&self, bytes: &[u8]) {
+		// create views onto rlp
+		let block = BlockView::new(bytes);
+		let header = block.header_view();
+		let hash = header.sha3();
+
+		if self.is_known(&hash) {
+			return;
+		}
+
+		// store block in db
+		self.blocks_db.put(&hash, &bytes).unwrap();
+		let (batch, new_best, details) = self.block_to_extras_insert_batch(bytes);
+
+		// update best block
+		let mut best_block = self.best_block.write().unwrap();
+		if let Some(b) = new_best {
+			*best_block = b;
+		}
+
+		// update caches
+		let mut write = self.block_details.write().unwrap();
+		write.remove(&header.parent_hash());
+		write.insert(hash.clone(), details);
+		self.note_used(CacheID::Block(hash));
+
+		// update extras database
+		self.extras_db.write(batch).unwrap();
+	}
+
+	/// Transforms block into WriteBatch that may be written into database
+	/// Additionally, if it's new best block it returns new best block object.
+	fn block_to_extras_insert_batch(&self, bytes: &[u8]) -> (WriteBatch, Option<BestBlock>, BlockDetails) {
+		// create views onto rlp
+		let block = BlockView::new(bytes);
+		let header = block.header_view();
+
+		// prepare variables
+		let hash = block.sha3();
+		let mut parent_details = self.block_details(&header.parent_hash()).expect("Invalid parent hash.");
+		let total_difficulty = parent_details.total_difficulty + header.difficulty();
+		let is_new_best = total_difficulty > self.best_block_total_difficulty();
+		let parent_hash = header.parent_hash();
+
+		// create current block details
+		let details = BlockDetails {
+			number: header.number(),
+			total_difficulty: total_difficulty,
+			parent: parent_hash.clone(),
+			children: vec![]
+		};
+
+		// prepare the batch
+		let batch = WriteBatch::new();
+
+		// insert new block details
+		batch.put_extras(&hash, &details);
+
+		// update parent details
+		parent_details.children.push(hash.clone());
+		batch.put_extras(&parent_hash, &parent_details);
+
+		// if it's not new best block, just return
+		if !is_new_best {
+			return (batch, None, details);
+		}
+
+		// if its new best block we need to make sure that all ancestors
+		// are moved to "canon chain"
+		// find the route between old best block and the new one
+		let best_hash = self.best_block_hash();
+		let best_details = self.block_details(&best_hash).expect("best block hash is invalid!");
+		let route = self.tree_route_aux((&best_details, &best_hash), (&details, &hash));
+
+		match route.blocks.len() {
+			// its our parent
+			1 => batch.put_extras(&header.number(), &hash),
+			// it is a fork
+			i if i > 1 => {
+				let ancestor_number = self.block_number(&route.ancestor).unwrap();
+				let start_number = ancestor_number + 1;
+				for (index, hash) in route.blocks.iter().skip(route.index).enumerate() {
+					batch.put_extras(&(start_number + index as BlockNumber), hash);
+				}
+			},
+			// route.blocks.len() could be 0 only if inserted block is best block,
+			// and this is not possible at this stage
+			_ => { unreachable!(); }
+		};
+
+		// this is new best block
+		batch.put(b"best", &hash).unwrap();
+
+		let best_block = BestBlock {
+			hash: hash,
+			number: header.number(),
+			total_difficulty: total_difficulty
+		};
+
+		(batch, Some(best_block), details)
+	}
+
+	/// Returns true if transaction is known.
+	pub fn is_known_transaction(&self, hash: &H256) -> bool {
+		self.query_extras_exist(hash, &self.transaction_addresses)
+	}
+
+	/// Get best block hash.
+	pub fn best_block_hash(&self) -> H256 {
+		self.best_block.read().unwrap().hash.clone()
+	}
+
+	/// Get best block number.
+	pub fn best_block_number(&self) -> BlockNumber {
+		self.best_block.read().unwrap().number
+	}
+
+	/// Get best block total difficulty.
+	pub fn best_block_total_difficulty(&self) -> U256 {
+		self.best_block.read().unwrap().total_difficulty
+	}
+
+	/// Get the transactions' log blooms of a block.
+	pub fn log_blooms(&self, hash: &H256) -> Option<BlockLogBlooms> {
+		self.query_extras(hash, &self.block_logs)
+	}
+
+	fn query_extras<K, T>(&self, hash: &K, cache: &RwLock<HashMap<K, T>>) -> Option<T> where
+		T: Clone + Decodable + ExtrasIndexable,
+		K: ExtrasSliceConvertable + Eq + Hash + Clone {
+		{
+			let read = cache.read().unwrap();
+			if let Some(v) = read.get(hash) {
+				return Some(v.clone());
+			}
+		}
+
+		if let Some(h) = hash.as_h256() {
+			self.note_used(CacheID::Extras(T::extras_index(), h.clone()));
+		}
+
+		self.extras_db.get_extras(hash).map(| t: T | {
+			let mut write = cache.write().unwrap();
+			write.insert(hash.clone(), t.clone());
+			t
+		})
+	}
+
+	fn query_extras_exist<K, T>(&self, hash: &K, cache: &RwLock<HashMap<K, T>>) -> bool where
+		K: ExtrasSliceConvertable + Eq + Hash + Clone,
+		T: ExtrasIndexable {
+		{
+			let read = cache.read().unwrap();
+			if let Some(_) = read.get(hash) {
+				return true;
+			}
+		}
+
+		self.extras_db.extras_exists::<_, T>(hash)
+	}
+
+	/// Get current cache size.
+	pub fn cache_size(&self) -> CacheSize {
+		CacheSize {
+			blocks: self.blocks.read().unwrap().heap_size_of_children(),
+			block_details: self.block_details.read().unwrap().heap_size_of_children(),
+			transaction_addresses: self.transaction_addresses.read().unwrap().heap_size_of_children(),
+			block_logs: self.block_logs.read().unwrap().heap_size_of_children(),
+			blocks_blooms: self.blocks_blooms.read().unwrap().heap_size_of_children()
+		}
+	}
+
+	/// Let the cache system know that a cacheable item has been used.
+	fn note_used(&self, id: CacheID) {
+		let mut cache_man = self.cache_man.write().unwrap();
+		if !cache_man.cache_usage[0].contains(&id) {
+			cache_man.cache_usage[0].insert(id.clone());
+			if cache_man.in_use.contains(&id) {
+				if let Some(c) = cache_man.cache_usage.iter_mut().skip(1).find(|e|e.contains(&id)) {
+					c.remove(&id);
+				}
+			} else {
+				cache_man.in_use.insert(id);
+			}
+		}
+	}
+
+	/// Ticks our cache system and throws out any old data.
+	pub fn collect_garbage(&self) {
+		if self.cache_size().total() < self.pref_cache_size { return; }
+
+		for _ in 0..COLLECTION_QUEUE_SIZE {
+			{
+				let mut cache_man = self.cache_man.write().unwrap();
+				let mut blocks = self.blocks.write().unwrap();
+				let mut block_details = self.block_details.write().unwrap();
+				let mut block_hashes = self.block_hashes.write().unwrap();
+				let mut transaction_addresses = self.transaction_addresses.write().unwrap();
+				let mut block_logs = self.block_logs.write().unwrap();
+				let mut blocks_blooms = self.blocks_blooms.write().unwrap();
+
+				for id in cache_man.cache_usage.pop_back().unwrap().into_iter() {
+					cache_man.in_use.remove(&id);
+					match id {
+						CacheID::Block(h) => { blocks.remove(&h); },
+						CacheID::Extras(ExtrasIndex::BlockDetails, h) => { block_details.remove(&h); },
+						CacheID::Extras(ExtrasIndex::TransactionAddress, h) => { transaction_addresses.remove(&h); },
+						CacheID::Extras(ExtrasIndex::BlockLogBlooms, h) => { block_logs.remove(&h); },
+						CacheID::Extras(ExtrasIndex::BlocksBlooms, h) => { blocks_blooms.remove(&h); },
+						_ => panic!(),
+					}
+				}
+				cache_man.cache_usage.push_front(HashSet::new());
+
+				// TODO: handle block_hashes properly.
+				block_hashes.clear();
+			}
+			if self.cache_size().total() < self.max_cache_size { break; }
+		}
+
+		// TODO: m_lastCollection = chrono::system_clock::now();
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use std::str::FromStr;
+	use rustc_serialize::hex::FromHex;
+	use util::hash::*;
+	use blockchain::*;
+	use tests::helpers::*;
+
+	#[test]
+	fn valid_tests_extra32() {
+		let genesis = "f901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0925002c3260b44e44c3edebad1cc442142b03020209df1ab8bb86752edbd2cd7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a0363659b251bf8b819179874c8cce7b9b983d7f3704cbb58a3b334431f7032871889032d09c281e1236c0c0".from_hex().unwrap();
+
+		let temp = RandomTempPath::new();
+		let bc = BlockChain::new(&genesis, temp.as_path());
+
+		let genesis_hash = H256::from_str("3caa2203f3d7c136c0295ed128a7d31cea520b1ca5e27afe17d0853331798942").unwrap();
+
+		assert_eq!(bc.genesis_hash(), genesis_hash.clone());
+		assert_eq!(bc.best_block_number(), 0);
+		assert_eq!(bc.best_block_hash(), genesis_hash.clone());
+		assert_eq!(bc.block_hash(0), Some(genesis_hash.clone()));
+		assert_eq!(bc.block_hash(1), None);
+		
+		let first = "f90285f90219a03caa2203f3d7c136c0295ed128a7d31cea520b1ca5e27afe17d0853331798942a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0bac6177a79e910c98d86ec31a09ae37ac2de15b754fd7bed1ba52362c49416bfa0d45893a296c1490a978e0bd321b5f2635d8280365c1fe9f693d65f233e791344a0c7778a7376099ee2e5c455791c1885b5c361b95713fddcbe32d97fd01334d296b90100000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000400000000000000000000000000000000000000000000000000000008302000001832fefd882560b845627cb99a00102030405060708091011121314151617181920212223242526272829303132a08ccb2837fb2923bd97e8f2d08ea32012d6e34be018c73e49a0f98843e8f47d5d88e53be49fec01012ef866f864800a82c35094095e7baea6a6c7c4c2dfeb977efac326af552d8785012a05f200801ba0cb088b8d2ff76a7b2c6616c9d02fb6b7a501afbf8b69d7180b09928a1b80b5e4a06448fe7476c606582039bb72a9f6f4b4fad18507b8dfbd00eebbe151cc573cd2c0".from_hex().unwrap();
+
+		bc.insert_block(&first);
+
+		let first_hash = H256::from_str("a940e5af7d146b3b917c953a82e1966b906dace3a4e355b5b0a4560190357ea1").unwrap();
+
+		assert_eq!(bc.block_hash(0), Some(genesis_hash.clone()));
+		assert_eq!(bc.best_block_number(), 1);
+		assert_eq!(bc.best_block_hash(), first_hash.clone());
+		assert_eq!(bc.block_hash(1), Some(first_hash.clone()));
+		assert_eq!(bc.block_details(&first_hash).unwrap().parent, genesis_hash.clone());
+		assert_eq!(bc.block_details(&genesis_hash).unwrap().children, vec![first_hash.clone()]);
+		assert_eq!(bc.block_hash(2), None);
+	}
+
+	#[test]
+	#[allow(cyclomatic_complexity)]
+	fn test_small_fork() {
+		let genesis = "f901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a07dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a059262c330941f3fe2a34d16d6e3c7b30d2ceb37c6a0e9a994c494ee1a61d2410885aa4c8bf8e56e264c0c0".from_hex().unwrap();
+		let b1 = "f90261f901f9a05716670833ec874362d65fea27a7cd35af5897d275b31a44944113111e4e96d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cb52de543653d86ccd13ba3ddf8b052525b04231c6884a4db3188a184681d878a0e78628dd45a1f8dc495594d83b76c588a3ee67463260f8b7d4a42f574aeab29aa0e9244cf7503b79c03d3a099e07a80d2dbc77bb0b502d8a89d51ac0d68dd31313b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefd882520884562791e580a051b3ecba4e3f2b49c11d42dd0851ec514b1be3138080f72a2b6e83868275d98f8877671f479c414b47f862f86080018304cb2f94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca09e2709d7ec9bbe6b1bbbf0b2088828d14cd5e8642a1fee22dc74bfa89761a7f9a04bd8813dee4be989accdb708b1c2e325a7e9c695a8024e30e89d6c644e424747c0".from_hex().unwrap();
+		let b2 = "f902ccf901f9a0437e51676ff10756fcfee5edd9159fa41dbcb1b2c592850450371cbecd54ee4fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0c70a5dc56146e5ef025e4e5726a6373c6f12fd2f6784093a19ead0a7d17fb292a040645cbce4fd399e7bb9160b4c30c40d7ee616a030d4e18ef0ed3b02bdb65911a086e608555f63628417032a011d107b36427af37d153f0da02ce3f90fdd5e8c08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302004002832fefd882c0e384562791e880a0e3cc39ff775cc0a32f175995b92e84b729e5c9a3563ff899e3555b908bc21d75887c3cde283f4846a6f8cdf8cb01018304cb2f8080b87e6060604052606e8060106000396000f360606040526000357c010000000000000000000000000000000000000000000000000000000090048063c0406226146037576035565b005b60406004506056565b6040518082815260200191505060405180910390f35b6000600560006000508190555060059050606b565b90561ba05258615c63503c0a600d6994b12ea5750d45b3c69668e2a371b4fbfb9eeff6b8a0a11be762bc90491231274a2945be35a43f23c27775b1ff24dd521702fe15f73ec0".from_hex().unwrap();
+		let b3a = "f90261f901f9a036fde1253128666fcb95a5956da14a73489e988bb72738717ec1d31e1cee781aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a05fb2b4bfdef7b314451cb138a534d225c922fc0e5fbe25e451142732c3e25c25a09dc4b1357c0b7b8108f8a098f4f9a1a274957bc9ebc22a9ae67ae81739e5b19ca007c6fdfa8eea7e86b81f5b0fc0f78f90cc19f4aa60d323151e0cac660199e9a1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302008003832fefd882524d84562791eb80a074861666bd346c025889745c793b91ab9cd1e2ca19b5cf3c50d04d135b0a4d2b8809fe9587ea4cdc04f862f86002018304cb2f94ec0e71ad0a90ffe1909d27dac207f7680abba42d01801ba06fd84874d36d5de9e8e48978c03619b53a96b7ae0a4cd1ac118f103098b44801a00572596974dd7df4f9f69bd7456585618c568d8434ef6453391b89281ce12ae1c0".from_hex().unwrap();
+		let b3b = "f90265f901f9a036fde1253128666fcb95a5956da14a73489e988bb72738717ec1d31e1cee781aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0ab87dc338bfd6f662b1cd90bc0c9e40a1b2146a095312393c9e13ce3a5008b09a0e609b7a7d4b8a2403ec1268627ecd98783627246e8f1b26addb3ff504f76a054a0592fabf92476512952db3a69a2481a42912e668a1ee28c4c322e703bb665f8beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302008003832fefd882a1f084562791ee80a0fe7098fa7e4ac5d637eea81fb23f8f78346826dbab430068dd9a249d0afa99818853e1a6b201ae3545f866f86402018304cb2f94ec0e71ad0a90ffe1909d27dac207f7680abba42d0284c04062261ca06edc9ce8e7da4cc34067beb325dcad59e5655a164a5100a50bc3eb681b12c716a0abf9053d5de65b1be81fe50d327b84de685efbeecea34e7b747180a6c6023e44c0".from_hex().unwrap();
+
+		let genesis_hash = H256::from_str("5716670833ec874362d65fea27a7cd35af5897d275b31a44944113111e4e96d2").unwrap();
+		let b1_hash = H256::from_str("437e51676ff10756fcfee5edd9159fa41dbcb1b2c592850450371cbecd54ee4f").unwrap();
+		let b2_hash = H256::from_str("36fde1253128666fcb95a5956da14a73489e988bb72738717ec1d31e1cee781a").unwrap();
+		let b3a_hash = H256::from_str("c208f88c9f5bf7e00840439742c12e5226d9752981f3ec0521bdcb6dd08af277").unwrap();
+		let b3b_hash = H256::from_str("bf72270ae0d95c9ea39a6adab994793fddb8c10fba7391e26279474124605d54").unwrap();
+
+		// b3a is a part of canon chain, whereas b3b is part of sidechain
+		let best_block_hash = H256::from_str("c208f88c9f5bf7e00840439742c12e5226d9752981f3ec0521bdcb6dd08af277").unwrap();
+
+		let temp = RandomTempPath::new();
+		let bc = BlockChain::new(&genesis, temp.as_path());
+		bc.insert_block(&b1);
+		bc.insert_block(&b2);
+		bc.insert_block(&b3a);
+		bc.insert_block(&b3b);
+
+		assert_eq!(bc.best_block_hash(), best_block_hash);
+		assert_eq!(bc.block_number(&genesis_hash).unwrap(), 0);
+		assert_eq!(bc.block_number(&b1_hash).unwrap(), 1);
+		assert_eq!(bc.block_number(&b2_hash).unwrap(), 2);
+		assert_eq!(bc.block_number(&b3a_hash).unwrap(), 3);
+		assert_eq!(bc.block_number(&b3b_hash).unwrap(), 3);
+
+		assert_eq!(bc.block_hash(0).unwrap(), genesis_hash);
+		assert_eq!(bc.block_hash(1).unwrap(), b1_hash);
+		assert_eq!(bc.block_hash(2).unwrap(), b2_hash);
+		assert_eq!(bc.block_hash(3).unwrap(), b3a_hash);
+
+		// test trie route
+		let r0_1 = bc.tree_route(genesis_hash.clone(), b1_hash.clone()).unwrap();
+		assert_eq!(r0_1.ancestor, genesis_hash);
+		assert_eq!(r0_1.blocks, [b1_hash.clone()]);
+		assert_eq!(r0_1.index, 0);
+
+		let r0_2 = bc.tree_route(genesis_hash.clone(), b2_hash.clone()).unwrap();
+		assert_eq!(r0_2.ancestor, genesis_hash);
+		assert_eq!(r0_2.blocks, [b1_hash.clone(), b2_hash.clone()]);
+		assert_eq!(r0_2.index, 0);
+
+		let r1_3a = bc.tree_route(b1_hash.clone(), b3a_hash.clone()).unwrap();
+		assert_eq!(r1_3a.ancestor, b1_hash);
+		assert_eq!(r1_3a.blocks, [b2_hash.clone(), b3a_hash.clone()]);
+		assert_eq!(r1_3a.index, 0);
+
+		let r1_3b = bc.tree_route(b1_hash.clone(), b3b_hash.clone()).unwrap();
+		assert_eq!(r1_3b.ancestor, b1_hash);
+		assert_eq!(r1_3b.blocks, [b2_hash.clone(), b3b_hash.clone()]);
+		assert_eq!(r1_3b.index, 0);
+
+		let r3a_3b = bc.tree_route(b3a_hash.clone(), b3b_hash.clone()).unwrap();
+		assert_eq!(r3a_3b.ancestor, b2_hash);
+		assert_eq!(r3a_3b.blocks, [b3a_hash.clone(), b3b_hash.clone()]);
+		assert_eq!(r3a_3b.index, 1);
+
+		let r1_0 = bc.tree_route(b1_hash.clone(), genesis_hash.clone()).unwrap();
+		assert_eq!(r1_0.ancestor, genesis_hash);
+		assert_eq!(r1_0.blocks, [b1_hash.clone()]);
+		assert_eq!(r1_0.index, 1);
+
+		let r2_0 = bc.tree_route(b2_hash.clone(), genesis_hash.clone()).unwrap();
+		assert_eq!(r2_0.ancestor, genesis_hash);
+		assert_eq!(r2_0.blocks, [b2_hash.clone(), b1_hash.clone()]);
+		assert_eq!(r2_0.index, 2);
+
+		let r3a_1 = bc.tree_route(b3a_hash.clone(), b1_hash.clone()).unwrap();
+		assert_eq!(r3a_1.ancestor, b1_hash);
+		assert_eq!(r3a_1.blocks, [b3a_hash.clone(), b2_hash.clone()]);
+		assert_eq!(r3a_1.index, 2);
+
+		let r3b_1 = bc.tree_route(b3b_hash.clone(), b1_hash.clone()).unwrap();
+		assert_eq!(r3b_1.ancestor, b1_hash);
+		assert_eq!(r3b_1.blocks, [b3b_hash.clone(), b2_hash.clone()]);
+		assert_eq!(r3b_1.index, 2);
+
+		let r3b_3a = bc.tree_route(b3b_hash.clone(), b3a_hash.clone()).unwrap();
+		assert_eq!(r3b_3a.ancestor, b2_hash);
+		assert_eq!(r3b_3a.blocks, [b3b_hash.clone(), b3a_hash.clone()]);
+		assert_eq!(r3b_3a.index, 1);
+	}
+
+	#[test]
+	fn test_reopen_blockchain_db() {
+		let genesis = "f901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a07dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080832fefd8808454c98c8142a059262c330941f3fe2a34d16d6e3c7b30d2ceb37c6a0e9a994c494ee1a61d2410885aa4c8bf8e56e264c0c0".from_hex().unwrap();
+		let b1 = "f90261f901f9a05716670833ec874362d65fea27a7cd35af5897d275b31a44944113111e4e96d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a0cb52de543653d86ccd13ba3ddf8b052525b04231c6884a4db3188a184681d878a0e78628dd45a1f8dc495594d83b76c588a3ee67463260f8b7d4a42f574aeab29aa0e9244cf7503b79c03d3a099e07a80d2dbc77bb0b502d8a89d51ac0d68dd31313b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefd882520884562791e580a051b3ecba4e3f2b49c11d42dd0851ec514b1be3138080f72a2b6e83868275d98f8877671f479c414b47f862f86080018304cb2f94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca09e2709d7ec9bbe6b1bbbf0b2088828d14cd5e8642a1fee22dc74bfa89761a7f9a04bd8813dee4be989accdb708b1c2e325a7e9c695a8024e30e89d6c644e424747c0".from_hex().unwrap();
+		let genesis_hash = H256::from_str("5716670833ec874362d65fea27a7cd35af5897d275b31a44944113111e4e96d2").unwrap();
+		let b1_hash = H256::from_str("437e51676ff10756fcfee5edd9159fa41dbcb1b2c592850450371cbecd54ee4f").unwrap();
+
+		let temp = RandomTempPath::new();
+		{
+			let bc = BlockChain::new(&genesis, temp.as_path());
+			assert_eq!(bc.best_block_hash(), genesis_hash);
+			bc.insert_block(&b1);
+			assert_eq!(bc.best_block_hash(), b1_hash);
+		}
+
+		{
+			let bc = BlockChain::new(&genesis, temp.as_path());
+			assert_eq!(bc.best_block_hash(), b1_hash);
+		}
+	}
+
+	#[test]
+	fn can_contain_arbitrary_block_sequence() {
+		let bc_result = generate_dummy_blockchain(50);
+		let bc = bc_result.reference();
+		assert_eq!(bc.best_block_number(), 49);
+	}
+
+	#[test]
+	fn can_collect_garbage() {
+		let bc_result = generate_dummy_blockchain(3000);
+		let bc = bc_result.reference();
+
+		assert_eq!(bc.best_block_number(), 2999);
+		let best_hash = bc.best_block_hash();
+		let mut block_header = bc.block_header(&best_hash);
+
+		while !block_header.is_none() {
+			block_header = bc.block_header(&block_header.unwrap().parent_hash);
+		}
+		assert!(bc.cache_size().blocks > 1024 * 1024);
+
+		for _ in 0..2 {
+			bc.collect_garbage();
+		}
+		assert!(bc.cache_size().blocks < 1024 * 1024);
+	}
+
+	#[test]
+	fn can_contain_arbitrary_block_sequence_with_extra() {
+		let bc_result = generate_dummy_blockchain_with_extra(25);
+		let bc = bc_result.reference();
+		assert_eq!(bc.best_block_number(), 24);
+	}
+
+	#[test]
+	fn can_contain_only_genesis_block() {
+		let bc_result = generate_dummy_empty_blockchain();
+		let bc = bc_result.reference();
+		assert_eq!(bc.best_block_number(), 0);
+	}
+}
--- a/ethcore/src/blockchain/best_block.rs
+++ b/ethcore/src/blockchain/best_block.rs
@@ -1,29 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 util::numbers::{U256,H256};
-use header::BlockNumber;
-
-/// Best block info.
-#[derive(Default)]
-pub struct BestBlock {
-	/// Best block hash.
-	pub hash: H256,
-	/// Best block number.
-	pub number: BlockNumber,
-	/// Best block total difficulty.
-	pub total_difficulty: U256
-}
--- a/ethcore/src/blockchain/block_info.rs
+++ b/ethcore/src/blockchain/block_info.rs
@@ -1,96 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 util::numbers::{U256,H256};
-use header::BlockNumber;
-
-use util::bytes::{FromRawBytesVariable, FromBytesError, ToBytesWithMap};
-
-/// Brief info about inserted block.
-#[derive(Clone)]
-pub struct BlockInfo {
-	/// Block hash.
-	pub hash: H256,
-	/// Block number.
-	pub number: BlockNumber,
-	/// Total block difficulty.
-	pub total_difficulty: U256,
-	/// Block location in blockchain.
-	pub location: BlockLocation
-}
-
-/// Describes location of newly inserted block.
-#[derive(Clone)]
-pub enum BlockLocation {
-	/// It's part of the canon chain.
-	CanonChain,
-	/// It's not a part of the canon chain.
-	Branch,
-	/// It's part of the fork which should become canon chain,
-	/// because it's total difficulty is higher than current
-	/// canon chain difficulty.
-	BranchBecomingCanonChain(BranchBecomingCanonChainData),
-}
-
-#[derive(Clone)]
-pub struct BranchBecomingCanonChainData {
-	/// Hash of the newest common ancestor with old canon chain.
-	pub ancestor: H256,
-	/// Hashes of the blocks between ancestor and this block.
-	pub enacted: Vec<H256>,
-	/// Hashes of the blocks which were invalidated.
-	pub retracted: Vec<H256>,
-}
-
-impl FromRawBytesVariable for BranchBecomingCanonChainData {
-	fn from_bytes_variable(bytes: &[u8]) -> Result<BranchBecomingCanonChainData, FromBytesError> {
-		type Tuple = (Vec<H256>, Vec<H256>, H256);
-		let (enacted, retracted, ancestor) = try!(Tuple::from_bytes_variable(bytes));
-		Ok(BranchBecomingCanonChainData { ancestor: ancestor, enacted: enacted, retracted: retracted })
-	}
-}
-
-impl FromRawBytesVariable for BlockLocation {
-	fn from_bytes_variable(bytes: &[u8]) -> Result<BlockLocation, FromBytesError> {
-		match bytes[0] {
-			0 => Ok(BlockLocation::CanonChain),
-			1 => Ok(BlockLocation::Branch),
-			2 => Ok(BlockLocation::BranchBecomingCanonChain(
-				try!(BranchBecomingCanonChainData::from_bytes_variable(&bytes[1..bytes.len()])))),
-			_ => Err(FromBytesError::UnknownMarker)
-		}
-	}
-}
-
-impl ToBytesWithMap for BranchBecomingCanonChainData {
-	fn to_bytes_map(&self) -> Vec<u8> {
-		(&self.enacted, &self.retracted, &self.ancestor).to_bytes_map()
-	}
-}
-
-impl ToBytesWithMap for BlockLocation {
-	fn to_bytes_map(&self) -> Vec<u8> {
-		match *self {
-			BlockLocation::CanonChain => vec![0u8],
-			BlockLocation::Branch => vec![1u8],
-			BlockLocation::BranchBecomingCanonChain(ref data) => {
-				let mut bytes = (&data.enacted, &data.retracted, &data.ancestor).to_bytes_map();
-				bytes.insert(0, 2u8);
-				bytes
-			}
-		}
-	}
-}
--- a/ethcore/src/blockchain/blockchain.rs
+++ b/ethcore/src/blockchain/blockchain.rs
--- a/ethcore/src/blockchain/cache.rs
+++ b/ethcore/src/blockchain/cache.rs
@@ -1,37 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-/// Represents blockchain's in-memory cache size in bytes.
-#[derive(Debug)]
-pub struct CacheSize {
-	/// Blocks cache size.
-	pub blocks: usize,
-	/// BlockDetails cache size.
-	pub block_details: usize,
-	/// Transaction addresses cache size.
-	pub transaction_addresses: usize,
-	/// Blooms cache size.
-	pub blocks_blooms: usize,
-	/// Block receipts size.
-	pub block_receipts: usize,
-}
-
-impl CacheSize {
-	/// Total amount used by the cache.
-	pub fn total(&self) -> usize {
-		self.blocks + self.block_details + self.transaction_addresses + self.blocks_blooms + self.block_receipts
-	}
-}
--- a/ethcore/src/blockchain/config.rs
+++ b/ethcore/src/blockchain/config.rs
@@ -1,39 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-//! Blockchain configuration.
-
-/// Blockchain configuration.
-#[derive(Debug)]
-pub struct Config {
-	/// Preferred cache size in bytes.
-	pub pref_cache_size: usize,
-	/// Maximum cache size in bytes.
-	pub max_cache_size: usize,
-	/// Backing db cache_size
-	pub db_cache_size: Option<usize>,
-}
-
-impl Default for Config {
-	fn default() -> Self {
-		Config {
-			pref_cache_size: 1 << 14,
-			max_cache_size: 1 << 20,
-			db_cache_size: None,
-		}
-	}
-}
-
--- a/ethcore/src/blockchain/extras.rs
+++ b/ethcore/src/blockchain/extras.rs
@@ -1,243 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-//! Blockchain DB extras.
-
-use bloomchain;
-use util::*;
-use header::BlockNumber;
-use receipt::Receipt;
-use db::Key;
-use blooms::{GroupPosition, BloomGroup};
-
-/// Represents index of extra data in database
-#[derive(Copy, Debug, Hash, Eq, PartialEq, Clone)]
-pub enum ExtrasIndex {
-	/// Block details index
-	BlockDetails = 0,
-	/// Block hash index
-	BlockHash = 1,
-	/// Transaction address index
-	TransactionAddress = 2,
-	/// Block blooms index
-	BlocksBlooms = 3,
-	/// Block receipts index
-	BlockReceipts = 4,
-}
-
-fn with_index(hash: &H256, i: ExtrasIndex) -> H264 {
-	let mut result = H264::default();
-	result[0] = i as u8;
-	result.deref_mut()[1..].clone_from_slice(hash);
-	result
-}
-
-pub struct BlockNumberKey([u8; 5]);
-
-impl Deref for BlockNumberKey {
-	type Target = [u8];
-
-	fn deref(&self) -> &Self::Target {
-		&self.0
-	}
-}
-
-impl Key<H256> for BlockNumber {
-	type Target = BlockNumberKey;
-
-	fn key(&self) -> Self::Target {
-		let mut result = [0u8; 5];
-		result[0] = ExtrasIndex::BlockHash as u8;
-		result[1] = (self >> 24) as u8;
-		result[2] = (self >> 16) as u8;
-		result[3] = (self >> 8) as u8;
-		result[4] = *self as u8;
-		BlockNumberKey(result)
-	}
-}
-
-impl Key<BlockDetails> for H256 {
-	type Target = H264;
-
-	fn key(&self) -> H264 {
-		with_index(self, ExtrasIndex::BlockDetails)
-	}
-}
-
-pub struct LogGroupKey([u8; 6]);
-
-impl Deref for LogGroupKey {
-	type Target = [u8];
-
-	fn deref(&self) -> &Self::Target {
-		&self.0
-	}
-}
-
-#[derive(Debug, PartialEq, Eq, Hash, Clone)]
-pub struct LogGroupPosition(GroupPosition);
-
-impl From<bloomchain::group::GroupPosition> for LogGroupPosition {
-	fn from(position: bloomchain::group::GroupPosition) -> Self {
-		LogGroupPosition(From::from(position))
-	}
-}
-
-impl HeapSizeOf for LogGroupPosition {
-	fn heap_size_of_children(&self) -> usize {
-		self.0.heap_size_of_children()
-	}
-}
-
-impl Key<BloomGroup> for LogGroupPosition {
-	type Target = LogGroupKey;
-
-	fn key(&self) -> Self::Target {
-		let mut result = [0u8; 6];
-		result[0] = ExtrasIndex::BlocksBlooms as u8;
-		result[1] = self.0.level;
-		result[2] = (self.0.index >> 24) as u8;
-		result[3] = (self.0.index >> 16) as u8;
-		result[4] = (self.0.index >> 8) as u8;
-		result[5] = self.0.index as u8;
-		LogGroupKey(result)
-	}
-}
-
-impl Key<TransactionAddress> for H256 {
-	type Target = H264;
-
-	fn key(&self) -> H264 {
-		with_index(self, ExtrasIndex::TransactionAddress)
-	}
-}
-
-impl Key<BlockReceipts> for H256 {
-	type Target = H264;
-
-	fn key(&self) -> H264 {
-		with_index(self, ExtrasIndex::BlockReceipts)
-	}
-}
-
-/// Familial details concerning a block
-#[derive(Debug, Clone)]
-pub struct BlockDetails {
-	/// Block number
-	pub number: BlockNumber,
-	/// Total difficulty of the block and all its parents
-	pub total_difficulty: U256,
-	/// Parent block hash
-	pub parent: H256,
-	/// List of children block hashes
-	pub children: Vec<H256>
-}
-
-impl HeapSizeOf for BlockDetails {
-	fn heap_size_of_children(&self) -> usize {
-		self.children.heap_size_of_children()
-	}
-}
-
-impl Decodable for BlockDetails {
-	fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder {
-		let d = decoder.as_rlp();
-		let details = BlockDetails {
-			number: try!(d.val_at(0)),
-			total_difficulty: try!(d.val_at(1)),
-			parent: try!(d.val_at(2)),
-			children: try!(d.val_at(3)),
-		};
-		Ok(details)
-	}
-}
-
-impl Encodable for BlockDetails {
-	fn rlp_append(&self, s: &mut RlpStream) {
-		s.begin_list(4);
-		s.append(&self.number);
-		s.append(&self.total_difficulty);
-		s.append(&self.parent);
-		s.append(&self.children);
-	}
-}
-
-/// Represents address of certain transaction within block
-#[derive(Clone)]
-pub struct TransactionAddress {
-	/// Block hash
-	pub block_hash: H256,
-	/// Transaction index within the block
-	pub index: usize
-}
-
-impl HeapSizeOf for TransactionAddress {
-	fn heap_size_of_children(&self) -> usize { 0 }
-}
-
-impl Decodable for TransactionAddress {
-	fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder {
-		let d = decoder.as_rlp();
-		let tx_address = TransactionAddress {
-			block_hash: try!(d.val_at(0)),
-			index: try!(d.val_at(1)),
-		};
-
-		Ok(tx_address)
-	}
-}
-
-impl Encodable for TransactionAddress {
-	fn rlp_append(&self, s: &mut RlpStream) {
-		s.begin_list(2);
-		s.append(&self.block_hash);
-		s.append(&self.index);
-	}
-}
-
-/// Contains all block receipts.
-#[derive(Clone)]
-pub struct BlockReceipts {
-	pub receipts: Vec<Receipt>,
-}
-
-impl BlockReceipts {
-	pub fn new(receipts: Vec<Receipt>) -> Self {
-		BlockReceipts {
-			receipts: receipts
-		}
-	}
-}
-
-impl Decodable for BlockReceipts {
-	fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder {
-		Ok(BlockReceipts {
-			receipts: try!(Decodable::decode(decoder))
-		})
-	}
-}
-
-impl Encodable for BlockReceipts {
-	fn rlp_append(&self, s: &mut RlpStream) {
-		s.append(&self.receipts);
-	}
-}
-
-impl HeapSizeOf for BlockReceipts {
-	fn heap_size_of_children(&self) -> usize {
-		self.receipts.heap_size_of_children()
-	}
-}
--- a/ethcore/src/blockchain/generator/block.rs
+++ b/ethcore/src/blockchain/generator/block.rs
@@ -1,64 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 util::rlp::*;
-use util::{H256, H2048};
-use util::U256;
-use util::bytes::Bytes;
-use header::Header;
-use transaction::SignedTransaction;
-
-use super::fork::Forkable;
-use super::bloom::WithBloom;
-use super::complete::CompleteBlock;
-
-/// Helper structure, used for encoding blocks.
-#[derive(Default)]
-pub struct Block {
-	pub header: Header,
-	pub transactions: Vec<SignedTransaction>,
-	pub uncles: Vec<Header>
-}
-
-impl Encodable for Block {
-	fn rlp_append(&self, s: &mut RlpStream) {
-		s.begin_list(3);
-		s.append(&self.header);
-		s.append(&self.transactions);
-		s.append(&self.uncles);
-	}
-}
-
-impl Forkable for Block {
-	fn fork(mut self, fork_number: usize) -> Self where Self: Sized {
-		self.header.difficulty = self.header.difficulty - U256::from(fork_number);
-		self
-	}
-}
-
-impl WithBloom for Block {
-	fn with_bloom(mut self, bloom: H2048) -> Self where Self: Sized {
-		self.header.log_bloom = bloom;
-		self
-	}
-}
-
-impl CompleteBlock for Block {
-	fn complete(mut self, parent_hash: H256) -> Bytes {
-		self.header.parent_hash = parent_hash;
-		encode(&self).to_vec()
-	}
-}
--- a/ethcore/src/blockchain/generator/bloom.rs
+++ b/ethcore/src/blockchain/generator/bloom.rs
@@ -1,35 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 util::hash::H2048;
-
-pub trait WithBloom {
-	fn with_bloom(self, bloom: H2048) -> Self where Self: Sized;
-}
-
-pub struct Bloom<'a, I> where I: 'a {
-	pub iter: &'a mut I,
-	pub bloom: H2048,
-}
-
-impl<'a, I> Iterator for Bloom<'a, I> where I: Iterator, <I as Iterator>::Item: WithBloom {
-	type Item = <I as Iterator>::Item;
-
-	#[inline]
-	fn next(&mut self) -> Option<Self::Item> {
-		self.iter.next().map(|item| item.with_bloom(self.bloom.clone()))
-	}
-}
--- a/ethcore/src/blockchain/generator/complete.rs
+++ b/ethcore/src/blockchain/generator/complete.rs
@@ -1,53 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 util::hash::H256;
-use util::bytes::Bytes;
-use util::sha3::Hashable;
-use views::BlockView;
-
-#[derive(Default, Clone)]
-pub struct BlockFinalizer {
-	parent_hash: H256
-}
-
-impl BlockFinalizer {
-	pub fn fork(&self) -> Self {
-		self.clone()
-	}
-}
-
-pub trait CompleteBlock {
-	fn complete(self, parent_hash: H256) -> Bytes;
-}
-
-pub struct Complete<'a, I> where I: 'a {
-	pub iter: &'a mut I,
-	pub finalizer: &'a mut BlockFinalizer,
-}
-
-impl<'a, I> Iterator for Complete<'a, I> where I: Iterator, <I as Iterator>::Item: CompleteBlock {
-	type Item = Bytes;
-
-	#[inline]
-	fn next(&mut self) -> Option<Self::Item> {
-		self.iter.next().map(|item| {
-			let rlp = item.complete(self.finalizer.parent_hash.clone());
-			self.finalizer.parent_hash = BlockView::new(&rlp).header_view().sha3();
-			rlp
-		})
-	}
-}
--- a/ethcore/src/blockchain/generator/fork.rs
+++ b/ethcore/src/blockchain/generator/fork.rs
@@ -1,42 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-pub trait Forkable {
-	fn fork(self, fork_number: usize) -> Self where Self: Sized;
-}
-
-pub struct Fork<I> {
-	pub iter: I,
-	pub fork_number: usize,
-}
-
-impl<I> Clone for Fork<I> where I: Iterator + Clone {
-	fn clone(&self) -> Self {
-		Fork {
-			iter: self.iter.clone(),
-			fork_number: self.fork_number
-		}
-	}
-}
-
-impl<I> Iterator for Fork<I> where I: Iterator, <I as Iterator>::Item: Forkable {
-	type Item = <I as Iterator>::Item;
-
-	#[inline]
-	fn next(&mut self) -> Option<Self::Item> {
-		self.iter.next().map(|item| item.fork(self.fork_number))
-	}
-}
--- a/ethcore/src/blockchain/generator/generator.rs
+++ b/ethcore/src/blockchain/generator/generator.rs
@@ -1,169 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 util::hash::H2048;
-use util::numbers::U256;
-use util::bytes::Bytes;
-use header::BlockNumber;
-use super::fork::Fork;
-use super::bloom::Bloom;
-use super::complete::{BlockFinalizer, CompleteBlock, Complete};
-use super::block::Block;
-
-/// Chain iterator interface.
-pub trait ChainIterator: Iterator + Sized {
-	/// Should be called to create a fork of current iterator.
-	/// Blocks generated by fork will have lower difficulty than current chain.
-	fn fork(&self, fork_number: usize) -> Fork<Self> where Self: Clone;
-	/// Should be called to make every consecutive block have given bloom.
-	fn with_bloom(&mut self, bloom: H2048) -> Bloom<Self>;
-	/// Should be called to complete block. Without complete, block may have incorrect hash.
-	fn complete<'a>(&'a mut self, finalizer: &'a mut BlockFinalizer) -> Complete<'a, Self>;
-	/// Completes and generates block.
-	fn generate<'a>(&'a mut self, finalizer: &'a mut BlockFinalizer) -> Option<Bytes> where Self::Item: CompleteBlock;
-}
-
-impl<I> ChainIterator for I where I: Iterator + Sized {
-	fn fork(&self, fork_number: usize) -> Fork<Self> where I: Clone {
-		Fork {
-			iter: self.clone(),
-			fork_number: fork_number
-		}
-	}
-
-	fn with_bloom(&mut self, bloom: H2048) -> Bloom<Self> {
-		Bloom {
-			iter: self,
-			bloom: bloom
-		}
-	}
-
-	fn complete<'a>(&'a mut self, finalizer: &'a mut BlockFinalizer) -> Complete<'a, Self> {
-		Complete {
-			iter: self,
-			finalizer: finalizer
-		}
-	}
-
-	fn generate<'a>(&'a mut self, finalizer: &'a mut BlockFinalizer) -> Option<Bytes> where <I as Iterator>::Item: CompleteBlock {
-		self.complete(finalizer).next()
-	}
-}
-
-/// Blockchain generator.
-#[derive(Clone)]
-pub struct ChainGenerator {
-	/// Next block number.
-	number: BlockNumber,
-	/// Next block difficulty.
-	difficulty: U256,
-}
-
-impl ChainGenerator {
-	fn prepare_block(&self) -> Block {
-		let mut block = Block::default();
-		block.header.number = self.number;
-		block.header.difficulty = self.difficulty;
-		block
-	}
-}
-
-impl Default for ChainGenerator {
-	fn default() -> Self {
-		ChainGenerator {
-			number: 0,
-			difficulty: U256::from(1000),
-		}
-	}
-}
-
-impl Iterator for ChainGenerator {
-	type Item = Block;
-
-	fn next(&mut self) -> Option<Self::Item> {
-		let block = self.prepare_block();
-		self.number += 1;
-		Some(block)
-	}
-}
-
-mod tests {
-	use util::hash::{H256, H2048};
-	use util::sha3::Hashable;
-	use views::BlockView;
-	use blockchain::generator::{ChainIterator, ChainGenerator, BlockFinalizer};
-
-	#[test]
-	fn canon_chain_generator() {
-		let mut canon_chain = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-
-		let genesis_rlp = canon_chain.generate(&mut finalizer).unwrap();
-		let genesis = BlockView::new(&genesis_rlp);
-
-		assert_eq!(genesis.header_view().parent_hash(), H256::default());
-		assert_eq!(genesis.header_view().number(), 0);
-
-		let b1_rlp = canon_chain.generate(&mut finalizer).unwrap();
-		let b1 = BlockView::new(&b1_rlp);
-
-		assert_eq!(b1.header_view().parent_hash(), genesis.header_view().sha3());
-		assert_eq!(b1.header_view().number(), 1);
-
-		let mut fork_chain = canon_chain.fork(1);
-
-		let b2_rlp_fork = fork_chain.generate(&mut finalizer.fork()).unwrap();
-		let b2_fork = BlockView::new(&b2_rlp_fork);
-
-		assert_eq!(b2_fork.header_view().parent_hash(), b1.header_view().sha3());
-		assert_eq!(b2_fork.header_view().number(), 2);
-
-		let b2_rlp = canon_chain.generate(&mut finalizer).unwrap();
-		let b2 = BlockView::new(&b2_rlp);
-
-		assert_eq!(b2.header_view().parent_hash(), b1.header_view().sha3());
-		assert_eq!(b2.header_view().number(), 2);
-		assert!(b2.header_view().difficulty() > b2_fork.header_view().difficulty());
-	}
-
-	#[test]
-	fn with_bloom_generator() {
-		let bloom = H2048([0x1; 256]);
-		let mut gen = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-
-		let block0_rlp = gen.with_bloom(bloom).generate(&mut finalizer).unwrap();
-		let block1_rlp = gen.generate(&mut finalizer).unwrap();
-		let block0 = BlockView::new(&block0_rlp);
-		let block1 = BlockView::new(&block1_rlp);
-
-		assert_eq!(block0.header_view().number(), 0);
-		assert_eq!(block0.header_view().parent_hash(), H256::default());
-
-		assert_eq!(block1.header_view().number(), 1);
-		assert_eq!(block1.header_view().parent_hash(), block0.header_view().sha3());
-
-	}
-
-	#[test]
-	fn generate_1000_blocks() {
-		let generator = ChainGenerator::default();
-		let mut finalizer = BlockFinalizer::default();
-		let blocks: Vec<_> = generator.take(1000).complete(&mut finalizer).collect();
-		assert_eq!(blocks.len(), 1000);
-	}
-}
-
--- a/ethcore/src/blockchain/generator/mod.rs
+++ b/ethcore/src/blockchain/generator/mod.rs
@@ -1,24 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-mod bloom;
-mod block;
-mod complete;
-mod fork;
-pub mod generator;
-
-pub use self::complete::BlockFinalizer;
-pub use self::generator::{ChainIterator, ChainGenerator};
--- a/ethcore/src/blockchain/import_route.rs
+++ b/ethcore/src/blockchain/import_route.rs
@@ -1,135 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-//! Import route.
-
-use util::hash::H256;
-use blockchain::block_info::{BlockInfo, BlockLocation};
-
-/// Import route for newly inserted block.
-#[derive(Debug, PartialEq)]
-pub struct ImportRoute {
-	/// Blocks that were invalidated by new block.
-	pub retracted: Vec<H256>,
-	/// Blocks that were validated by new block.
-	pub enacted: Vec<H256>,
-	/// Blocks which are neither retracted nor enacted.
-	pub omitted: Vec<H256>,
-}
-
-impl ImportRoute {
-	pub fn none() -> Self {
-		ImportRoute {
-			retracted: vec![],
-			enacted: vec![],
-			omitted: vec![],
-		}
-	}
-}
-
-impl From<BlockInfo> for ImportRoute {
-	fn from(info: BlockInfo) -> ImportRoute {
-		match info.location {
-			BlockLocation::CanonChain => ImportRoute {
-				retracted: vec![],
-				enacted: vec![info.hash],
-				omitted: vec![],
-			},
-			BlockLocation::Branch => ImportRoute {
-				retracted: vec![],
-				enacted: vec![],
-				omitted: vec![info.hash],
-			},
-			BlockLocation::BranchBecomingCanonChain(mut data) => {
-				data.enacted.push(info.hash);
-				ImportRoute {
-					retracted: data.retracted,
-					enacted: data.enacted,
-					omitted: vec![],
-				}
-			}
-		}
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use util::hash::H256;
-	use util::numbers::U256;
-	use blockchain::block_info::{BlockInfo, BlockLocation, BranchBecomingCanonChainData};
-	use blockchain::ImportRoute;
-
-	#[test]
-	fn import_route_none() {
-		assert_eq!(ImportRoute::none(), ImportRoute {
-			enacted: vec![],
-			retracted: vec![],
-			omitted: vec![],
-		});
-	}
-
-	#[test]
-	fn import_route_branch() {
-		let info = BlockInfo {
-			hash: H256::from(U256::from(1)),
-			number: 0,
-			total_difficulty: U256::from(0),
-			location: BlockLocation::Branch,
-		};
-
-		assert_eq!(ImportRoute::from(info), ImportRoute {
-			retracted: vec![],
-			enacted: vec![],
-			omitted: vec![H256::from(U256::from(1))],
-		});
-	}
-
-	#[test]
-	fn import_route_canon_chain() {
-		let info = BlockInfo {
-			hash: H256::from(U256::from(1)),
-			number: 0,
-			total_difficulty: U256::from(0),
-			location: BlockLocation::CanonChain,
-		};
-
-		assert_eq!(ImportRoute::from(info), ImportRoute {
-			retracted: vec![],
-			enacted: vec![H256::from(U256::from(1))],
-			omitted: vec![],
-		});
-	}
-
-	#[test]
-	fn import_route_branch_becoming_canon_chain() {
-		let info = BlockInfo {
-			hash: H256::from(U256::from(2)),
-			number: 0,
-			total_difficulty: U256::from(0),
-			location: BlockLocation::BranchBecomingCanonChain(BranchBecomingCanonChainData {
-				ancestor: H256::from(U256::from(0)),
-				enacted: vec![H256::from(U256::from(1))],
-				retracted: vec![H256::from(U256::from(3)), H256::from(U256::from(4))],
-			})
-		};
-
-		assert_eq!(ImportRoute::from(info), ImportRoute {
-			retracted: vec![H256::from(U256::from(3)), H256::from(U256::from(4))],
-			enacted: vec![H256::from(U256::from(1)), H256::from(U256::from(2))],
-			omitted: vec![],
-		});
-	}
-}
--- a/ethcore/src/blockchain/mod.rs
+++ b/ethcore/src/blockchain/mod.rs
@@ -1,35 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-//! Blockchain database.
-
-mod best_block;
-mod block_info;
-pub mod blockchain;
-mod cache;
-mod config;
-pub mod extras;
-mod import_route;
-mod update;
-
-#[cfg(test)]
-mod generator;
-
-pub use self::blockchain::{BlockProvider, BlockChain};
-pub use self::cache::CacheSize;
-pub use self::config::Config;
-pub use types::tree_route::TreeRoute;
-pub use self::import_route::ImportRoute;
--- a/ethcore/src/blockchain/update.rs
+++ b/ethcore/src/blockchain/update.rs
@@ -1,22 +0,0 @@
-use std::collections::HashMap;
-use util::numbers::H256;
-use header::BlockNumber;
-use blockchain::block_info::BlockInfo;
-use blooms::BloomGroup;
-use super::extras::{BlockDetails, BlockReceipts, TransactionAddress, LogGroupPosition};
-
-/// Block extras update info.
-pub struct ExtrasUpdate {
-	/// Block info.
-	pub info: BlockInfo,
-	/// Modified block hashes.
-	pub block_hashes: HashMap<BlockNumber, H256>,
-	/// Modified block details.
-	pub block_details: HashMap<H256, BlockDetails>,
-	/// Modified block receipts.
-	pub block_receipts: HashMap<H256, BlockReceipts>,
-	/// Modified transaction addresses.
-	pub transactions_addresses: HashMap<H256, TransactionAddress>,
-	/// Modified blocks blooms.
-	pub blocks_blooms: HashMap<LogGroupPosition, BloomGroup>,
-}
--- a/ethcore/src/blooms/bloom.rs
+++ b/ethcore/src/blooms/bloom.rs
@@ -1,62 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 bloomchain as bc;
-use util::rlp::*;
-use util::HeapSizeOf;
-use basic_types::LogBloom;
-
-/// Helper structure representing bloom of the trace.
-#[derive(Debug, Clone)]
-pub struct Bloom(LogBloom);
-
-impl From<LogBloom> for Bloom {
-	fn from(bloom: LogBloom) -> Self {
-		Bloom(bloom)
-	}
-}
-
-impl From<bc::Bloom> for Bloom {
-	fn from(bloom: bc::Bloom) -> Self {
-		let bytes: [u8; 256] = bloom.into();
-		Bloom(LogBloom::from(bytes))
-	}
-}
-
-impl Into<bc::Bloom> for Bloom {
-	fn into(self) -> bc::Bloom {
-		let log = self.0;
-		bc::Bloom::from(log.0)
-	}
-}
-
-impl Decodable for Bloom {
-	fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder {
-		Decodable::decode(decoder).map(Bloom)
-	}
-}
-
-impl Encodable for Bloom {
-	fn rlp_append(&self, s: &mut RlpStream) {
-		Encodable::rlp_append(&self.0, s)
-	}
-}
-
-impl HeapSizeOf for Bloom {
-	fn heap_size_of_children(&self) -> usize {
-		0
-	}
-}
--- a/ethcore/src/blooms/bloom_group.rs
+++ b/ethcore/src/blooms/bloom_group.rs
@@ -1,74 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 bloomchain::group as bc;
-use util::rlp::*;
-use util::HeapSizeOf;
-use super::Bloom;
-
-/// Represents group of X consecutive blooms.
-#[derive(Debug, Clone)]
-pub struct BloomGroup {
-	blooms: Vec<Bloom>,
-}
-
-impl From<bc::BloomGroup> for BloomGroup {
-	fn from(group: bc::BloomGroup) -> Self {
-		let blooms = group.blooms
-			.into_iter()
-			.map(From::from)
-			.collect();
-
-		BloomGroup {
-			blooms: blooms
-		}
-	}
-}
-
-impl Into<bc::BloomGroup> for BloomGroup {
-	fn into(self) -> bc::BloomGroup {
-		let blooms = self.blooms
-			.into_iter()
-			.map(Into::into)
-			.collect();
-
-		bc::BloomGroup {
-			blooms: blooms
-		}
-	}
-}
-
-impl Decodable for BloomGroup {
-	fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder {
-		let blooms = try!(Decodable::decode(decoder));
-		let group = BloomGroup {
-			blooms: blooms
-		};
-		Ok(group)
-	}
-}
-
-impl Encodable for BloomGroup {
-	fn rlp_append(&self, s: &mut RlpStream) {
-		Encodable::rlp_append(&self.blooms, s)
-	}
-}
-
-impl HeapSizeOf for BloomGroup {
-	fn heap_size_of_children(&self) -> usize {
-		self.blooms.heap_size_of_children()
-	}
-}
--- a/ethcore/src/blooms/group_position.rs
+++ b/ethcore/src/blooms/group_position.rs
@@ -1,42 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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 bloomchain::group as bc;
-use util::HeapSizeOf;
-
-/// Represents `BloomGroup` position in database.
-#[derive(PartialEq, Eq, Hash, Clone, Debug)]
-pub struct GroupPosition {
-	/// Bloom level.
-	pub level: u8,
-	/// Group index.
-	pub index: u32,
-}
-
-impl From<bc::GroupPosition> for GroupPosition {
-	fn from(p: bc::GroupPosition) -> Self {
-		GroupPosition {
-			level: p.level as u8,
-			index: p.index as u32,
-		}
-	}
-}
-
-impl HeapSizeOf for GroupPosition {
-	fn heap_size_of_children(&self) -> usize {
-		0
-	}
-}
--- a/ethcore/src/blooms/mod.rs
+++ b/ethcore/src/blooms/mod.rs
@@ -1,25 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-//! Bridge between bloomchain crate types and ethcore.
-
-mod bloom;
-mod bloom_group;
-mod group_position;
-
-pub use self::bloom::Bloom;
-pub use self::bloom_group::BloomGroup;
-pub use self::group_position::GroupPosition;
--- a/ethcore/src/builtin.rs
+++ b/ethcore/src/builtin.rs
@@ -18,9 +18,8 @@ use util::*;
 use crypto::sha2::Sha256;
 use crypto::ripemd160::Ripemd160;
 use crypto::digest::Digest;
-use ethjson;

-/// Definition of a contract whose implementation is built-in.
+/// Definition of a contract whose implementation is built-in. 
 pub struct Builtin {
 	/// The gas cost of running this built-in for the given size of input data.
 	pub cost: Box<Fn(usize) -> U256>,	// TODO: U256 should be bignum.
@@ -47,12 +46,13 @@ impl Builtin {
 	}

 	/// Create a new object from a builtin-function name with a linear cost associated with input size.
-	pub fn from_named_linear(name: &str, base_cost: usize, word_cost: usize) -> Builtin {
-		let cost = Box::new(move|s: usize| -> U256 {
-			U256::from(base_cost) + U256::from(word_cost) * U256::from((s + 31) / 32)
-		});
-
-		Self::new(cost, new_builtin_exec(name))
+	pub fn from_named_linear(name: &str, base_cost: usize, word_cost: usize) -> Option<Builtin> {
+		new_builtin_exec(name).map(|b| {
+			let cost = Box::new(move|s: usize| -> U256 {
+				U256::from(base_cost) + U256::from(word_cost) * U256::from((s + 31) / 32)
+			});
+			Self::new(cost, b)
+		})
 	}

 	/// Simple forwarder for cost.
@@ -60,15 +60,22 @@ impl Builtin {

 	/// Simple forwarder for execute.
 	pub fn execute(&self, input: &[u8], output: &mut[u8]) { (*self.execute)(input, output); }
-}

-impl From<ethjson::spec::Builtin> for Builtin {
-	fn from(b: ethjson::spec::Builtin) -> Self {
-		match b.pricing {
-			ethjson::spec::Pricing::Linear(linear) => {
-				Self::from_named_linear(b.name.as_ref(), linear.base, linear.word)
+	/// Create a builtin from JSON.
+	///
+	/// JSON must be of the form `{ "name": "identity", "linear": {"base": 10, "word": 20} }`.
+	pub fn from_json(json: &Json) -> Option<Builtin> {
+		// NICE: figure out a more convenient means of handing errors here.
+		if let Json::String(ref name) = json["name"] {
+			if let Json::Object(ref o) = json["linear"] {
+				if let Json::U64(ref word) = o["word"] {
+					if let Json::U64(ref base) = o["base"] {
+						return Self::from_named_linear(&name[..], *base as usize, *word as usize);
+					}
+				}
 			}
 		}
+		None
 	}
 }

@@ -83,14 +90,14 @@ pub fn copy_to(src: &[u8], dest: &mut[u8]) {

 /// Create a new builtin executor according to `name`.
 /// TODO: turn in to a factory with dynamic registration.
-pub fn new_builtin_exec(name: &str) -> Box<Fn(&[u8], &mut [u8])> {
+pub fn new_builtin_exec(name: &str) -> Option<Box<Fn(&[u8], &mut [u8])>> {
 	match name {
-		"identity" => Box::new(move|input: &[u8], output: &mut[u8]| {
+		"identity" => Some(Box::new(move|input: &[u8], output: &mut[u8]| {
 			for i in 0..min(input.len(), output.len()) {
 				output[i] = input[i];
 			}
-		}),
-		"ecrecover" => Box::new(move|input: &[u8], output: &mut[u8]| {
+		})),
+		"ecrecover" => Some(Box::new(move|input: &[u8], output: &mut[u8]| {
 			#[repr(packed)]
 			#[derive(Debug)]
 			struct InType {
@@ -113,8 +120,8 @@ pub fn new_builtin_exec(name: &str) -> Box<Fn(&[u8], &mut [u8])> {
 					}
 				}
 			}
-		}),
-		"sha256" => Box::new(move|input: &[u8], output: &mut[u8]| {
+		})),
+		"sha256" => Some(Box::new(move|input: &[u8], output: &mut[u8]| {
 			let mut sha = Sha256::new();
 			sha.input(input);
 			if output.len() >= 32 {
@@ -124,23 +131,21 @@ pub fn new_builtin_exec(name: &str) -> Box<Fn(&[u8], &mut [u8])> {
 				sha.result(ret.as_slice_mut());
 				copy_to(&ret, output);
 			}
-		}),
-		"ripemd160" => Box::new(move|input: &[u8], output: &mut[u8]| {
+		})),
+		"ripemd160" => Some(Box::new(move|input: &[u8], output: &mut[u8]| {
 			let mut sha = Ripemd160::new();
 			sha.input(input);
 			let mut ret = H256::new();
 			sha.result(&mut ret.as_slice_mut()[12..32]);
 			copy_to(&ret, output);
-		}),
-		_ => {
-			panic!("invalid builtin name {}", name);
-		}
+		})),
+		_ => None
 	}
 }

 #[test]
 fn identity() {
-	let f = new_builtin_exec("identity");
+	let f = new_builtin_exec("identity").unwrap();
 	let i = [0u8, 1, 2, 3];

 	let mut o2 = [255u8; 2];
@@ -160,7 +165,7 @@ fn identity() {
 #[test]
 fn sha256() {
 	use rustc_serialize::hex::FromHex;
-	let f = new_builtin_exec("sha256");
+	let f = new_builtin_exec("sha256").unwrap();
 	let i = [0u8; 0];

 	let mut o = [255u8; 32];
@@ -179,7 +184,7 @@ fn sha256() {
 #[test]
 fn ripemd160() {
 	use rustc_serialize::hex::FromHex;
-	let f = new_builtin_exec("ripemd160");
+	let f = new_builtin_exec("ripemd160").unwrap();
 	let i = [0u8; 0];

 	let mut o = [255u8; 32];
@@ -206,7 +211,7 @@ fn ecrecover() {
 	let s = k.sign(&m).unwrap();
 	println!("Signed: {}", s);*/

-	let f = new_builtin_exec("ecrecover");
+	let f = new_builtin_exec("ecrecover").unwrap();
 	let i = FromHex::from_hex("47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad000000000000000000000000000000000000000000000000000000000000001b650acf9d3f5f0a2c799776a1254355d5f4061762a237396a99a0e0e3fc2bcd6729514a0dacb2e623ac4abd157cb18163ff942280db4d5caad66ddf941ba12e03").unwrap();

 	let mut o = [255u8; 32];
@@ -253,15 +258,9 @@ fn ecrecover() {
 	assert_eq!(&o[..], &(FromHex::from_hex("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap())[..]);*/
 }

-#[test]
-#[should_panic]
-fn from_unknown_linear() {
-	let _ = Builtin::from_named_linear("dw", 10, 20);
-}
-
 #[test]
 fn from_named_linear() {
-	let b = Builtin::from_named_linear("identity", 10, 20);
+	let b = Builtin::from_named_linear("identity", 10, 20).unwrap();
 	assert_eq!((*b.cost)(0), U256::from(10));
 	assert_eq!((*b.cost)(1), U256::from(30));
 	assert_eq!((*b.cost)(32), U256::from(30));
@@ -275,14 +274,9 @@ fn from_named_linear() {

 #[test]
 fn from_json() {
-	let b = Builtin::from(ethjson::spec::Builtin {
-		name: "identity".to_owned(),
-		pricing: ethjson::spec::Pricing::Linear(ethjson::spec::Linear {
-			base: 10,
-			word: 20,
-		})
-	});
-
+	let text = "{ \"name\": \"identity\", \"linear\": {\"base\": 10, \"word\": 20} }";
+	let json = Json::from_str(text).unwrap();
+	let b = Builtin::from_json(&json).unwrap();
 	assert_eq!((*b.cost)(0), U256::from(10));
 	assert_eq!((*b.cost)(1), U256::from(30));
 	assert_eq!((*b.cost)(32), U256::from(30));
--- a/ethcore/src/client.rs
+++ b/ethcore/src/client.rs
@@ -0,0 +1,421 @@
+// Copyright 2015, 2016 Ethcore (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/>.
+
+//! Blockchain database client.
+
+use util::*;
+use rocksdb::{Options, DB, DBCompactionStyle};
+use blockchain::{BlockChain, BlockProvider, CacheSize};
+use views::BlockView;
+use error::*;
+use header::BlockNumber;
+use state::State;
+use spec::Spec;
+use engine::Engine;
+use views::HeaderView;
+use block_queue::{BlockQueue, BlockQueueInfo};
+use service::NetSyncMessage;
+use env_info::LastHashes;
+use verification::*;
+use block::*;
+pub use blockchain::TreeRoute;
+
+/// General block status
+#[derive(Debug, Eq, PartialEq)]
+pub enum BlockStatus {
+	/// Part of the blockchain.
+	InChain,
+	/// Queued for import.
+	Queued,
+	/// Known as bad.
+	Bad,
+	/// Unknown.
+	Unknown,
+}
+
+/// Information about the blockchain gthered together.
+#[derive(Debug)]
+pub struct BlockChainInfo {
+	/// Blockchain difficulty.
+	pub total_difficulty: U256,
+	/// Block queue difficulty.
+	pub pending_total_difficulty: U256,
+	/// Genesis block hash.
+	pub genesis_hash: H256,
+	/// Best blockchain block hash.
+	pub best_block_hash: H256,
+	/// Best blockchain block number.
+	pub best_block_number: BlockNumber
+}
+
+impl fmt::Display for BlockChainInfo {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		write!(f, "#{}.{}", self.best_block_number, self.best_block_hash)
+	}
+}
+
+/// Blockchain database client. Owns and manages a blockchain and a block queue.
+pub trait BlockChainClient : Sync + Send {
+	/// Get raw block header data by block header hash.
+	fn block_header(&self, hash: &H256) -> Option<Bytes>;
+
+	/// Get raw block body data by block header hash.
+	/// Block body is an RLP list of two items: uncles and transactions.
+	fn block_body(&self, hash: &H256) -> Option<Bytes>;
+
+	/// Get raw block data by block header hash.
+	fn block(&self, hash: &H256) -> Option<Bytes>;
+
+	/// Get block status by block header hash.
+	fn block_status(&self, hash: &H256) -> BlockStatus;
+
+	/// Get block total difficulty.
+	fn block_total_difficulty(&self, hash: &H256) -> Option<U256>;
+
+	/// Get raw block header data by block number.
+	fn block_header_at(&self, n: BlockNumber) -> Option<Bytes>;
+
+	/// Get raw block body data by block number.
+	/// Block body is an RLP list of two items: uncles and transactions.
+	fn block_body_at(&self, n: BlockNumber) -> Option<Bytes>;
+
+	/// Get raw block data by block number.
+	fn block_at(&self, n: BlockNumber) -> Option<Bytes>;
+
+	/// Get block status by block number.
+	fn block_status_at(&self, n: BlockNumber) -> BlockStatus;
+
+	/// Get block total difficulty.
+	fn block_total_difficulty_at(&self, n: BlockNumber) -> Option<U256>;
+
+	/// Get a tree route between `from` and `to`.
+	/// See `BlockChain::tree_route`.
+	fn tree_route(&self, from: &H256, to: &H256) -> Option<TreeRoute>;
+
+	/// Get latest state node
+	fn state_data(&self, hash: &H256) -> Option<Bytes>;
+
+	/// Get raw block receipts data by block header hash.
+	fn block_receipts(&self, hash: &H256) -> Option<Bytes>;
+
+	/// Import a block into the blockchain.
+	fn import_block(&self, bytes: Bytes) -> ImportResult;
+
+	/// Get block queue information.
+	fn queue_info(&self) -> BlockQueueInfo;
+
+	/// Clear block queue and abort all import activity.
+	fn clear_queue(&self);
+
+	/// Get blockchain information.
+	fn chain_info(&self) -> BlockChainInfo;
+
+	/// Get the best block header.
+	fn best_block_header(&self) -> Bytes {
+		self.block_header(&self.chain_info().best_block_hash).unwrap()
+	}
+}
+
+#[derive(Default, Clone, Debug, Eq, PartialEq)]
+/// Report on the status of a client.
+pub struct ClientReport {
+	/// How many blocks have been imported so far.
+	pub blocks_imported: usize,
+	/// How many transactions have been applied so far.
+	pub transactions_applied: usize,
+	/// How much gas has been processed so far.
+	pub gas_processed: U256,
+}
+
+impl ClientReport {
+	/// Alter internal reporting to reflect the additional `block` has been processed.
+	pub fn accrue_block(&mut self, block: &PreVerifiedBlock) {
+		self.blocks_imported += 1;
+		self.transactions_applied += block.transactions.len();
+		self.gas_processed += block.header.gas_used;
+	}
+}
+
+/// Blockchain database client backed by a persistent database. Owns and manages a blockchain and a block queue.
+/// Call `import_block()` to import a block asynchronously; `flush_queue()` flushes the queue.
+pub struct Client {
+	chain: Arc<RwLock<BlockChain>>,
+	engine: Arc<Box<Engine>>,
+	state_db: Mutex<JournalDB>,
+	block_queue: RwLock<BlockQueue>,
+	report: RwLock<ClientReport>,
+	import_lock: Mutex<()>
+}
+
+const HISTORY: u64 = 1000;
+const CLIENT_DB_VER_STR: &'static str = "1.0";
+
+impl Client {
+	/// Create a new client with given spec and DB path.
+	pub fn new(spec: Spec, path: &Path, message_channel: IoChannel<NetSyncMessage> ) -> Result<Arc<Client>, Error> {
+		let mut dir = path.to_path_buf();
+		dir.push(H64::from(spec.genesis_header().hash()).hex());
+		//TODO: sec/fat: pruned/full versioning
+		dir.push(format!("v{}-sec-pruned", CLIENT_DB_VER_STR));
+		let path = dir.as_path();
+		let gb = spec.genesis_block();
+		let chain = Arc::new(RwLock::new(BlockChain::new(&gb, path)));
+		let mut opts = Options::new();
+		opts.set_max_open_files(256);
+		opts.create_if_missing(true);
+		opts.set_use_fsync(false);
+		opts.set_compaction_style(DBCompactionStyle::DBUniversalCompaction);
+		/*
+		opts.set_bytes_per_sync(8388608);
+		opts.set_disable_data_sync(false);
+		opts.set_block_cache_size_mb(1024);
+		opts.set_table_cache_num_shard_bits(6);
+		opts.set_max_write_buffer_number(32);
+		opts.set_write_buffer_size(536870912);
+		opts.set_target_file_size_base(1073741824);
+		opts.set_min_write_buffer_number_to_merge(4);
+		opts.set_level_zero_stop_writes_trigger(2000);
+		opts.set_level_zero_slowdown_writes_trigger(0);
+		opts.set_compaction_style(DBUniversalCompaction);
+		opts.set_max_background_compactions(4);
+		opts.set_max_background_flushes(4);
+		opts.set_filter_deletes(false);
+		opts.set_disable_auto_compactions(false);*/
+
+		let mut state_path = path.to_path_buf();
+		state_path.push("state");
+		let db = Arc::new(DB::open(&opts, state_path.to_str().unwrap()).unwrap());
+		
+		let engine = Arc::new(try!(spec.to_engine()));
+		let mut state_db = JournalDB::new_with_arc(db.clone());
+		if state_db.is_empty() && engine.spec().ensure_db_good(&mut state_db) {
+			state_db.commit(0, &engine.spec().genesis_header().hash(), None).expect("Error commiting genesis state to state DB");
+		}
+		Ok(Arc::new(Client {
+			chain: chain,
+			engine: engine.clone(),
+			state_db: Mutex::new(state_db),
+			block_queue: RwLock::new(BlockQueue::new(engine, message_channel)),
+			report: RwLock::new(Default::default()),
+			import_lock: Mutex::new(()),
+		}))
+	}
+
+	/// Flush the block import queue.
+	pub fn flush_queue(&self) {
+		self.block_queue.write().unwrap().flush();
+	}
+
+	/// This is triggered by a message coming from a block queue when the block is ready for insertion
+	pub fn import_verified_blocks(&self, _io: &IoChannel<NetSyncMessage>) -> usize {
+		let mut ret = 0;
+		let mut bad = HashSet::new();
+		let _import_lock = self.import_lock.lock();
+		let blocks = self.block_queue.write().unwrap().drain(128);
+		let mut good_blocks = Vec::with_capacity(128);
+		for block in blocks {
+			if bad.contains(&block.header.parent_hash) {
+				self.block_queue.write().unwrap().mark_as_bad(&block.header.hash());
+				bad.insert(block.header.hash());
+				continue;
+			}
+
+			let header = &block.header;
+			if let Err(e) = verify_block_family(&header, &block.bytes, self.engine.deref().deref(), self.chain.read().unwrap().deref()) {
+				warn!(target: "client", "Stage 3 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
+				self.block_queue.write().unwrap().mark_as_bad(&header.hash());
+				bad.insert(block.header.hash());
+				break;
+			};
+			let parent = match self.chain.read().unwrap().block_header(&header.parent_hash) {
+				Some(p) => p,
+				None => {
+					warn!(target: "client", "Block import failed for #{} ({}): Parent not found ({}) ", header.number(), header.hash(), header.parent_hash);
+					self.block_queue.write().unwrap().mark_as_bad(&header.hash());
+					bad.insert(block.header.hash());
+					break;
+				},
+			};
+			// build last hashes
+			let mut last_hashes = LastHashes::new();
+			last_hashes.resize(256, H256::new());
+			last_hashes[0] = header.parent_hash.clone();
+			for i in 0..255 {
+				match self.chain.read().unwrap().block_details(&last_hashes[i]) {
+					Some(details) => {
+						last_hashes[i + 1] = details.parent.clone();
+					},
+					None => break,
+				}
+			}
+
+			let db = self.state_db.lock().unwrap().clone();
+			let result = match enact_verified(&block, self.engine.deref().deref(), db, &parent, &last_hashes) {
+				Ok(b) => b,
+				Err(e) => {
+					warn!(target: "client", "Block import failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
+					bad.insert(block.header.hash());
+					self.block_queue.write().unwrap().mark_as_bad(&header.hash());
+					break;
+				}
+			};
+			if let Err(e) = verify_block_final(&header, result.block().header()) {
+				warn!(target: "client", "Stage 4 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
+				self.block_queue.write().unwrap().mark_as_bad(&header.hash());
+				break;
+			}
+
+			good_blocks.push(header.hash().clone());
+
+			self.chain.write().unwrap().insert_block(&block.bytes); //TODO: err here?
+			let ancient = if header.number() >= HISTORY { Some(header.number() - HISTORY) } else { None };
+			match result.drain().commit(header.number(), &header.hash(), ancient.map(|n|(n, self.chain.read().unwrap().block_hash(n).unwrap()))) {
+				Ok(_) => (),
+				Err(e) => {
+					warn!(target: "client", "State DB commit failed: {:?}", e);
+					break;
+				}
+			}
+			self.report.write().unwrap().accrue_block(&block);
+			trace!(target: "client", "Imported #{} ({})", header.number(), header.hash());
+			ret += 1;
+		}
+		self.block_queue.write().unwrap().mark_as_good(&good_blocks);
+		ret
+	}
+
+	/// Get a copy of the best block's state.
+	pub fn state(&self) -> State {
+		State::from_existing(self.state_db.lock().unwrap().clone(), HeaderView::new(&self.best_block_header()).state_root(), self.engine.account_start_nonce())
+	}
+
+	/// Get info on the cache.
+	pub fn cache_info(&self) -> CacheSize {
+		self.chain.read().unwrap().cache_size()
+	}
+
+	/// Get the report.
+	pub fn report(&self) -> ClientReport {
+		self.report.read().unwrap().clone()
+	}
+
+	/// Tick the client.
+	pub fn tick(&self) {
+		self.chain.read().unwrap().collect_garbage();
+	}
+
+	/// Set up the cache behaviour.
+	pub fn configure_cache(&self, pref_cache_size: usize, max_cache_size: usize) {
+		self.chain.write().unwrap().configure_cache(pref_cache_size, max_cache_size);
+	}
+}
+
+impl BlockChainClient for Client {
+	fn block_header(&self, hash: &H256) -> Option<Bytes> {
+		self.chain.read().unwrap().block(hash).map(|bytes| BlockView::new(&bytes).rlp().at(0).as_raw().to_vec())
+	}
+
+	fn block_body(&self, hash: &H256) -> Option<Bytes> {
+		self.chain.read().unwrap().block(hash).map(|bytes| {
+			let rlp = Rlp::new(&bytes);
+			let mut body = RlpStream::new();
+			body.append_raw(rlp.at(1).as_raw(), 1);
+			body.append_raw(rlp.at(2).as_raw(), 1);
+			body.out()
+		})
+	}
+
+	fn block(&self, hash: &H256) -> Option<Bytes> {
+		self.chain.read().unwrap().block(hash)
+	}
+
+	fn block_status(&self, hash: &H256) -> BlockStatus {
+		if self.chain.read().unwrap().is_known(&hash) {
+			BlockStatus::InChain 
+		} else { 
+			self.block_queue.read().unwrap().block_status(hash) 
+		}
+	}
+	
+	fn block_total_difficulty(&self, hash: &H256) -> Option<U256> {
+		self.chain.read().unwrap().block_details(hash).map(|d| d.total_difficulty)
+	}
+
+	fn block_header_at(&self, n: BlockNumber) -> Option<Bytes> {
+		self.chain.read().unwrap().block_hash(n).and_then(|h| self.block_header(&h))
+	}
+
+	fn block_body_at(&self, n: BlockNumber) -> Option<Bytes> {
+		self.chain.read().unwrap().block_hash(n).and_then(|h| self.block_body(&h))
+	}
+
+	fn block_at(&self, n: BlockNumber) -> Option<Bytes> {
+		self.chain.read().unwrap().block_hash(n).and_then(|h| self.block(&h))
+	}
+
+	fn block_status_at(&self, n: BlockNumber) -> BlockStatus {
+		match self.chain.read().unwrap().block_hash(n) {
+			Some(h) => self.block_status(&h),
+			None => BlockStatus::Unknown
+		}
+	}
+
+	fn block_total_difficulty_at(&self, n: BlockNumber) -> Option<U256> {
+		self.chain.read().unwrap().block_hash(n).and_then(|h| self.block_total_difficulty(&h))
+	}
+
+	fn tree_route(&self, from: &H256, to: &H256) -> Option<TreeRoute> {
+		self.chain.read().unwrap().tree_route(from.clone(), to.clone())
+	}
+
+	fn state_data(&self, _hash: &H256) -> Option<Bytes> {
+		unimplemented!();
+	}
+
+	fn block_receipts(&self, _hash: &H256) -> Option<Bytes> {
+		unimplemented!();
+	}
+
+	fn import_block(&self, bytes: Bytes) -> ImportResult {
+		let header = BlockView::new(&bytes).header();
+		if self.chain.read().unwrap().is_known(&header.hash()) {
+			return Err(ImportError::AlreadyInChain);
+		}
+		if self.block_status(&header.parent_hash) == BlockStatus::Unknown {
+			return Err(ImportError::UnknownParent);
+		}
+		self.block_queue.write().unwrap().import_block(bytes)
+	}
+
+	fn queue_info(&self) -> BlockQueueInfo {
+		self.block_queue.read().unwrap().queue_info()
+	}
+
+	fn clear_queue(&self) {
+		self.block_queue.write().unwrap().clear();
+	}
+
+	fn chain_info(&self) -> BlockChainInfo {
+		let chain = self.chain.read().unwrap();
+		BlockChainInfo {
+			total_difficulty: chain.best_block_total_difficulty(),
+			pending_total_difficulty: chain.best_block_total_difficulty(),
+			genesis_hash: chain.genesis_hash(),
+			best_block_hash: chain.best_block_hash(),
+			best_block_number: From::from(chain.best_block_number())
+		}
+	}
+}
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -1,877 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-//! Blockchain database client.
-
-use std::path::PathBuf;
-use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
-use util::*;
-use util::panics::*;
-use views::BlockView;
-use error::{ImportError, ExecutionError, BlockError, ImportResult};
-use header::{BlockNumber, Header};
-use state::State;
-use spec::Spec;
-use basic_types::Seal;
-use engine::Engine;
-use views::HeaderView;
-use service::{NetSyncMessage, SyncMessage};
-use env_info::LastHashes;
-use verification;
-use verification::{PreverifiedBlock, Verifier};
-use block::*;
-use transaction::{LocalizedTransaction, SignedTransaction, Action};
-use blockchain::extras::TransactionAddress;
-use filter::Filter;
-use log_entry::LocalizedLogEntry;
-use block_queue::{BlockQueue, BlockQueueInfo};
-use blockchain::{BlockChain, BlockProvider, TreeRoute, ImportRoute};
-use client::{BlockID, TransactionID, UncleID, TraceId, ClientConfig, DatabaseCompactionProfile,
-	BlockChainClient, MiningBlockChainClient, TraceFilter, CallAnalytics };
-use client::Error as ClientError;
-use env_info::EnvInfo;
-use executive::{Executive, Executed, TransactOptions, contract_address};
-use receipt::LocalizedReceipt;
-pub use blockchain::CacheSize as BlockChainCacheSize;
-use trace::{TraceDB, ImportRequest as TraceImportRequest, LocalizedTrace, Database as TraceDatabase};
-use trace;
-pub use types::blockchain_info::BlockChainInfo;
-pub use types::block_status::BlockStatus;
-use evm::Factory as EvmFactory;
-use miner::{Miner, MinerService};
-
-const MAX_TX_QUEUE_SIZE: usize = 4096;
-
-impl fmt::Display for BlockChainInfo {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		write!(f, "#{}.{}", self.best_block_number, self.best_block_hash)
-	}
-}
-
-/// Report on the status of a client.
-#[derive(Default, Clone, Debug, Eq, PartialEq)]
-pub struct ClientReport {
-	/// How many blocks have been imported so far.
-	pub blocks_imported: usize,
-	/// How many transactions have been applied so far.
-	pub transactions_applied: usize,
-	/// How much gas has been processed so far.
-	pub gas_processed: U256,
-	/// Memory used by state DB
-	pub state_db_mem: usize,
-}
-
-impl ClientReport {
-	/// Alter internal reporting to reflect the additional `block` has been processed.
-	pub fn accrue_block(&mut self, block: &PreverifiedBlock) {
-		self.blocks_imported += 1;
-		self.transactions_applied += block.transactions.len();
-		self.gas_processed = self.gas_processed + block.header.gas_used;
-	}
-}
-
-/// Blockchain database client backed by a persistent database. Owns and manages a blockchain and a block queue.
-/// Call `import_block()` to import a block asynchronously; `flush_queue()` flushes the queue.
-pub struct Client {
-	chain: Arc<BlockChain>,
-	tracedb: Arc<TraceDB<BlockChain>>,
-	engine: Arc<Box<Engine>>,
-	state_db: Mutex<Box<JournalDB>>,
-	block_queue: BlockQueue,
-	report: RwLock<ClientReport>,
-	import_lock: Mutex<()>,
-	panic_handler: Arc<PanicHandler>,
-	verifier: Box<Verifier>,
-	vm_factory: Arc<EvmFactory>,
-	miner: Arc<Miner>,
-	io_channel: IoChannel<NetSyncMessage>,
-	queue_transactions: AtomicUsize,
-}
-
-const HISTORY: u64 = 1200;
-// DO NOT TOUCH THIS ANY MORE UNLESS YOU REALLY KNOW WHAT YOU'RE DOING.
-// Altering it will force a blanket DB update for *all* JournalDB-derived
-//   databases.
-// Instead, add/upgrade the version string of the individual JournalDB-derived database
-// of which you actually want force an upgrade.
-const CLIENT_DB_VER_STR: &'static str = "5.3";
-
-/// Get the path for the databases given the root path and information on the databases.
-pub fn get_db_path(path: &Path, pruning: journaldb::Algorithm, genesis_hash: H256) -> PathBuf {
-	let mut dir = path.to_path_buf();
-	dir.push(H64::from(genesis_hash).hex());
-	//TODO: sec/fat: pruned/full versioning
-	// version here is a bit useless now, since it's controlled only be the pruning algo.
-	dir.push(format!("v{}-sec-{}", CLIENT_DB_VER_STR, pruning));
-	dir
-}
-
-/// Append a path element to the given path and return the string.
-pub fn append_path(path: &Path, item: &str) -> String {
-	let mut p = path.to_path_buf();
-	p.push(item);
-	p.to_str().unwrap().to_owned()
-}
-
-impl Client {
-	///  Create a new client with given spec and DB path and custom verifier.
-	pub fn new(
-		config: ClientConfig,
-		spec: Spec,
-		path: &Path,
-		miner: Arc<Miner>,
-		message_channel: IoChannel<NetSyncMessage>)
-		-> Result<Arc<Client>, ClientError>
-	{
-		let path = get_db_path(path, config.pruning, spec.genesis_header().hash());
-		let gb = spec.genesis_block();
-		let chain = Arc::new(BlockChain::new(config.blockchain, &gb, &path));
-		let tracedb = Arc::new(try!(TraceDB::new(config.tracing, &path, chain.clone())));
-
-		let mut state_db_config = match config.db_cache_size {
-			None => DatabaseConfig::default(),
-			Some(cache_size) => DatabaseConfig::with_cache(cache_size),
-		};
-
-		if config.db_compaction == DatabaseCompactionProfile::HDD {
-			state_db_config = state_db_config.compaction(CompactionProfile::hdd());
-		}
-
-		let mut state_db = journaldb::new(
-			&append_path(&path, "state"),
-			config.pruning,
-			state_db_config
-		);
-
-		if state_db.is_empty() && spec.ensure_db_good(state_db.as_hashdb_mut()) {
-			state_db.commit(0, &spec.genesis_header().hash(), None).expect("Error commiting genesis state to state DB");
-		}
-
-		let engine = Arc::new(spec.engine);
-
-		let block_queue = BlockQueue::new(config.queue, engine.clone(), message_channel.clone());
-		let panic_handler = PanicHandler::new_in_arc();
-		panic_handler.forward_from(&block_queue);
-
-		let client = Client {
-			chain: chain,
-			tracedb: tracedb,
-			engine: engine,
-			state_db: Mutex::new(state_db),
-			block_queue: block_queue,
-			report: RwLock::new(Default::default()),
-			import_lock: Mutex::new(()),
-			panic_handler: panic_handler,
-			verifier: verification::new(config.verifier_type),
-			vm_factory: Arc::new(EvmFactory::new(config.vm_type)),
-			miner: miner,
-			io_channel: message_channel,
-			queue_transactions: AtomicUsize::new(0),
-		};
-
-		Ok(Arc::new(client))
-	}
-
-	/// Flush the block import queue.
-	pub fn flush_queue(&self) {
-		self.block_queue.flush();
-	}
-
-	fn build_last_hashes(&self, parent_hash: H256) -> LastHashes {
-		let mut last_hashes = LastHashes::new();
-		last_hashes.resize(256, H256::new());
-		last_hashes[0] = parent_hash;
-		for i in 0..255 {
-			match self.chain.block_details(&last_hashes[i]) {
-				Some(details) => {
-					last_hashes[i + 1] = details.parent.clone();
-				},
-				None => break,
-			}
-		}
-		last_hashes
-	}
-
-	fn check_and_close_block(&self, block: &PreverifiedBlock) -> Result<LockedBlock, ()> {
-		let engine = self.engine.deref().deref();
-		let header = &block.header;
-
-		// Check the block isn't so old we won't be able to enact it.
-		let best_block_number = self.chain.best_block_number();
-		if best_block_number >= HISTORY && header.number() <= best_block_number - HISTORY {
-			warn!(target: "client", "Block import failed for #{} ({})\nBlock is ancient (current best block: #{}).", header.number(), header.hash(), best_block_number);
-			return Err(());
-		}
-
-		// Verify Block Family
-		let verify_family_result = self.verifier.verify_block_family(&header, &block.bytes, engine, self.chain.deref());
-		if let Err(e) = verify_family_result {
-			warn!(target: "client", "Stage 3 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
-			return Err(());
-		};
-
-		// Check if Parent is in chain
-		let chain_has_parent = self.chain.block_header(&header.parent_hash);
-		if let None = chain_has_parent {
-			warn!(target: "client", "Block import failed for #{} ({}): Parent not found ({}) ", header.number(), header.hash(), header.parent_hash);
-			return Err(());
-		};
-
-		// Enact Verified Block
-		let parent = chain_has_parent.unwrap();
-		let last_hashes = self.build_last_hashes(header.parent_hash.clone());
-		let db = self.state_db.lock().unwrap().boxed_clone();
-
-		let enact_result = enact_verified(&block, engine, self.tracedb.tracing_enabled(), db, &parent, last_hashes, &self.vm_factory);
-		if let Err(e) = enact_result {
-			warn!(target: "client", "Block import failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
-			return Err(());
-		};
-
-		// Final Verification
-		let locked_block = enact_result.unwrap();
-		if let Err(e) = self.verifier.verify_block_final(&header, locked_block.block().header()) {
-			warn!(target: "client", "Stage 4 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
-			return Err(());
-		}
-
-		Ok(locked_block)
-	}
-
-	fn calculate_enacted_retracted(&self, import_results: &[ImportRoute]) -> (Vec<H256>, Vec<H256>) {
-		fn map_to_vec(map: Vec<(H256, bool)>) -> Vec<H256> {
-			map.into_iter().map(|(k, _v)| k).collect()
-		}
-
-		// In ImportRoute we get all the blocks that have been enacted and retracted by single insert.
-		// Because we are doing multiple inserts some of the blocks that were enacted in import `k`
-		// could be retracted in import `k+1`. This is why to understand if after all inserts
-		// the block is enacted or retracted we iterate over all routes and at the end final state
-		// will be in the hashmap
-		let map = import_results.iter().fold(HashMap::new(), |mut map, route| {
-			for hash in &route.enacted {
-				map.insert(hash.clone(), true);
-			}
-			for hash in &route.retracted {
-				map.insert(hash.clone(), false);
-			}
-			map
-		});
-
-		// Split to enacted retracted (using hashmap value)
-		let (enacted, retracted) = map.into_iter().partition(|&(_k, v)| v);
-		// And convert tuples to keys
-		(map_to_vec(enacted), map_to_vec(retracted))
-	}
-
-	/// This is triggered by a message coming from a block queue when the block is ready for insertion
-	pub fn import_verified_blocks(&self, io: &IoChannel<NetSyncMessage>) -> usize {
-		let max_blocks_to_import = 64;
-
-		let mut imported_blocks = Vec::with_capacity(max_blocks_to_import);
-		let mut invalid_blocks = HashSet::new();
-		let mut import_results = Vec::with_capacity(max_blocks_to_import);
-
-		let _import_lock = self.import_lock.lock();
-		let _timer = PerfTimer::new("import_verified_blocks");
-		let blocks = self.block_queue.drain(max_blocks_to_import);
-
-		let original_best = self.chain_info().best_block_hash;
-
-		for block in blocks {
-			let header = &block.header;
-
-			if invalid_blocks.contains(&header.parent_hash) {
-				invalid_blocks.insert(header.hash());
-				continue;
-			}
-			let closed_block = self.check_and_close_block(&block);
-			if let Err(_) = closed_block {
-				invalid_blocks.insert(header.hash());
-				continue;
-			}
-			let closed_block = closed_block.unwrap();
-			imported_blocks.push(header.hash());
-
-			let route = self.commit_block(closed_block, &header.hash(), &block.bytes);
-			import_results.push(route);
-
-			self.report.write().unwrap().accrue_block(&block);
-			trace!(target: "client", "Imported #{} ({})", header.number(), header.hash());
-		}
-
-		let imported = imported_blocks.len();
-		let invalid_blocks = invalid_blocks.into_iter().collect::<Vec<H256>>();
-
-		{
-			if !invalid_blocks.is_empty() {
-				self.block_queue.mark_as_bad(&invalid_blocks);
-			}
-			if !imported_blocks.is_empty() {
-				self.block_queue.mark_as_good(&imported_blocks);
-			}
-		}
-
-		{
-			if !imported_blocks.is_empty() && self.block_queue.queue_info().is_empty() {
-				let (enacted, retracted) = self.calculate_enacted_retracted(&import_results);
-
-				if self.queue_info().is_empty() {
-					self.miner.chain_new_blocks(self, &imported_blocks, &invalid_blocks, &enacted, &retracted);
-				}
-
-				io.send(NetworkIoMessage::User(SyncMessage::NewChainBlocks {
-					imported: imported_blocks,
-					invalid: invalid_blocks,
-					enacted: enacted,
-					retracted: retracted,
-					sealed: Vec::new(),
-				})).unwrap_or_else(|e| warn!("Error sending IO notification: {:?}", e));
-			}
-		}
-
-		if self.chain_info().best_block_hash != original_best {
-			self.miner.update_sealing(self);
-		}
-
-		imported
-	}
-
-	fn commit_block<B>(&self, block: B, hash: &H256, block_data: &Bytes) -> ImportRoute where B: IsBlock + Drain {
-		let number = block.header().number();
-		// Are we committing an era?
-		let ancient = if number >= HISTORY {
-			let n = number - HISTORY;
-			Some((n, self.chain.block_hash(n).unwrap()))
-		} else {
-			None
-		};
-
-		// Commit results
-		let receipts = block.receipts().clone();
-		let traces = From::from(block.traces().clone().unwrap_or_else(Vec::new));
-
-		// CHECK! I *think* this is fine, even if the state_root is equal to another
-		// already-imported block of the same number.
-		// TODO: Prove it with a test.
-		block.drain().commit(number, hash, ancient).expect("State DB commit failed.");
-
-		// And update the chain after commit to prevent race conditions
-		// (when something is in chain but you are not able to fetch details)
-		let route = self.chain.insert_block(block_data, receipts);
-		self.tracedb.import(TraceImportRequest {
-			traces: traces,
-			block_hash: hash.clone(),
-			block_number: number,
-			enacted: route.enacted.clone(),
-			retracted: route.retracted.len()
-		});
-		route
-	}
-
-	/// Import transactions from the IO queue
-	pub fn import_queued_transactions(&self, transactions: &[Bytes]) -> usize {
-		let _timer = PerfTimer::new("import_queued_transactions");
-		self.queue_transactions.fetch_sub(transactions.len(), AtomicOrdering::SeqCst);
-		let txs = transactions.iter().filter_map(|bytes| UntrustedRlp::new(&bytes).as_val().ok()).collect();
-		let results = self.miner.import_external_transactions(self, txs);
-		results.len()
-	}
-
-	/// Attempt to get a copy of a specific block's state.
-	///
-	/// This will not fail if given BlockID::Latest.
-	/// Otherwise, this can fail (but may not) if the DB prunes state.
-	pub fn state_at(&self, id: BlockID) -> Option<State> {
-		// fast path for latest state.
-		match id.clone() {
-			BlockID::Pending => return self.miner.pending_state().or_else(|| Some(self.state())),
-			BlockID::Latest => return Some(self.state()),
-			_ => {},
-		}
-
-		let block_number = match self.block_number(id.clone()) {
-			Some(num) => num,
-			None => return None,
-		};
-
-		self.block_header(id).and_then(|header| {
-			let db = self.state_db.lock().unwrap().boxed_clone();
-
-			// early exit for pruned blocks
-			if db.is_pruned() && self.chain.best_block_number() >= block_number + HISTORY {
-				return None;
-			}
-
-			let root = HeaderView::new(&header).state_root();
-
-			State::from_existing(db, root, self.engine.account_start_nonce()).ok()
-		})
-	}
-
-	/// Get a copy of the best block's state.
-	pub fn state(&self) -> State {
-		State::from_existing(self.state_db.lock().unwrap().boxed_clone(), HeaderView::new(&self.best_block_header()).state_root(), self.engine.account_start_nonce())
-			.expect("State root of best block header always valid.")
-	}
-
-	/// Get info on the cache.
-	pub fn blockchain_cache_info(&self) -> BlockChainCacheSize {
-		self.chain.cache_size()
-	}
-
-	/// Get the report.
-	pub fn report(&self) -> ClientReport {
-		let mut report = self.report.read().unwrap().clone();
-		report.state_db_mem = self.state_db.lock().unwrap().mem_used();
-		report
-	}
-
-	/// Tick the client.
-	pub fn tick(&self) {
-		self.chain.collect_garbage();
-		self.block_queue.collect_garbage();
-	}
-
-	/// Set up the cache behaviour.
-	pub fn configure_cache(&self, pref_cache_size: usize, max_cache_size: usize) {
-		self.chain.configure_cache(pref_cache_size, max_cache_size);
-	}
-
-	/// Look up the block number for the given block ID.
-	pub fn block_number(&self, id: BlockID) -> Option<BlockNumber> {
-		match id {
-			BlockID::Number(number) => Some(number),
-			BlockID::Hash(ref hash) => self.chain.block_number(hash),
-			BlockID::Earliest => Some(0),
-			BlockID::Latest | BlockID::Pending => Some(self.chain.best_block_number()),
-		}
-	}
-
-	fn block_hash(chain: &BlockChain, id: BlockID) -> Option<H256> {
-		match id {
-			BlockID::Hash(hash) => Some(hash),
-			BlockID::Number(number) => chain.block_hash(number),
-			BlockID::Earliest => chain.block_hash(0),
-			BlockID::Latest | BlockID::Pending => Some(chain.best_block_hash()),
-		}
-	}
-
-	fn transaction_address(&self, id: TransactionID) -> Option<TransactionAddress> {
-		match id {
-			TransactionID::Hash(ref hash) => self.chain.transaction_address(hash),
-			TransactionID::Location(id, index) => Self::block_hash(&self.chain, id).map(|hash| TransactionAddress {
-				block_hash: hash,
-				index: index,
-			})
-		}
-	}
-}
-
-impl BlockChainClient for Client {
-	fn call(&self, t: &SignedTransaction, analytics: CallAnalytics) -> Result<Executed, ExecutionError> {
-		let header = self.block_header(BlockID::Latest).unwrap();
-		let view = HeaderView::new(&header);
-		let last_hashes = self.build_last_hashes(view.hash());
-		let env_info = EnvInfo {
-			number: view.number(),
-			author: view.author(),
-			timestamp: view.timestamp(),
-			difficulty: view.difficulty(),
-			last_hashes: last_hashes,
-			gas_used: U256::zero(),
-			gas_limit: U256::max_value(),
-		};
-		// that's just a copy of the state.
-		let mut state = self.state();
-		let sender = try!(t.sender().map_err(|e| {
-			let message = format!("Transaction malformed: {:?}", e);
-			ExecutionError::TransactionMalformed(message)
-		}));
-		let balance = state.balance(&sender);
-		let needed_balance = t.value + t.gas * t.gas_price;
-		if balance < needed_balance {
-			// give the sender a sufficient balance
-			state.add_balance(&sender, &(needed_balance - balance));
-		}
-		let options = TransactOptions { tracing: analytics.transaction_tracing, vm_tracing: analytics.vm_tracing, check_nonce: false };
-		let mut ret = Executive::new(&mut state, &env_info, self.engine.deref().deref(), &self.vm_factory).transact(t, options);
-
-		// TODO gav move this into Executive.
-		if analytics.state_diffing {
-			if let Ok(ref mut x) = ret {
-				x.state_diff = Some(state.diff_from(self.state()));
-			}
-		}
-		ret
-	}
-
-
-	fn block_header(&self, id: BlockID) -> Option<Bytes> {
-		Self::block_hash(&self.chain, id).and_then(|hash| self.chain.block(&hash).map(|bytes| BlockView::new(&bytes).rlp().at(0).as_raw().to_vec()))
-	}
-
-	fn block_body(&self, id: BlockID) -> Option<Bytes> {
-		Self::block_hash(&self.chain, id).and_then(|hash| {
-			self.chain.block(&hash).map(|bytes| {
-				let rlp = Rlp::new(&bytes);
-				let mut body = RlpStream::new_list(2);
-				body.append_raw(rlp.at(1).as_raw(), 1);
-				body.append_raw(rlp.at(2).as_raw(), 1);
-				body.out()
-			})
-		})
-	}
-
-	fn block(&self, id: BlockID) -> Option<Bytes> {
-		if let &BlockID::Pending = &id {
-			if let Some(block) = self.miner.pending_block() { 
-				return Some(block.rlp_bytes(Seal::Without));
-			}
-		}
-		Self::block_hash(&self.chain, id).and_then(|hash| {
-			self.chain.block(&hash)
-		})
-	}
-
-	fn block_status(&self, id: BlockID) -> BlockStatus {
-		match Self::block_hash(&self.chain, id) {
-			Some(ref hash) if self.chain.is_known(hash) => BlockStatus::InChain,
-			Some(hash) => self.block_queue.block_status(&hash),
-			None => BlockStatus::Unknown
-		}
-	}
-
-	fn block_total_difficulty(&self, id: BlockID) -> Option<U256> {
-		if let &BlockID::Pending = &id {
-			if let Some(block) = self.miner.pending_block() {
-				return Some(*block.header.difficulty() + self.block_total_difficulty(BlockID::Latest).expect("blocks in chain have details; qed"));
-			} 
-		}
-		Self::block_hash(&self.chain, id).and_then(|hash| self.chain.block_details(&hash)).map(|d| d.total_difficulty)
-	}
-
-	fn nonce(&self, address: &Address, id: BlockID) -> Option<U256> {
-		self.state_at(id).map(|s| s.nonce(address))
-	}
-
-	fn block_hash(&self, id: BlockID) -> Option<H256> {
-		Self::block_hash(&self.chain, id)
-	}
-
-	fn code(&self, address: &Address) -> Option<Bytes> {
-		self.state().code(address)
-	}
-
-	fn balance(&self, address: &Address, id: BlockID) -> Option<U256> {
-		self.state_at(id).map(|s| s.balance(address))
-	}
-
-	fn storage_at(&self, address: &Address, position: &H256, id: BlockID) -> Option<H256> {
-		self.state_at(id).map(|s| s.storage_at(address, position))
-	}
-
-	fn transaction(&self, id: TransactionID) -> Option<LocalizedTransaction> {
-		self.transaction_address(id).and_then(|address| self.chain.transaction(&address))
-	}
-
-	fn uncle(&self, id: UncleID) -> Option<Header> {
-		let index = id.1;
-		self.block(id.0).and_then(|block| BlockView::new(&block).uncle_at(index))
-	}
-
-	fn transaction_receipt(&self, id: TransactionID) -> Option<LocalizedReceipt> {
-		self.transaction_address(id).and_then(|address| {
-			let t = self.chain.block(&address.block_hash)
-				.and_then(|block| BlockView::new(&block).localized_transaction_at(address.index));
-
-			match (t, self.chain.transaction_receipt(&address)) {
-				(Some(tx), Some(receipt)) => {
-					let block_hash = tx.block_hash.clone();
-					let block_number = tx.block_number.clone();
-					let transaction_hash = tx.hash();
-					let transaction_index = tx.transaction_index;
-					let prior_gas_used = match tx.transaction_index {
-						0 => U256::zero(),
-						i => {
-							let prior_address = TransactionAddress { block_hash: address.block_hash, index: i - 1 };
-							let prior_receipt = self.chain.transaction_receipt(&prior_address).expect("Transaction receipt at `address` exists; `prior_address` has lower index in same block; qed");
-							prior_receipt.gas_used
-						}
-					};
-					Some(LocalizedReceipt {
-						transaction_hash: tx.hash(),
-						transaction_index: tx.transaction_index,
-						block_hash: tx.block_hash,
-						block_number: tx.block_number,
-						cumulative_gas_used: receipt.gas_used,
-						gas_used: receipt.gas_used - prior_gas_used,
-						contract_address: match tx.action {
-							Action::Call(_) => None,
-							Action::Create => Some(contract_address(&tx.sender().unwrap(), &tx.nonce))
-						},
-						logs: receipt.logs.into_iter().enumerate().map(|(i, log)| LocalizedLogEntry {
-							entry: log,
-							block_hash: block_hash.clone(),
-							block_number: block_number,
-							transaction_hash: transaction_hash.clone(),
-							transaction_index: transaction_index,
-							log_index: i
-						}).collect()
-					})
-				},
-				_ => None
-			}
-		})
-	}
-
-	fn tree_route(&self, from: &H256, to: &H256) -> Option<TreeRoute> {
-		match self.chain.is_known(from) && self.chain.is_known(to) {
-			true => Some(self.chain.tree_route(from.clone(), to.clone())),
-			false => None
-		}
-	}
-
-	fn find_uncles(&self, hash: &H256) -> Option<Vec<H256>> {
-		self.chain.find_uncle_hashes(hash, self.engine.maximum_uncle_age())
-	}
-
-	fn state_data(&self, hash: &H256) -> Option<Bytes> {
-		self.state_db.lock().unwrap().state(hash)
-	}
-
-	fn block_receipts(&self, hash: &H256) -> Option<Bytes> {
-		self.chain.block_receipts(hash).map(|receipts| rlp::encode(&receipts).to_vec())
-	}
-
-	fn import_block(&self, bytes: Bytes) -> ImportResult {
-		{
-			let header = BlockView::new(&bytes).header_view();
-			if self.chain.is_known(&header.sha3()) {
-				return Err(ImportError::AlreadyInChain.into());
-			}
-			if self.block_status(BlockID::Hash(header.parent_hash())) == BlockStatus::Unknown {
-				return Err(BlockError::UnknownParent(header.parent_hash()).into());
-			}
-		}
-		self.block_queue.import_block(bytes)
-	}
-
-	fn queue_info(&self) -> BlockQueueInfo {
-		self.block_queue.queue_info()
-	}
-
-	fn clear_queue(&self) {
-		self.block_queue.clear();
-	}
-
-	fn chain_info(&self) -> BlockChainInfo {
-		BlockChainInfo {
-			total_difficulty: self.chain.best_block_total_difficulty(),
-			pending_total_difficulty: self.chain.best_block_total_difficulty(),
-			genesis_hash: self.chain.genesis_hash(),
-			best_block_hash: self.chain.best_block_hash(),
-			best_block_number: From::from(self.chain.best_block_number())
-		}
-	}
-
-	fn blocks_with_bloom(&self, bloom: &H2048, from_block: BlockID, to_block: BlockID) -> Option<Vec<BlockNumber>> {
-		match (self.block_number(from_block), self.block_number(to_block)) {
-			(Some(from), Some(to)) => Some(self.chain.blocks_with_bloom(bloom, from, to)),
-			_ => None
-		}
-	}
-
-	fn logs(&self, filter: Filter) -> Vec<LocalizedLogEntry> {
-		// TODO: lock blockchain only once
-
-		let mut blocks = filter.bloom_possibilities().iter()
-			.filter_map(|bloom| self.blocks_with_bloom(bloom, filter.from_block.clone(), filter.to_block.clone()))
-			.flat_map(|m| m)
-			// remove duplicate elements
-			.collect::<HashSet<u64>>()
-			.into_iter()
-			.collect::<Vec<u64>>();
-
-		blocks.sort();
-
-		blocks.into_iter()
-			.filter_map(|number| self.chain.block_hash(number).map(|hash| (number, hash)))
-			.filter_map(|(number, hash)| self.chain.block_receipts(&hash).map(|r| (number, hash, r.receipts)))
-			.filter_map(|(number, hash, receipts)| self.chain.block(&hash).map(|ref b| (number, hash, receipts, BlockView::new(b).transaction_hashes())))
-			.flat_map(|(number, hash, receipts, hashes)| {
-				let mut log_index = 0;
-				receipts.into_iter()
-					.enumerate()
-					.flat_map(|(index, receipt)| {
-						log_index += receipt.logs.len();
-						receipt.logs.into_iter()
-							.enumerate()
-							.filter(|tuple| filter.matches(&tuple.1))
-						 	.map(|(i, log)| LocalizedLogEntry {
-							 	entry: log,
-								block_hash: hash.clone(),
-								block_number: number,
-								transaction_hash: hashes.get(index).cloned().unwrap_or_else(H256::new),
-								transaction_index: index,
-								log_index: log_index + i
-							})
-							.collect::<Vec<LocalizedLogEntry>>()
-					})
-					.collect::<Vec<LocalizedLogEntry>>()
-
-			})
-			.collect()
-	}
-
-	fn filter_traces(&self, filter: TraceFilter) -> Option<Vec<LocalizedTrace>> {
-		let start = self.block_number(filter.range.start);
-		let end = self.block_number(filter.range.end);
-
-		if start.is_some() && end.is_some() {
-			let filter = trace::Filter {
-				range: start.unwrap() as usize..end.unwrap() as usize,
-				from_address: From::from(filter.from_address),
-				to_address: From::from(filter.to_address),
-			};
-
-			let traces = self.tracedb.filter(&filter);
-			Some(traces)
-		} else {
-			None
-		}
-	}
-
-	fn trace(&self, trace: TraceId) -> Option<LocalizedTrace> {
-		let trace_address = trace.address;
-		self.transaction_address(trace.transaction)
-			.and_then(|tx_address| {
-				self.block_number(BlockID::Hash(tx_address.block_hash))
-					.and_then(|number| self.tracedb.trace(number, tx_address.index, trace_address))
-			})
-	}
-
-	fn transaction_traces(&self, transaction: TransactionID) -> Option<Vec<LocalizedTrace>> {
-		self.transaction_address(transaction)
-			.and_then(|tx_address| {
-				self.block_number(BlockID::Hash(tx_address.block_hash))
-					.and_then(|number| self.tracedb.transaction_traces(number, tx_address.index))
-			})
-	}
-
-	fn block_traces(&self, block: BlockID) -> Option<Vec<LocalizedTrace>> {
-		self.block_number(block)
-			.and_then(|number| self.tracedb.block_traces(number))
-	}
-
-	fn last_hashes(&self) -> LastHashes {
-		self.build_last_hashes(self.chain.best_block_hash())
-	}
-
-	fn queue_transactions(&self, transactions: Vec<Bytes>) {
-		if self.queue_transactions.load(AtomicOrdering::Relaxed) > MAX_TX_QUEUE_SIZE {
-			debug!("Ignoring {} transactions: queue is full", transactions.len());
-		} else {
-			let len = transactions.len();
-			match self.io_channel.send(NetworkIoMessage::User(SyncMessage::NewTransactions(transactions))) {
-				Ok(_) => {
-					self.queue_transactions.fetch_add(len, AtomicOrdering::SeqCst);
-				}
-				Err(e) => {
-					debug!("Ignoring {} transactions: error queueing: {}", len, e);
-				}
-			}
-		}
-	}
-
-	fn pending_transactions(&self) -> Vec<SignedTransaction> {
-		self.miner.pending_transactions()
-	}
-}
-
-impl MiningBlockChainClient for Client {
-	fn prepare_open_block(&self, author: Address, gas_range_target: (U256, U256), extra_data: Bytes) -> OpenBlock {
-		let engine = self.engine.deref().deref();
-		let h = self.chain.best_block_hash();
-
-		let mut open_block = OpenBlock::new(
-			engine,
-			&self.vm_factory,
-			false,	// TODO: this will need to be parameterised once we want to do immediate mining insertion.
-			self.state_db.lock().unwrap().boxed_clone(),
-			&self.chain.block_header(&h).expect("h is best block hash: so it's header must exist: qed"),
-			self.build_last_hashes(h.clone()),
-			author,
-			gas_range_target,
-			extra_data,
-		).expect("OpenBlock::new only fails if parent state root invalid; state root of best block's header is never invalid; qed");
-
-		// Add uncles
-		self.chain
-			.find_uncle_headers(&h, engine.maximum_uncle_age())
-			.unwrap()
-			.into_iter()
-			.take(engine.maximum_uncle_count())
-			.foreach(|h| {
-				open_block.push_uncle(h).unwrap();
-			});
-
-		open_block
-	}
-
-	fn vm_factory(&self) -> &EvmFactory {
-		&self.vm_factory
-	}
-
-	fn import_sealed_block(&self, block: SealedBlock) -> ImportResult {
-		let _import_lock = self.import_lock.lock();
-		let _timer = PerfTimer::new("import_sealed_block");
-
-		let original_best = self.chain_info().best_block_hash;
-
-		let h = block.header().hash();
-		let number = block.header().number();
-
-		let block_data = block.rlp_bytes();
-		let route = self.commit_block(block, &h, &block_data);
-		trace!(target: "client", "Imported sealed block #{} ({})", number, h);
-
-		{
-			let (enacted, retracted) = self.calculate_enacted_retracted(&[route]);
-			self.miner.chain_new_blocks(self, &[h.clone()], &[], &enacted, &retracted);
-
-			self.io_channel.send(NetworkIoMessage::User(SyncMessage::NewChainBlocks {
-				imported: vec![h.clone()],
-				invalid: vec![],
-				enacted: enacted,
-				retracted: retracted,
-				sealed: vec![h.clone()],
-			})).unwrap_or_else(|e| warn!("Error sending IO notification: {:?}", e));
-		}
-
-		if self.chain_info().best_block_hash != original_best {
-			self.miner.update_sealing(self);
-		}
-
-		Ok(h)
-	}
-}
-
-impl MayPanic for Client {
-	fn on_panic<F>(&self, closure: F) where F: OnPanicListener {
-		self.panic_handler.on_panic(closure);
-	}
-}
--- a/ethcore/src/client/config.rs
+++ b/ethcore/src/client/config.rs
@@ -1,58 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-pub use block_queue::BlockQueueConfig;
-pub use blockchain::Config as BlockChainConfig;
-pub use trace::{Config as TraceConfig, Switch};
-pub use evm::VMType;
-pub use verification::VerifierType;
-use util::journaldb;
-
-/// Client state db compaction profile
-#[derive(Debug, PartialEq)]
-pub enum DatabaseCompactionProfile {
-	/// Default compaction profile
-	Default,
-	/// HDD or other slow storage io compaction profile
-	HDD,
-}
-
-impl Default for DatabaseCompactionProfile {
-	fn default() -> Self { DatabaseCompactionProfile::Default }
-}
-
-/// Client configuration. Includes configs for all sub-systems.
-#[derive(Debug, Default)]
-pub struct ClientConfig {
-	/// Block queue configuration.
-	pub queue: BlockQueueConfig,
-	/// Blockchain configuration.
-	pub blockchain: BlockChainConfig,
-	/// Trace configuration.
-	pub tracing: TraceConfig,
-	/// VM type.
-	pub vm_type: VMType,
-	/// The JournalDB ("pruning") algorithm to use.
-	pub pruning: journaldb::Algorithm,
-	/// The name of the client instance.
-	pub name: String,
-	/// State db cache-size if not default
-	pub db_cache_size: Option<usize>,
-	/// State db compaction profile
-	pub db_compaction: DatabaseCompactionProfile,
-	/// Type of block verifier used by client.
-	pub verifier_type: VerifierType,
-}
--- a/ethcore/src/client/error.rs
+++ b/ethcore/src/client/error.rs
@@ -1,23 +0,0 @@
-use trace::Error as TraceError;
-use std::fmt::{Display, Formatter, Error as FmtError};
-
-/// Client configuration errors.
-#[derive(Debug)]
-pub enum Error {
-	/// TraceDB configuration error.
-	Trace(TraceError),
-}
-
-impl From<TraceError> for Error {
-	fn from(err: TraceError) -> Self {
-		Error::Trace(err)
-	}
-}
-
-impl Display for Error {
-	fn fmt(&self, f: &mut Formatter) -> Result<(), FmtError> {
-		match *self {
-			Error::Trace(ref err) => write!(f, "{}", err)
-		}
-	}
-}
--- a/ethcore/src/client/mod.rs
+++ b/ethcore/src/client/mod.rs
@@ -1,232 +0,0 @@
-// Copyright 2015, 2016 Ethcore (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/>.
-
-//! Blockchain database client.
-
-mod client;
-mod config;
-mod error;
-mod test_client;
-mod trace;
-
-pub use self::client::*;
-pub use self::config::{ClientConfig, DatabaseCompactionProfile, BlockQueueConfig, BlockChainConfig, Switch, VMType};
-pub use self::error::Error;
-pub use types::ids::*;
-pub use self::test_client::{TestBlockChainClient, EachBlockWith};
-pub use self::trace::Filter as TraceFilter;
-pub use executive::{Executed, Executive, TransactOptions};
-pub use env_info::{LastHashes, EnvInfo};
-
-use util::bytes::Bytes;
-use util::hash::{Address, H256, H2048};
-use util::numbers::U256;
-use util::Itertools;
-use blockchain::TreeRoute;
-use block_queue::BlockQueueInfo;
-use block::{OpenBlock, SealedBlock};
-use header::{BlockNumber, Header};
-use transaction::{LocalizedTransaction, SignedTransaction};
-use log_entry::LocalizedLogEntry;
-use filter::Filter;
-use views::{BlockView};
-use error::{ImportResult, ExecutionError};
-use receipt::LocalizedReceipt;
-use trace::LocalizedTrace;
-use evm::Factory as EvmFactory;
-
-/// Options concerning what analytics we run on the call.
-#[derive(Eq, PartialEq, Default, Clone, Copy, Debug)]
-pub struct CallAnalytics {
-	/// Make a transaction trace.
-	pub transaction_tracing: bool,
-	/// Make a VM trace.
-	pub vm_tracing: bool,
-	/// Make a diff.
-	pub state_diffing: bool,
-}
-
-/// Blockchain database client. Owns and manages a blockchain and a block queue.
-pub trait BlockChainClient : Sync + Send {
-	/// Get raw block header data by block id.
-	fn block_header(&self, id: BlockID) -> Option<Bytes>;
-
-	/// Get raw block body data by block id.
-	/// Block body is an RLP list of two items: uncles and transactions.
-	fn block_body(&self, id: BlockID) -> Option<Bytes>;
-
-	/// Get raw block data by block header hash.
-	fn block(&self, id: BlockID) -> Option<Bytes>;
-
-	/// Get block status by block header hash.
-	fn block_status(&self, id: BlockID) -> BlockStatus;
-
-	/// Get block total difficulty.
-	fn block_total_difficulty(&self, id: BlockID) -> Option<U256>;
-
-	/// Attempt to get address nonce at given block.
-	/// May not fail on BlockID::Latest.
-	fn nonce(&self, address: &Address, id: BlockID) -> Option<U256>;
-
-	/// Get address nonce at the latest block's state.
-	fn latest_nonce(&self, address: &Address) -> U256 {
-		self.nonce(address, BlockID::Latest)
-			.expect("nonce will return Some when given BlockID::Latest. nonce was given BlockID::Latest. \
-			Therefore nonce has returned Some; qed")
-	}
-
-	/// Get block hash.
-	fn block_hash(&self, id: BlockID) -> Option<H256>;
-
-	/// Get address code.
-	fn code(&self, address: &Address) -> Option<Bytes>;
-
-	/// Get address balance at the given block's state.
-	///
-	/// May not return None if given BlockID::Latest.
-	/// Returns None if and only if the block's root hash has been pruned from the DB.
-	fn balance(&self, address: &Address, id: BlockID) -> Option<U256>;
-
-	/// Get address balance at the latest block's state.
-	fn latest_balance(&self, address: &Address) -> U256 {
-		self.balance(address, BlockID::Latest)
-			.expect("balance will return Some if given BlockID::Latest. balance was given BlockID::Latest \
-			Therefore balance has returned Some; qed")
-	}
-
-	/// Get value of the storage at given position at the given block's state.
-	///
-	/// May not return None if given BlockID::Latest.
-	/// Returns None if and only if the block's root hash has been pruned from the DB.
-	fn storage_at(&self, address: &Address, position: &H256, id: BlockID) -> Option<H256>;
-
-	/// Get value of the storage at given position at the latest block's state.
-	fn latest_storage_at(&self, address: &Address, position: &H256) -> H256 {
-		self.storage_at(address, position, BlockID::Latest)
-			.expect("storage_at will return Some if given BlockID::Latest. storage_at was given BlockID::Latest. \
-			Therefore storage_at has returned Some; qed")
-	}
-
-	/// Get transaction with given hash.
-	fn transaction(&self, id: TransactionID) -> Option<LocalizedTransaction>;
-
-	/// Get uncle with given id.
-	fn uncle(&self, id: UncleID) -> Option<Header>;
-
-	/// Get transaction receipt with given hash.
-	fn transaction_receipt(&self, id: TransactionID) -> Option<LocalizedReceipt>;
-
-	/// Get a tree route between `from` and `to`.
-	/// See `BlockChain::tree_route`.
-	fn tree_route(&self, from: &H256, to: &H256) -> Option<TreeRoute>;
-
-	/// Get all possible uncle hashes for a block.
-	fn find_uncles(&self, hash: &H256) -> Option<Vec<H256>>;
-
-	/// Get latest state node
-	fn state_data(&self, hash: &H256) -> Option<Bytes>;
-
-	/// Get raw block receipts data by block header hash.
-	fn block_receipts(&self, hash: &H256) -> Option<Bytes>;
-
-	/// Import a block into the blockchain.
-	fn import_block(&self, bytes: Bytes) -> ImportResult;
-
-	/// Get block queue information.
-	fn queue_info(&self) -> BlockQueueInfo;
-
-	/// Clear block queue and abort all import activity.
-	fn clear_queue(&self);
-
-	/// Get blockchain information.
-	fn chain_info(&self) -> BlockChainInfo;
-
-	/// Get the best block header.
-	fn best_block_header(&self) -> Bytes {
-		// TODO: lock blockchain only once
-		self.block_header(BlockID::Hash(self.chain_info().best_block_hash)).unwrap()
-	}
-
-	/// Returns numbers of blocks containing given bloom.
-	fn blocks_with_bloom(&self, bloom: &H2048, from_block: BlockID, to_block: BlockID) -> Option<Vec<BlockNumber>>;
-
-	/// Returns logs matching given filter.
-	fn logs(&self, filter: Filter) -> Vec<LocalizedLogEntry>;
-
-	/// Makes a non-persistent transaction call.
-	// TODO: should be able to accept blockchain location for call.
-	fn call(&self, t: &SignedTransaction, analytics: CallAnalytics) -> Result<Executed, ExecutionError>;
-
-	/// Returns traces matching given filter.
-	fn filter_traces(&self, filter: TraceFilter) -> Option<Vec<LocalizedTrace>>;
-
-	/// Returns trace with given id.
-	fn trace(&self, trace: TraceId) -> Option<LocalizedTrace>;
-
-	/// Returns traces created by transaction.
-	fn transaction_traces(&self, trace: TransactionID) -> Option<Vec<LocalizedTrace>>;
-
-	/// Returns traces created by transaction from block.
-	fn block_traces(&self, trace: BlockID) -> Option<Vec<LocalizedTrace>>;
-
-	/// Get last hashes starting from best block.
-	fn last_hashes(&self) -> LastHashes;
-
-	/// Queue transactions for importing.
-	fn queue_transactions(&self, transactions: Vec<Bytes>);
-
-	/// list all transactions
-	fn pending_transactions(&self) -> Vec<SignedTransaction>;
-
-	/// Get the gas price distribution.
-	fn gas_price_statistics(&self, sample_size: usize, distribution_size: usize) -> Result<Vec<U256>, ()> {
-		let mut h = self.chain_info().best_block_hash;
-		let mut corpus = Vec::new();
-		for _ in 0..sample_size {
-			let block_bytes = self.block(BlockID::Hash(h)).expect("h is either the best_block_hash or an ancestor; qed");
-			let block = BlockView::new(&block_bytes);
-			let header = block.header_view();
-			if header.number() == 0 {
-				break;
-			}
-			block.transaction_views().iter().foreach(|t| corpus.push(t.gas_price()));
-			h = header.parent_hash().clone();
-		}
-		corpus.sort();
-		let n = corpus.len();
-		if n > 0 {
-			Ok((0..(distribution_size + 1))
-				.map(|i| corpus[i * (n - 1) / distribution_size])
-				.collect::<Vec<_>>()
-			)
-		} else {
-			Err(())
-		}
-	}
-}
-
-/// Extended client interface used for mining
-pub trait MiningBlockChainClient : BlockChainClient {
-	/// Returns OpenBlock prepared for closing.
-	fn prepare_open_block(&self, author: Address, gas_range_target: (U256, U256), extra_data: Bytes)
-		-> OpenBlock;
-
-	/// Returns EvmFactory.
-	fn vm_factory(&self) -> &EvmFactory;
-
-	/// Import sealed block. Skips all verifications.
-	fn import_sealed_block(&self, block: SealedBlock) -> ImportResult;
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gav Wood	f7ce9314e0	Merge pull request #445 from ethcore/beta-patched Beta patch to 0.9.1	2016-02-16 10:49:49 +01:00
debris	50f17c3d7f	ignore transition tests for now, make travis build green again	2016-02-16 07:38:34 +03:00
Nikolay Volf	d0f796616f	lock finally valid ignore	2016-02-16 07:05:26 +03:00
Nikolay Volf	3edf986aea	making beta compiling and passing tests	2016-02-16 07:02:00 +03:00
debris	05c4f584d0	ongoing pick	2016-02-16 03:37:07 +03:00
debris	9bbb4c6f7b	fixed util benches on nighly	2016-02-16 03:33:36 +03:00
Gav Wood	b5fc7f9d8f	working on picking	2016-02-16 03:33:33 +03:00
Nikolay Volf	8466b98019	fixing ignores	2016-02-16 03:19:26 +03:00
Nikolay Volf	0587409f5a	preserving root cargo lock	2016-02-16 03:18:02 +03:00
Gav Wood	160e2394cf	Use 1100000 as the homestead transition, fix build instructions.	2016-02-16 03:17:00 +03:00