backports for stable 2.2.7 (#10163 )

* version: bump stable to 2.2.7 * version: mark 2.2 track stable * version: mark update critical on all networks * version: commit cargo lock * Ping nodes from discovery (#10167) * snap: fix path in script (#10157) * snap: fix path in script * debug, revert me * fix * necromancer awk magic * awk necromancy and path fixing * working track selection * Fix _cannot recursively call into `Core`_ issue (#10144) * Change igd to github:maufl/rust-igd * Run `igd::search_gateway_from_timeout` from own thread * Handle the case for contract creation on an empty but exist account with storage items (#10065) * Add is_base_storage_root_unchanged * Fix compile, use a shortcut for check, and remove ignored tests * Add a warn! * Update ethereum/tests to v6.0.0-beta.2 * grumble: use {:#x} instead of 0x{:x} Co-Authored-By: sorpaas <accounts@that.world> * version: bump fork blocks for kovan and foundation (#10186) * pull constantinople on ethereum network (#10189) * ethcore: pull constantinople on ethereum network * version: mark update as critical * ethcore: remove constantinople alltogether from chain spec * version: revert fork block for ethereum
beta backports v2.2.6 (#10113 )
2019-01-15 22:25:31 +01:00 · 2019-01-09 15:15:57 +01:00 · 2018-12-13 17:52:49 +01:00 · 2018-12-05 16:07:11 +01:00 · 2018-11-30 16:13:58 +01:00 · 2018-11-29 10:57:49 +01:00
911 changed files with 21220 additions and 29507 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,19 +4,13 @@ stages:
  - publish
  - optional

-image:                             parity/rust-parity-ethereum-build:xenial
+image:                             parity/rust:gitlab-ci
+
 variables:
-  GIT_STRATEGY:                    fetch
-  GIT_SUBMODULE_STRATEGY:          recursive
  CI_SERVER_NAME:                  "GitLab CI"
  CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
  CARGO_TARGET:                    x86_64-unknown-linux-gnu

-.no_git:                           &no_git #disable git strategy
-  variables:
-    GIT_STRATEGY:                  none
-    GIT_SUBMODULE_STRATEGY:        none
-
 .releaseable_branches:             # list of git refs for building GitLab artifacts (think "pre-release binaries")
  only:                            &releaseable_branches
    - stable
@@ -24,92 +18,47 @@ variables:
    - tags
    - schedules

+
 .collect_artifacts:                &collect_artifacts
  artifacts:
    name:                          "${CI_JOB_NAME}_${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}"
    when:                          on_success
    expire_in:                     1 mos
    paths:
-      - artifacts/
+    - artifacts/

-.docker-cache-status:                      &docker-cache-status
-  dependencies:                    []
-  before_script:
-    - sccache -s
-  after_script:
-    - sccache -s
-  tags:
-    - linux-docker
-
-
-cargo-check 0 3:
-  stage:                           test
-  <<:                              *docker-cache-status
-  script:
-    - time cargo check --target $CARGO_TARGET --locked --no-default-features
-
-cargo-check 1 3:
-  stage:                           test
-  <<:                              *docker-cache-status
-  script:
-    - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --no-default-features
-
-cargo-check 2 3:
-  stage:                           test
-  <<:                              *docker-cache-status
-  script:
-    - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --features "mio"
-
-cargo-audit:
-  stage:                           test
-  script:
-    - cargo audit
-  tags:
-    - linux-docker
-
-validate-chainspecs:
-  stage:                           test
-  <<:                              *docker-cache-status
-  script:
-    - ./scripts/gitlab/validate-chainspecs.sh
-
-test-cpp:
-  stage:                           build
-  <<:                              *docker-cache-status
-  script:
-    - ./scripts/gitlab/test-cpp.sh
+.determine_version:                &determine_version
+  - VERSION="$(sed -r -n '1,/^version/s/^version = "([^"]+)".*$/\1/p' Cargo.toml)"
+  - DATE_STR="$(date +%Y%m%d)"
+  - ID_SHORT="$(echo ${CI_COMMIT_SHA} | cut -c 1-7)"
+  - test "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" = "nightly" && VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"
+  - export VERSION
+  - echo "Version = ${VERSION}"

 test-linux:
-  stage:                           build
-  <<:                              *docker-cache-status
+  stage:                           test
+  variables:
+    RUN_TESTS:                     all
  script:
-    - ./scripts/gitlab/test-linux.sh
+    - scripts/gitlab/test-all.sh stable
+  tags:
+    - rust-stable

-build-linux:                       &build-linux
+test-audit:
+  stage:                           test
+  script:
+    - scripts/gitlab/cargo-audit.sh
+  tags:
+    - rust-stable
+
+build-linux:
  stage:                           build
  only:                            *releaseable_branches
-  <<:                              *docker-cache-status
  script:
-    - scripts/gitlab/build-linux.sh
+    - scripts/gitlab/build-unix.sh
  <<:                              *collect_artifacts
-
-build-linux-i386:
-  <<:                              *build-linux
-  image:                           parity/rust-parity-ethereum-build:i386
-  variables:
-    CARGO_TARGET:                  i686-unknown-linux-gnu
-
-build-linux-arm64:
-  <<:                              *build-linux
-  image:                           parity/rust-parity-ethereum-build:arm64
-  variables:
-    CARGO_TARGET:                  aarch64-unknown-linux-gnu
-
-build-linux-armhf:
-  <<:                              *build-linux
-  image:                           parity/rust-parity-ethereum-build:armhf
-  variables:
-    CARGO_TARGET:                  armv7-unknown-linux-gnueabihf
+  tags:
+    - rust-stable

 build-darwin:
  stage:                           build
@@ -119,7 +68,7 @@ build-darwin:
    CC:                            gcc
    CXX:                           g++
  script:
-    - scripts/gitlab/build-linux.sh
+    - scripts/gitlab/build-unix.sh
  tags:
    - rust-osx
  <<:                              *collect_artifacts
@@ -132,7 +81,7 @@ build-windows:
  script:
    - sh scripts/gitlab/build-windows.sh
  tags:
-    - rust-windows
+   - rust-windows
  <<:                              *collect_artifacts

 publish-docker:
@@ -146,84 +95,39 @@ publish-docker:
  script:
    - scripts/gitlab/publish-docker.sh parity

-publish-snap:                      &publish-snap
+publish-snap:
  stage:                           publish
  only:                            *releaseable_branches
-  image:                           snapcore/snapcraft
+  image:                           parity/snapcraft:gitlab-ci
  variables:
-    BUILD_ARCH:                    amd64
+    BUILD_ARCH:                  amd64
+  cache: {}
+  before_script:                   *determine_version
+  dependencies:
+    - build-linux
+  tags:
+    - rust-stable
+  script:
+    - scripts/gitlab/publish-snap.sh
+  allow_failure:                   true
+  <<:                              *collect_artifacts
+
+publish-awss3:
+  stage:                           publish
+  only:                            *releaseable_branches
  cache: {}
-  dependencies:
-    - build-linux
-  tags:
-    - linux-docker
-  script:
-    - scripts/gitlab/publish-snap.sh
-  <<:                              *collect_artifacts
-
-publish-snap-i386:
-  <<:                              *publish-snap
-  variables:
-    BUILD_ARCH:                    i386
-  dependencies:
-    - build-linux-i386
-
-publish-snap-arm64:
-  <<:                              *publish-snap
-  variables:
-    BUILD_ARCH:                    arm64
-  dependencies:
-    - build-linux-arm64
-
-publish-snap-armhf:
-  <<:                              *publish-snap
-  variables:
-    BUILD_ARCH:                    armhf
-  dependencies:
-    - build-linux-armhf
-
-publish-onchain:
-  stage:                           publish
-  only:                            *releaseable_branches
-  cache:                           {}
  dependencies:
    - build-linux
    - build-darwin
    - build-windows
+  before_script:                   *determine_version
  script:
-    - scripts/gitlab/publish-onchain.sh
+    - scripts/gitlab/publish-awss3.sh
  tags:
-    - linux-docker
-
-publish-awss3-release:
-  image:                           parity/awscli:latest
-  stage:                           publish
-  only:                            *releaseable_branches
-  <<:                              *no_git
-  cache:                           {}
-  dependencies:
-    - build-linux
-    - build-darwin
-    - build-windows
-  script:
-    - echo "__________Push binaries to AWS S3____________"
-    - case "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" in
-       (beta|stable|nightly)
-         export BUCKET=releases.parity.io/ethereum;
-         ;;
-       (*)
-         export BUCKET=builds-parity;
-         ;;
-     esac
-    - aws s3 sync ./artifacts s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}/
-    - echo "__________Read from S3____________"
-    - aws s3 ls s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}} --recursive --human-readable --summarize
-  tags:
-    - linux-docker
+    - shell

 publish-docs:
  stage:                            publish
-  # <<:                              *no_git
  only:
    - tags
  except:
@@ -235,12 +139,32 @@ publish-docs:
    - linux-docker

 build-android:
-  stage:                           build
+  stage:                           optional
  image:                           parity/rust-android:gitlab-ci
  variables:
    CARGO_TARGET:                  armv7-linux-androideabi
  script:
-    - scripts/gitlab/build-linux.sh
+    - scripts/gitlab/build-unix.sh
  tags:
-    - linux-docker
-  <<:                              *collect_artifacts
+    - rust-arm
+  allow_failure:                   true
+
+test-beta:
+  stage:                           optional
+  variables:
+    RUN_TESTS:                     cargo
+  script:
+    - scripts/gitlab/test-all.sh beta
+  tags:
+    - rust-beta
+  allow_failure:                   true
+
+test-nightly:
+  stage:                           optional
+  variables:
+    RUN_TESTS:                     all
+  script:
+    - scripts/gitlab/test-all.sh nightly
+  tags:
+    - rust-nightly
+  allow_failure:                   true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,15 +2,16 @@
 description = "Parity Ethereum client"
 name = "parity-ethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "2.4.1"
+version = "2.2.7"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
 blooms-db = { path = "util/blooms-db" }
 log = "0.4"
+env_logger = "0.5"
 rustc-hex = "1.0"
-docopt = "1.0"
+docopt = "0.8"
 clap = "2"
 term_size = "0.3"
 textwrap = "0.9"
@@ -19,8 +20,8 @@ number_prefix = "0.2"
 rpassword = "1.0"
 semver = "0.9"
 ansi_term = "0.10"
-parking_lot = "0.7"
-regex = "1.0"
+parking_lot = "0.6"
+regex = "0.2"
 atty = "0.2.8"
 toml = "0.4"
 serde = "1.0"
@@ -29,49 +30,45 @@ serde_derive = "1.0"
 futures = "0.1"
 fdlimit = "0.1"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
-jsonrpc-core = "10.0.1"
-parity-bytes = "0.1"
-common-types = { path = "ethcore/types" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" }
 ethcore = { path = "ethcore", features = ["parity"] }
-ethcore-accounts = { path = "accounts", optional = true }
-ethcore-blockchain = { path = "ethcore/blockchain" }
-ethcore-call-contract = { path = "ethcore/call-contract"}
-ethcore-db = { path = "ethcore/db" }
+parity-bytes = "0.1"
 ethcore-io = { path = "util/io" }
 ethcore-light = { path = "ethcore/light" }
-ethcore-logger = { path = "parity/logger" }
+ethcore-logger = { path = "logger" }
 ethcore-miner = { path = "miner" }
 ethcore-network = { path = "util/network" }
 ethcore-private-tx = { path = "ethcore/private-tx" }
 ethcore-service = { path = "ethcore/service" }
 ethcore-sync = { path = "ethcore/sync" }
+ethcore-transaction = { path = "ethcore/transaction" }
 ethereum-types = "0.4"
-ethkey = { path = "accounts/ethkey" }
-ethstore = { path = "accounts/ethstore" }
-node-filter = { path = "ethcore/node-filter" }
+node-filter = { path = "ethcore/node_filter" }
+ethkey = { path = "ethkey" }
 rlp = { version = "0.3.0", features = ["ethereum"] }
-cli-signer= { path = "cli-signer" }
-parity-daemonize = "0.3"
-parity-hash-fetch = { path = "updater/hash-fetch" }
+rpc-cli = { path = "rpc_cli" }
+parity-hash-fetch = { path = "hash-fetch" }
 parity-ipfs-api = { path = "ipfs" }
-parity-local-store = { path = "miner/local-store" }
+parity-local-store = { path = "local-store" }
 parity-runtime = { path = "util/runtime" }
 parity-rpc = { path = "rpc" }
+parity-rpc-client = { path = "rpc_client" }
 parity-updater = { path = "updater" }
 parity-version = { path = "util/version" }
 parity-whisper = { path = "whisper" }
 parity-path = "0.1"
 dir = { path = "util/dir" }
-panic_hook = { path = "util/panic-hook" }
+panic_hook = { path = "util/panic_hook" }
 keccak-hash = "0.1"
 migration-rocksdb = { path = "util/migration-rocksdb" }
 kvdb = "0.1"
 kvdb-rocksdb = "0.1.3"
 journaldb = { path = "util/journaldb" }
+mem = { path = "util/mem" }

-ethcore-secretstore = { path = "secret-store", optional = true }
+ethcore-secretstore = { path = "secret_store", optional = true }

-registrar = { path = "util/registrar" }
+registrar = { path = "registrar" }

 [build-dependencies]
 rustc_version = "0.2"
@@ -81,22 +78,22 @@ pretty_assertions = "0.1"
 ipnetwork = "0.12.6"
 tempdir = "0.3"
 fake-fetch = { path = "util/fake-fetch" }
-lazy_static = "1.2.0"

 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3.4", features = ["winsock2", "winuser", "shellapi"] }

+[target.'cfg(not(windows))'.dependencies]
+daemonize = "0.3"
+
 [features]
-default = ["accounts"]
-accounts = ["ethcore-accounts", "parity-rpc/accounts"]
 miner-debug = ["ethcore/miner-debug"]
 json-tests = ["ethcore/json-tests"]
-ci-skip-tests = ["ethcore/ci-skip-tests"]
+ci-skip-issue = ["ethcore/ci-skip-issue"]
 test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
-secretstore = ["ethcore-secretstore", "ethcore-secretstore/accounts"]
+secretstore = ["ethcore-secretstore"]
 final = ["parity-version/final"]
 deadlock_detection = ["parking_lot/deadlock_detection"]
 # to create a memory profile (requires nightly rust), use e.g.
@@ -124,22 +121,19 @@ name = "parity"
 debug = false

 [workspace]
-# This should only list projects that are not
-# in the dependency tree in any other way
-# (i.e. pretty much only standalone CLI tools)
 members = [
-	"accounts/ethkey/cli",
-	"accounts/ethstore/cli",
 	"chainspec",
 	"ethcore/wasm/run",
+	"ethcore/types",
+	"ethkey/cli",
+	"ethstore/cli",
 	"evmbin",
+	"miner",
 	"parity-clib",
+	"whisper",
 	"whisper/cli",
 	"util/triehash-ethereum",
 	"util/keccak-hasher",
 	"util/patricia-trie-ethereum",
-	"util/fastmap"
+	"util/fastmap",
 ]
-
-[patch.crates-io]
-heapsize = { git = "https://github.com/cheme/heapsize.git", branch = "ec-macfix" }
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![Parity Ethereum](docs/logo-parity-ethereum.svg)

-<h2 align="center">The Fastest and most Advanced Ethereum Client.</h2>
+## The fastest and most advanced Ethereum client.

 <p align="center"><strong><a href="https://github.com/paritytech/parity-ethereum/releases/latest">» Download the latest release «</a></strong></p>

@@ -27,7 +27,7 @@ Parity Ethereum's current beta-release is 2.1. You can download it at [the relea

 ## Build Dependencies

-Parity Ethereum requires **latest stable Rust version** to build.
+Parity Ethereum requires **Rust version 1.29.x** to build.

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

@@ -125,8 +125,7 @@ To start Parity Ethereum as a regular user using `systemd` init:

 1. Copy `./scripts/parity.service` to your
 `systemd` user directory (usually `~/.config/systemd/user`).
-2. Copy release to bin folder, write `sudo install ./target/release/parity /usr/bin/parity`
-3. To configure Parity Ethereum, write a `/etc/parity/config.toml` config file, see [Configuring Parity Ethereum](https://paritytech.github.io/wiki/Configuring-Parity) for details.
+2. To configure Parity Ethereum, write a `/etc/parity/config.toml` config file, see [Configuring Parity Ethereum](https://paritytech.github.io/wiki/Configuring-Parity) for details.

 ## Parity Ethereum toolchain

@@ -134,8 +133,8 @@ In addition to the Parity Ethereum client, there are additional tools in this re

 - [evmbin](https://github.com/paritytech/parity-ethereum/blob/master/evmbin/) - EVM implementation for Parity Ethereum.
 - [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding.
- [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethstore) - Parity Ethereum key management.
- [ethkey](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethkey) - Parity Ethereum keys generator.
+- [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/ethstore/) - Parity Ethereum key management.
+- [ethkey](https://github.com/paritytech/parity-ethereum/blob/master/ethkey/) - Parity Ethereum keys generator.
 - [whisper](https://github.com/paritytech/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.

 ## Join the chat!
--- a/accounts/Cargo.toml
+++ b/accounts/Cargo.toml
@@ -1,28 +0,0 @@
-[package]
-description = "Account management for Parity Ethereum"
-homepage = "http://parity.io"
-license = "GPL-3.0"
-name = "ethcore-accounts"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-common-types = { path = "../ethcore/types" }
-ethkey = { path = "ethkey" }
-ethstore = { path = "ethstore" }
-log = "0.4"
-parking_lot = "0.7"
-serde = "1.0"
-serde_derive = "1.0"
-serde_json = "1.0"
-
-[target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))'.dependencies]
-hardware-wallet = { path = "hw" }
-
-[target.'cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows")))'.dependencies]
-fake-hardware-wallet = { path = "fake-hardware-wallet" }
-
-[dev-dependencies]
-ethereum-types = "0.4"
-tempdir = "0.3"
--- a/accounts/src/account_data.rs
+++ b/accounts/src/account_data.rs
@@ -1,73 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Account Metadata
-
-use std::{
-	collections::HashMap,
-	time::Instant,
-};
-
-use ethkey::{Address, Password};
-use serde_derive::{Serialize, Deserialize};
-use serde_json;
-
-/// Type of unlock.
-#[derive(Clone, PartialEq)]
-pub enum Unlock {
-	/// If account is unlocked temporarily, it should be locked after first usage.
-	OneTime,
-	/// Account unlocked permanently can always sign message.
-	/// Use with caution.
-	Perm,
-	/// Account unlocked with a timeout
-	Timed(Instant),
-}
-
-/// Data associated with account.
-#[derive(Clone)]
-pub struct AccountData {
-	pub unlock: Unlock,
-	pub password: Password,
-}
-
-/// Collected account metadata
-#[derive(Default, Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct AccountMeta {
-	/// The name of the account.
-	pub name: String,
-	/// The rest of the metadata of the account.
-	pub meta: String,
-	/// The 128-bit Uuid of the account, if it has one (brain-wallets don't).
-	pub uuid: Option<String>,
-}
-
-impl AccountMeta {
-	/// Read a hash map of Address -> AccountMeta
-	pub fn read<R>(reader: R) -> Result<HashMap<Address, Self>, serde_json::Error> where
-		R: ::std::io::Read,
-	{
-		serde_json::from_reader(reader)
-	}
-
-	/// Write a hash map of Address -> AccountMeta
-	pub fn write<W>(m: &HashMap<Address, Self>, writer: &mut W) -> Result<(), serde_json::Error> where
-		W: ::std::io::Write,
-	{
-		serde_json::to_writer(writer, m)
-	}
-}
-
--- a/accounts/src/error.rs
+++ b/accounts/src/error.rs
@@ -1,56 +0,0 @@
-// Copyright 2015-2018 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-
-use ethstore::{Error as SSError};
-use hardware_wallet::{Error as HardwareError};
-
-/// Signing error
-#[derive(Debug)]
-pub enum SignError {
-	/// Account is not unlocked
-	NotUnlocked,
-	/// Account does not exist.
-	NotFound,
-	/// Low-level hardware device error.
-	Hardware(HardwareError),
-	/// Low-level error from store
-	SStore(SSError),
-}
-
-impl fmt::Display for SignError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		match *self {
-			SignError::NotUnlocked => write!(f, "Account is locked"),
-			SignError::NotFound => write!(f, "Account does not exist"),
-			SignError::Hardware(ref e) => write!(f, "{}", e),
-			SignError::SStore(ref e) => write!(f, "{}", e),
-		}
-	}
-}
-
-impl From<HardwareError> for SignError {
-	fn from(e: HardwareError) -> Self {
-		SignError::Hardware(e)
-	}
-}
-
-impl From<SSError> for SignError {
-	fn from(e: SSError) -> Self {
-		SignError::SStore(e)
-	}
-}
--- a/chainspec/src/main.rs
+++ b/chainspec/src/main.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 extern crate serde_json;
 extern crate ethjson;
--- a/devtools/Cargo.toml
+++ b/devtools/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+description = "Ethcore development/test/build tools"
+homepage = "http://parity.io"
+license = "GPL-3.0"
+name = "ethcore-devtools"
+version = "1.12.0"
+authors = ["Parity Technologies <admin@parity.io>"]
--- a/rpc/src/tests/http_client.rs
+++ b/rpc/src/tests/http_client.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::thread;
 use std::time::Duration;
--- a/ethcore/types/src/transaction/mod.rs
+++ b/ethcore/types/src/transaction/mod.rs
@@ -1,23 +1,19 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

-//! Ethereum Transactions
+//! dev-tools

-mod error;
-mod transaction;
-
-pub use self::error::Error;
-pub use self::transaction::*;
+pub mod http_client;
--- a/docs/CHANGELOG-2.0.md
+++ b/docs/CHANGELOG-2.0.md
@@ -1,26 +1,3 @@
-Note: Parity Ethereum 2.0 reached End-of-Life on 2018-11-15 (EOL).
-
-## Parity-Ethereum [v2.0.9](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.9) (2018-10-29)
-
-Parity-Ethereum 2.0.9-stable is a bug-fix release to improve performance and stability.
-
-The full list of included changes:
-
- Backports: parity stable 2.0.9 ([#9786](https://github.com/paritytech/parity-ethereum/pull/9786))
-  - Version: bump parity stable to 2.0.9
-  - Ethcore: bump ropsten forkblock checkpoint ([#9775](https://github.com/paritytech/parity-ethereum/pull/9775))
-  - Ethcore: handle vm exception when estimating gas ([#9615](https://github.com/paritytech/parity-ethereum/pull/9615))
-  - Update jsonrpc-core to a1b2bb742ce16d1168669ffb13ffe856e8131228 ([#9780](https://github.com/paritytech/parity-ethereum/pull/9780))
-  - Removed "rustup" & added new runner tag ([#9731](https://github.com/paritytech/parity-ethereum/pull/9731))
-    - Removed "rustup" & added new runner tag
-    - Exchanged tag "rust-windows" with "windows"
-    - Revert windows tag change
-  - Allow zero chain id in EIP155 signing process ([#9792](https://github.com/paritytech/parity-ethereum/pull/9792))
-    - Allow zero chain id in EIP155 signing process
-    - Rename test
-    - Fix test failure
-  - Insert dev account before unlocking ([#9813](https://github.com/paritytech/parity-ethereum/pull/9813))
-
 ## Parity-Ethereum [v2.0.8](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.8) (2018-10-16)

 Parity-Ethereum 2.0.8-stable is a release that fixes a consensus issue with the recent Constantinople release. Upgrading is mandatory whatever network you are connected to that plans enabling EIP-1283, e.g., Ropsten, Kovan, Ethereum.
--- a/docs/CHANGELOG-2.1.md
+++ b/docs/CHANGELOG-2.1.md
--- a/docs/CHANGELOG-2.2.md
+++ b/docs/CHANGELOG-2.2.md
@@ -1,317 +0,0 @@
-## Parity-Ethereum [v2.2.7](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.7) (2019-01-15)
-
-Parity-Ethereum 2.2.7-stable is a consensus-relevant security release that reverts Constantinople on the Ethereum network. Upgrading is mandatory for Ethereum, and strongly recommended for other networks.
-
- **Consensus** - Ethereum Network: Pull Constantinople protocol upgrade on Ethereum ([#10189](https://github.com/paritytech/parity-ethereum/pull/10189))
-  - Read more: [Security Alert: Ethereum Constantinople Postponement](https://blog.ethereum.org/2019/01/15/security-alert-ethereum-constantinople-postponement/)
- **Networking** - All networks: Ping nodes from discovery ([#10167](https://github.com/paritytech/parity-ethereum/pull/10167))
- **Wasm** - Kovan Network: Update pwasm-utils to 0.6.1 ([#10134](https://github.com/paritytech/parity-ethereum/pull/10134))
-
-_Note:_ This release marks Parity 2.2 as _stable_. All versions of Parity 2.1 now reached _end of life_.
-
-The full list of included changes:
-
- Backports for stable 2.2.7 ([#10163](https://github.com/paritytech/parity-ethereum/pull/10163))
-  - Version: bump stable to 2.2.7
-  - Version: mark 2.2 track stable
-  - Version: mark update critical on all networks
-  - Handle the case for contract creation on an empty but exist account with storage items ([#10065](https://github.com/paritytech/parity-ethereum/pull/10065))
-  - Fix _cannot recursively call into `Core`_ issue ([#10144](https://github.com/paritytech/parity-ethereum/pull/10144))
-  - Snap: fix path in script ([#10157](https://github.com/paritytech/parity-ethereum/pull/10157))
-  - Ping nodes from discovery ([#10167](https://github.com/paritytech/parity-ethereum/pull/10167))
-  - Version: bump fork blocks for kovan and foundation, mark releases non critical
-  - Pull constantinople on ethereum network ([#10189](https://github.com/paritytech/parity-ethereum/pull/10189))
-
-## Parity-Ethereum [v2.2.6](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.6) (2019-01-10)
-
-Parity-Ethereum 2.2.6-beta is a bugfix release that improves performance and stability.
-
-The full list of included changes:
-
- Beta backports v2.2.6 ([#10113](https://github.com/paritytech/parity-ethereum/pull/10113))
-  - Version: bump beta to v2.2.6
-  - Fill transaction hash on ethGetLog of light client. ([#9938](https://github.com/paritytech/parity-ethereum/pull/9938))
-  - Fix pubsub new_blocks notifications to include all blocks ([#9987](https://github.com/paritytech/parity-ethereum/pull/9987))
-  - Finality: dont require chain head to be in the chain ([#10054](https://github.com/paritytech/parity-ethereum/pull/10054))
-  - Handle the case for contract creation on an empty but exist account with storage items ([#10065](https://github.com/paritytech/parity-ethereum/pull/10065))
-  - Autogen docs for the "Configuring Parity Ethereum" wiki page. ([#10067](https://github.com/paritytech/parity-ethereum/pull/10067))
-  - HF in POA Sokol (2019-01-04) ([#10077](https://github.com/paritytech/parity-ethereum/pull/10077))
-  - Add --locked when running cargo ([#10107](https://github.com/paritytech/parity-ethereum/pull/10107))
-  - Ethcore: update hardcoded headers ([#10123](https://github.com/paritytech/parity-ethereum/pull/10123))
-  - Identity fix ([#10128](https://github.com/paritytech/parity-ethereum/pull/10128))
-  - Update pwasm-utils to 0.6.1 ([#10134](https://github.com/paritytech/parity-ethereum/pull/10134))
-  - Make sure parent block is not in importing queue when importing ancient blocks ([#10138](https://github.com/paritytech/parity-ethereum/pull/10138))
-  - CI: re-enable snap publishing ([#10142](https://github.com/paritytech/parity-ethereum/pull/10142))
-  - HF in POA Core (2019-01-18) - Constantinople ([#10155](https://github.com/paritytech/parity-ethereum/pull/10155))
-  - Version: mark upgrade critical on kovan
-
-## Parity-Ethereum [v2.2.5](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.5) (2018-12-14)
-
-Parity-Ethereum 2.2.5-beta is an important release that introduces Constantinople fork at block 7080000 on Mainnet.
-This release also contains a fix for chains using AuRa + EmptySteps. Read carefully if this applies to you.
-If you have a chain with`empty_steps` already running, some blocks most likely contain non-strict entries (unordered or duplicated empty steps). In this release`strict_empty_steps_transition` **is enabled by default at block 0** for any chain with `empty_steps`.
-If your network uses `empty_steps` you **must**:
- plan a hard fork and change `strict_empty_steps_transition` to the desire fork block
- update the clients of the whole network to 2.2.5-beta / 2.1.10-stable.
-If for some reason you don't want to do this please set`strict_empty_steps_transition` to `0xfffffffff` to disable it.
-
-The full list of included changes:
- Backports for beta 2.2.5 ([#10047](https://github.com/paritytech/parity-ethereum/pull/10047))
-	- Bump beta to 2.2.5 ([#10047](https://github.com/paritytech/parity-ethereum/pull/10047))
-	- Fix empty steps ([#9939](https://github.com/paritytech/parity-ethereum/pull/9939))
-		- Prevent sending empty step message twice
-		- Prevent sending empty step and then block in the same step
-		- Don't accept double empty steps
-		- Do basic validation of self-sealed blocks
-	- Strict empty steps validation ([#10041](https://github.com/paritytech/parity-ethereum/pull/10041))
-		- Enables strict verification of empty steps - there can be no duplicates and empty steps should be ordered inside the seal.
-		- Note that authorities won't produce invalid seals after [#9939](https://github.com/paritytech/parity-ethereum/pull/9939), this PR just adds verification to the seal to prevent forging incorrect blocks and potentially causing consensus issues.
-		- This features is enabled by default so any AuRa + EmptySteps chain should set strict_empty_steps_transition fork block number in their spec and upgrade to v2.2.5-beta or v2.1.10-stable.
-	- ethcore: enable constantinople on ethereum ([#10031](https://github.com/paritytech/parity-ethereum/pull/10031))
-		- ethcore: change blockreward to 2e18 for foundation after constantinople
-		- ethcore: delay diff bomb by 2e6 blocks for foundation after constantinople
-		- ethcore: enable eip-{145,1014,1052,1283} for foundation after constantinople
-	- Change test miner max memory to malloc reports. ([#10024](https://github.com/paritytech/parity-ethereum/pull/10024))
-	- Fix: test corpus_inaccessible panic ([#10019](https://github.com/paritytech/parity-ethereum/pull/10019))
-
-## Parity-Ethereum [v2.2.2](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.2) (2018-11-29)
-
-Parity-Ethereum 2.2.2-beta is an exciting release. Among others, it improves sync performance, peering stability, block propagation, and transaction propagation times. Also, a warp-sync no longer removes existing blocks from the database, but rather reuses locally available information to decrease sync times and reduces required bandwidth.
-
-Before upgrading to 2.2.2, please also verify the validity of your chain specs. Parity Ethereum now denies unknown fields in the specification. To do this, use the chainspec tool:
-
-```
-cargo build --release -p chainspec
-./target/release/chainspec /path/to/spec.json
-```
-
-Last but not least, JSONRPC APIs which are not yet accepted as an EIP in the `eth`, `personal`, or `web3` namespace, are now considere experimental as their final specification might change in future. These APIs have to be manually enabled by explicitly running `--jsonrpc-experimental`.
-
-The full list of included changes:
-
- Backports For beta 2.2.2 ([#9976](https://github.com/paritytech/parity-ethereum/pull/9976))
-  - Version: bump beta to 2.2.2
-  - Add experimental RPCs flag ([#9928](https://github.com/paritytech/parity-ethereum/pull/9928))
-  - Keep existing blocks when restoring a Snapshot ([#8643](https://github.com/paritytech/parity-ethereum/pull/8643))
-    - Rename db_restore => client
-    - First step: make it compile!
-    - Second step: working implementation!
-    - Refactoring
-    - Fix tests
-    - Migrate ancient blocks interacting backward
-    - Early return in block migration if snapshot is aborted
-    - Remove RwLock getter (PR Grumble I)
-    - Remove dependency on `Client`: only used Traits
-    - Add test for recovering aborted snapshot recovery
-    - Add test for migrating old blocks
-    - Release RwLock earlier
-    - Revert Cargo.lock
-    - Update _update ancient block_ logic: set local in `commit`
-    - Update typo in ethcore/src/snapshot/service.rs
-  - Adjust requests costs for light client ([#9925](https://github.com/paritytech/parity-ethereum/pull/9925))
-    - Pip Table Cost relative to average peers instead of max peers
-    - Add tracing in PIP new_cost_table
-    - Update stat peer_count
-    - Use number of leeching peers for Light serve costs
-    - Fix test::light_params_load_share_depends_on_max_peers (wrong type)
-    - Remove (now) useless test
-    - Remove `load_share` from LightParams.Config
-    - Add LEECHER_COUNT_FACTOR
-    - Pr Grumble: u64 to u32 for f64 casting
-    - Prevent u32 overflow for avg_peer_count
-    - Add tests for LightSync::Statistics
-  - Fix empty steps ([#9939](https://github.com/paritytech/parity-ethereum/pull/9939))
-    - Don't send empty step twice or empty step then block.
-    - Perform basic validation of locally sealed blocks.
-    - Don't include empty step twice.
-  - Prevent silent errors in daemon mode, closes [#9367](https://github.com/paritytech/parity-ethereum/issues/9367) ([#9946](https://github.com/paritytech/parity-ethereum/pull/9946))
-  - Fix a deadlock ([#9952](https://github.com/paritytech/parity-ethereum/pull/9952))
-    - Update informant:
-      - Decimal in Mgas/s
-      - Print every 5s (not randomly between 5s and 10s)
-    - Fix dead-lock in `blockchain.rs`
-    - Update locks ordering
-  - Fix light client informant while syncing ([#9932](https://github.com/paritytech/parity-ethereum/pull/9932))
-    - Add `is_idle` to LightSync to check importing status
-    - Use SyncStateWrapper to make sure is_idle gets updates
-    - Update is_major_import to use verified queue size as well
-    - Add comment for `is_idle`
-    - Add Debug to `SyncStateWrapper`
-    - `fn get` -> `fn into_inner`
-  -  Ci: rearrange pipeline by logic ([#9970](https://github.com/paritytech/parity-ethereum/pull/9970))
-    - Ci: rearrange pipeline by logic
-    - Ci: rename docs script
-  - Fix docker build ([#9971](https://github.com/paritytech/parity-ethereum/pull/9971))
-  - Deny unknown fields for chainspec ([#9972](https://github.com/paritytech/parity-ethereum/pull/9972))
-    - Add deny_unknown_fields to chainspec
-    - Add tests and fix existing one
-    - Remove serde_ignored dependency for chainspec
-    - Fix rpc test eth chain spec
-    - Fix starting_nonce_test spec
-  - Improve block and transaction propagation ([#9954](https://github.com/paritytech/parity-ethereum/pull/9954))
-    - Refactor sync to add priority tasks.
-    - Send priority tasks notifications.
-    - Propagate blocks, optimize transactions.
-    - Implement transaction propagation. Use sync_channel.
-    - Tone down info.
-    - Prevent deadlock by not waiting forever for sync lock.
-    - Fix lock order.
-    - Don't use sync_channel to prevent deadlocks.
-    - Fix tests.
-  - Fix unstable peers and slowness in sync ([#9967](https://github.com/paritytech/parity-ethereum/pull/9967))
-    - Don't sync all peers after each response
-    - Update formating
-    - Fix tests: add `continue_sync` to `Sync_step`
-    - Update ethcore/sync/src/chain/mod.rs
-    - Fix rpc middlewares
-  - Fix Cargo.lock
-  - Json: resolve merge in spec
-  - Rpc: fix starting_nonce_test
-  - Ci: allow nightl job to fail
-
-## Parity-Ethereum [v2.2.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.1) (2018-11-15)
-
-Parity-Ethereum 2.2.1-beta is the first v2.2 release, and might introduce features that break previous work flows, among others:
-
- Prevent zero network ID ([#9763](https://github.com/paritytech/parity-ethereum/pull/9763)) and drop support for Olympic testnet ([#9801](https://github.com/paritytech/parity-ethereum/pull/9801)): The Olympic test net is dead for years and never used a chain ID but network ID zero. Parity Ethereum is now preventing the network ID to be zero, thus Olympic support is dropped. Make sure to chose positive non-zero network IDs in future.
- Multithreaded snapshot creation ([#9239](https://github.com/paritytech/parity-ethereum/pull/9239)): adds a CLI argument `--snapshot-threads` which specifies the number of threads. This helps improving the performance of full nodes that wish to provide warp-snapshots for the network. The gain in performance comes with a slight drawback in increased snapshot size.
- Expose config max-round-blocks-to-import ([#9439](https://github.com/paritytech/parity-ethereum/pull/9439)): Parity Ethereum imports blocks in rounds. If at the end of any round, the queue is not empty, we consider it to be _importing_ and won't notify pubsub. On large re-orgs (10+ blocks), this is possible. The default `max_round_blocks_to_import` is increased to 12 and configurable via the `--max-round-blocks-to-import` CLI flag. With unstable network conditions, it is advised to increase the number. This shouldn't have any noticeable performance impact unless the number is set to really large.
- Increase Gas-floor-target and Gas Cap ([#9564](https://github.com/paritytech/parity-ethereum/pull/9564)): the default values for gas floor target are `8_000_000` and gas cap `10_000_000`, similar to Geth 1.8.15+.
- Produce portable binaries ([#9725](https://github.com/paritytech/parity-ethereum/pull/9725)): we now produce portable binaries, but it may incur some performance degradation. For ultimate performance it's now better to compile Parity Ethereum from source with `PORTABLE=OFF` environment variable.
- RPC: `parity_allTransactionHashes` ([#9745](https://github.com/paritytech/parity-ethereum/pull/9745)): Get all pending transactions from the queue with the high performant `parity_allTransactionHashes` RPC method.
- Support `eth_chainId` RPC method ([#9783](https://github.com/paritytech/parity-ethereum/pull/9783)): implements EIP-695 to get the chainID via RPC.
- AuRa: finalize blocks ([#9692](https://github.com/paritytech/parity-ethereum/pull/9692)): The AuRa engine was updated to emit ancestry actions to finalize blocks. The full client stores block finality in the database, the engine builds finality from an ancestry of `ExtendedHeader`; `is_epoch_end` was updated to take a vec of recently finalized headers; `is_epoch_end_light` was added which maintains the previous interface and is used by the light client since the client itself doesn't track finality.
-
-The full list of included changes:
-
- Backport to parity 2.2.1 beta ([#9905](https://github.com/paritytech/parity-ethereum/pull/9905))
-  - Bump version to 2.2.1
-  - Fix: Intermittent failing CI due to addr in use ([#9885](https://github.com/paritytech/parity-ethereum/pull/9885))
-  - Fix Parity not closing on Ctrl-C ([#9886](https://github.com/paritytech/parity-ethereum/pull/9886))
-  - Fix json tracer overflow ([#9873](https://github.com/paritytech/parity-ethereum/pull/9873))
-  - Fix docker script ([#9854](https://github.com/paritytech/parity-ethereum/pull/9854))
-  - Add hardcoded headers for light client ([#9907](https://github.com/paritytech/parity-ethereum/pull/9907))
-  - Gitlab-ci: make android release build succeed ([#9743](https://github.com/paritytech/parity-ethereum/pull/9743))
-  - Allow to seal work on latest block ([#9876](https://github.com/paritytech/parity-ethereum/pull/9876))
-  - Remove rust-toolchain file ([#9906](https://github.com/paritytech/parity-ethereum/pull/9906))
-  - Light-fetch: Differentiate between out-of-gas/manual throw and use required gas from response on failure ([#9824](https://github.com/paritytech/parity-ethereum/pull/9824))
-  - Eip-712 implementation ([#9631](https://github.com/paritytech/parity-ethereum/pull/9631))
-  - Eip-191 implementation ([#9701](https://github.com/paritytech/parity-ethereum/pull/9701))
-  - Simplify cargo audit ([#9918](https://github.com/paritytech/parity-ethereum/pull/9918))
-  - Fix performance issue importing Kovan blocks ([#9914](https://github.com/paritytech/parity-ethereum/pull/9914))
-  - Ci: nuke the gitlab caches ([#9855](https://github.com/paritytech/parity-ethereum/pull/9855))
- Backports to parity beta 2.2.0 ([#9820](https://github.com/paritytech/parity-ethereum/pull/9820))
-  - Ci: remove failing tests for android, windows, and macos ([#9788](https://github.com/paritytech/parity-ethereum/pull/9788))
-  - Implement NoProof for json tests and update tests reference ([#9814](https://github.com/paritytech/parity-ethereum/pull/9814))
-  - Move state root verification before gas used ([#9841](https://github.com/paritytech/parity-ethereum/pull/9841))
-  - Classic.json Bootnode Update ([#9828](https://github.com/paritytech/parity-ethereum/pull/9828))
- Rpc: parity_allTransactionHashes ([#9745](https://github.com/paritytech/parity-ethereum/pull/9745))
- Revert "prevent zero networkID ([#9763](https://github.com/paritytech/parity-ethereum/pull/9763))" ([#9815](https://github.com/paritytech/parity-ethereum/pull/9815))
- Allow zero chain id in EIP155 signing process ([#9792](https://github.com/paritytech/parity-ethereum/pull/9792))
- Add readiness check for docker container ([#9804](https://github.com/paritytech/parity-ethereum/pull/9804))
- Insert dev account before unlocking ([#9813](https://github.com/paritytech/parity-ethereum/pull/9813))
- Removed "rustup" & added new runner tag ([#9731](https://github.com/paritytech/parity-ethereum/pull/9731))
- Expose config max-round-blocks-to-import ([#9439](https://github.com/paritytech/parity-ethereum/pull/9439))
- Aura: finalize blocks ([#9692](https://github.com/paritytech/parity-ethereum/pull/9692))
- Sync: retry different peer after empty subchain heads response ([#9753](https://github.com/paritytech/parity-ethereum/pull/9753))
- Fix(light-rpc/parity) : Remove unused client ([#9802](https://github.com/paritytech/parity-ethereum/pull/9802))
- Drops support for olympic testnet, closes [#9800](https://github.com/paritytech/parity-ethereum/issues/9800) ([#9801](https://github.com/paritytech/parity-ethereum/pull/9801))
- Replace `tokio_core` with `tokio` (`ring` -> 0.13) ([#9657](https://github.com/paritytech/parity-ethereum/pull/9657))
- Support eth_chainId RPC method ([#9783](https://github.com/paritytech/parity-ethereum/pull/9783))
- Ethcore: bump ropsten forkblock checkpoint ([#9775](https://github.com/paritytech/parity-ethereum/pull/9775))
- Docs: changelogs for 2.0.8 and 2.1.3 ([#9758](https://github.com/paritytech/parity-ethereum/pull/9758))
- Prevent zero networkID ([#9763](https://github.com/paritytech/parity-ethereum/pull/9763))
- Skip seal fields count check when --no-seal-check is used ([#9757](https://github.com/paritytech/parity-ethereum/pull/9757))
- Aura: fix panic on extra_info with unsealed block ([#9755](https://github.com/paritytech/parity-ethereum/pull/9755))
- Docs: update changelogs ([#9742](https://github.com/paritytech/parity-ethereum/pull/9742))
- Removed extra assert in generation_session_is_removed_when_succeeded ([#9738](https://github.com/paritytech/parity-ethereum/pull/9738))
- Make checkpoint_storage_at use plain loop instead of recursion ([#9734](https://github.com/paritytech/parity-ethereum/pull/9734))
- Use signed 256-bit integer for sstore gas refund substate ([#9746](https://github.com/paritytech/parity-ethereum/pull/9746))
- Heads ref not present for branches beta and stable ([#9741](https://github.com/paritytech/parity-ethereum/pull/9741))
- Add Callisto support ([#9534](https://github.com/paritytech/parity-ethereum/pull/9534))
- Add --force to cargo audit install script ([#9735](https://github.com/paritytech/parity-ethereum/pull/9735))
- Remove unused expired value from Handshake ([#9732](https://github.com/paritytech/parity-ethereum/pull/9732))
- Add hardcoded headers ([#9730](https://github.com/paritytech/parity-ethereum/pull/9730))
- Produce portable binaries ([#9725](https://github.com/paritytech/parity-ethereum/pull/9725))
- Gitlab ci: releasable_branches: change variables condition to schedule ([#9729](https://github.com/paritytech/parity-ethereum/pull/9729))
- Update a few parity-common dependencies ([#9663](https://github.com/paritytech/parity-ethereum/pull/9663))
- Hf in POA Core (2018-10-22) ([#9724](https://github.com/paritytech/parity-ethereum/pull/9724))
- Schedule nightly builds ([#9717](https://github.com/paritytech/parity-ethereum/pull/9717))
- Fix ancient blocks sync ([#9531](https://github.com/paritytech/parity-ethereum/pull/9531))
- Ci: Skip docs job for nightly ([#9693](https://github.com/paritytech/parity-ethereum/pull/9693))
- Fix (light/provider) : Make `read_only executions` read-only ([#9591](https://github.com/paritytech/parity-ethereum/pull/9591))
- Ethcore: fix detection of major import ([#9552](https://github.com/paritytech/parity-ethereum/pull/9552))
- Return 0 on error ([#9705](https://github.com/paritytech/parity-ethereum/pull/9705))
- Ethcore: delay ropsten hardfork ([#9704](https://github.com/paritytech/parity-ethereum/pull/9704))
- Make instantSeal engine backwards compatible, closes [#9696](https://github.com/paritytech/parity-ethereum/issues/9696) ([#9700](https://github.com/paritytech/parity-ethereum/pull/9700))
- Implement CREATE2 gas changes and fix some potential overflowing ([#9694](https://github.com/paritytech/parity-ethereum/pull/9694))
- Don't hash the init_code of CREATE. ([#9688](https://github.com/paritytech/parity-ethereum/pull/9688))
- Ethcore: minor optimization of modexp by using LR exponentiation ([#9697](https://github.com/paritytech/parity-ethereum/pull/9697))
- Removed redundant clone before each block import ([#9683](https://github.com/paritytech/parity-ethereum/pull/9683))
- Add Foundation Bootnodes ([#9666](https://github.com/paritytech/parity-ethereum/pull/9666))
- Docker: run as parity user ([#9689](https://github.com/paritytech/parity-ethereum/pull/9689))
- Ethcore: mcip3 block reward contract ([#9605](https://github.com/paritytech/parity-ethereum/pull/9605))
- Verify block syncing responses against requests ([#9670](https://github.com/paritytech/parity-ethereum/pull/9670))
- Add a new RPC `parity_submitWorkDetail` similar `eth_submitWork` but return block hash ([#9404](https://github.com/paritytech/parity-ethereum/pull/9404))
- Resumable EVM and heap-allocated callstack ([#9360](https://github.com/paritytech/parity-ethereum/pull/9360))
- Update parity-wordlist library ([#9682](https://github.com/paritytech/parity-ethereum/pull/9682))
- Ci: Remove unnecessary pipes ([#9681](https://github.com/paritytech/parity-ethereum/pull/9681))
- Test.sh: use cargo --target for platforms other than linux, win or mac ([#9650](https://github.com/paritytech/parity-ethereum/pull/9650))
- Ci: fix push script ([#9679](https://github.com/paritytech/parity-ethereum/pull/9679))
- Hardfork the testnets ([#9562](https://github.com/paritytech/parity-ethereum/pull/9562))
- Calculate sha3 instead of sha256 for push-release. ([#9673](https://github.com/paritytech/parity-ethereum/pull/9673))
- Ethcore-io retries failed work steal ([#9651](https://github.com/paritytech/parity-ethereum/pull/9651))
- Fix(light_fetch): avoid race with BlockNumber::Latest ([#9665](https://github.com/paritytech/parity-ethereum/pull/9665))
- Test fix for windows cache name... ([#9658](https://github.com/paritytech/parity-ethereum/pull/9658))
- Refactor(fetch) : light use only one `DNS` thread ([#9647](https://github.com/paritytech/parity-ethereum/pull/9647))
- Ethereum libfuzzer integration small change ([#9547](https://github.com/paritytech/parity-ethereum/pull/9547))
- Cli: remove reference to --no-ui in --unlock flag help ([#9616](https://github.com/paritytech/parity-ethereum/pull/9616))
- Remove master from releasable branches ([#9655](https://github.com/paritytech/parity-ethereum/pull/9655))
- Ethcore/VerificationQueue don't spawn up extra `worker-threads` when explictly specified not to ([#9620](https://github.com/paritytech/parity-ethereum/pull/9620))
- Rpc: parity_getBlockReceipts ([#9527](https://github.com/paritytech/parity-ethereum/pull/9527))
- Remove unused dependencies ([#9589](https://github.com/paritytech/parity-ethereum/pull/9589))
- Ignore key_server_cluster randomly failing tests ([#9639](https://github.com/paritytech/parity-ethereum/pull/9639))
- Ethcore: handle vm exception when estimating gas ([#9615](https://github.com/paritytech/parity-ethereum/pull/9615))
- Fix bad-block reporting no reason ([#9638](https://github.com/paritytech/parity-ethereum/pull/9638))
- Use static call and apparent value transfer for block reward contract code ([#9603](https://github.com/paritytech/parity-ethereum/pull/9603))
- Hf in POA Sokol (2018-09-19) ([#9607](https://github.com/paritytech/parity-ethereum/pull/9607))
- Bump smallvec to 0.6 in ethcore-light, ethstore and whisper ([#9588](https://github.com/paritytech/parity-ethereum/pull/9588))
- Add constantinople conf to EvmTestClient. ([#9570](https://github.com/paritytech/parity-ethereum/pull/9570))
- Fix(network): don't disconnect reserved peers ([#9608](https://github.com/paritytech/parity-ethereum/pull/9608))
- Fix failing node-table tests on mac os, closes [#9632](https://github.com/paritytech/parity-ethereum/issues/9632) ([#9633](https://github.com/paritytech/parity-ethereum/pull/9633))
- Update ropsten.json ([#9602](https://github.com/paritytech/parity-ethereum/pull/9602))
- Simplify ethcore errors by removing BlockImportError ([#9593](https://github.com/paritytech/parity-ethereum/pull/9593))
- Fix windows compilation, replaces [#9561](https://github.com/paritytech/parity-ethereum/issues/9561) ([#9621](https://github.com/paritytech/parity-ethereum/pull/9621))
- Master: rpc-docs set github token ([#9610](https://github.com/paritytech/parity-ethereum/pull/9610))
- Docs: add changelogs for 1.11.10, 1.11.11, 2.0.3, 2.0.4, 2.0.5, 2.0.6, 2.1.0, and 2.1.1 ([#9554](https://github.com/paritytech/parity-ethereum/pull/9554))
- Docs(rpc): annotate tag with the provided message ([#9601](https://github.com/paritytech/parity-ethereum/pull/9601))
- Ci: fix regex roll_eyes ([#9597](https://github.com/paritytech/parity-ethereum/pull/9597))
- Remove snapcraft clean ([#9585](https://github.com/paritytech/parity-ethereum/pull/9585))
- Add snapcraft package image (master) ([#9584](https://github.com/paritytech/parity-ethereum/pull/9584))
- Docs(rpc): push the branch along with tags ([#9578](https://github.com/paritytech/parity-ethereum/pull/9578))
- Fix typo for jsonrpc-threads flag ([#9574](https://github.com/paritytech/parity-ethereum/pull/9574))
- Fix informant compile ([#9571](https://github.com/paritytech/parity-ethereum/pull/9571))
- Added ropsten bootnodes ([#9569](https://github.com/paritytech/parity-ethereum/pull/9569))
- Increase Gas-floor-target and Gas Cap ([#9564](https://github.com/paritytech/parity-ethereum/pull/9564))
- While working on the platform tests make them non-breaking ([#9563](https://github.com/paritytech/parity-ethereum/pull/9563))
- Improve P2P discovery ([#9526](https://github.com/paritytech/parity-ethereum/pull/9526))
- Move dockerfile for android build container to scripts repo ([#9560](https://github.com/paritytech/parity-ethereum/pull/9560))
- Simultaneous platform tests WIP ([#9557](https://github.com/paritytech/parity-ethereum/pull/9557))
- Update ethabi-derive, serde, serde_json, serde_derive, syn && quote ([#9553](https://github.com/paritytech/parity-ethereum/pull/9553))
- Ci: fix rpc docs generation 2 ([#9550](https://github.com/paritytech/parity-ethereum/pull/9550))
- Ci: always run build pipelines for win, mac, linux, and android ([#9537](https://github.com/paritytech/parity-ethereum/pull/9537))
- Multithreaded snapshot creation ([#9239](https://github.com/paritytech/parity-ethereum/pull/9239))
- New ethabi ([#9511](https://github.com/paritytech/parity-ethereum/pull/9511))
- Remove initial token for WS. ([#9545](https://github.com/paritytech/parity-ethereum/pull/9545))
- Net_version caches network_id to avoid redundant aquire of sync readlock ([#9544](https://github.com/paritytech/parity-ethereum/pull/9544))
- Correct before_script for nightly build versions ([#9543](https://github.com/paritytech/parity-ethereum/pull/9543))
- Deps: bump kvdb-rocksdb to 0.1.4 ([#9539](https://github.com/paritytech/parity-ethereum/pull/9539))
- State: test when contract creation fails, old storage values should re-appear ([#9532](https://github.com/paritytech/parity-ethereum/pull/9532))
- Allow dropping light client RPC query with no results ([#9318](https://github.com/paritytech/parity-ethereum/pull/9318))
- Bump master to 2.2.0 ([#9517](https://github.com/paritytech/parity-ethereum/pull/9517))
- Enable all Constantinople hard fork changes in constantinople_test.json ([#9505](https://github.com/paritytech/parity-ethereum/pull/9505))
- [Light] Validate `account balance` before importing transactions ([#9417](https://github.com/paritytech/parity-ethereum/pull/9417))
- In create memory calculation is the same for create2 because the additional parameter was popped before. ([#9522](https://github.com/paritytech/parity-ethereum/pull/9522))
- Update patricia trie to 0.2.2 ([#9525](https://github.com/paritytech/parity-ethereum/pull/9525))
- Replace hardcoded JSON with serde json! macro ([#9489](https://github.com/paritytech/parity-ethereum/pull/9489))
- Fix typo in version string ([#9516](https://github.com/paritytech/parity-ethereum/pull/9516))
--- a/ethash/Cargo.toml
+++ b/ethash/Cargo.toml
@@ -10,23 +10,11 @@ ethereum-types = "0.4"
 keccak-hash = "0.1"
 log = "0.4"
 memmap = "0.6"
-parking_lot = "0.7"
+parking_lot = "0.6"
 primal = "0.2.3"

 [dev-dependencies]
-criterion = "0.2"
-rustc-hex = "1.0"
-serde_json = "1.0"
 tempdir = "0.3"

 [features]
-default = []
-bench = []
-
-[[bench]]
-name = "basic"
-harness = false
-
-[[bench]]
-name = "progpow"
-harness = false
+benches = []
--- a/ethash/benches/basic.rs
+++ b/ethash/benches/basic.rs
@@ -1,113 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-#[macro_use]
-extern crate criterion;
-extern crate ethash;
-
-use criterion::Criterion;
-use ethash::{NodeCacheBuilder, OptimizeFor};
-
-const HASH: [u8; 32] = [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];
-const NONCE: u64 = 0xd7b3ac70a301a249;
-
-criterion_group!(
-	basic,
-	bench_light_compute_memmap,
-	bench_light_compute_memory,
-	bench_light_new_round_trip_memmap,
-	bench_light_new_round_trip_memory,
-	bench_light_from_file_round_trip_memory,
-	bench_light_from_file_round_trip_memmap
-);
-criterion_main!(basic);
-
-fn bench_light_compute_memmap(b: &mut Criterion) {
-	use std::env;
-
-	let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-	let light = builder.light(&env::temp_dir(), 486382);
-
-	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| light.compute(&HASH, NONCE, u64::max_value())));
-}
-
-fn bench_light_compute_memory(b: &mut Criterion) {
-	use std::env;
-
-	let builder = NodeCacheBuilder::new(OptimizeFor::Cpu, u64::max_value());
-	let light = builder.light(&env::temp_dir(), 486382);
-
-	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| light.compute(&HASH, NONCE, u64::max_value())));
-}
-
-fn bench_light_new_round_trip_memmap(b: &mut Criterion) {
-	use std::env;
-
-	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| {
-		let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-		let light = builder.light(&env::temp_dir(), 486382);
-		light.compute(&HASH, NONCE, u64::max_value());
-	}));
-}
-
-fn bench_light_new_round_trip_memory(b: &mut Criterion) {
-	use std::env;
-
-	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| {
-		let builder = NodeCacheBuilder::new(OptimizeFor::Cpu, u64::max_value());
-		let light = builder.light(&env::temp_dir(), 486382);
-		light.compute(&HASH, NONCE, u64::max_value());
-	}));
-}
-
-fn bench_light_from_file_round_trip_memory(b: &mut Criterion) {
-	use std::env;
-
-	let dir = env::temp_dir();
-	let height = 486382;
-	{
-		let builder = NodeCacheBuilder::new(OptimizeFor::Cpu, u64::max_value());
-		let mut dummy = builder.light(&dir, height);
-		dummy.to_file().unwrap();
-	}
-
-	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| {
-		let builder = NodeCacheBuilder::new(OptimizeFor::Cpu, u64::max_value());
-		let light = builder.light_from_file(&dir, 486382).unwrap();
-		light.compute(&HASH, NONCE, u64::max_value());
-	}));
-}
-
-fn bench_light_from_file_round_trip_memmap(b: &mut Criterion) {
-	use std::env;
-
-	let dir = env::temp_dir();
-	let height = 486382;
-
-	{
-		let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-		let mut dummy = builder.light(&dir, height);
-		dummy.to_file().unwrap();
-	}
-
-	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| {
-		let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-		let light = builder.light_from_file(&dir, 486382).unwrap();
-		light.compute(&HASH, NONCE, u64::max_value());
-	}));
-}
--- a/ethash/benches/progpow.rs
+++ b/ethash/benches/progpow.rs
@@ -1,86 +0,0 @@
-#[macro_use]
-extern crate criterion;
-extern crate ethash;
-extern crate rustc_hex;
-extern crate tempdir;
-
-use criterion::Criterion;
-use ethash::progpow;
-
-use tempdir::TempDir;
-use rustc_hex::FromHex;
-use ethash::{NodeCacheBuilder, OptimizeFor};
-use ethash::compute::light_compute;
-
-fn bench_hashimoto_light(c: &mut Criterion) {
-	let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-	let tempdir = TempDir::new("").unwrap();
-	let light = builder.light(&tempdir.path(), 1);
-	let h = FromHex::from_hex("c9149cc0386e689d789a1c2f3d5d169a61a6218ed30e74414dc736e442ef3d1f").unwrap();
-	let mut hash = [0; 32];
-	hash.copy_from_slice(&h);
-
-	c.bench_function("hashimoto_light", move |b| {
-		b.iter(|| light_compute(&light, &hash, 0))
-	});
-}
-
-fn bench_progpow_light(c: &mut Criterion) {
-	let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-	let tempdir = TempDir::new("").unwrap();
-	let cache = builder.new_cache(tempdir.into_path(), 0);
-
-	let h = FromHex::from_hex("c9149cc0386e689d789a1c2f3d5d169a61a6218ed30e74414dc736e442ef3d1f").unwrap();
-	let mut hash = [0; 32];
-	hash.copy_from_slice(&h);
-
-	c.bench_function("progpow_light", move |b| {
-		b.iter(|| {
-			let c_dag = progpow::generate_cdag(cache.as_ref());
-			progpow::progpow(
-				hash,
-				0,
-				0,
-				cache.as_ref(),
-				&c_dag,
-			);
-		})
-	});
-}
-
-fn bench_progpow_optimal_light(c: &mut Criterion) {
-	let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-	let tempdir = TempDir::new("").unwrap();
-	let cache = builder.new_cache(tempdir.into_path(), 0);
-	let c_dag = progpow::generate_cdag(cache.as_ref());
-
-	let h = FromHex::from_hex("c9149cc0386e689d789a1c2f3d5d169a61a6218ed30e74414dc736e442ef3d1f").unwrap();
-	let mut hash = [0; 32];
-	hash.copy_from_slice(&h);
-
-	c.bench_function("progpow_optimal_light", move |b| {
-		b.iter(|| {
-			progpow::progpow(
-				hash,
-				0,
-				0,
-				cache.as_ref(),
-				&c_dag,
-			);
-		})
-	});
-}
-
-fn bench_keccak_f800_long(c: &mut Criterion) {
-	c.bench_function("keccak_f800_long(0, 0, 0)", |b| {
-		b.iter(|| progpow::keccak_f800_long([0; 32], 0, [0; 8]))
-	});
-}
-
-criterion_group!(benches,
-	bench_hashimoto_light,
-	bench_progpow_light,
-	bench_progpow_optimal_light,
-	bench_keccak_f800_long,
-);
-criterion_main!(benches);
--- a/ethash/res/progpow_testvectors.json
+++ b/ethash/res/progpow_testvectors.json
@@ -1,86 +0,0 @@
-[
-  [
-    0,
-    "0000000000000000000000000000000000000000000000000000000000000000",
-    "0000000000000000",
-    "faeb1be51075b03a4ff44b335067951ead07a3b078539ace76fd56fc410557a3",
-    "63155f732f2bf556967f906155b510c917e48e99685ead76ea83f4eca03ab12b"
-  ],
-  [
-    49,
-    "63155f732f2bf556967f906155b510c917e48e99685ead76ea83f4eca03ab12b",
-    "0000000006ff2c47",
-    "c789c1180f890ec555ff42042913465481e8e6bc512cb981e1c1108dc3f2227d",
-    "9e7248f20914913a73d80a70174c331b1d34f260535ac3631d770e656b5dd922"
-  ],
-  [
-    50,
-    "9e7248f20914913a73d80a70174c331b1d34f260535ac3631d770e656b5dd922",
-    "00000000076e482e",
-    "c7340542c2a06b3a7dc7222635f7cd402abf8b528ae971ddac6bbe2b0c7cb518",
-    "de37e1824c86d35d154cf65a88de6d9286aec4f7f10c3fc9f0fa1bcc2687188d"
-  ],
-  [
-    99,
-    "de37e1824c86d35d154cf65a88de6d9286aec4f7f10c3fc9f0fa1bcc2687188d",
-    "000000003917afab",
-    "f5e60b2c5bfddd136167a30cbc3c8dbdbd15a512257dee7964e0bc6daa9f8ba7",
-    "ac7b55e801511b77e11d52e9599206101550144525b5679f2dab19386f23dcce"
-  ],
-  [
-    29950,
-    "ac7b55e801511b77e11d52e9599206101550144525b5679f2dab19386f23dcce",
-    "005d409dbc23a62a",
-    "07393d15805eb08ee6fc6cb3ad4ad1010533bd0ff92d6006850246829f18fd6e",
-    "e43d7e0bdc8a4a3f6e291a5ed790b9fa1a0948a2b9e33c844888690847de19f5"
-  ],
-  [
-    29999,
-    "e43d7e0bdc8a4a3f6e291a5ed790b9fa1a0948a2b9e33c844888690847de19f5",
-    "005db5fa4c2a3d03",
-    "7551bddf977491da2f6cfc1679299544b23483e8f8ee0931c4c16a796558a0b8",
-    "d34519f72c97cae8892c277776259db3320820cb5279a299d0ef1e155e5c6454"
-  ],
-  [
-    30000,
-    "d34519f72c97cae8892c277776259db3320820cb5279a299d0ef1e155e5c6454",
-    "005db8607994ff30",
-    "f1c2c7c32266af9635462e6ce1c98ebe4e7e3ecab7a38aaabfbf2e731e0fbff4",
-    "8b6ce5da0b06d18db7bd8492d9e5717f8b53e7e098d9fef7886d58a6e913ef64"
-  ],
-  [
-    30049,
-    "8b6ce5da0b06d18db7bd8492d9e5717f8b53e7e098d9fef7886d58a6e913ef64",
-    "005e2e215a8ca2e7",
-    "57fe6a9fbf920b4e91deeb66cb0efa971e08229d1a160330e08da54af0689add",
-    "c2c46173481b9ced61123d2e293b42ede5a1b323210eb2a684df0874ffe09047"
-  ],
-  [
-    30050,
-    "c2c46173481b9ced61123d2e293b42ede5a1b323210eb2a684df0874ffe09047",
-    "005e30899481055e",
-    "ba30c61cc5a2c74a5ecaf505965140a08f24a296d687e78720f0b48baf712f2d",
-    "ea42197eb2ba79c63cb5e655b8b1f612c5f08aae1a49ff236795a3516d87bc71"
-  ],
-  [
-    30099,
-    "ea42197eb2ba79c63cb5e655b8b1f612c5f08aae1a49ff236795a3516d87bc71",
-    "005ea6aef136f88b",
-    "cfd5e46048cd133d40f261fe8704e51d3f497fc14203ac6a9ef6a0841780b1cd",
-    "49e15ba4bf501ce8fe8876101c808e24c69a859be15de554bf85dbc095491bd6"
-  ],
-  [
-    59950,
-    "49e15ba4bf501ce8fe8876101c808e24c69a859be15de554bf85dbc095491bd6",
-    "02ebe0503bd7b1da",
-    "21511fbaa31fb9f5fc4998a754e97b3083a866f4de86fa7500a633346f56d773",
-    "f5c50ba5c0d6210ddb16250ec3efda178de857b2b1703d8d5403bd0f848e19cf"
-  ],
-  [
-    59999,
-    "f5c50ba5c0d6210ddb16250ec3efda178de857b2b1703d8d5403bd0f848e19cf",
-    "02edb6275bd221e3",
-    "653eda37d337e39d311d22be9bbd3458d3abee4e643bee4a7280a6d08106ef98",
-    "341562d10d4afb706ec2c8d5537cb0c810de02b4ebb0a0eea5ae335af6fb2e88"
-  ]
-]
--- a/ethash/src/cache.rs
+++ b/ethash/src/cache.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use compute::Light;
 use either::Either;
@@ -69,7 +69,6 @@ pub struct NodeCacheBuilder {
 	// TODO: Remove this locking and just use an `Rc`?
 	seedhash: Arc<Mutex<SeedHashCompute>>,
 	optimize_for: OptimizeFor,
-	progpow_transition: u64,
 }

 // TODO: Abstract the "optimize for" logic
@@ -83,18 +82,17 @@ pub struct NodeCache {

 impl NodeCacheBuilder {
 	pub fn light(&self, cache_dir: &Path, block_number: u64) -> Light {
-		Light::new_with_builder(self, cache_dir, block_number, self.progpow_transition)
+		Light::new_with_builder(self, cache_dir, block_number)
 	}

 	pub fn light_from_file(&self, cache_dir: &Path, block_number: u64) -> io::Result<Light> {
-		Light::from_file_with_builder(self, cache_dir, block_number, self.progpow_transition)
+		Light::from_file_with_builder(self, cache_dir, block_number)
 	}

-	pub fn new<T: Into<Option<OptimizeFor>>>(optimize_for: T, progpow_transition: u64) -> Self {
+	pub fn new<T: Into<Option<OptimizeFor>>>(optimize_for: T) -> Self {
 		NodeCacheBuilder {
 			seedhash: Arc::new(Mutex::new(SeedHashCompute::default())),
 			optimize_for: optimize_for.into().unwrap_or_default(),
-			progpow_transition
 		}
 	}

--- a/ethash/src/compute.rs
+++ b/ethash/src/compute.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Ethash implementation
 //! See https://github.com/ethereum/wiki/wiki/Ethash
@@ -21,7 +21,6 @@

 use keccak::{keccak_512, keccak_256, H256};
 use cache::{NodeCache, NodeCacheBuilder};
-use progpow::{CDag, generate_cdag, progpow, keccak_f800_short, keccak_f800_long};
 use seed_compute::SeedHashCompute;
 use shared::*;
 use std::io;
@@ -31,7 +30,7 @@ use std::path::Path;

 const MIX_WORDS: usize = ETHASH_MIX_BYTES / 4;
 const MIX_NODES: usize = MIX_WORDS / NODE_WORDS;
-pub const FNV_PRIME: u32 = 0x01000193;
+const FNV_PRIME: u32 = 0x01000193;

 /// Computation result
 pub struct ProofOfWork {
@@ -41,15 +40,9 @@ pub struct ProofOfWork {
 	pub mix_hash: H256,
 }

-enum Algorithm {
-	Hashimoto,
-	Progpow(Box<CDag>),
-}
-
 pub struct Light {
 	block_number: u64,
 	cache: NodeCache,
-	algorithm: Algorithm,
 }

 /// Light cache structure
@@ -58,55 +51,32 @@ impl Light {
 		builder: &NodeCacheBuilder,
 		cache_dir: &Path,
 		block_number: u64,
-		progpow_transition: u64,
 	) -> Self {
 		let cache = builder.new_cache(cache_dir.to_path_buf(), block_number);

-		let algorithm = if block_number >= progpow_transition {
-			Algorithm::Progpow(Box::new(generate_cdag(cache.as_ref())))
-		} else {
-			Algorithm::Hashimoto
-		};
-
-		Light { block_number, cache, algorithm }
+		Light {
+			block_number: block_number,
+			cache: cache,
+		}
 	}

 	/// Calculate the light boundary data
 	/// `header_hash` - The header hash to pack into the mix
 	/// `nonce` - The nonce to pack into the mix
-	pub fn compute(&self, header_hash: &H256, nonce: u64, block_number: u64) -> ProofOfWork {
-		match self.algorithm {
-			Algorithm::Progpow(ref c_dag) => {
-				let (value, mix_hash) = progpow(
-					*header_hash,
-					nonce,
-					block_number,
-					self.cache.as_ref(),
-					c_dag,
-				);
-
-				ProofOfWork { value, mix_hash }
-			},
-			Algorithm::Hashimoto => light_compute(self, header_hash, nonce),
-		}
-
+	pub fn compute(&self, header_hash: &H256, nonce: u64) -> ProofOfWork {
+		light_compute(self, header_hash, nonce)
 	}

 	pub fn from_file_with_builder(
 		builder: &NodeCacheBuilder,
 		cache_dir: &Path,
 		block_number: u64,
-		progpow_transition: u64,
 	) -> io::Result<Self> {
 		let cache = builder.from_file(cache_dir.to_path_buf(), block_number)?;
-
-		let algorithm = if block_number >= progpow_transition {
-			Algorithm::Progpow(Box::new(generate_cdag(cache.as_ref())))
-		} else {
-			Algorithm::Hashimoto
-		};
-
-		Ok(Light { block_number, cache, algorithm })
+		Ok(Light {
+			block_number: block_number,
+			cache: cache,
+		})
 	}

 	pub fn to_file(&mut self) -> io::Result<&Path> {
@@ -129,32 +99,27 @@ fn fnv_hash(x: u32, y: u32) -> u32 {
 /// `nonce`            The block's nonce
 /// `mix_hash`         The mix digest hash
 /// Boundary recovered from mix hash
-pub fn quick_get_difficulty(header_hash: &H256, nonce: u64, mix_hash: &H256, progpow: bool) -> H256 {
+pub fn quick_get_difficulty(header_hash: &H256, nonce: u64, mix_hash: &H256) -> H256 {
 	unsafe {
-		if progpow {
-			let seed = keccak_f800_short(*header_hash, nonce, [0u32; 8]);
-			keccak_f800_long(*header_hash, seed, mem::transmute(*mix_hash))
-		} else {
-			// This is safe - the `keccak_512` call below reads the first 40 bytes (which we explicitly set
-			// with two `copy_nonoverlapping` calls) but writes the first 64, and then we explicitly write
-			// the next 32 bytes before we read the whole thing with `keccak_256`.
-			//
-			// This cannot be elided by the compiler as it doesn't know the implementation of
-			// `keccak_512`.
-			let mut buf: [u8; 64 + 32] = mem::uninitialized();
+		// This is safe - the `keccak_512` call below reads the first 40 bytes (which we explicitly set
+		// with two `copy_nonoverlapping` calls) but writes the first 64, and then we explicitly write
+		// the next 32 bytes before we read the whole thing with `keccak_256`.
+		//
+		// This cannot be elided by the compiler as it doesn't know the implementation of
+		// `keccak_512`.
+		let mut buf: [u8; 64 + 32] = mem::uninitialized();

-			ptr::copy_nonoverlapping(header_hash.as_ptr(), buf.as_mut_ptr(), 32);
-			ptr::copy_nonoverlapping(&nonce as *const u64 as *const u8, buf[32..].as_mut_ptr(), 8);
+		ptr::copy_nonoverlapping(header_hash.as_ptr(), buf.as_mut_ptr(), 32);
+		ptr::copy_nonoverlapping(&nonce as *const u64 as *const u8, buf[32..].as_mut_ptr(), 8);

-			keccak_512::unchecked(buf.as_mut_ptr(), 64, buf.as_ptr(), 40);
-			ptr::copy_nonoverlapping(mix_hash.as_ptr(), buf[64..].as_mut_ptr(), 32);
+		keccak_512::unchecked(buf.as_mut_ptr(), 64, buf.as_ptr(), 40);
+		ptr::copy_nonoverlapping(mix_hash.as_ptr(), buf[64..].as_mut_ptr(), 32);

-			// This is initialized in `keccak_256`
-			let mut hash: [u8; 32] = mem::uninitialized();
-			keccak_256::unchecked(hash.as_mut_ptr(), hash.len(), buf.as_ptr(), buf.len());
+		// This is initialized in `keccak_256`
+		let mut hash: [u8; 32] = mem::uninitialized();
+		keccak_256::unchecked(hash.as_mut_ptr(), hash.len(), buf.as_ptr(), buf.len());

-			hash
-		}
+		hash
 	}
 }

@@ -307,7 +272,7 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 		// We overwrite the second half since `keccak_256` has an internal buffer and so allows
 		// overlapping arrays as input.
 		let write_ptr: *mut u8 = &mut buf.compress_bytes as *mut [u8; 32] as *mut u8;
-		unsafe {
+		unsafe { 
 			keccak_256::unchecked(
 				write_ptr,
 				buf.compress_bytes.len(),
@@ -322,7 +287,7 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 }

 // TODO: Use the `simd` crate
-pub fn calculate_dag_item(node_index: u32, cache: &[Node]) -> Node {
+fn calculate_dag_item(node_index: u32, cache: &[Node]) -> Node {
 	let num_parent_nodes = cache.len();
 	let mut ret = cache[node_index as usize % num_parent_nodes].clone();
 	ret.as_words_mut()[0] ^= node_index;
@@ -396,13 +361,13 @@ mod test {
 			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, false)[..], boundary_good[..]);
+		assert_eq!(quick_get_difficulty(&hash, nonce, &mix_hash)[..], boundary_good[..]);
 		let boundary_bad = [
 			0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3a, 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!(quick_get_difficulty(&hash, nonce, &mix_hash, false)[..] != boundary_bad[..]);
+		assert!(quick_get_difficulty(&hash, nonce, &mix_hash)[..] != boundary_bad[..]);
 	}

 	#[test]
@@ -426,7 +391,7 @@ mod test {

 		let tempdir = TempDir::new("").unwrap();
 		// difficulty = 0x085657254bd9u64;
-		let light = NodeCacheBuilder::new(None, u64::max_value()).light(tempdir.path(), 486382);
+		let light = NodeCacheBuilder::new(None).light(tempdir.path(), 486382);
 		let result = light_compute(&light, &hash, nonce);
 		assert_eq!(result.mix_hash[..], mix_hash[..]);
 		assert_eq!(result.value[..], boundary[..]);
@@ -435,7 +400,7 @@ mod test {
 	#[test]
 	fn test_drop_old_data() {
 		let tempdir = TempDir::new("").unwrap();
-		let builder = NodeCacheBuilder::new(None, u64::max_value());
+		let builder = NodeCacheBuilder::new(None);
 		let first = builder.light(tempdir.path(), 0).to_file().unwrap().to_owned();

 		let second = builder.light(tempdir.path(), ETHASH_EPOCH_LENGTH).to_file().unwrap().to_owned();
--- a/ethash/src/keccak.rs
+++ b/ethash/src/keccak.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 extern crate keccak_hash as hash;

--- a/ethash/src/lib.rs
+++ b/ethash/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+#![cfg_attr(feature = "benches", feature(test))]

 extern crate either;
 extern crate ethereum_types;
@@ -25,30 +27,15 @@ extern crate crunchy;
 #[macro_use]
 extern crate log;

-#[cfg(test)]
-extern crate rustc_hex;
-
-#[cfg(test)]
-extern crate serde_json;
-
 #[cfg(test)]
 extern crate tempdir;

-#[cfg(feature = "bench")]
-pub mod compute;
-#[cfg(not(feature = "bench"))]
 mod compute;
-
 mod seed_compute;
 mod cache;
 mod keccak;
 mod shared;

-#[cfg(feature = "bench")]
-pub mod progpow;
-#[cfg(not(feature = "bench"))]
-mod progpow;
-
 pub use cache::{NodeCacheBuilder, OptimizeFor};
 pub use compute::{ProofOfWork, quick_get_difficulty, slow_hash_block_number};
 use compute::Light;
@@ -74,16 +61,14 @@ pub struct EthashManager {
 	nodecache_builder: NodeCacheBuilder,
 	cache: Mutex<LightCache>,
 	cache_dir: PathBuf,
-	progpow_transition: u64,
 }

 impl EthashManager {
 	/// Create a new new instance of ethash manager
-	pub fn new<T: Into<Option<OptimizeFor>>>(cache_dir: &Path, optimize_for: T, progpow_transition: u64) -> EthashManager {
+	pub fn new<T: Into<Option<OptimizeFor>>>(cache_dir: &Path, optimize_for: T) -> EthashManager {
 		EthashManager {
 			cache_dir: cache_dir.to_path_buf(),
-			nodecache_builder: NodeCacheBuilder::new(optimize_for.into().unwrap_or_default(), progpow_transition),
-			progpow_transition: progpow_transition,
+			nodecache_builder: NodeCacheBuilder::new(optimize_for.into().unwrap_or_default()),
 			cache: Mutex::new(LightCache {
 				recent_epoch: None,
 				recent: None,
@@ -102,33 +87,27 @@ impl EthashManager {
 		let epoch = block_number / ETHASH_EPOCH_LENGTH;
 		let light = {
 			let mut lights = self.cache.lock();
-			let light = if block_number == self.progpow_transition {
-				// we need to regenerate the cache to trigger algorithm change to progpow inside `Light`
-				None
-			} else {
-				match lights.recent_epoch.clone() {
-					Some(ref e) if *e == epoch => lights.recent.clone(),
-					_ => match lights.prev_epoch.clone() {
-						Some(e) if e == epoch => {
-							// don't swap if recent is newer.
-							if lights.recent_epoch > lights.prev_epoch {
-								None
-							} else {
-								// 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()
-							}
+			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 => {
+						// don't swap if recent is newer.
+						if lights.recent_epoch > lights.prev_epoch {
+							None
+						} else {
+							// 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,
-					},
-				}
+					}
+					_ => None,
+				},
 			};
-
 			match light {
 				None => {
 					let light = match self.nodecache_builder.light_from_file(
@@ -155,7 +134,7 @@ impl EthashManager {
 				Some(light) => light,
 			}
 		};
-		light.compute(header_hash, nonce, block_number)
+		light.compute(header_hash, nonce)
 	}
 }

@@ -187,7 +166,7 @@ fn test_lru() {
 	use tempdir::TempDir;

 	let tempdir = TempDir::new("").unwrap();
-	let ethash = EthashManager::new(tempdir.path(), None, u64::max_value());
+	let ethash = EthashManager::new(tempdir.path(), None);
 	let hash = [0u8; 32];
 	ethash.compute_light(1, &hash, 1);
 	ethash.compute_light(50000, &hash, 1);
@@ -237,3 +216,100 @@ fn test_difficulty_to_boundary_panics_on_zero() {
 fn test_boundary_to_difficulty_panics_on_zero() {
 	boundary_to_difficulty(&ethereum_types::H256::from(0));
 }
+
+#[cfg(feature = "benches")]
+mod benchmarks {
+	extern crate test;
+
+	use self::test::Bencher;
+	use cache::{NodeCacheBuilder, OptimizeFor};
+	use compute::{Light, light_compute};
+
+	const HASH: [u8; 32] = [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];
+	const NONCE: u64 = 0xd7b3ac70a301a249;
+
+	#[bench]
+	fn bench_light_compute_memmap(b: &mut Bencher) {
+		use std::env;
+
+		let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
+		let light = builder.light(&env::temp_dir(), 486382);
+
+		b.iter(|| light_compute(&light, &HASH, NONCE));
+	}
+
+	#[bench]
+	fn bench_light_compute_memory(b: &mut Bencher) {
+		use std::env;
+
+		let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
+		let light = builder.light(&env::temp_dir(), 486382);
+
+		b.iter(|| light_compute(&light, &HASH, NONCE));
+	}
+
+	#[bench]
+	#[ignore]
+	fn bench_light_new_round_trip_memmap(b: &mut Bencher) {
+		use std::env;
+
+		b.iter(|| {
+			let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
+			let light = builder.light(&env::temp_dir(), 486382);
+			light_compute(&light, &HASH, NONCE);
+		});
+	}
+
+	#[bench]
+	#[ignore]
+	fn bench_light_new_round_trip_memory(b: &mut Bencher) {
+		use std::env;
+
+		b.iter(|| {
+			let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
+			let light = builder.light(&env::temp_dir(), 486382);
+			light_compute(&light, &HASH, NONCE);
+		});
+	}
+
+	#[bench]
+	fn bench_light_from_file_round_trip_memory(b: &mut Bencher) {
+		use std::env;
+
+		let dir = env::temp_dir();
+		let height = 486382;
+		{
+			let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
+			let mut dummy = builder.light(&dir, height);
+			dummy.to_file().unwrap();
+		}
+
+		b.iter(|| {
+			let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
+			let light = builder.light_from_file(&dir, 486382).unwrap();
+			light_compute(&light, &HASH, NONCE);
+		});
+	}
+
+	#[bench]
+	fn bench_light_from_file_round_trip_memmap(b: &mut Bencher) {
+		use std::env;
+
+		let dir = env::temp_dir();
+		let height = 486382;
+
+		{
+			let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
+			let mut dummy = builder.light(&dir, height);
+			dummy.to_file().unwrap();
+		}
+
+		b.iter(|| {
+			let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
+			let light = builder.light_from_file(&dir, 486382).unwrap();
+			light_compute(&light, &HASH, NONCE);
+		});
+	}
+}
--- a/ethash/src/progpow.rs
+++ b/ethash/src/progpow.rs
@@ -1,595 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use compute::{FNV_PRIME, calculate_dag_item};
-use keccak::H256;
-use shared::{ETHASH_ACCESSES, ETHASH_MIX_BYTES, Node, get_data_size};
-
-const PROGPOW_CACHE_BYTES: usize = 16 * 1024;
-const PROGPOW_CACHE_WORDS: usize = PROGPOW_CACHE_BYTES / 4;
-const PROGPOW_CNT_CACHE: usize = 12;
-const PROGPOW_CNT_MATH: usize = 20;
-const PROGPOW_CNT_DAG: usize = ETHASH_ACCESSES;
-const PROGPOW_DAG_LOADS: usize = 4;
-const PROGPOW_MIX_BYTES: usize = 2 * ETHASH_MIX_BYTES;
-const PROGPOW_PERIOD_LENGTH: usize = 50; // blocks per progpow epoch (N)
-const PROGPOW_LANES: usize = 16;
-const PROGPOW_REGS: usize = 32;
-
-const FNV_HASH: u32 = 0x811c9dc5;
-
-const KECCAKF_RNDC: [u32; 24] = [
-	0x00000001, 0x00008082, 0x0000808a, 0x80008000, 0x0000808b, 0x80000001,
-	0x80008081, 0x00008009, 0x0000008a, 0x00000088, 0x80008009, 0x8000000a,
-	0x8000808b, 0x0000008b, 0x00008089, 0x00008003, 0x00008002, 0x00000080,
-	0x0000800a, 0x8000000a, 0x80008081, 0x00008080, 0x80000001, 0x80008008
-];
-
-const KECCAKF_ROTC: [u32; 24] = [
-	1,  3,  6,  10, 15, 21, 28, 36, 45, 55, 2,  14,
-	27, 41, 56, 8,  25, 43, 62, 18, 39, 61, 20, 44
-];
-
-const KECCAKF_PILN: [usize; 24] = [
-	10, 7,  11, 17, 18, 3, 5,  16, 8,  21, 24, 4,
-	15, 23, 19, 13, 12, 2, 20, 14, 22, 9,  6,  1
-];
-
-fn keccak_f800_round(st: &mut [u32; 25], r: usize) {
-	// Theta
-	let mut bc = [0u32; 5];
-	for i in 0..bc.len() {
-		bc[i] = st[i] ^ st[i + 5] ^ st[i + 10] ^ st[i + 15] ^ st[i + 20];
-	}
-
-	for i in 0..bc.len() {
-		let t = bc[(i + 4) % 5] ^ bc[(i + 1) % 5].rotate_left(1);
-		for j in (0..st.len()).step_by(5) {
-			st[j + i] ^= t;
-		}
-	}
-
-	// Rho Pi
-	let mut t = st[1];
-
-	debug_assert_eq!(KECCAKF_ROTC.len(), 24);
-	for i in 0..24 {
-		let j = KECCAKF_PILN[i];
-		bc[0] = st[j];
-		st[j] = t.rotate_left(KECCAKF_ROTC[i]);
-		t = bc[0];
-	}
-
-	// Chi
-	for j in (0..st.len()).step_by(5) {
-		for i in 0..bc.len() {
-			bc[i] = st[j + i];
-		}
-		for i in 0..bc.len() {
-			st[j + i] ^= (!bc[(i + 1) % 5]) & bc[(i + 2) % 5];
-		}
-	}
-
-	// Iota
-	debug_assert!(r < KECCAKF_RNDC.len());
-	st[0] ^= KECCAKF_RNDC[r];
-}
-
-fn keccak_f800(header_hash: H256, nonce: u64, result: [u32; 8], st: &mut [u32; 25]) {
-	for i in 0..8 {
-		st[i] = (header_hash[4 * i] as u32) +
-			((header_hash[4 * i + 1] as u32) << 8) +
-			((header_hash[4 * i + 2] as u32) << 16) +
-			((header_hash[4 * i + 3] as u32) << 24);
-	}
-
-	st[8] = nonce as u32;
-	st[9] = (nonce >> 32) as u32;
-
-	for i in 0..8 {
-		st[10 + i] = result[i];
-	}
-
-	for r in 0..22 {
-		keccak_f800_round(st, r);
-	}
-}
-
-pub fn keccak_f800_short(header_hash: H256, nonce: u64, result: [u32; 8]) -> u64 {
-	let mut st = [0u32; 25];
-	keccak_f800(header_hash, nonce, result, &mut st);
-	(st[0].swap_bytes() as u64) << 32 | st[1].swap_bytes() as u64
-}
-
-pub fn keccak_f800_long(header_hash: H256, nonce: u64, result: [u32; 8]) -> H256 {
-	let mut st = [0u32; 25];
-	keccak_f800(header_hash, nonce, result, &mut st);
-
-	// NOTE: transmute from `[u32; 8]` to `[u8; 32]`
-	unsafe {
-		std::mem::transmute(
-			[st[0], st[1], st[2], st[3], st[4], st[5], st[6], st[7]]
-		)
-	}
-}
-
-#[inline]
-fn fnv1a_hash(h: u32, d: u32) -> u32 {
-	(h ^ d).wrapping_mul(FNV_PRIME)
-}
-
-#[derive(Clone)]
-struct Kiss99 {
-	z: u32,
-	w: u32,
-	jsr: u32,
-	jcong: u32,
-}
-
-impl Kiss99 {
-	fn new(z: u32, w: u32, jsr: u32, jcong: u32) -> Kiss99 {
-		Kiss99 { z, w, jsr, jcong }
-	}
-
-	#[inline]
-	fn next_u32(&mut self) -> u32 {
-		self.z = 36969u32.wrapping_mul(self.z & 65535).wrapping_add(self.z >> 16);
-		self.w = 18000u32.wrapping_mul(self.w & 65535).wrapping_add(self.w >> 16);
-		let mwc = (self.z << 16).wrapping_add(self.w);
-		self.jsr ^= self.jsr << 17;
-		self.jsr ^= self.jsr >> 13;
-		self.jsr ^= self.jsr << 5;
-		self.jcong = 69069u32.wrapping_mul(self.jcong).wrapping_add(1234567);
-
-		(mwc ^ self.jcong).wrapping_add(self.jsr)
-	}
-}
-
-fn fill_mix(seed: u64, lane_id: u32) -> [u32; PROGPOW_REGS] {
-	// Use FNV to expand the per-warp seed to per-lane
-	// Use KISS to expand the per-lane seed to fill mix
-	let z = fnv1a_hash(FNV_HASH, seed as u32);
-	let w = fnv1a_hash(z, (seed >> 32) as u32);
-	let jsr = fnv1a_hash(w, lane_id);
-	let jcong = fnv1a_hash(jsr, lane_id);
-
-	let mut rnd = Kiss99::new(z, w, jsr, jcong);
-
-	let mut mix = [0; PROGPOW_REGS];
-
-	debug_assert_eq!(PROGPOW_REGS, 32);
-	for i in 0..32 {
-		mix[i] = rnd.next_u32();
-	}
-
-	mix
-}
-
-// Merge new data from b into the value in a. Assuming A has high entropy only
-// do ops that retain entropy even if B is low entropy (IE don't do A&B)
-fn merge(a: u32, b: u32, r: u32) -> u32 {
-	match r % 4 {
-		0 => a.wrapping_mul(33).wrapping_add(b),
-		1 => (a ^ b).wrapping_mul(33),
-		2 => a.rotate_left(((r >> 16) % 31) + 1) ^ b,
-		_ => a.rotate_right(((r >> 16) % 31) + 1) ^ b,
-	}
-}
-
-fn math(a: u32, b: u32, r: u32) -> u32 {
-	match r % 11 {
-		0 => a.wrapping_add(b),
-		1 => a.wrapping_mul(b),
-		2 => ((a as u64).wrapping_mul(b as u64) >> 32) as u32,
-		3 => a.min(b),
-		4 => a.rotate_left(b),
-		5 => a.rotate_right(b),
-		6 => a & b,
-		7 => a | b,
-		8 => a ^ b,
-		9 => a.leading_zeros() + b.leading_zeros(),
-		_ => a.count_ones() + b.count_ones(),
-	}
-}
-
-fn progpow_init(seed: u64) -> (Kiss99, [u32; PROGPOW_REGS], [u32; PROGPOW_REGS]) {
-	let z = fnv1a_hash(FNV_HASH, seed as u32);
-	let w = fnv1a_hash(z, (seed >> 32) as u32);
-	let jsr = fnv1a_hash(w, seed as u32);
-	let jcong = fnv1a_hash(jsr, (seed >> 32) as u32);
-
-	let mut rnd = Kiss99::new(z, w, jsr, jcong);
-
-	// Create a random sequence of mix destinations for merge() and mix sources
-	// for cache reads guarantees every destination merged once and guarantees
-	// no duplicate cache reads, which could be optimized away. Uses
-	// Fisher-Yates shuffle.
-	let mut mix_seq_dst = [0u32; PROGPOW_REGS];
-	let mut mix_seq_cache = [0u32; PROGPOW_REGS];
-	for i in 0..mix_seq_dst.len() {
-		mix_seq_dst[i] = i as u32;
-		mix_seq_cache[i] = i as u32;
-	}
-
-	for i in (1..mix_seq_dst.len()).rev() {
-		let j = rnd.next_u32() as usize % (i + 1);
-		mix_seq_dst.swap(i, j);
-
-		let j = rnd.next_u32() as usize % (i + 1);
-		mix_seq_cache.swap(i, j);
-	}
-
-	(rnd, mix_seq_dst, mix_seq_cache)
-}
-
-pub type CDag = [u32; PROGPOW_CACHE_WORDS];
-
-fn progpow_loop(
-	seed: u64,
-	loop_: usize,
-	mix: &mut [[u32; PROGPOW_REGS]; PROGPOW_LANES],
-	cache: &[Node],
-	c_dag: &CDag,
-	data_size: usize,
-) {
-	// All lanes share a base address for the global load. Global offset uses
-	// mix[0] to guarantee it depends on the load result.
-	let g_offset = mix[loop_ % PROGPOW_LANES][0] as usize %
-		(64 * data_size / (PROGPOW_LANES * PROGPOW_DAG_LOADS));
-
-	// 256 bytes of dag data
-	let mut dag_item = [0u32; 64];
-
-	// Fetch DAG nodes (64 bytes each)
-	for l in 0..PROGPOW_DAG_LOADS {
-		let index = g_offset * PROGPOW_LANES * PROGPOW_DAG_LOADS + l * 16;
-		let node = calculate_dag_item(index as u32 / 16, cache);
-		dag_item[l * 16..(l + 1) * 16].clone_from_slice(node.as_words());
-	}
-
-	let (rnd, mix_seq_dst, mix_seq_cache) = progpow_init(seed);
-
-	// Lanes can execute in parallel and will be convergent
-	for l in 0..mix.len() {
-		let mut rnd = rnd.clone();
-
-		// Initialize the seed and mix destination sequence
-		let mut mix_seq_dst_cnt = 0;
-		let mut mix_seq_cache_cnt = 0;
-
-		let mut mix_dst = || {
-			let res = mix_seq_dst[mix_seq_dst_cnt % PROGPOW_REGS] as usize;
-			mix_seq_dst_cnt += 1;
-			res
-		};
-		let mut mix_cache = || {
-			let res = mix_seq_cache[mix_seq_cache_cnt % PROGPOW_REGS] as usize;
-			mix_seq_cache_cnt += 1;
-			res
-		};
-
-		for i in 0..PROGPOW_CNT_CACHE.max(PROGPOW_CNT_MATH) {
-			if i < PROGPOW_CNT_CACHE {
-				// Cached memory access, lanes access random 32-bit locations
-				// within the first portion of the DAG
-				let offset = mix[l][mix_cache()] as usize % PROGPOW_CACHE_WORDS;
-				let data = c_dag[offset];
-				let dst = mix_dst();
-
-				mix[l][dst] = merge(mix[l][dst], data, rnd.next_u32());
-			}
-
-			if i < PROGPOW_CNT_MATH {
-				// Random math
-				// Generate 2 unique sources
-				let src_rnd = rnd.next_u32() % (PROGPOW_REGS * (PROGPOW_REGS - 1)) as u32;
-				let src1 = src_rnd % PROGPOW_REGS as u32; // 0 <= src1 < PROGPOW_REGS
-				let mut src2 = src_rnd / PROGPOW_REGS as u32; // 0 <= src2 < PROGPOW_REGS - 1
-				if src2 >= src1 {
-					src2 += 1; // src2 is now any reg other than src1
-				}
-
-				let data = math(mix[l][src1 as usize], mix[l][src2 as usize], rnd.next_u32());
-				let dst = mix_dst();
-
-				mix[l][dst] = merge(mix[l][dst], data, rnd.next_u32());
-			}
-		}
-
-		// Global load to sequential locations
-		let mut data_g = [0u32; PROGPOW_DAG_LOADS];
-		let index = ((l ^ loop_) % PROGPOW_LANES) * PROGPOW_DAG_LOADS;
-		for i in 0..PROGPOW_DAG_LOADS {
-			data_g[i] = dag_item[index + i];
-		}
-
-		// Consume the global load data at the very end of the loop to allow
-		// full latency hiding. Always merge into `mix[0]` to feed the offset
-		// calculation.
-		mix[l][0] = merge(mix[l][0], data_g[0], rnd.next_u32());
-		for i in 1..PROGPOW_DAG_LOADS {
-			let dst = mix_dst();
-			mix[l][dst] = merge(mix[l][dst], data_g[i], rnd.next_u32());
-		}
-	}
-}
-
-pub fn progpow(
-	header_hash: H256,
-	nonce: u64,
-	block_number: u64,
-	cache: &[Node],
-	c_dag: &CDag,
-) -> (H256, H256) {
-	let mut mix = [[0u32; PROGPOW_REGS]; PROGPOW_LANES];
-	let mut lane_results = [0u32; PROGPOW_LANES];
-	let mut result = [0u32; 8];
-
-	let data_size = get_data_size(block_number) / PROGPOW_MIX_BYTES;
-
-	// NOTE: This assert is required to aid the optimizer elide the non-zero
-	// remainder check in `progpow_loop`.
-	assert!(data_size > 0);
-
-	// Initialize mix for all lanes
-	let seed = keccak_f800_short(header_hash, nonce, result);
-
-	for l in 0..mix.len() {
-		mix[l] = fill_mix(seed, l as u32);
-	}
-
-	// Execute the randomly generated inner loop
-	let period = block_number / PROGPOW_PERIOD_LENGTH as u64;
-	for i in 0..PROGPOW_CNT_DAG {
-		progpow_loop(
-			period,
-			i,
-			&mut mix,
-			cache,
-			c_dag,
-			data_size,
-		);
-	}
-
-	// Reduce mix data to a single per-lane result
-	for l in 0..lane_results.len() {
-		lane_results[l] = FNV_HASH;
-		for i in 0..PROGPOW_REGS {
-			lane_results[l] = fnv1a_hash(lane_results[l], mix[l][i]);
-		}
-	}
-
-	// Reduce all lanes to a single 128-bit result
-	result = [FNV_HASH; 8];
-	for l in 0..PROGPOW_LANES {
-		result[l % 8] = fnv1a_hash(result[l % 8], lane_results[l]);
-	}
-
-	let digest = keccak_f800_long(header_hash, seed, result);
-
-	// NOTE: transmute from `[u32; 8]` to `[u8; 32]`
-	let result = unsafe { ::std::mem::transmute(result) };
-
-	(digest, result)
-}
-
-pub fn generate_cdag(cache: &[Node]) -> CDag {
-	let mut c_dag = [0u32; PROGPOW_CACHE_WORDS];
-
-	for i in 0..PROGPOW_CACHE_WORDS / 16 {
-		let node = calculate_dag_item(i as u32, cache);
-		for j in 0..16 {
-			c_dag[i * 16 + j] = node.as_words()[j];
-		}
-	}
-
-	c_dag
-}
-
-#[cfg(test)]
-mod test {
-	use tempdir::TempDir;
-
-	use cache::{NodeCacheBuilder, OptimizeFor};
-	use keccak::H256;
-	use rustc_hex::FromHex;
-	use serde_json::{self, Value};
-	use std::collections::VecDeque;
-	use super::*;
-
-	fn h256(hex: &str) -> H256 {
-		let bytes = FromHex::from_hex(hex).unwrap();
-		let mut res = [0; 32];
-		res.copy_from_slice(&bytes);
-		res
-	}
-
-	#[test]
-	fn test_cdag() {
-		let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-		let tempdir = TempDir::new("").unwrap();
-		let cache = builder.new_cache(tempdir.into_path(), 0);
-
-		let c_dag = generate_cdag(cache.as_ref());
-
-		let expected = vec![
-			690150178u32, 1181503948, 2248155602, 2118233073, 2193871115,
-			1791778428, 1067701239, 724807309, 530799275, 3480325829, 3899029234,
-			1998124059, 2541974622, 1100859971, 1297211151, 3268320000, 2217813733,
-			2690422980, 3172863319, 2651064309
-		];
-
-		assert_eq!(
-			c_dag.iter().take(20).cloned().collect::<Vec<_>>(),
-			expected,
-		);
-	}
-
-	#[test]
-	fn test_random_merge() {
-		let tests = [
-			(1000000u32, 101u32, 33000101u32),
-			(2000000, 102, 66003366),
-			(3000000, 103, 6000103),
-			(4000000, 104, 2000104),
-			(1000000, 0, 33000000),
-			(2000000, 0, 66000000),
-			(3000000, 0, 6000000),
-			(4000000, 0, 2000000),
-		];
-
-		for (i, &(a, b, expected)) in tests.iter().enumerate() {
-			assert_eq!(
-				merge(a, b, i as u32),
-				expected,
-			);
-		}
-	}
-
-	#[test]
-	fn test_random_math() {
-		let tests = [
-			(20u32, 22u32, 42u32),
-			(70000, 80000, 1305032704),
-			(70000, 80000, 1),
-			(1, 2, 1),
-			(3, 10000, 196608),
-			(3, 0, 3),
-			(3, 6, 2),
-			(3, 6, 7),
-			(3, 6, 5),
-			(0, 0xffffffff, 32),
-			(3 << 13, 1 << 5, 3),
-			(22, 20, 42),
-			(80000, 70000, 1305032704),
-			(80000, 70000, 1),
-			(2, 1, 1),
-			(10000, 3, 80000),
-			(0, 3, 0),
-			(6, 3, 2),
-			(6, 3, 7),
-			(6, 3, 5),
-			(0, 0xffffffff, 32),
-			(3 << 13, 1 << 5, 3),
-		];
-
-		for (i, &(a, b, expected)) in tests.iter().enumerate() {
-			assert_eq!(
-				math(a, b, i as u32),
-				expected,
-			);
-		}
-	}
-
-	#[test]
-	fn test_keccak_256() {
-		let expected = "5dd431e5fbc604f499bfa0232f45f8f142d0ff5178f539e5a7800bf0643697af";
-		assert_eq!(
-			keccak_f800_long([0; 32], 0, [0; 8]),
-			h256(expected),
-		);
-	}
-
-	#[test]
-	fn test_keccak_64() {
-		let expected: u64 = 0x5dd431e5fbc604f4;
-		assert_eq!(
-			keccak_f800_short([0; 32], 0, [0; 8]),
-			expected,
-		);
-	}
-
-	#[test]
-	fn test_progpow_hash() {
-		let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-		let tempdir = TempDir::new("").unwrap();
-		let cache = builder.new_cache(tempdir.into_path(), 0);
-		let c_dag = generate_cdag(cache.as_ref());
-
-		let header_hash = [0; 32];
-
-		let (digest, result) = progpow(
-			header_hash,
-			0,
-			0,
-			cache.as_ref(),
-			&c_dag,
-		);
-
-		let expected_digest = FromHex::from_hex("63155f732f2bf556967f906155b510c917e48e99685ead76ea83f4eca03ab12b").unwrap();
-		let expected_result = FromHex::from_hex("faeb1be51075b03a4ff44b335067951ead07a3b078539ace76fd56fc410557a3").unwrap();
-
-		assert_eq!(
-			digest.to_vec(),
-			expected_digest,
-		);
-
-		assert_eq!(
-			result.to_vec(),
-			expected_result,
-		);
-	}
-
-	#[test]
-	fn test_progpow_testvectors() {
-		struct ProgpowTest {
-			block_number: u64,
-			header_hash: H256,
-			nonce: u64,
-			mix_hash: H256,
-			final_hash: H256,
-		}
-
-		let tests: Vec<VecDeque<Value>> =
-			serde_json::from_slice(include_bytes!("../res/progpow_testvectors.json")).unwrap();
-
-		let tests: Vec<ProgpowTest> = tests.into_iter().map(|mut test: VecDeque<Value>| {
-			assert!(test.len() == 5);
-
-			let block_number: u64 = serde_json::from_value(test.pop_front().unwrap()).unwrap();
-			let header_hash: String = serde_json::from_value(test.pop_front().unwrap()).unwrap();
-			let nonce: String = serde_json::from_value(test.pop_front().unwrap()).unwrap();
-			let mix_hash: String = serde_json::from_value(test.pop_front().unwrap()).unwrap();
-			let final_hash: String = serde_json::from_value(test.pop_front().unwrap()).unwrap();
-
-			ProgpowTest {
-				block_number,
-				header_hash: h256(&header_hash),
-				nonce: u64::from_str_radix(&nonce, 16).unwrap(),
-				mix_hash: h256(&mix_hash),
-				final_hash: h256(&final_hash),
-			}
-		}).collect();
-
-		for test in tests {
-			let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-			let tempdir = TempDir::new("").unwrap();
-			let cache = builder.new_cache(tempdir.path().to_owned(), test.block_number);
-			let c_dag = generate_cdag(cache.as_ref());
-
-			let (digest, result) = progpow(
-				test.header_hash,
-				test.nonce,
-				test.block_number,
-				cache.as_ref(),
-				&c_dag,
-			);
-
-			assert_eq!(digest, test.final_hash);
-			assert_eq!(result, test.mix_hash);
-		}
-	}
-}
--- a/ethash/src/seed_compute.rs
+++ b/ethash/src/seed_compute.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use shared;
 use keccak::{keccak_256, H256};
--- a/ethash/src/shared.rs
+++ b/ethash/src/shared.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use primal::is_prime;

--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -8,78 +8,75 @@ authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
 ansi_term = "0.10"
-blooms-db = { path = "../util/blooms-db", optional = true }
+blooms-db = { path = "../util/blooms-db" }
 bn = { git = "https://github.com/paritytech/bn", default-features = false }
 byteorder = "1.0"
 common-types = { path = "types" }
 crossbeam = "0.4"
-env_logger = { version = "0.5", optional = true }
-error-chain = { version = "0.12", default-features = false }
-ethabi = "6.0"
-ethabi-contract = "6.0"
-ethabi-derive = "6.0"
 ethash = { path = "../ethash" }
-ethcore-blockchain = { path = "./blockchain" }
 ethcore-bloom-journal = { path = "../util/bloom" }
-ethcore-call-contract = { path = "./call-contract" }
-ethcore-db = { path = "./db" }
+parity-bytes = "0.1"
+hashdb = "0.3.0"
+memorydb = "0.3.0"
+patricia-trie = "0.3.0"
+patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
+parity-crypto = "0.2"
+error-chain = { version = "0.12", default-features = false }
 ethcore-io = { path = "../util/io" }
+ethcore-logger = { path = "../logger" }
 ethcore-miner = { path = "../miner" }
-ethcore-stratum = { path = "../miner/stratum", optional = true }
+ethcore-stratum = { path = "./stratum", optional = true }
+ethcore-transaction = { path = "./transaction" }
 ethereum-types = "0.4"
+memory-cache = { path = "../util/memory_cache" }
+ethabi = "6.0"
+ethabi-derive = "6.0"
+ethabi-contract = "6.0"
 ethjson = { path = "../json" }
-ethkey = { path = "../accounts/ethkey" }
+ethkey = { path = "../ethkey" }
+ethstore = { path = "../ethstore" }
 evm = { path = "evm" }
-hash-db = "0.11.0"
 heapsize = "0.4"
 itertools = "0.5"
-journaldb = { path = "../util/journaldb" }
-keccak-hash = "0.1"
-keccak-hasher = { path = "../util/keccak-hasher" }
-kvdb = "0.1"
-kvdb-memorydb = "0.1"
-kvdb-rocksdb = { version = "0.1.3", optional = true }
 lazy_static = "1.0"
-len-caching-lock = { path = "../util/len-caching-lock" }
 log = "0.4"
 lru-cache = "0.1"
-macros = { path = "../util/macros" }
-memory-cache = { path = "../util/memory-cache" }
-memory-db = "0.11.0"
 num = { version = "0.1", default-features = false, features = ["bigint"] }
 num_cpus = "1.2"
-parity-bytes = "0.1"
-parity-crypto = "0.3.0"
 parity-machine = { path = "../machine" }
-parity-snappy = "0.1"
-parking_lot = "0.7"
-trie-db = "0.11.0"
-patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
-rand = "0.4"
+parking_lot = "0.6"
 rayon = "1.0"
+rand = "0.4"
 rlp = { version = "0.3.0", features = ["ethereum"] }
-rlp_derive = { path = "../util/rlp-derive" }
+rlp_compress = { path = "../util/rlp_compress" }
+rlp_derive = { path = "../util/rlp_derive" }
+kvdb = "0.1"
+kvdb-memorydb = "0.1"
+parity-snappy = "0.1"
+stop-guard = { path = "../util/stop-guard" }
+macros = { path = "../util/macros" }
 rustc-hex = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
 stats = { path = "../util/stats" }
-tempdir = {version="0.3", optional = true}
 trace-time = "0.1"
-triehash-ethereum = { version = "0.2",  path = "../util/triehash-ethereum" }
-unexpected = { path = "../util/unexpected" }
-using_queue = { path = "../miner/using-queue" }
+using_queue = { path = "../util/using_queue" }
 vm = { path = "vm" }
 wasm = { path = "wasm" }
+keccak-hash = "0.1"
+triehash-ethereum = { version = "0.2",  path = "../util/triehash-ethereum" }
+unexpected = { path = "../util/unexpected" }
+journaldb = { path = "../util/journaldb" }
+keccak-hasher = { path = "../util/keccak-hasher" }
+kvdb-rocksdb = "0.1.3"
+tempdir = {version="0.3", optional = true}
+
+[target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android"))'.dependencies]
+hardware-wallet = { path = "../hw" }
+
+[target.'cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android")))'.dependencies]
+fake-hardware-wallet = { path = "../util/fake-hardware-wallet" }

 [dev-dependencies]
-blooms-db = { path = "../util/blooms-db" }
-criterion = "0.2"
-env_logger = "0.5"
-ethcore-accounts = { path = "../accounts" }
-fetch = { path = "../util/fetch" }
-kvdb-rocksdb = "0.1.3"
-parity-runtime = { path = "../util/runtime" }
-rlp_compress = { path = "../util/rlp-compress" }
+env_logger = "0.4"
 tempdir = "0.3"
 trie-standardmap = "0.1"

@@ -105,16 +102,12 @@ evm-debug-tests = ["evm-debug", "evm/evm-debug-tests"]
 # EVM debug traces are printed.
 slow-blocks = []
 # Run JSON consensus tests.
-json-tests = ["env_logger", "test-helpers", "to-pod-full"]
+json-tests = ["ethcore-transaction/json-tests", "test-helpers", "tempdir"]
 # Skip JSON consensus tests with pending issues.
-ci-skip-tests = []
+ci-skip-issue = []
 # Run memory/cpu heavy tests.
 test-heavy = []
+# Compile benches
+benches = []
 # Compile test helpers
-test-helpers = ["tempdir", "kvdb-rocksdb", "blooms-db"]
-# Enables slow 'to-pod-full' method for use in tests and evmbin.
-to-pod-full = []
-
-[[bench]]
-name = "builtin"
-harness = false
+test-helpers = ["tempdir"]
--- a/ethcore/benches/builtin.rs
+++ b/ethcore/benches/builtin.rs
@@ -1,21 +1,21 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

-#[macro_use]
-extern crate criterion;
+#![feature(test)]
+extern crate test;

 #[macro_use]
 extern crate lazy_static;
@@ -25,13 +25,13 @@ extern crate ethereum_types;
 extern crate parity_bytes as bytes;
 extern crate rustc_hex;

-use criterion::{Criterion, Bencher};
 use bytes::BytesRef;
 use ethcore::builtin::Builtin;
 use ethcore::machine::EthereumMachine;
 use ethereum_types::U256;
 use ethcore::ethereum::new_byzantium_test_machine;
 use rustc_hex::FromHex;
+use self::test::Bencher;

 lazy_static! {
 	static ref BYZANTIUM_MACHINE: EthereumMachine = new_byzantium_test_machine();
@@ -72,81 +72,20 @@ impl<'a> BuiltinBenchmark<'a> {
 }

 fn bench(
-	id: &str,
 	builtin_address: &'static str,
 	input: &str,
 	expected: &str,
-	b: &mut Criterion,
+	b: &mut Bencher,
 ) {
 	let bench = BuiltinBenchmark::new(builtin_address, input, expected);
-	b.bench_function(id, move |b| bench.run(b));
+
+	println!("gas cost: {}", bench.gas_cost());
+	bench.run(b);
 }

-criterion_group!(
-	builtin,
-	ecrecover,
-	sha256,
-	ripemd,
-	identity,
-	modexp_eip_example1,
-	modexp_eip_example2,
-	modexp_nagydani_1_square,
-	modexp_nagydani_1_qube,
-	modexp_nagydani_1_pow0x10001,
-	modexp_nagydani_2_square,
-	modexp_nagydani_2_qube,
-	modexp_nagydani_2_pow0x10001,
-	modexp_nagydani_3_square,
-	modexp_nagydani_3_qube,
-	modexp_nagydani_3_pow0x10001,
-	modexp_nagydani_4_square,
-	modexp_nagydani_4_qube,
-	modexp_nagydani_4_pow0x10001,
-	modexp_nagydani_5_square,
-	modexp_nagydani_5_qube,
-	modexp_nagydani_5_pow0x10001,
-	alt_bn128_add_chfast1,
-	alt_bn128_add_chfast2,
-	alt_bn128_add_cdetrio1,
-	alt_bn128_add_cdetrio2,
-	alt_bn128_add_cdetrio3,
-	alt_bn128_add_cdetrio4,
-	alt_bn128_add_cdetrio5,
-	alt_bn128_add_cdetrio6,
-	alt_bn128_add_cdetrio7,
-	alt_bn128_add_cdetrio8,
-	alt_bn128_add_cdetrio9,
-	alt_bn128_add_cdetrio10,
-	alt_bn128_add_cdetrio11,
-	alt_bn128_add_cdetrio12,
-	alt_bn128_add_cdetrio13,
-	alt_bn128_add_cdetrio14,
-	alt_bn128_mul_chfast1,
-	alt_bn128_mul_chfast2,
-	alt_bn128_mul_chfast3,
-	alt_bn128_mul_cdetrio1,
-	alt_bn128_mul_cdetrio6,
-	alt_bn128_mul_cdetrio11,
-	alt_bn128_pairing_jeff1,
-	alt_bn128_pairing_jeff2,
-	alt_bn128_pairing_jeff3,
-	alt_bn128_pairing_jeff4,
-	alt_bn128_pairing_jeff5,
-	alt_bn128_pairing_jeff6,
-	alt_bn128_pairing_empty_data,
-	alt_bn128_pairing_one_point,
-	alt_bn128_pairing_two_point_match_2,
-	alt_bn128_pairing_two_point_match_3,
-	alt_bn128_pairing_two_point_match_4,
-	alt_bn128_pairing_ten_point_match_1,
-	alt_bn128_pairing_ten_point_match_2,
-	alt_bn128_pairing_ten_point_match_3
-);
-criterion_main!(builtin);
-
-fn ecrecover(b: &mut Criterion) {
+#[bench]
+fn ecrecover(b: &mut Bencher) {
 	bench(
-		"ecrecover",
 		"0000000000000000000000000000000000000001", // ecrecover
 		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
 		"000000000000000000000000ceaccac640adf55b2028469bd36ba501f28b699d",
@@ -154,9 +93,9 @@ fn ecrecover(b: &mut Criterion) {
 	);
 }

-fn sha256(b: &mut Criterion) {
+#[bench]
+fn sha256(b: &mut Bencher) {
 	bench(
-		"sha256",
 		"0000000000000000000000000000000000000002", // sha256
 		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
 		"811c7003375852fabd0d362e40e68607a12bdabae61a7d068fe5fdd1dbbf2a5d",
@@ -164,9 +103,9 @@ fn sha256(b: &mut Criterion) {
 	);
 }

-fn ripemd(b: &mut Criterion) {
+#[bench]
+fn ripemd(b: &mut Bencher) {
 	bench(
-		"ripemd",
 		"0000000000000000000000000000000000000003", // ripemd
 		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
 		"0000000000000000000000009215b8d9882ff46f0dfde6684d78e831467f65e6",
@@ -174,9 +113,9 @@ fn ripemd(b: &mut Criterion) {
 	);
 }

-fn identity(b: &mut Criterion) {
+#[bench]
+fn identity(b: &mut Bencher) {
 	bench(
-		"identity",
 		"0000000000000000000000000000000000000004", // identity
 		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
 		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
@@ -184,9 +123,9 @@ fn identity(b: &mut Criterion) {
 	);
 }

-fn modexp_eip_example1(b: &mut Criterion) {
+#[bench]
+fn modexp_eip_example1(b: &mut Bencher) {
 	bench(
-		"modexp_eip_example1",
 		"0000000000000000000000000000000000000005", // modexp
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -194,9 +133,9 @@ fn modexp_eip_example1(b: &mut Criterion) {
 	);
 }

-fn modexp_eip_example2(b: &mut Criterion) {
+#[bench]
+fn modexp_eip_example2(b: &mut Bencher) {
 	bench(
-		"modexp_eip_example2",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
 		"0000000000000000000000000000000000000000000000000000000000000000",
@@ -204,9 +143,9 @@ fn modexp_eip_example2(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_1_square(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_1_square(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_1_square",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040e09ad9675465c53a109fac66a445c91b292d2bb2c5268addb30cd82f80fcb0033ff97c80a5fc6f39193ae969c6ede6710a6b7ac27078a06d90ef1c72e5c85fb502fc9e1f6beb81516545975218075ec2af118cd8798df6e08a147c60fd6095ac2bb02c2908cf4dd7c81f11c289e4bce98f3553768f392a80ce22bf5c4f4a248c6b",
 		"60008f1614cc01dcfb6bfb09c625cf90b47d4468db81b5f8b7a39d42f332eab9b2da8f2d95311648a8f243f4bb13cfb3d8f7f2a3c014122ebb3ed41b02783adc",
@@ -214,9 +153,9 @@ fn modexp_nagydani_1_square(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_1_qube(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_1_qube(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_1_qube",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040e09ad9675465c53a109fac66a445c91b292d2bb2c5268addb30cd82f80fcb0033ff97c80a5fc6f39193ae969c6ede6710a6b7ac27078a06d90ef1c72e5c85fb503fc9e1f6beb81516545975218075ec2af118cd8798df6e08a147c60fd6095ac2bb02c2908cf4dd7c81f11c289e4bce98f3553768f392a80ce22bf5c4f4a248c6b",
 		"4834a46ba565db27903b1c720c9d593e84e4cbd6ad2e64b31885d944f68cd801f92225a8961c952ddf2797fa4701b330c85c4b363798100b921a1a22a46a7fec",
@@ -224,9 +163,9 @@ fn modexp_nagydani_1_qube(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_1_pow0x10001(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_1_pow0x10001(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_1_pow0x10001",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000040e09ad9675465c53a109fac66a445c91b292d2bb2c5268addb30cd82f80fcb0033ff97c80a5fc6f39193ae969c6ede6710a6b7ac27078a06d90ef1c72e5c85fb5010001fc9e1f6beb81516545975218075ec2af118cd8798df6e08a147c60fd6095ac2bb02c2908cf4dd7c81f11c289e4bce98f3553768f392a80ce22bf5c4f4a248c6b",
 		"c36d804180c35d4426b57b50c5bfcca5c01856d104564cd513b461d3c8b8409128a5573e416d0ebe38f5f736766d9dc27143e4da981dfa4d67f7dc474cbee6d2",
@@ -234,9 +173,9 @@ fn modexp_nagydani_1_pow0x10001(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_2_square(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_2_square(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_2_square",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080cad7d991a00047dd54d3399b6b0b937c718abddef7917c75b6681f40cc15e2be0003657d8d4c34167b2f0bbbca0ccaa407c2a6a07d50f1517a8f22979ce12a81dcaf707cc0cebfc0ce2ee84ee7f77c38b9281b9822a8d3de62784c089c9b18dcb9a2a5eecbede90ea788a862a9ddd9d609c2c52972d63e289e28f6a590ffbf5102e6d893b80aeed5e6e9ce9afa8a5d5675c93a32ac05554cb20e9951b2c140e3ef4e433068cf0fb73bc9f33af1853f64aa27a0028cbf570d7ac9048eae5dc7b28c87c31e5810f1e7fa2cda6adf9f1076dbc1ec1238560071e7efc4e9565c49be9e7656951985860a558a754594115830bcdb421f741408346dd5997bb01c287087",
 		"981dd99c3b113fae3e3eaa9435c0dc96779a23c12a53d1084b4f67b0b053a27560f627b873e3f16ad78f28c94f14b6392def26e4d8896c5e3c984e50fa0b3aa44f1da78b913187c6128baa9340b1e9c9a0fd02cb78885e72576da4a8f7e5a113e173a7a2889fde9d407bd9f06eb05bc8fc7b4229377a32941a02bf4edcc06d70",
@@ -244,9 +183,10 @@ fn modexp_nagydani_2_square(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_2_qube(b: &mut Criterion) {
+
+#[bench]
+fn modexp_nagydani_2_qube(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_2_qube",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080cad7d991a00047dd54d3399b6b0b937c718abddef7917c75b6681f40cc15e2be0003657d8d4c34167b2f0bbbca0ccaa407c2a6a07d50f1517a8f22979ce12a81dcaf707cc0cebfc0ce2ee84ee7f77c38b9281b9822a8d3de62784c089c9b18dcb9a2a5eecbede90ea788a862a9ddd9d609c2c52972d63e289e28f6a590ffbf5103e6d893b80aeed5e6e9ce9afa8a5d5675c93a32ac05554cb20e9951b2c140e3ef4e433068cf0fb73bc9f33af1853f64aa27a0028cbf570d7ac9048eae5dc7b28c87c31e5810f1e7fa2cda6adf9f1076dbc1ec1238560071e7efc4e9565c49be9e7656951985860a558a754594115830bcdb421f741408346dd5997bb01c287087",
 		"d89ceb68c32da4f6364978d62aaa40d7b09b59ec61eb3c0159c87ec3a91037f7dc6967594e530a69d049b64adfa39c8fa208ea970cfe4b7bcd359d345744405afe1cbf761647e32b3184c7fbe87cee8c6c7ff3b378faba6c68b83b6889cb40f1603ee68c56b4c03d48c595c826c041112dc941878f8c5be828154afd4a16311f",
@@ -254,9 +194,9 @@ fn modexp_nagydani_2_qube(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_2_pow0x10001(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_2_pow0x10001(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_2_pow0x10001",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000080cad7d991a00047dd54d3399b6b0b937c718abddef7917c75b6681f40cc15e2be0003657d8d4c34167b2f0bbbca0ccaa407c2a6a07d50f1517a8f22979ce12a81dcaf707cc0cebfc0ce2ee84ee7f77c38b9281b9822a8d3de62784c089c9b18dcb9a2a5eecbede90ea788a862a9ddd9d609c2c52972d63e289e28f6a590ffbf51010001e6d893b80aeed5e6e9ce9afa8a5d5675c93a32ac05554cb20e9951b2c140e3ef4e433068cf0fb73bc9f33af1853f64aa27a0028cbf570d7ac9048eae5dc7b28c87c31e5810f1e7fa2cda6adf9f1076dbc1ec1238560071e7efc4e9565c49be9e7656951985860a558a754594115830bcdb421f741408346dd5997bb01c287087",
 		"ad85e8ef13fd1dd46eae44af8b91ad1ccae5b7a1c92944f92a19f21b0b658139e0cabe9c1f679507c2de354bf2c91ebd965d1e633978a830d517d2f6f8dd5fd58065d58559de7e2334a878f8ec6992d9b9e77430d4764e863d77c0f87beede8f2f7f2ab2e7222f85cc9d98b8467f4bb72e87ef2882423ebdb6daf02dddac6db2",
@@ -264,9 +204,9 @@ fn modexp_nagydani_2_pow0x10001(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_3_square(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_3_square(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_3_square",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000100c9130579f243e12451760976261416413742bd7c91d39ae087f46794062b8c239f2a74abf3918605a0e046a7890e049475ba7fbb78f5de6490bd22a710cc04d30088179a919d86c2da62cf37f59d8f258d2310d94c24891be2d7eeafaa32a8cb4b0cfe5f475ed778f45907dc8916a73f03635f233f7a77a00a3ec9ca6761a5bbd558a2318ecd0caa1c5016691523e7e1fa267dd35e70c66e84380bdcf7c0582f540174e572c41f81e93da0b757dff0b0fe23eb03aa19af0bdec3afb474216febaacb8d0381e631802683182b0fe72c28392539850650b70509f54980241dc175191a35d967288b532a7a8223ce2440d010615f70df269501944d4ec16fe4a3cb02d7a85909174757835187cb52e71934e6c07ef43b4c46fc30bbcd0bc72913068267c54a4aabebb493922492820babdeb7dc9b1558fcf7bd82c37c82d3147e455b623ab0efa752fe0b3a67ca6e4d126639e645a0bf417568adbb2a6a4eef62fa1fa29b2a5a43bebea1f82193a7dd98eb483d09bb595af1fa9c97c7f41f5649d976aee3e5e59e2329b43b13bea228d4a93f16ba139ccb511de521ffe747aa2eca664f7c9e33da59075cc335afcd2bf3ae09765f01ab5a7c3e3938ec168b74724b5074247d200d9970382f683d6059b94dbc336603d1dfee714e4b447ac2fa1d99ecb4961da2854e03795ed758220312d101e1e3d87d5313a6d052aebde75110363d",
 		"affc7507ea6d84751ec6b3f0d7b99dbcc263f33330e450d1b3ff0bc3d0874320bf4edd57debd587306988157958cb3cfd369cc0c9c198706f635c9e0f15d047df5cb44d03e2727f26b083c4ad8485080e1293f171c1ed52aef5993a5815c35108e848c951cf1e334490b4a539a139e57b68f44fee583306f5b85ffa57206b3ee5660458858534e5386b9584af3c7f67806e84c189d695e5eb96e1272d06ec2df5dc5fabc6e94b793718c60c36be0a4d031fc84cd658aa72294b2e16fc240aef70cb9e591248e38bd49c5a554d1afa01f38dab72733092f7555334bbef6c8c430119840492380aa95fa025dcf699f0a39669d812b0c6946b6091e6e235337b6f8",
@@ -274,9 +214,9 @@ fn modexp_nagydani_3_square(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_3_qube(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_3_qube(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_3_qube",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000100c9130579f243e12451760976261416413742bd7c91d39ae087f46794062b8c239f2a74abf3918605a0e046a7890e049475ba7fbb78f5de6490bd22a710cc04d30088179a919d86c2da62cf37f59d8f258d2310d94c24891be2d7eeafaa32a8cb4b0cfe5f475ed778f45907dc8916a73f03635f233f7a77a00a3ec9ca6761a5bbd558a2318ecd0caa1c5016691523e7e1fa267dd35e70c66e84380bdcf7c0582f540174e572c41f81e93da0b757dff0b0fe23eb03aa19af0bdec3afb474216febaacb8d0381e631802683182b0fe72c28392539850650b70509f54980241dc175191a35d967288b532a7a8223ce2440d010615f70df269501944d4ec16fe4a3cb03d7a85909174757835187cb52e71934e6c07ef43b4c46fc30bbcd0bc72913068267c54a4aabebb493922492820babdeb7dc9b1558fcf7bd82c37c82d3147e455b623ab0efa752fe0b3a67ca6e4d126639e645a0bf417568adbb2a6a4eef62fa1fa29b2a5a43bebea1f82193a7dd98eb483d09bb595af1fa9c97c7f41f5649d976aee3e5e59e2329b43b13bea228d4a93f16ba139ccb511de521ffe747aa2eca664f7c9e33da59075cc335afcd2bf3ae09765f01ab5a7c3e3938ec168b74724b5074247d200d9970382f683d6059b94dbc336603d1dfee714e4b447ac2fa1d99ecb4961da2854e03795ed758220312d101e1e3d87d5313a6d052aebde75110363d",
 		"1b280ecd6a6bf906b806d527c2a831e23b238f89da48449003a88ac3ac7150d6a5e9e6b3be4054c7da11dd1e470ec29a606f5115801b5bf53bc1900271d7c3ff3cd5ed790d1c219a9800437a689f2388ba1a11d68f6a8e5b74e9a3b1fac6ee85fc6afbac599f93c391f5dc82a759e3c6c0ab45ce3f5d25d9b0c1bf94cf701ea6466fc9a478dacc5754e593172b5111eeba88557048bceae401337cd4c1182ad9f700852bc8c99933a193f0b94cf1aedbefc48be3bc93ef5cb276d7c2d5462ac8bb0c8fe8923a1db2afe1c6b90d59c534994a6a633f0ead1d638fdc293486bb634ff2c8ec9e7297c04241a61c37e3ae95b11d53343d4ba2b4cc33d2cfa7eb705e",
@@ -284,9 +224,9 @@ fn modexp_nagydani_3_qube(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_3_pow0x10001(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_3_pow0x10001(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_3_pow0x10001",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000100c9130579f243e12451760976261416413742bd7c91d39ae087f46794062b8c239f2a74abf3918605a0e046a7890e049475ba7fbb78f5de6490bd22a710cc04d30088179a919d86c2da62cf37f59d8f258d2310d94c24891be2d7eeafaa32a8cb4b0cfe5f475ed778f45907dc8916a73f03635f233f7a77a00a3ec9ca6761a5bbd558a2318ecd0caa1c5016691523e7e1fa267dd35e70c66e84380bdcf7c0582f540174e572c41f81e93da0b757dff0b0fe23eb03aa19af0bdec3afb474216febaacb8d0381e631802683182b0fe72c28392539850650b70509f54980241dc175191a35d967288b532a7a8223ce2440d010615f70df269501944d4ec16fe4a3cb010001d7a85909174757835187cb52e71934e6c07ef43b4c46fc30bbcd0bc72913068267c54a4aabebb493922492820babdeb7dc9b1558fcf7bd82c37c82d3147e455b623ab0efa752fe0b3a67ca6e4d126639e645a0bf417568adbb2a6a4eef62fa1fa29b2a5a43bebea1f82193a7dd98eb483d09bb595af1fa9c97c7f41f5649d976aee3e5e59e2329b43b13bea228d4a93f16ba139ccb511de521ffe747aa2eca664f7c9e33da59075cc335afcd2bf3ae09765f01ab5a7c3e3938ec168b74724b5074247d200d9970382f683d6059b94dbc336603d1dfee714e4b447ac2fa1d99ecb4961da2854e03795ed758220312d101e1e3d87d5313a6d052aebde75110363d",
 		"37843d7c67920b5f177372fa56e2a09117df585f81df8b300fba245b1175f488c99476019857198ed459ed8d9799c377330e49f4180c4bf8e8f66240c64f65ede93d601f957b95b83efdee1e1bfde74169ff77002eaf078c71815a9220c80b2e3b3ff22c2f358111d816ebf83c2999026b6de50bfc711ff68705d2f40b753424aefc9f70f08d908b5a20276ad613b4ab4309a3ea72f0c17ea9df6b3367d44fb3acab11c333909e02e81ea2ed404a712d3ea96bba87461720e2d98723e7acd0520ac1a5212dbedcd8dc0c1abf61d4719e319ff4758a774790b8d463cdfe131d1b2dcfee52d002694e98e720cb6ae7ccea353bc503269ba35f0f63bf8d7b672a76",
@@ -294,9 +234,9 @@ fn modexp_nagydani_3_pow0x10001(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_4_square(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_4_square(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_4_square",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000200db34d0e438249c0ed685c949cc28776a05094e1c48691dc3f2dca5fc3356d2a0663bd376e4712839917eb9a19c670407e2c377a2de385a3ff3b52104f7f1f4e0c7bf7717fb913896693dc5edbb65b760ef1b00e42e9d8f9af17352385e1cd742c9b006c0f669995cb0bb21d28c0aced2892267637b6470d8cee0ab27fc5d42658f6e88240c31d6774aa60a7ebd25cd48b56d0da11209f1928e61005c6eb709f3e8e0aaf8d9b10f7d7e296d772264dc76897ccdddadc91efa91c1903b7232a9e4c3b941917b99a3bc0c26497dedc897c25750af60237aa67934a26a2bc491db3dcc677491944bc1f51d3e5d76b8d846a62db03dedd61ff508f91a56d71028125035c3a44cbb041497c83bf3e4ae2a9613a401cc721c547a2afa3b16a2969933d3626ed6d8a7428648f74122fd3f2a02a20758f7f693892c8fd798b39abac01d18506c45e71432639e9f9505719ee822f62ccbf47f6850f096ff77b5afaf4be7d772025791717dbe5abf9b3f40cff7d7aab6f67e38f62faf510747276e20a42127e7500c444f9ed92baf65ade9e836845e39c4316d9dce5f8e2c8083e2c0acbb95296e05e51aab13b6b8f53f06c9c4276e12b0671133218cc3ea907da3bd9a367096d9202128d14846cc2e20d56fc8473ecb07cecbfb8086919f3971926e7045b853d85a69d026195c70f9f7a823536e2a8f4b3e12e94d9b53a934353451094b8102df3143a0057457d75e8c708b6337a6f5a4fd1a06727acf9fb93e2993c62f3378b37d56c85e7b1e00f0145ebf8e4095bd723166293c60b6ac1252291ef65823c9e040ddad14969b3b340a4ef714db093a587c37766d68b8d6b5016e741587e7e6bf7e763b44f0247e64bae30f994d248bfd20541a333e5b225ef6a61199e301738b1e688f70ec1d7fb892c183c95dc543c3e12adf8a5e8b9ca9d04f9445cced3ab256f29e998e69efaa633a7b60e1db5a867924ccab0a171d9d6e1098dfa15acde9553de599eaa56490c8f411e4985111f3d40bddfc5e301edb01547b01a886550a61158f7e2033c59707789bf7c854181d0c2e2a42a93cf09209747d7082e147eb8544de25c3eb14f2e35559ea0c0f5877f2f3fc92132c0ae9da4e45b2f6c866a224ea6d1f28c05320e287750fbc647368d41116e528014cc1852e5531d53e4af938374daba6cee4baa821ed07117253bb3601ddd00d59a3d7fb2ef1f5a2fbba7c429f0cf9a5b3462410fd833a69118f8be9c559b1000cc608fd877fb43f8e65c2d1302622b944462579056874b387208d90623fcdaf93920ca7a9e4ba64ea208758222ad868501cc2c345e2d3a5ea2a17e5069248138c8a79c0251185d29ee73e5afab5354769142d2bf0cb6712727aa6bf84a6245fcdae66e4938d84d1b9dd09a884818622080ff5f98942fb20acd7e0c916c2d5ea7ce6f7e173315384518f",
 		"8a5aea5f50dcc03dc7a7a272b5aeebc040554dbc1ffe36753c4fc75f7ed5f6c2cc0de3a922bf96c78bf0643a73025ad21f45a4a5cadd717612c511ab2bff1190fe5f1ae05ba9f8fe3624de1de2a817da6072ddcdb933b50216811dbe6a9ca79d3a3c6b3a476b079fd0d05f04fb154e2dd3e5cb83b148a006f2bcbf0042efb2ae7b916ea81b27aac25c3bf9a8b6d35440062ad8eae34a83f3ffa2cc7b40346b62174a4422584f72f95316f6b2bee9ff232ba9739301c97c99a9ded26c45d72676eb856ad6ecc81d36a6de36d7f9dafafee11baa43a4b0d5e4ecffa7b9b7dcefd58c397dd373e6db4acd2b2c02717712e6289bed7c813b670c4a0c6735aa7f3b0f1ce556eae9fcc94b501b2c8781ba50a8c6220e8246371c3c7359fe4ef9da786ca7d98256754ca4e496be0a9174bedbecb384bdf470779186d6a833f068d2838a88d90ef3ad48ff963b67c39cc5a3ee123baf7bf3125f64e77af7f30e105d72c4b9b5b237ed251e4c122c6d8c1405e736299c3afd6db16a28c6a9cfa68241e53de4cd388271fe534a6a9b0dbea6171d170db1b89858468885d08fecbd54c8e471c3e25d48e97ba450b96d0d87e00ac732aaa0d3ce4309c1064bd8a4c0808a97e0143e43a24cfa847635125cd41c13e0574487963e9d725c01375db99c31da67b4cf65eff555f0c0ac416c727ff8d438ad7c42030551d68c2e7adda0abb1ca7c10",
@@ -304,9 +244,9 @@ fn modexp_nagydani_4_square(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_4_qube(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_4_qube(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_4_qube",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000200db34d0e438249c0ed685c949cc28776a05094e1c48691dc3f2dca5fc3356d2a0663bd376e4712839917eb9a19c670407e2c377a2de385a3ff3b52104f7f1f4e0c7bf7717fb913896693dc5edbb65b760ef1b00e42e9d8f9af17352385e1cd742c9b006c0f669995cb0bb21d28c0aced2892267637b6470d8cee0ab27fc5d42658f6e88240c31d6774aa60a7ebd25cd48b56d0da11209f1928e61005c6eb709f3e8e0aaf8d9b10f7d7e296d772264dc76897ccdddadc91efa91c1903b7232a9e4c3b941917b99a3bc0c26497dedc897c25750af60237aa67934a26a2bc491db3dcc677491944bc1f51d3e5d76b8d846a62db03dedd61ff508f91a56d71028125035c3a44cbb041497c83bf3e4ae2a9613a401cc721c547a2afa3b16a2969933d3626ed6d8a7428648f74122fd3f2a02a20758f7f693892c8fd798b39abac01d18506c45e71432639e9f9505719ee822f62ccbf47f6850f096ff77b5afaf4be7d772025791717dbe5abf9b3f40cff7d7aab6f67e38f62faf510747276e20a42127e7500c444f9ed92baf65ade9e836845e39c4316d9dce5f8e2c8083e2c0acbb95296e05e51aab13b6b8f53f06c9c4276e12b0671133218cc3ea907da3bd9a367096d9202128d14846cc2e20d56fc8473ecb07cecbfb8086919f3971926e7045b853d85a69d026195c70f9f7a823536e2a8f4b3e12e94d9b53a934353451094b8103df3143a0057457d75e8c708b6337a6f5a4fd1a06727acf9fb93e2993c62f3378b37d56c85e7b1e00f0145ebf8e4095bd723166293c60b6ac1252291ef65823c9e040ddad14969b3b340a4ef714db093a587c37766d68b8d6b5016e741587e7e6bf7e763b44f0247e64bae30f994d248bfd20541a333e5b225ef6a61199e301738b1e688f70ec1d7fb892c183c95dc543c3e12adf8a5e8b9ca9d04f9445cced3ab256f29e998e69efaa633a7b60e1db5a867924ccab0a171d9d6e1098dfa15acde9553de599eaa56490c8f411e4985111f3d40bddfc5e301edb01547b01a886550a61158f7e2033c59707789bf7c854181d0c2e2a42a93cf09209747d7082e147eb8544de25c3eb14f2e35559ea0c0f5877f2f3fc92132c0ae9da4e45b2f6c866a224ea6d1f28c05320e287750fbc647368d41116e528014cc1852e5531d53e4af938374daba6cee4baa821ed07117253bb3601ddd00d59a3d7fb2ef1f5a2fbba7c429f0cf9a5b3462410fd833a69118f8be9c559b1000cc608fd877fb43f8e65c2d1302622b944462579056874b387208d90623fcdaf93920ca7a9e4ba64ea208758222ad868501cc2c345e2d3a5ea2a17e5069248138c8a79c0251185d29ee73e5afab5354769142d2bf0cb6712727aa6bf84a6245fcdae66e4938d84d1b9dd09a884818622080ff5f98942fb20acd7e0c916c2d5ea7ce6f7e173315384518f",
 		"5a2664252aba2d6e19d9600da582cdd1f09d7a890ac48e6b8da15ae7c6ff1856fc67a841ac2314d283ffa3ca81a0ecf7c27d89ef91a5a893297928f5da0245c99645676b481b7e20a566ee6a4f2481942bee191deec5544600bb2441fd0fb19e2ee7d801ad8911c6b7750affec367a4b29a22942c0f5f4744a4e77a8b654da2a82571037099e9c6d930794efe5cdca73c7b6c0844e386bdca8ea01b3d7807146bb81365e2cdc6475f8c23e0ff84463126189dc9789f72bbce2e3d2d114d728a272f1345122de23df54c922ec7a16e5c2a8f84da8871482bd258c20a7c09bbcd64c7a96a51029bbfe848736a6ba7bf9d931a9b7de0bcaf3635034d4958b20ae9ab3a95a147b0421dd5f7ebff46c971010ebfc4adbbe0ad94d5498c853e7142c450d8c71de4b2f84edbf8acd2e16d00c8115b150b1c30e553dbb82635e781379fe2a56360420ff7e9f70cc64c00aba7e26ed13c7c19622865ae07248daced36416080f35f8cc157a857ed70ea4f347f17d1bee80fa038abd6e39b1ba06b97264388b21364f7c56e192d4b62d9b161405f32ab1e2594e86243e56fcf2cb30d21adef15b9940f91af681da24328c883d892670c6aa47940867a81830a82b82716895db810df1b834640abefb7db2092dd92912cb9a735175bc447be40a503cf22dfe565b4ed7a3293ca0dfd63a507430b323ee248ec82e843b673c97ad730728cebc",
@@ -314,9 +254,9 @@ fn modexp_nagydani_4_qube(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_4_pow0x10001(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_4_pow0x10001(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_4_pow0x10001",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000200db34d0e438249c0ed685c949cc28776a05094e1c48691dc3f2dca5fc3356d2a0663bd376e4712839917eb9a19c670407e2c377a2de385a3ff3b52104f7f1f4e0c7bf7717fb913896693dc5edbb65b760ef1b00e42e9d8f9af17352385e1cd742c9b006c0f669995cb0bb21d28c0aced2892267637b6470d8cee0ab27fc5d42658f6e88240c31d6774aa60a7ebd25cd48b56d0da11209f1928e61005c6eb709f3e8e0aaf8d9b10f7d7e296d772264dc76897ccdddadc91efa91c1903b7232a9e4c3b941917b99a3bc0c26497dedc897c25750af60237aa67934a26a2bc491db3dcc677491944bc1f51d3e5d76b8d846a62db03dedd61ff508f91a56d71028125035c3a44cbb041497c83bf3e4ae2a9613a401cc721c547a2afa3b16a2969933d3626ed6d8a7428648f74122fd3f2a02a20758f7f693892c8fd798b39abac01d18506c45e71432639e9f9505719ee822f62ccbf47f6850f096ff77b5afaf4be7d772025791717dbe5abf9b3f40cff7d7aab6f67e38f62faf510747276e20a42127e7500c444f9ed92baf65ade9e836845e39c4316d9dce5f8e2c8083e2c0acbb95296e05e51aab13b6b8f53f06c9c4276e12b0671133218cc3ea907da3bd9a367096d9202128d14846cc2e20d56fc8473ecb07cecbfb8086919f3971926e7045b853d85a69d026195c70f9f7a823536e2a8f4b3e12e94d9b53a934353451094b81010001df3143a0057457d75e8c708b6337a6f5a4fd1a06727acf9fb93e2993c62f3378b37d56c85e7b1e00f0145ebf8e4095bd723166293c60b6ac1252291ef65823c9e040ddad14969b3b340a4ef714db093a587c37766d68b8d6b5016e741587e7e6bf7e763b44f0247e64bae30f994d248bfd20541a333e5b225ef6a61199e301738b1e688f70ec1d7fb892c183c95dc543c3e12adf8a5e8b9ca9d04f9445cced3ab256f29e998e69efaa633a7b60e1db5a867924ccab0a171d9d6e1098dfa15acde9553de599eaa56490c8f411e4985111f3d40bddfc5e301edb01547b01a886550a61158f7e2033c59707789bf7c854181d0c2e2a42a93cf09209747d7082e147eb8544de25c3eb14f2e35559ea0c0f5877f2f3fc92132c0ae9da4e45b2f6c866a224ea6d1f28c05320e287750fbc647368d41116e528014cc1852e5531d53e4af938374daba6cee4baa821ed07117253bb3601ddd00d59a3d7fb2ef1f5a2fbba7c429f0cf9a5b3462410fd833a69118f8be9c559b1000cc608fd877fb43f8e65c2d1302622b944462579056874b387208d90623fcdaf93920ca7a9e4ba64ea208758222ad868501cc2c345e2d3a5ea2a17e5069248138c8a79c0251185d29ee73e5afab5354769142d2bf0cb6712727aa6bf84a6245fcdae66e4938d84d1b9dd09a884818622080ff5f98942fb20acd7e0c916c2d5ea7ce6f7e173315384518f",
 		"bed8b970c4a34849fc6926b08e40e20b21c15ed68d18f228904878d4370b56322d0da5789da0318768a374758e6375bfe4641fca5285ec7171828922160f48f5ca7efbfee4d5148612c38ad683ae4e3c3a053d2b7c098cf2b34f2cb19146eadd53c86b2d7ccf3d83b2c370bfb840913ee3879b1057a6b4e07e110b6bcd5e958bc71a14798c91d518cc70abee264b0d25a4110962a764b364ac0b0dd1ee8abc8426d775ec0f22b7e47b32576afaf1b5a48f64573ed1c5c29f50ab412188d9685307323d990802b81dacc06c6e05a1e901830ba9fcc67688dc29c5e27bde0a6e845ca925f5454b6fb3747edfaa2a5820838fb759eadf57f7cb5cec57fc213ddd8a4298fa079c3c0f472b07fb15aa6a7f0a3780bd296ff6a62e58ef443870b02260bd4fd2bbc98255674b8e1f1f9f8d33c7170b0ebbea4523b695911abbf26e41885344823bd0587115fdd83b721a4e8457a31c9a84b3d3520a07e0e35df7f48e5a9d534d0ec7feef1ff74de6a11e7f93eab95175b6ce22c68d78a642ad642837897ec11349205d8593ac19300207572c38d29ca5dfa03bc14cdbc32153c80e5cc3e739403d34c75915e49beb43094cc6dcafb3665b305ddec9286934ae66ec6b777ca528728c851318eb0f207b39f1caaf96db6eeead6b55ed08f451939314577d42bcc9f97c0b52d0234f88fd07e4c1d7780fdebc025cfffcb572cb27a8c33963",
@@ -324,9 +264,9 @@ fn modexp_nagydani_4_pow0x10001(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_5_square(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_5_square(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_5_square",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000400c5a1611f8be90071a43db23cc2fe01871cc4c0e8ab5743f6378e4fef77f7f6db0095c0727e20225beb665645403453e325ad5f9aeb9ba99bf3c148f63f9c07cf4fe8847ad5242d6b7d4499f93bd47056ddab8f7dee878fc2314f344dbee2a7c41a5d3db91eff372c730c2fdd3a141a4b61999e36d549b9870cf2f4e632c4d5df5f024f81c028000073a0ed8847cfb0593d36a47142f578f05ccbe28c0c06aeb1b1da027794c48db880278f79ba78ae64eedfea3c07d10e0562668d839749dc95f40467d15cf65b9cfc52c7c4bcef1cda3596dd52631aac942f146c7cebd46065131699ce8385b0db1874336747ee020a5698a3d1a1082665721e769567f579830f9d259cec1a836845109c21cf6b25da572512bf3c42fd4b96e43895589042ab60dd41f497db96aec102087fe784165bb45f942859268fd2ff6c012d9d00c02ba83eace047cc5f7b2c392c2955c58a49f0338d6fc58749c9db2155522ac17914ec216ad87f12e0ee95574613942fa615898c4d9e8a3be68cd6afa4e7a003dedbdf8edfee31162b174f965b20ae752ad89c967b3068b6f722c16b354456ba8e280f987c08e0a52d40a2e8f3a59b94d590aeef01879eb7a90b3ee7d772c839c85519cbeaddc0c193ec4874a463b53fcaea3271d80ebfb39b33489365fc039ae549a17a9ff898eea2f4cb27b8dbee4c17b998438575b2b8d107e4a0d66ba7fca85b41a58a8d51f191a35c856dfbe8aef2b00048a694bbccff832d23c8ca7a7ff0b6c0b3011d00b97c86c0628444d267c951d9e4fb8f83e154b8f74fb51aa16535e498235c5597dac9606ed0be3173a3836baa4e7d756ffe1e2879b415d3846bccd538c05b847785699aefde3e305decb600cd8fb0e7d8de5efc26971a6ad4e6d7a2d91474f1023a0ac4b78dc937da0ce607a45974d2cac1c33a2631ff7fe6144a3b2e5cf98b531a9627dea92c1dc82204d09db0439b6a11dd64b484e1263aa45fd9539b6020b55e3baece3986a8bffc1003406348f5c61265099ed43a766ee4f93f5f9c5abbc32a0fd3ac2b35b87f9ec26037d88275bd7dd0a54474995ee34ed3727f3f97c48db544b1980193a4b76a8a3ddab3591ce527f16d91882e67f0103b5cda53f7da54d489fc4ac08b6ab358a5a04aa9daa16219d50bd672a7cb804ed769d218807544e5993f1c27427104b349906a0b654df0bf69328afd3013fbe430155339c39f236df5557bf92f1ded7ff609a8502f49064ec3d1dbfb6c15d3a4c11a4f8acd12278cbf68acd5709463d12e3338a6eddb8c112f199645e23154a8e60879d2a654e3ed9296aa28f134168619691cd2c6b9e2eba4438381676173fc63c2588a3c5910dc149cf3760f0aa9fa9c3f5faa9162b0bf1aac9dd32b706a60ef53cbdb394b6b40222b5bc80eea82ba8958386672564cae3794f977871ab62337cf02e30049201ec12937e7ce79d0f55d9c810e20acf52212aca1d3888949e0e4830aad88d804161230eb89d4d329cc83570fe257217d2119134048dd2ed167646975fc7d77136919a049ea74cf08ddd2b896890bb24a0ba18094a22baa351bf29ad96c66bbb1a598f2ca391749620e62d61c3561a7d3653ccc8892c7b99baaf76bf836e2991cb06d6bc0514568ff0d1ec8bb4b3d6984f5eaefb17d3ea2893722375d3ddb8e389a8eef7d7d198f8e687d6a513983df906099f9a2d23f4f9dec6f8ef2f11fc0a21fac45353b94e00486f5e17d386af42502d09db33cf0cf28310e049c07e88682aeeb00cb833c5174266e62407a57583f1f88b304b7c6e0c84bbe1c0fd423072d37a5bd0aacf764229e5c7cd02473460ba3645cd8e8ae144065bf02d0dd238593d8e230354f67e0b2f23012c23274f80e3ee31e35e2606a4a3f31d94ab755e6d163cff52cbb36b6d0cc67ffc512aeed1dce4d7a0d70ce82f2baba12e8d514dc92a056f994adfb17b5b9712bd5186f27a2fda1f7039c5df2c8587fdc62f5627580c13234b55be4df3056050e2d1ef3218f0dd66cb05265fe1acfb0989d8213f2c19d1735a7cf3fa65d88dad5af52dc2bba22b7abf46c3bc77b5091baab9e8f0ddc4d5e581037de91a9f8dcbc69309be29cc815cf19a20a7585b8b3073edf51fc9baeb3e509b97fa4ecfd621e0fd57bd61cac1b895c03248ff12bdbc57509250df3517e8a3fe1d776836b34ab352b973d932ef708b14f7418f9eceb1d87667e61e3e758649cb083f01b133d37ab2f5afa96d6c84bcacf4efc3851ad308c1e7d9113624fce29fab460ab9d2a48d92cdb281103a5250ad44cb2ff6e67ac670c02fdafb3e0f1353953d6d7d5646ca1568dea55275a050ec501b7c6250444f7219f1ba7521ba3b93d089727ca5f3bbe0d6c1300b423377004954c5628fdb65770b18ced5c9b23a4a5a6d6ef25fe01b4ce278de0bcc4ed86e28a0a68818ffa40970128cf2c38740e80037984428c1bd5113f40ff47512ee6f4e4d8f9b8e8e1b3040d2928d003bd1c1329dc885302fbce9fa81c23b4dc49c7c82d29b52957847898676c89aa5d32b5b0e1c0d5a2b79a19d67562f407f19425687971a957375879d90c5f57c857136c17106c9ab1b99d80e69c8c954ed386493368884b55c939b8d64d26f643e800c56f90c01079d7c534e3b2b7ae352cefd3016da55f6a85eb803b85e2304915fd2001f77c74e28746293c46e4f5f0fd49cf988aafd0026b8e7a3bab2da5cdce1ea26c2e29ec03f4807fac432662b2d6c060be1c7be0e5489de69d0a6e03a4b9117f9244b34a0f1ecba89884f781c6320412413a00c4980287409a2a78c2cd7e65cecebbe4ec1c28cac4dd95f6998e78fc6f1392384331c9436aa10e10e2bf8ad2c4eafbcf276aa7bae64b74428911b3269c749338b0fc5075ad",
 		"d61fe4e3f32ac260915b5b03b78a86d11bfc41d973fce5b0cc59035cf8289a8a2e3878ea15fa46565b0d806e2f85b53873ea20ed653869b688adf83f3ef444535bf91598ff7e80f334fb782539b92f39f55310cc4b35349ab7b278346eda9bc37c0d8acd3557fae38197f412f8d9e57ce6a76b7205c23564cab06e5615be7c6f05c3d05ec690cba91da5e89d55b152ff8dd2157dc5458190025cf94b1ad98f7cbe64e9482faba95e6b33844afc640892872b44a9932096508f4a782a4805323808f23e54b6ff9b841dbfa87db3505ae4f687972c18ea0f0d0af89d36c1c2a5b14560c153c3fee406f5cf15cfd1c0bb45d767426d465f2f14c158495069d0c5955a00150707862ecaae30624ebacdd8ac33e4e6aab3ff90b6ba445a84689386b9e945d01823a65874444316e83767290fcff630d2477f49d5d8ffdd200e08ee1274270f86ed14c687895f6caf5ce528bd970c20d2408a9ba66216324c6a011ac4999098362dbd98a038129a2d40c8da6ab88318aa3046cb660327cc44236d9e5d2163bd0959062195c51ed93d0088b6f92051fc99050ece2538749165976233697ab4b610385366e5ce0b02ad6b61c168ecfbedcdf74278a38de340fd7a5fead8e588e294795f9b011e2e60377a89e25c90e145397cdeabc60fd32444a6b7642a611a83c464d8b8976666351b4865c37b02e6dc21dbcdf5f930341707b618cc0f03c3122646b3385c9df9f2ec730eec9d49e7dfc9153b6e6289da8c4f0ebea9ccc1b751948e3bb7171c9e4d57423b0eeeb79095c030cb52677b3f7e0b45c30f645391f3f9c957afa549c4e0b2465b03c67993cd200b1af01035962edbc4c9e89b31c82ac121987d6529dafdeef67a132dc04b6dc68e77f22862040b75e2ceb9ff16da0fca534e6db7bd12fa7b7f51b6c08c1e23dfcdb7acbd2da0b51c87ffbced065a612e9b1c8bba9b7e2d8d7a2f04fcc4aaf355b60d764879a76b5e16762d5f2f55d585d0c8e82df6940960cddfb72c91dfa71f6b4e1c6ca25dfc39a878e998a663c04fe29d5e83b9586d047b4d7ff70a9f0d44f127e7d741685ca75f11629128d916a0ffef4be586a30c4b70389cc746e84ebf177c01ee8a4511cfbb9d1ecf7f7b33c7dd8177896e10bbc82f838dcd6db7ac67de62bf46b6a640fb580c5d1d2708f3862e3d2b645d0d18e49ef088053e3a220adc0e033c2afcfe61c90e32151152eb3caaf746c5e377d541cafc6cbb0cc0fa48b5caf1728f2e1957f5addfc234f1a9d89e40d49356c9172d0561a695fce6dab1d412321bbf407f63766ffd7b6b3d79bcfa07991c5a9709849c1008689e3b47c50d613980bec239fb64185249d055b30375ccb4354d71fe4d05648fbf6c80634dfc3575f2f24abb714c1e4c95e8896763bf4316e954c7ad19e5780ab7a040ca6fb9271f90a8b22ae738daf6cb",
@@ -334,9 +274,9 @@ fn modexp_nagydani_5_square(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_5_qube(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_5_qube(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_5_qube",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000400c5a1611f8be90071a43db23cc2fe01871cc4c0e8ab5743f6378e4fef77f7f6db0095c0727e20225beb665645403453e325ad5f9aeb9ba99bf3c148f63f9c07cf4fe8847ad5242d6b7d4499f93bd47056ddab8f7dee878fc2314f344dbee2a7c41a5d3db91eff372c730c2fdd3a141a4b61999e36d549b9870cf2f4e632c4d5df5f024f81c028000073a0ed8847cfb0593d36a47142f578f05ccbe28c0c06aeb1b1da027794c48db880278f79ba78ae64eedfea3c07d10e0562668d839749dc95f40467d15cf65b9cfc52c7c4bcef1cda3596dd52631aac942f146c7cebd46065131699ce8385b0db1874336747ee020a5698a3d1a1082665721e769567f579830f9d259cec1a836845109c21cf6b25da572512bf3c42fd4b96e43895589042ab60dd41f497db96aec102087fe784165bb45f942859268fd2ff6c012d9d00c02ba83eace047cc5f7b2c392c2955c58a49f0338d6fc58749c9db2155522ac17914ec216ad87f12e0ee95574613942fa615898c4d9e8a3be68cd6afa4e7a003dedbdf8edfee31162b174f965b20ae752ad89c967b3068b6f722c16b354456ba8e280f987c08e0a52d40a2e8f3a59b94d590aeef01879eb7a90b3ee7d772c839c85519cbeaddc0c193ec4874a463b53fcaea3271d80ebfb39b33489365fc039ae549a17a9ff898eea2f4cb27b8dbee4c17b998438575b2b8d107e4a0d66ba7fca85b41a58a8d51f191a35c856dfbe8aef2b00048a694bbccff832d23c8ca7a7ff0b6c0b3011d00b97c86c0628444d267c951d9e4fb8f83e154b8f74fb51aa16535e498235c5597dac9606ed0be3173a3836baa4e7d756ffe1e2879b415d3846bccd538c05b847785699aefde3e305decb600cd8fb0e7d8de5efc26971a6ad4e6d7a2d91474f1023a0ac4b78dc937da0ce607a45974d2cac1c33a2631ff7fe6144a3b2e5cf98b531a9627dea92c1dc82204d09db0439b6a11dd64b484e1263aa45fd9539b6020b55e3baece3986a8bffc1003406348f5c61265099ed43a766ee4f93f5f9c5abbc32a0fd3ac2b35b87f9ec26037d88275bd7dd0a54474995ee34ed3727f3f97c48db544b1980193a4b76a8a3ddab3591ce527f16d91882e67f0103b5cda53f7da54d489fc4ac08b6ab358a5a04aa9daa16219d50bd672a7cb804ed769d218807544e5993f1c27427104b349906a0b654df0bf69328afd3013fbe430155339c39f236df5557bf92f1ded7ff609a8502f49064ec3d1dbfb6c15d3a4c11a4f8acd12278cbf68acd5709463d12e3338a6eddb8c112f199645e23154a8e60879d2a654e3ed9296aa28f134168619691cd2c6b9e2eba4438381676173fc63c2588a3c5910dc149cf3760f0aa9fa9c3f5faa9162b0bf1aac9dd32b706a60ef53cbdb394b6b40222b5bc80eea82ba8958386672564cae3794f977871ab62337cf03e30049201ec12937e7ce79d0f55d9c810e20acf52212aca1d3888949e0e4830aad88d804161230eb89d4d329cc83570fe257217d2119134048dd2ed167646975fc7d77136919a049ea74cf08ddd2b896890bb24a0ba18094a22baa351bf29ad96c66bbb1a598f2ca391749620e62d61c3561a7d3653ccc8892c7b99baaf76bf836e2991cb06d6bc0514568ff0d1ec8bb4b3d6984f5eaefb17d3ea2893722375d3ddb8e389a8eef7d7d198f8e687d6a513983df906099f9a2d23f4f9dec6f8ef2f11fc0a21fac45353b94e00486f5e17d386af42502d09db33cf0cf28310e049c07e88682aeeb00cb833c5174266e62407a57583f1f88b304b7c6e0c84bbe1c0fd423072d37a5bd0aacf764229e5c7cd02473460ba3645cd8e8ae144065bf02d0dd238593d8e230354f67e0b2f23012c23274f80e3ee31e35e2606a4a3f31d94ab755e6d163cff52cbb36b6d0cc67ffc512aeed1dce4d7a0d70ce82f2baba12e8d514dc92a056f994adfb17b5b9712bd5186f27a2fda1f7039c5df2c8587fdc62f5627580c13234b55be4df3056050e2d1ef3218f0dd66cb05265fe1acfb0989d8213f2c19d1735a7cf3fa65d88dad5af52dc2bba22b7abf46c3bc77b5091baab9e8f0ddc4d5e581037de91a9f8dcbc69309be29cc815cf19a20a7585b8b3073edf51fc9baeb3e509b97fa4ecfd621e0fd57bd61cac1b895c03248ff12bdbc57509250df3517e8a3fe1d776836b34ab352b973d932ef708b14f7418f9eceb1d87667e61e3e758649cb083f01b133d37ab2f5afa96d6c84bcacf4efc3851ad308c1e7d9113624fce29fab460ab9d2a48d92cdb281103a5250ad44cb2ff6e67ac670c02fdafb3e0f1353953d6d7d5646ca1568dea55275a050ec501b7c6250444f7219f1ba7521ba3b93d089727ca5f3bbe0d6c1300b423377004954c5628fdb65770b18ced5c9b23a4a5a6d6ef25fe01b4ce278de0bcc4ed86e28a0a68818ffa40970128cf2c38740e80037984428c1bd5113f40ff47512ee6f4e4d8f9b8e8e1b3040d2928d003bd1c1329dc885302fbce9fa81c23b4dc49c7c82d29b52957847898676c89aa5d32b5b0e1c0d5a2b79a19d67562f407f19425687971a957375879d90c5f57c857136c17106c9ab1b99d80e69c8c954ed386493368884b55c939b8d64d26f643e800c56f90c01079d7c534e3b2b7ae352cefd3016da55f6a85eb803b85e2304915fd2001f77c74e28746293c46e4f5f0fd49cf988aafd0026b8e7a3bab2da5cdce1ea26c2e29ec03f4807fac432662b2d6c060be1c7be0e5489de69d0a6e03a4b9117f9244b34a0f1ecba89884f781c6320412413a00c4980287409a2a78c2cd7e65cecebbe4ec1c28cac4dd95f6998e78fc6f1392384331c9436aa10e10e2bf8ad2c4eafbcf276aa7bae64b74428911b3269c749338b0fc5075ad",
 		"5f9c70ec884926a89461056ad20ac4c30155e817f807e4d3f5bb743d789c83386762435c3627773fa77da5144451f2a8aad8adba88e0b669f5377c5e9bad70e45c86fe952b613f015a9953b8a5de5eaee4566acf98d41e327d93a35bd5cef4607d025e58951167957df4ff9b1627649d3943805472e5e293d3efb687cfd1e503faafeb2840a3e3b3f85d016051a58e1c9498aab72e63b748d834b31eb05d85dcde65e27834e266b85c75cc4ec0135135e0601cb93eeeb6e0010c8ceb65c4c319623c5e573a2c8c9fbbf7df68a930beb412d3f4dfd146175484f45d7afaa0d2e60684af9b34730f7c8438465ad3e1d0c3237336722f2aa51095bd5759f4b8ab4dda111b684aa3dac62a761722e7ae43495b7709933512c81c4e3c9133a51f7ce9f2b51fcec064f65779666960b4e45df3900f54311f5613e8012dd1b8efd359eda31a778264c72aa8bb419d862734d769076bce2810011989a45374e5c5d8729fec21427f0bf397eacbb4220f603cf463a4b0c94efd858ffd9768cd60d6ce68d755e0fbad007ce5c2223d70c7018345a102e4ab3c60a13a9e7794303156d4c2063e919f2153c13961fb324c80b240742f47773a7a8e25b3e3fb19b00ce839346c6eb3c732fbc6b888df0b1fe0a3d07b053a2e9402c267b2d62f794d8a2840526e3ade15ce2264496ccd7519571dfde47f7a4bb16292241c20b2be59f3f8fb4f6383f232d838c5a22d8c95b6834d9d2ca493f5a505ebe8899503b0e8f9b19e6e2dd81c1628b80016d02097e0134de51054c4e7674824d4d758760fc52377d2cad145e259aa2ffaf54139e1a66b1e0c1c191e32ac59474c6b526f5b3ba07d3e5ec286eddf531fcd5292869be58c9f22ef91026159f7cf9d05ef66b4299f4da48cc1635bf2243051d342d378a22c83390553e873713c0454ce5f3234397111ac3fe3207b86f0ed9fc025c81903e1748103692074f83824fda6341be4f95ff00b0a9a208c267e12fa01825054cc0513629bf3dbb56dc5b90d4316f87654a8be18227978ea0a8a522760cad620d0d14fd38920fb7321314062914275a5f99f677145a6979b156bd82ecd36f23f8e1273cc2759ecc0b2c69d94dad5211d1bed939dd87ed9e07b91d49713a6e16ade0a98aea789f04994e318e4ff2c8a188cd8d43aeb52c6daa3bc29b4af50ea82a247c5cd67b573b34cbadcc0a376d3bbd530d50367b42705d870f2e27a8197ef46070528bfe408360faa2ebb8bf76e9f388572842bcb119f4d84ee34ae31f5cc594f23705a49197b181fb78ed1ec99499c690f843a4d0cf2e226d118e9372271054fbabdcc5c92ae9fefaef0589cd0e722eaf30c1703ec4289c7fd81beaa8a455ccee5298e31e2080c10c366a6fcf56f7d13582ad0bcad037c612b710fc595b70fbefaaca23623b60c6c39b11beb8e5843b6b3dac60f",
@@ -344,9 +284,10 @@ fn modexp_nagydani_5_qube(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_5_pow0x10001(b: &mut Criterion) {
+
+#[bench]
+fn modexp_nagydani_5_pow0x10001(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_5_pow0x10001",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000400c5a1611f8be90071a43db23cc2fe01871cc4c0e8ab5743f6378e4fef77f7f6db0095c0727e20225beb665645403453e325ad5f9aeb9ba99bf3c148f63f9c07cf4fe8847ad5242d6b7d4499f93bd47056ddab8f7dee878fc2314f344dbee2a7c41a5d3db91eff372c730c2fdd3a141a4b61999e36d549b9870cf2f4e632c4d5df5f024f81c028000073a0ed8847cfb0593d36a47142f578f05ccbe28c0c06aeb1b1da027794c48db880278f79ba78ae64eedfea3c07d10e0562668d839749dc95f40467d15cf65b9cfc52c7c4bcef1cda3596dd52631aac942f146c7cebd46065131699ce8385b0db1874336747ee020a5698a3d1a1082665721e769567f579830f9d259cec1a836845109c21cf6b25da572512bf3c42fd4b96e43895589042ab60dd41f497db96aec102087fe784165bb45f942859268fd2ff6c012d9d00c02ba83eace047cc5f7b2c392c2955c58a49f0338d6fc58749c9db2155522ac17914ec216ad87f12e0ee95574613942fa615898c4d9e8a3be68cd6afa4e7a003dedbdf8edfee31162b174f965b20ae752ad89c967b3068b6f722c16b354456ba8e280f987c08e0a52d40a2e8f3a59b94d590aeef01879eb7a90b3ee7d772c839c85519cbeaddc0c193ec4874a463b53fcaea3271d80ebfb39b33489365fc039ae549a17a9ff898eea2f4cb27b8dbee4c17b998438575b2b8d107e4a0d66ba7fca85b41a58a8d51f191a35c856dfbe8aef2b00048a694bbccff832d23c8ca7a7ff0b6c0b3011d00b97c86c0628444d267c951d9e4fb8f83e154b8f74fb51aa16535e498235c5597dac9606ed0be3173a3836baa4e7d756ffe1e2879b415d3846bccd538c05b847785699aefde3e305decb600cd8fb0e7d8de5efc26971a6ad4e6d7a2d91474f1023a0ac4b78dc937da0ce607a45974d2cac1c33a2631ff7fe6144a3b2e5cf98b531a9627dea92c1dc82204d09db0439b6a11dd64b484e1263aa45fd9539b6020b55e3baece3986a8bffc1003406348f5c61265099ed43a766ee4f93f5f9c5abbc32a0fd3ac2b35b87f9ec26037d88275bd7dd0a54474995ee34ed3727f3f97c48db544b1980193a4b76a8a3ddab3591ce527f16d91882e67f0103b5cda53f7da54d489fc4ac08b6ab358a5a04aa9daa16219d50bd672a7cb804ed769d218807544e5993f1c27427104b349906a0b654df0bf69328afd3013fbe430155339c39f236df5557bf92f1ded7ff609a8502f49064ec3d1dbfb6c15d3a4c11a4f8acd12278cbf68acd5709463d12e3338a6eddb8c112f199645e23154a8e60879d2a654e3ed9296aa28f134168619691cd2c6b9e2eba4438381676173fc63c2588a3c5910dc149cf3760f0aa9fa9c3f5faa9162b0bf1aac9dd32b706a60ef53cbdb394b6b40222b5bc80eea82ba8958386672564cae3794f977871ab62337cf010001e30049201ec12937e7ce79d0f55d9c810e20acf52212aca1d3888949e0e4830aad88d804161230eb89d4d329cc83570fe257217d2119134048dd2ed167646975fc7d77136919a049ea74cf08ddd2b896890bb24a0ba18094a22baa351bf29ad96c66bbb1a598f2ca391749620e62d61c3561a7d3653ccc8892c7b99baaf76bf836e2991cb06d6bc0514568ff0d1ec8bb4b3d6984f5eaefb17d3ea2893722375d3ddb8e389a8eef7d7d198f8e687d6a513983df906099f9a2d23f4f9dec6f8ef2f11fc0a21fac45353b94e00486f5e17d386af42502d09db33cf0cf28310e049c07e88682aeeb00cb833c5174266e62407a57583f1f88b304b7c6e0c84bbe1c0fd423072d37a5bd0aacf764229e5c7cd02473460ba3645cd8e8ae144065bf02d0dd238593d8e230354f67e0b2f23012c23274f80e3ee31e35e2606a4a3f31d94ab755e6d163cff52cbb36b6d0cc67ffc512aeed1dce4d7a0d70ce82f2baba12e8d514dc92a056f994adfb17b5b9712bd5186f27a2fda1f7039c5df2c8587fdc62f5627580c13234b55be4df3056050e2d1ef3218f0dd66cb05265fe1acfb0989d8213f2c19d1735a7cf3fa65d88dad5af52dc2bba22b7abf46c3bc77b5091baab9e8f0ddc4d5e581037de91a9f8dcbc69309be29cc815cf19a20a7585b8b3073edf51fc9baeb3e509b97fa4ecfd621e0fd57bd61cac1b895c03248ff12bdbc57509250df3517e8a3fe1d776836b34ab352b973d932ef708b14f7418f9eceb1d87667e61e3e758649cb083f01b133d37ab2f5afa96d6c84bcacf4efc3851ad308c1e7d9113624fce29fab460ab9d2a48d92cdb281103a5250ad44cb2ff6e67ac670c02fdafb3e0f1353953d6d7d5646ca1568dea55275a050ec501b7c6250444f7219f1ba7521ba3b93d089727ca5f3bbe0d6c1300b423377004954c5628fdb65770b18ced5c9b23a4a5a6d6ef25fe01b4ce278de0bcc4ed86e28a0a68818ffa40970128cf2c38740e80037984428c1bd5113f40ff47512ee6f4e4d8f9b8e8e1b3040d2928d003bd1c1329dc885302fbce9fa81c23b4dc49c7c82d29b52957847898676c89aa5d32b5b0e1c0d5a2b79a19d67562f407f19425687971a957375879d90c5f57c857136c17106c9ab1b99d80e69c8c954ed386493368884b55c939b8d64d26f643e800c56f90c01079d7c534e3b2b7ae352cefd3016da55f6a85eb803b85e2304915fd2001f77c74e28746293c46e4f5f0fd49cf988aafd0026b8e7a3bab2da5cdce1ea26c2e29ec03f4807fac432662b2d6c060be1c7be0e5489de69d0a6e03a4b9117f9244b34a0f1ecba89884f781c6320412413a00c4980287409a2a78c2cd7e65cecebbe4ec1c28cac4dd95f6998e78fc6f1392384331c9436aa10e10e2bf8ad2c4eafbcf276aa7bae64b74428911b3269c749338b0fc5075ad",
 		"5a0eb2bdf0ac1cae8e586689fa16cd4b07dfdedaec8a110ea1fdb059dd5253231b6132987598dfc6e11f86780428982d50cf68f67ae452622c3b336b537ef3298ca645e8f89ee39a26758206a5a3f6409afc709582f95274b57b71fae5c6b74619ae6f089a5393c5b79235d9caf699d23d88fb873f78379690ad8405e34c19f5257d596580c7a6a7206a3712825afe630c76b31cdb4a23e7f0632e10f14f4e282c81a66451a26f8df2a352b5b9f607a7198449d1b926e27036810368e691a74b91c61afa73d9d3b99453e7c8b50fd4f09c039a2f2feb5c419206694c31b92df1d9586140cb3417b38d0c503c7b508cc2ed12e813a1c795e9829eb39ee78eeaf360a169b491a1d4e419574e712402de9d48d54c1ae5e03739b7156615e8267e1fb0a897f067afd11fb33f6e24182d7aaaaa18fe5bc1982f20d6b871e5a398f0f6f718181d31ec225cfa9a0a70124ed9a70031bdf0c1c7829f708b6e17d50419ef361cf77d99c85f44607186c8d683106b8bd38a49b5d0fb503b397a83388c5678dcfcc737499d84512690701ed621a6f0172aecf037184ddf0f2453e4053024018e5ab2e30d6d5363b56e8b41509317c99042f517247474ab3abc848e00a07f69c254f46f2a05cf6ed84e5cc906a518fdcfdf2c61ce731f24c5264f1a25fc04934dc28aec112134dd523f70115074ca34e3807aa4cb925147f3a0ce152d323bd8c675ace446d0fd1ae30c4b57f0eb2c23884bc18f0964c0114796c5b6d080c3d89175665fbf63a6381a6a9da39ad070b645c8bb1779506da14439a9f5b5d481954764ea114fac688930bc68534d403cff4210673b6a6ff7ae416b7cd41404c3d3f282fcd193b86d0f54d0006c2a503b40d5c3930da980565b8f9630e9493a79d1c03e74e5f93ac8e4dc1a901ec5e3b3e57049124c7b72ea345aa359e782285d9e6a5c144a378111dd02c40855ff9c2be9b48425cb0b2fd62dc8678fd151121cf26a65e917d65d8e0dacfae108eb5508b601fb8ffa370be1f9a8b749a2d12eeab81f41079de87e2d777994fa4d28188c579ad327f9957fb7bdecec5c680844dd43cb57cf87aeb763c003e65011f73f8c63442df39a92b946a6bd968a1c1e4d5fa7d88476a68bd8e20e5b70a99259c7d3f85fb1b65cd2e93972e6264e74ebf289b8b6979b9b68a85cd5b360c1987f87235c3c845d62489e33acf85d53fa3561fe3a3aee18924588d9c6eba4edb7a4d106b31173e42929f6f0c48c80ce6a72d54eca7c0fe870068b7a7c89c63cdda593f5b32d3cb4ea8a32c39f00ab449155757172d66763ed9527019d6de6c9f2416aa6203f4d11c9ebee1e1d3845099e55504446448027212616167eb36035726daa7698b075286f5379cd3e93cb3e0cf4f9cb8d017facbb5550ed32d5ec5400ae57e47e2bf78d1eaeff9480cc765ceff39db500",
@@ -354,9 +295,9 @@ fn modexp_nagydani_5_pow0x10001(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_chfast1(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_chfast1(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_chfast1",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"18b18acfb4c2c30276db5411368e7185b311dd124691610c5d3b74034e093dc9063c909c4720840cb5134cb9f59fa749755796819658d32efc0d288198f3726607c2b7f58a84bd6145f00c9c2bc0bb1a187f20ff2c92963a88019e7c6a014eed06614e20c147e940f2d70da3f74c9a17df361706a4485c742bd6788478fa17d7",
 		"2243525c5efd4b9c3d3c45ac0ca3fe4dd85e830a4ce6b65fa1eeaee202839703301d1d33be6da8e509df21cc35964723180eed7532537db9ae5e7d48f195c915",
@@ -364,9 +305,9 @@ fn alt_bn128_add_chfast1(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_chfast2(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_chfast2(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_chfast2",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"2243525c5efd4b9c3d3c45ac0ca3fe4dd85e830a4ce6b65fa1eeaee202839703301d1d33be6da8e509df21cc35964723180eed7532537db9ae5e7d48f195c91518b18acfb4c2c30276db5411368e7185b311dd124691610c5d3b74034e093dc9063c909c4720840cb5134cb9f59fa749755796819658d32efc0d288198f37266",
 		"2bd3e6d0f3b142924f5ca7b49ce5b9d54c4703d7ae5648e61d02268b1a0a9fb721611ce0a6af85915e2f1d70300909ce2e49dfad4a4619c8390cae66cefdb204",
@@ -374,9 +315,9 @@ fn alt_bn128_add_chfast2(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio1(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio1(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio1",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -384,9 +325,9 @@ fn alt_bn128_add_cdetrio1(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio2(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio2(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio2",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -394,9 +335,9 @@ fn alt_bn128_add_cdetrio2(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio3(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio3(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio3",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -404,9 +345,9 @@ fn alt_bn128_add_cdetrio3(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio4(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio4(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio4",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"",
 		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -414,9 +355,9 @@ fn alt_bn128_add_cdetrio4(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio5(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio5(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio5",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -424,9 +365,9 @@ fn alt_bn128_add_cdetrio5(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio6(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio6(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio6",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
@@ -434,9 +375,9 @@ fn alt_bn128_add_cdetrio6(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio7(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio7(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio7",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
@@ -444,9 +385,9 @@ fn alt_bn128_add_cdetrio7(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio8(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio8(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio8",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
@@ -454,9 +395,9 @@ fn alt_bn128_add_cdetrio8(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio9(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio9(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio9",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
@@ -464,9 +405,9 @@ fn alt_bn128_add_cdetrio9(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio10(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio10(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio10",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
@@ -474,9 +415,9 @@ fn alt_bn128_add_cdetrio10(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio11(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio11(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio11",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
 		"030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd315ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c4",
@@ -484,9 +425,9 @@ fn alt_bn128_add_cdetrio11(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio12(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio12(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio12",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd315ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c4",
@@ -494,9 +435,9 @@ fn alt_bn128_add_cdetrio12(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio13(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio13(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio13",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa901e0559bacb160664764a357af8a9fe70baa9258e0b959273ffc5718c6d4cc7c039730ea8dff1254c0fee9c0ea777d29a9c710b7e616683f194f18c43b43b869073a5ffcc6fc7a28c30723d6e58ce577356982d65b833a5a5c15bf9024b43d98",
 		"15bf2bb17880144b5d1cd2b1f46eff9d617bffd1ca57c37fb5a49bd84e53cf66049c797f9ce0d17083deb32b5e36f2ea2a212ee036598dd7624c168993d1355f",
@@ -504,9 +445,9 @@ fn alt_bn128_add_cdetrio13(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio14(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio14(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio14",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa901e0559bacb160664764a357af8a9fe70baa9258e0b959273ffc5718c6d4cc7c17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa92e83f8d734803fc370eba25ed1f6b8768bd6d83887b87165fc2434fe11a830cb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -514,9 +455,9 @@ fn alt_bn128_add_cdetrio14(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_mul_chfast1(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_mul_chfast1(b: &mut Bencher) {
 	bench(
-		"alt_bn128_mul_chfast1",
 		"0000000000000000000000000000000000000007", // alt_bn128_mul
 		"2bd3e6d0f3b142924f5ca7b49ce5b9d54c4703d7ae5648e61d02268b1a0a9fb721611ce0a6af85915e2f1d70300909ce2e49dfad4a4619c8390cae66cefdb20400000000000000000000000000000000000000000000000011138ce750fa15c2",
 		"070a8d6a982153cae4be29d434e8faef8a47b274a053f5a4ee2a6c9c13c31e5c031b8ce914eba3a9ffb989f9cdd5b0f01943074bf4f0f315690ec3cec6981afc",
@@ -524,9 +465,9 @@ fn alt_bn128_mul_chfast1(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_mul_chfast2(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_mul_chfast2(b: &mut Bencher) {
 	bench(
-		"alt_bn128_mul_chfast2",
 		"0000000000000000000000000000000000000007", // alt_bn128_mul
 		"070a8d6a982153cae4be29d434e8faef8a47b274a053f5a4ee2a6c9c13c31e5c031b8ce914eba3a9ffb989f9cdd5b0f01943074bf4f0f315690ec3cec6981afc30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",
 		"025a6f4181d2b4ea8b724290ffb40156eb0adb514c688556eb79cdea0752c2bb2eff3f31dea215f1eb86023a133a996eb6300b44da664d64251d05381bb8a02e",
@@ -534,9 +475,9 @@ fn alt_bn128_mul_chfast2(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_mul_chfast3(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_mul_chfast3(b: &mut Bencher) {
 	bench(
-		"alt_bn128_mul_chfast3",
 		"0000000000000000000000000000000000000007", // alt_bn128_mul
 		"025a6f4181d2b4ea8b724290ffb40156eb0adb514c688556eb79cdea0752c2bb2eff3f31dea215f1eb86023a133a996eb6300b44da664d64251d05381bb8a02e183227397098d014dc2822db40c0ac2ecbc0b548b438e5469e10460b6c3e7ea3",
 		"14789d0d4a730b354403b5fac948113739e276c23e0258d8596ee72f9cd9d3230af18a63153e0ec25ff9f2951dd3fa90ed0197bfef6e2a1a62b5095b9d2b4a27",
@@ -544,9 +485,9 @@ fn alt_bn128_mul_chfast3(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_mul_cdetrio1(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_mul_cdetrio1(b: &mut Bencher) {
 	bench(
-		"alt_bn128_mul_cdetrio1",
 		"0000000000000000000000000000000000000007", // alt_bn128_mul
 		"1a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
 		"2cde5879ba6f13c0b5aa4ef627f159a3347df9722efce88a9afbb20b763b4c411aa7e43076f6aee272755a7f9b84832e71559ba0d2e0b17d5f9f01755e5b0d11",
@@ -554,9 +495,9 @@ fn alt_bn128_mul_cdetrio1(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_mul_cdetrio6(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_mul_cdetrio6(b: &mut Bencher) {
 	bench(
-		"alt_bn128_mul_cdetrio6",
 		"0000000000000000000000000000000000000007", // alt_bn128_mul
 		"17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa901e0559bacb160664764a357af8a9fe70baa9258e0b959273ffc5718c6d4cc7cffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
 		"29e587aadd7c06722aabba753017c093f70ba7eb1f1c0104ec0564e7e3e21f6022b1143f6a41008e7755c71c3d00b6b915d386de21783ef590486d8afa8453b1",
@@ -564,9 +505,9 @@ fn alt_bn128_mul_cdetrio6(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_mul_cdetrio11(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_mul_cdetrio11(b: &mut Bencher) {
 	bench(
-		"alt_bn128_mul_cdetrio11",
 		"0000000000000000000000000000000000000007", // alt_bn128_mul
 		"039730ea8dff1254c0fee9c0ea777d29a9c710b7e616683f194f18c43b43b869073a5ffcc6fc7a28c30723d6e58ce577356982d65b833a5a5c15bf9024b43d98ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
 		"00a1a234d08efaa2616607e31eca1980128b00b415c845ff25bba3afcb81dc00242077290ed33906aeb8e42fd98c41bcb9057ba03421af3f2d08cfc441186024",
@@ -574,9 +515,9 @@ fn alt_bn128_mul_cdetrio11(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_jeff1(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_jeff1(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_jeff1",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf411198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -584,9 +525,9 @@ fn alt_bn128_pairing_jeff1(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_jeff2(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_jeff2(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_jeff2",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"2eca0c7238bf16e83e7a1e6c5d49540685ff51380f309842a98561558019fc0203d3260361bb8451de5ff5ecd17f010ff22f5c31cdf184e9020b06fa5997db841213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f06967a1237ebfeca9aaae0d6d0bab8e28c198c5a339ef8a2407e31cdac516db922160fa257a5fd5b280642ff47b65eca77e626cb685c84fa6d3b6882a283ddd1198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -594,9 +535,9 @@ fn alt_bn128_pairing_jeff2(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_jeff3(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_jeff3(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_jeff3",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba2e89718ad33c8bed92e210e81d1853435399a271913a6520736a4729cf0d51eb01a9e2ffa2e92599b68e44de5bcf354fa2642bd4f26b259daa6f7ce3ed57aeb314a9a87b789a58af499b314e13c3d65bede56c07ea2d418d6874857b70763713178fb49a2d6cd347dc58973ff49613a20757d0fcc22079f9abd10c3baee245901b9e027bd5cfc2cb5db82d4dc9677ac795ec500ecd47deee3b5da006d6d049b811d7511c78158de484232fc68daf8a45cf217d1c2fae693ff5871e8752d73b21198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -604,9 +545,9 @@ fn alt_bn128_pairing_jeff3(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_jeff4(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_jeff4(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_jeff4",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"2f2ea0b3da1e8ef11914acf8b2e1b32d99df51f5f4f206fc6b947eae860eddb6068134ddb33dc888ef446b648d72338684d678d2eb2371c61a50734d78da4b7225f83c8b6ab9de74e7da488ef02645c5a16a6652c3c71a15dc37fe3a5dcb7cb122acdedd6308e3bb230d226d16a105295f523a8a02bfc5e8bd2da135ac4c245d065bbad92e7c4e31bf3757f1fe7362a63fbfee50e7dc68da116e67d600d9bf6806d302580dc0661002994e7cd3a7f224e7ddc27802777486bf80f40e4ca3cfdb186bac5188a98c45e6016873d107f5cd131f3a3e339d0375e58bd6219347b008122ae2b09e539e152ec5364e7e2204b03d11d3caa038bfc7cd499f8176aacbee1f39e4e4afc4bc74790a4a028aff2c3d2538731fb755edefd8cb48d6ea589b5e283f150794b6736f670d6a1033f9b46c6f5204f50813eb85c8dc4b59db1c5d39140d97ee4d2b36d99bc49974d18ecca3e7ad51011956051b464d9e27d46cc25e0764bb98575bd466d32db7b15f582b2d5c452b36aa394b789366e5e3ca5aabd415794ab061441e51d01e94640b7e3084a07e02c78cf3103c542bc5b298669f211b88da1679b0b64a63b7e0e7bfe52aae524f73a55be7fe70c7e9bfc94b4cf0da1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -614,9 +555,9 @@ fn alt_bn128_pairing_jeff4(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_jeff5(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_jeff5(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_jeff5",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"20a754d2071d4d53903e3b31a7e98ad6882d58aec240ef981fdf0a9d22c5926a29c853fcea789887315916bbeb89ca37edb355b4f980c9a12a94f30deeed30211213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f1abb4a25eb9379ae96c84fff9f0540abcfc0a0d11aeda02d4f37e4baf74cb0c11073b3ff2cdbb38755f8691ea59e9606696b3ff278acfc098fa8226470d03869217cee0a9ad79a4493b5253e2e4e3a39fc2df38419f230d341f60cb064a0ac290a3d76f140db8418ba512272381446eb73958670f00cf46f1d9e64cba057b53c26f64a8ec70387a13e41430ed3ee4a7db2059cc5fc13c067194bcc0cb49a98552fd72bd9edb657346127da132e5b82ab908f5816c826acb499e22f2412d1a2d70f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2198a1f162a73261f112401aa2db79c7dab1533c9935c77290a6ce3b191f2318d198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -624,9 +565,9 @@ fn alt_bn128_pairing_jeff5(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_jeff6(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_jeff6(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_jeff6",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c103188585e2364128fe25c70558f1560f4f9350baf3959e603cc91486e110936198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000000",
@@ -634,9 +575,9 @@ fn alt_bn128_pairing_jeff6(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_empty_data(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_empty_data(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_empty_data",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -644,9 +585,9 @@ fn alt_bn128_pairing_empty_data(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_one_point(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_one_point(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_one_point",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000000",
@@ -654,9 +595,9 @@ fn alt_bn128_pairing_one_point(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_two_point_match_2(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_two_point_match_2(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_two_point_match_2",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -664,9 +605,9 @@ fn alt_bn128_pairing_two_point_match_2(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_two_point_match_3(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_two_point_match_3(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_two_point_match_3",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -674,9 +615,9 @@ fn alt_bn128_pairing_two_point_match_3(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_two_point_match_4(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_two_point_match_4(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_two_point_match_4",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"105456a333e6d636854f987ea7bb713dfd0ae8371a72aea313ae0c32c0bf10160cf031d41b41557f3e7e3ba0c51bebe5da8e6ecd855ec50fc87efcdeac168bcc0476be093a6d2b4bbf907172049874af11e1b6267606e00804d3ff0037ec57fd3010c68cb50161b7d1d96bb71edfec9880171954e56871abf3d93cc94d745fa114c059d74e5b6c4ec14ae5864ebe23a71781d86c29fb8fb6cce94f70d3de7a2101b33461f39d9e887dbb100f170a2345dde3c07e256d1dfa2b657ba5cd030427000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000021a2c3013d2ea92e13c800cde68ef56a294b883f6ac35d25f587c09b1b3c635f7290158a80cd3d66530f74dc94c94adb88f5cdb481acca997b6e60071f08a115f2f997f3dbd66a7afe07fe7862ce239edba9e05c5afff7f8a1259c9733b2dfbb929d1691530ca701b4a106054688728c9972c8512e9789e9567aae23e302ccd75",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -684,9 +625,9 @@ fn alt_bn128_pairing_two_point_match_4(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_ten_point_match_1(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_ten_point_match_1(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_ten_point_match_1",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -694,9 +635,9 @@ fn alt_bn128_pairing_ten_point_match_1(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_ten_point_match_2(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_ten_point_match_2(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_ten_point_match_2",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -704,9 +645,9 @@ fn alt_bn128_pairing_ten_point_match_2(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_ten_point_match_3(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_ten_point_match_3(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_ten_point_match_3",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"105456a333e6d636854f987ea7bb713dfd0ae8371a72aea313ae0c32c0bf10160cf031d41b41557f3e7e3ba0c51bebe5da8e6ecd855ec50fc87efcdeac168bcc0476be093a6d2b4bbf907172049874af11e1b6267606e00804d3ff0037ec57fd3010c68cb50161b7d1d96bb71edfec9880171954e56871abf3d93cc94d745fa114c059d74e5b6c4ec14ae5864ebe23a71781d86c29fb8fb6cce94f70d3de7a2101b33461f39d9e887dbb100f170a2345dde3c07e256d1dfa2b657ba5cd030427000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000021a2c3013d2ea92e13c800cde68ef56a294b883f6ac35d25f587c09b1b3c635f7290158a80cd3d66530f74dc94c94adb88f5cdb481acca997b6e60071f08a115f2f997f3dbd66a7afe07fe7862ce239edba9e05c5afff7f8a1259c9733b2dfbb929d1691530ca701b4a106054688728c9972c8512e9789e9567aae23e302ccd75",
 		"0000000000000000000000000000000000000000000000000000000000000001",
--- a/ethcore/blockchain/Cargo.toml
+++ b/ethcore/blockchain/Cargo.toml
@@ -1,33 +0,0 @@
-[package]
-description = "Ethcore blockchain database"
-homepage = "http://parity.io"
-license = "GPL-3.0"
-name = "ethcore-blockchain"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-ansi_term = "0.10"
-blooms-db = { path = "../../util/blooms-db" }
-common-types = { path = "../types" }
-ethcore-db = { path = "../db" }
-ethereum-types = "0.4"
-heapsize = "0.4"
-itertools = "0.5"
-kvdb = "0.1"
-log = "0.4"
-parity-bytes = "0.1"
-parking_lot = "0.7"
-rayon = "1.0"
-rlp = { version = "0.3.0", features = ["ethereum"] }
-rlp_compress = { path = "../../util/rlp-compress" }
-rlp_derive = { path = "../../util/rlp-derive" }
-
-[dev-dependencies]
-env_logger = "0.5"
-ethkey = { path = "../../accounts/ethkey" }
-keccak-hash = "0.1"
-rustc-hex = "1.0"
-tempdir = "0.3"
-kvdb-memorydb = "0.1"
--- a/ethcore/call-contract/Cargo.toml
+++ b/ethcore/call-contract/Cargo.toml
@@ -1,11 +0,0 @@
-[package]
-name = "ethcore-call-contract"
-version = "0.1.0"
-license = "GPL-3.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-types = { path = "../types", package = "common-types" }
-ethereum-types = "0.4"
-bytes = { version = "0.1", package = "parity-bytes" }
--- a/ethcore/call-contract/src/call_contract.rs
+++ b/ethcore/call-contract/src/call_contract.rs
@@ -1,33 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Provides CallContract and RegistryInfo traits
-
-use bytes::Bytes;
-use ethereum_types::Address;
-use types::ids::BlockId;
-
-/// Provides `call_contract` method
-pub trait CallContract {
-	/// Like `call`, but with various defaults. Designed to be used for calling contracts.
-	fn call_contract(&self, id: BlockId, address: Address, data: Bytes) -> Result<Bytes, String>;
-}
-
-/// Provides information on a blockchain service and it's registry
-pub trait RegistryInfo {
-	/// Get the address of a particular blockchain service, if available.
-	fn registry_address(&self, name: String, block: BlockId) -> Option<Address>;
-}
--- a/ethcore/call-contract/src/lib.rs
+++ b/ethcore/call-contract/src/lib.rs
@@ -1,27 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-#![warn(missing_docs)]
-
-//! Call Contract module
-//! 
-//! This crate exposes traits required to call contracts at particular block.
-//! All utilities that depend on on-chain data should use those traits to access it.
-
-pub mod call_contract;
-
-// Re-export
-pub use self::call_contract::*;
--- a/ethcore/db/Cargo.toml
+++ b/ethcore/db/Cargo.toml
@@ -1,17 +0,0 @@
-[package]
-description = "Ethcore DB access utilities"
-homepage = "http://parity.io"
-license = "GPL-3.0"
-name = "ethcore-db"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-common-types = { path = "../types" }
-ethereum-types = "0.4"
-heapsize = "0.4"
-kvdb = "0.1"
-parking_lot = "0.7"
-rlp = { version = "0.3.0", features = ["ethereum"] }
-rlp_derive = { path = "../../util/rlp-derive" }
--- a/ethcore/db/src/lib.rs
+++ b/ethcore/db/src/lib.rs
@@ -1,26 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Parity Ethereum database access utilities.
-
-#![warn(missing_docs)]
-
-mod db;
-
-pub mod keys;
-pub mod cache_manager;
-
-pub use self::db::*;
--- a/ethcore/evm/Cargo.toml
+++ b/ethcore/evm/Cargo.toml
@@ -12,17 +12,12 @@ lazy_static = "1.0"
 log = "0.4"
 vm = { path = "../vm" }
 keccak-hash = "0.1"
-parking_lot = "0.7"
-memory-cache = { path = "../../util/memory-cache" }
+parking_lot = "0.6"
+memory-cache = { path = "../../util/memory_cache" }

 [dev-dependencies]
 rustc-hex = "1.0"
-criterion = "0.2"

 [features]
 evm-debug = []
 evm-debug-tests = ["evm-debug"]
-
-[[bench]]
-name = "basic"
-harness = false
--- a/ethcore/evm/benches/basic.rs
+++ b/ethcore/evm/benches/basic.rs
@@ -1,159 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! benchmarking for EVM
-
-#[macro_use]
-extern crate criterion;
-extern crate bit_set;
-extern crate ethereum_types;
-extern crate parking_lot;
-extern crate heapsize;
-extern crate vm;
-extern crate evm;
-extern crate keccak_hash as hash;
-extern crate memory_cache;
-extern crate parity_bytes as bytes;
-extern crate rustc_hex;
-
-use criterion::{Criterion, Bencher, black_box};
-use std::str::FromStr;
-use std::sync::Arc;
-use ethereum_types::{U256, Address};
-use vm::{ActionParams, Result, GasLeft, Ext};
-use vm::tests::FakeExt;
-use evm::Factory;
-use rustc_hex::FromHex;
-
-criterion_group!(
-	basic,
-	simple_loop_log0_usize,
-	simple_loop_log0_u256,
-	mem_gas_calculation_same_usize,
-	mem_gas_calculation_same_u256,
-	mem_gas_calculation_increasing_usize,
-	mem_gas_calculation_increasing_u256
-);
-criterion_main!(basic);
-
-fn simple_loop_log0_usize(b: &mut Criterion) {
-	b.bench_function("simple_loop_log0_usize", |b| {
-		simple_loop_log0(U256::from(::std::usize::MAX), b);
-	});
-}
-
-fn simple_loop_log0_u256(b: &mut Criterion) {
-	b.bench_function("simple_loop_log0_u256", |b| {
-		simple_loop_log0(!U256::zero(), b);
-	});
-}
-
-fn simple_loop_log0(gas: U256, b: &mut Bencher) {
-	let factory = Factory::default();
-	let mut ext = FakeExt::new();
-
-	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
-	let code = black_box(
-		"62ffffff5b600190036000600fa0600357".from_hex().unwrap()
-	);
-
-	b.iter(|| {
-		let mut params = ActionParams::default();
-		params.address = address.clone();
-		params.gas = gas;
-		params.code = Some(Arc::new(code.clone()));
-
-		let vm = factory.create(params, ext.schedule(), 0);
-
-		result(vm.exec(&mut ext).ok().unwrap())
-	});
-}
-
-fn mem_gas_calculation_same_usize(b: &mut Criterion) {
-	b.bench_function("mem_gas_calculation_same_usize", |b| {
-		mem_gas_calculation_same(U256::from(::std::usize::MAX), b);
-	});
-}
-
-fn mem_gas_calculation_same_u256(b: &mut Criterion) {
-	b.bench_function("mem_gas_calculation_same_u256", |b| {
-		mem_gas_calculation_same(!U256::zero(), b);
-	});
-}
-
-fn mem_gas_calculation_same(gas: U256, b: &mut Bencher) {
-	let factory = Factory::default();
-	let mut ext = FakeExt::new();
-
-	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
-
-	b.iter(|| {
-		let code = black_box(
-			"6110006001556001546000555b610fff805560016000540380600055600c57".from_hex().unwrap()
-		);
-
-		let mut params = ActionParams::default();
-		params.address = address.clone();
-		params.gas = gas;
-		params.code = Some(Arc::new(code.clone()));
-
-		let vm = factory.create(params, ext.schedule(), 0);
-
-		result(vm.exec(&mut ext).ok().unwrap())
-	});
-}
-
-fn mem_gas_calculation_increasing_usize(b: &mut Criterion) {
-	b.bench_function("mem_gas_calculation_increasing_usize", |b| {
-		mem_gas_calculation_increasing(U256::from(::std::usize::MAX), b);
-	});
-}
-
-fn mem_gas_calculation_increasing_u256(b: &mut Criterion) {
-	b.bench_function("mem_gas_calculation_increasing_u256", |b| {
-		mem_gas_calculation_increasing(!U256::zero(), b);
-	});
-}
-
-fn mem_gas_calculation_increasing(gas: U256, b: &mut Bencher) {
-	let factory = Factory::default();
-	let mut ext = FakeExt::new();
-
-	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
-
-	b.iter(|| {
-		let code = black_box(
-			"6110006001556001546000555b610fff60005401805560016000540380600055600c57".from_hex().unwrap()
-		);
-
-		let mut params = ActionParams::default();
-		params.address = address.clone();
-		params.gas = gas;
-		params.code = Some(Arc::new(code.clone()));
-
-		let vm = factory.create(params, ext.schedule(), 0);
-
-		result(vm.exec(&mut ext).ok().unwrap())
-	});
-}
-
-fn result(r: Result<evm::GasLeft>) -> U256 {
-	match r {
-		Ok(GasLeft::Known(gas_left)) => gas_left,
-		Ok(GasLeft::NeedsReturn { gas_left,  .. }) => gas_left,
-		_ => U256::zero(),
-	}
-}
--- a/ethcore/evm/src/benches/mod.rs
+++ b/ethcore/evm/src/benches/mod.rs
@@ -0,0 +1,129 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! benchmarking for EVM
+//! should be started with:
+//! ```bash
+//! multirust run nightly cargo bench
+//! ```
+
+extern crate test;
+
+use self::test::{Bencher, black_box};
+
+use bigint::prelude::U256;
+use bigint::hash::H256;
+use util::*;
+use vm::ActionParams;
+use evm::{self, Factory, VMType};
+use evm::tests::FakeExt;
+
+#[bench]
+fn simple_loop_log0_usize(b: &mut Bencher) {
+	simple_loop_log0(U256::from(::std::usize::MAX), b)
+}
+
+#[bench]
+fn simple_loop_log0_u256(b: &mut Bencher) {
+	simple_loop_log0(!U256::zero(), b)
+}
+
+fn simple_loop_log0(gas: U256, b: &mut Bencher) {
+	let mut vm = Factory::new(VMType::Interpreter).create(gas);
+	let mut ext = FakeExt::new();
+
+	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
+	let code = black_box(
+		"62ffffff5b600190036000600fa0600357".from_hex().unwrap()
+	);
+
+	b.iter(|| {
+		let mut params = ActionParams::default();
+		params.address = address.clone();
+		params.gas = gas;
+		params.code = Some(code.clone());
+
+		result(vm.exec(params, &mut ext))
+	});
+}
+
+#[bench]
+fn mem_gas_calculation_same_usize(b: &mut Bencher) {
+	mem_gas_calculation_same(U256::from(::std::usize::MAX), b)
+}
+
+#[bench]
+fn mem_gas_calculation_same_u256(b: &mut Bencher) {
+	mem_gas_calculation_same(!U256::zero(), b)
+}
+
+fn mem_gas_calculation_same(gas: U256, b: &mut Bencher) {
+	let mut vm = Factory::new(VMType::Interpreter).create(gas);
+	let mut ext = FakeExt::new();
+
+	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
+
+	b.iter(|| {
+		let code = black_box(
+			"6110006001556001546000555b610fff805560016000540380600055600c57".from_hex().unwrap()
+		);
+
+		let mut params = ActionParams::default();
+		params.address = address.clone();
+		params.gas = gas;
+		params.code = Some(code.clone());
+
+		result(vm.exec(params, &mut ext))
+	});
+}
+
+#[bench]
+fn mem_gas_calculation_increasing_usize(b: &mut Bencher) {
+	mem_gas_calculation_increasing(U256::from(::std::usize::MAX), b)
+}
+
+#[bench]
+fn mem_gas_calculation_increasing_u256(b: &mut Bencher) {
+	mem_gas_calculation_increasing(!U256::zero(), b)
+}
+
+fn mem_gas_calculation_increasing(gas: U256, b: &mut Bencher) {
+	let mut vm = Factory::new(VMType::Interpreter).create(gas);
+	let mut ext = FakeExt::new();
+
+	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
+
+	b.iter(|| {
+		let code = black_box(
+			"6110006001556001546000555b610fff60005401805560016000540380600055600c57".from_hex().unwrap()
+		);
+
+		let mut params = ActionParams::default();
+		params.address = address.clone();
+		params.gas = gas;
+		params.code = Some(code.clone());
+
+		result(vm.exec(params, &mut ext))
+	});
+}
+
+fn result(r: evm::Result<evm::GasLeft>) -> U256 {
+	match r {
+		Ok(evm::GasLeft::Known(v)) => v,
+		Ok(evm::GasLeft::NeedsReturn(v, _)) => v,
+		_ => U256::zero(),
+	}
+}
--- a/ethcore/evm/src/evm.rs
+++ b/ethcore/evm/src/evm.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Evm interface.

--- a/ethcore/evm/src/factory.rs
+++ b/ethcore/evm/src/factory.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Evm factory.
 //!
--- a/ethcore/evm/src/instructions.rs
+++ b/ethcore/evm/src/instructions.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! VM Instructions list and utility functions

@@ -354,6 +354,7 @@ impl Instruction {
 		}
 	}

+
 	/// Returns stack position of item to duplicate
 	/// DUP1 -> 0
 	pub fn dup_position(&self) -> Option<usize> {
@@ -364,6 +365,7 @@ impl Instruction {
 		}
 	}

+
 	/// Returns stack position of item to SWAP top with
 	/// SWAP1 -> 1
 	pub fn swap_position(&self) -> Option<usize> {
--- a/ethcore/evm/src/interpreter/gasometer.rs
+++ b/ethcore/evm/src/interpreter/gasometer.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::cmp;
 use ethereum_types::{U256, H256};
--- a/ethcore/evm/src/interpreter/informant.rs
+++ b/ethcore/evm/src/interpreter/informant.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 pub use self::inner::*;

--- a/ethcore/evm/src/interpreter/memory.rs
+++ b/ethcore/evm/src/interpreter/memory.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use ethereum_types::U256;
 use vm::ReturnData;
@@ -38,6 +38,7 @@ pub trait Memory {
 	fn read_slice(&self, offset: U256, size: U256) -> &[u8];
 	/// Retrieve writeable part of memory
 	fn writeable_slice(&mut self, offset: U256, size: U256) -> &mut[u8];
+	fn dump(&self);
 	/// Convert memory into return data.
 	fn into_return_data(self, offset: U256, size: U256) -> ReturnData;
 }
@@ -50,6 +51,14 @@ pub fn is_valid_range(off: usize, size: usize)  -> bool {
 }

 impl Memory for Vec<u8> {
+	fn dump(&self) {
+		println!("MemoryDump:");
+		for i in self.iter() {
+			println!("{:02x} ", i);
+		}
+		println!("");
+	}
+
 	fn size(&self) -> usize {
 		self.len()
 	}
--- a/ethcore/evm/src/interpreter/mod.rs
+++ b/ethcore/evm/src/interpreter/mod.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Rust VM implementation

@@ -571,10 +571,10 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let out_size = self.stack.pop_back();

 				// Add stipend (only CALL|CALLCODE when value > 0)
-				let call_gas = call_gas.overflow_add(value.map_or_else(|| Cost::from(0), |val| match val.is_zero() {
+				let call_gas = call_gas + value.map_or_else(|| Cost::from(0), |val| match val.is_zero() {
 					false => Cost::from(ext.schedule().call_stipend),
 					true => Cost::from(0),
-				})).0;
+				});

 				// Get sender & receive addresses, check if we have balance
 				let (sender_address, receive_address, has_balance, call_type) = match instruction {
--- a/ethcore/evm/src/interpreter/shared_cache.rs
+++ b/ethcore/evm/src/interpreter/shared_cache.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::sync::Arc;
 use hash::KECCAK_EMPTY;
--- a/ethcore/evm/src/interpreter/stack.rs
+++ b/ethcore/evm/src/interpreter/stack.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::fmt;
 use instructions;
@@ -66,7 +66,11 @@ impl<S : fmt::Display> Stack<S> for VecStack<S> {
 	}

 	fn pop_back(&mut self) -> S {
-		self.stack.pop().expect("instruction validation prevents from popping too many items; qed")
+		let val = self.stack.pop();
+		match val {
+			Some(x) => x,
+			None => panic!("Tried to pop from empty stack.")
+		}
 	}

 	fn pop_n(&mut self, no_of_elems: usize) -> &[S] {
--- a/ethcore/evm/src/lib.rs
+++ b/ethcore/evm/src/lib.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Ethereum virtual machine.

@@ -44,6 +44,8 @@ mod instructions;

 #[cfg(test)]
 mod tests;
+#[cfg(all(feature = "benches", test))]
+mod benches;

 pub use vm::{
    Schedule, CleanDustMode, EnvInfo, CallType, ActionParams, Ext,
--- a/ethcore/evm/src/tests.rs
+++ b/ethcore/evm/src/tests.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::fmt::Debug;
 use std::str::FromStr;
--- a/ethcore/evm/src/vmtype.rs
+++ b/ethcore/evm/src/vmtype.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::fmt;

--- a/ethcore/light/Cargo.toml
+++ b/ethcore/light/Cargo.toml
@@ -8,24 +8,21 @@ authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
 log = "0.4"
-parity-bytes = "0.1"
-common-types = { path = "../types" }
 ethcore = { path = ".."}
-ethcore-db = { path = "../db" }
-ethcore-blockchain = { path = "../blockchain" }
+parity-bytes = "0.1"
+ethcore-transaction = { path = "../transaction" }
 ethereum-types = "0.4"
-memory-db = "0.11.0"
-trie-db = "0.11.0"
+memorydb = "0.3.0"
+patricia-trie = "0.3.0"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 ethcore-network = { path = "../../util/network" }
 ethcore-io = { path = "../../util/io" }
-hash-db = "0.11.0"
+hashdb = "0.3.0"
 heapsize = "0.4"
 vm = { path = "../vm" }
 fastmap = { path = "../../util/fastmap" }
-failsafe = { version = "0.3.0", default-features = false, features = ["parking_lot_mutex"] }
 rlp = { version = "0.3.0", features = ["ethereum"] }
-rlp_derive = { path = "../../util/rlp-derive" }
+rlp_derive = { path = "../../util/rlp_derive" }
 smallvec = "0.6"
 futures = "0.1"
 rand = "0.4"
@@ -33,15 +30,14 @@ itertools = "0.5"
 bincode = "0.8.0"
 serde = "1.0"
 serde_derive = "1.0"
-parking_lot = "0.7"
+parking_lot = "0.6"
 stats = { path = "../../util/stats" }
 keccak-hash = "0.1"
 keccak-hasher = { path = "../../util/keccak-hasher" }
 triehash-ethereum = { version = "0.2",  path = "../../util/triehash-ethereum" }
 kvdb = "0.1"
-memory-cache = { path = "../../util/memory-cache" }
+memory-cache = { path = "../../util/memory_cache" }
 error-chain = { version = "0.12", default-features = false }
-journaldb = { path = "../../util/journaldb" }

 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }
--- a/ethcore/light/src/cache.rs
+++ b/ethcore/light/src/cache.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Cache for data fetched from the network.
 //!
@@ -20,15 +20,15 @@
 //! Furthermore, stores a "gas price corpus" of relative recency, which is a sorted
 //! vector of all gas prices from a recent range of blocks.

-use std::time::{Instant, Duration};
+use ethcore::encoded;
+use ethcore::header::BlockNumber;
+use ethcore::receipt::Receipt;

-use common_types::encoded;
-use common_types::BlockNumber;
-use common_types::receipt::Receipt;
-use ethereum_types::{H256, U256};
-use heapsize::HeapSizeOf;
-use memory_cache::MemoryLruCache;
 use stats::Corpus;
+use std::time::{Instant, Duration};
+use heapsize::HeapSizeOf;
+use ethereum_types::{H256, U256};
+use memory_cache::MemoryLruCache;

 /// Configuration for how much data to cache.
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
--- a/ethcore/light/src/cht.rs
+++ b/ethcore/light/src/cht.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Canonical hash trie definitions and helper functions.
 //!
@@ -23,13 +23,12 @@
 //! root has. A correct proof implies that the claimed block is identical to the one
 //! we discarded.

-use common_types::ids::BlockId;
+use ethcore::ids::BlockId;
 use ethereum_types::{H256, U256};
-use hash_db::HashDB;
+use hashdb::HashDB;
 use keccak_hasher::KeccakHasher;
 use kvdb::DBValue;
-use memory_db::MemoryDB;
-use journaldb::new_memory_db;
+use memorydb::MemoryDB;
 use bytes::Bytes;
 use trie::{TrieMut, Trie, Recorder};
 use ethtrie::{self, TrieDB, TrieDBMut};
@@ -74,8 +73,7 @@ impl<DB: HashDB<KeccakHasher, DBValue>> CHT<DB> {
 		if block_to_cht_number(num) != Some(self.number) { return Ok(None) }

 		let mut recorder = Recorder::with_depth(from_level);
-		let db: &HashDB<_,_> = &self.db;
-		let t = TrieDB::new(&db, &self.root)?;
+		let t = TrieDB::new(&self.db, &self.root)?;
 		t.get_with(&key!(num), &mut recorder)?;

 		Ok(Some(recorder.drain().into_iter().map(|x| x.data).collect()))
@@ -98,7 +96,7 @@ pub struct BlockInfo {
 pub fn build<F>(cht_num: u64, mut fetcher: F) -> Option<CHT<MemoryDB<KeccakHasher, DBValue>>>
 	where F: FnMut(BlockId) -> Option<BlockInfo>
 {
-	let mut db = new_memory_db();
+	let mut db = MemoryDB::<KeccakHasher, DBValue>::new();

 	// start from the last block by number and work backwards.
 	let last_num = start_number(cht_num + 1) - 1;
@@ -152,7 +150,7 @@ pub fn compute_root<I>(cht_num: u64, iterable: I) -> Option<H256>
 /// verify the given trie branch and extract the canonical hash and total difficulty.
 // TODO: better support for partially-checked queries.
 pub fn check_proof(proof: &[Bytes], num: u64, root: H256) -> Option<(H256, U256)> {
-	let mut db = new_memory_db();
+	let mut db = MemoryDB::<KeccakHasher, DBValue>::new();

 	for node in proof { db.insert(&node[..]); }
 	let res = match TrieDB::new(&db, &root) {
--- a/ethcore/light/src/client/fetch.rs
+++ b/ethcore/light/src/client/fetch.rs
@@ -1,30 +1,30 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Trait for fetching chain data.

 use std::sync::Arc;

-use common_types::encoded;
-use common_types::header::Header;
-use common_types::receipt::Receipt;
+use ethcore::encoded;
 use ethcore::engines::{EthEngine, StateDependentProof};
 use ethcore::machine::EthereumMachine;
-use ethereum_types::H256;
+use ethcore::header::Header;
+use ethcore::receipt::Receipt;
 use futures::future::IntoFuture;
+use ethereum_types::H256;

 /// Provides full chain data.
 pub trait ChainDataFetcher: Send + Sync + 'static {
--- a/ethcore/light/src/client/header_chain.rs
+++ b/ethcore/light/src/client/header_chain.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Light client header chain.
 //!
@@ -30,12 +30,12 @@ use std::sync::Arc;

 use cache::Cache;
 use cht;
-use common_types::block_status::BlockStatus;
-use common_types::encoded;
-use common_types::header::Header;
-use common_types::ids::BlockId;
+use ethcore::block_status::BlockStatus;
+use ethcore::encoded;
 use ethcore::engines::epoch::{Transition as EpochTransition, PendingTransition as PendingEpochTransition};
 use ethcore::error::{Error, EthcoreResult, ErrorKind as EthcoreErrorKind, BlockError};
+use ethcore::header::Header;
+use ethcore::ids::BlockId;
 use ethcore::spec::{Spec, SpecHardcodedSync};
 use ethereum_types::{H256, H264, U256};
 use heapsize::HeapSizeOf;
@@ -862,11 +862,11 @@ mod tests {
 	use super::{HeaderChain, HardcodedSync};
 	use std::sync::Arc;

-	use cache::Cache;
-	use common_types::header::Header;
-	use common_types::ids::BlockId;
-	use ethcore::spec::Spec;
 	use ethereum_types::U256;
+	use ethcore::ids::BlockId;
+	use ethcore::header::Header;
+	use ethcore::spec::Spec;
+	use cache::Cache;
 	use kvdb::KeyValueDB;
 	use kvdb_memorydb;

--- a/ethcore/light/src/client/mod.rs
+++ b/ethcore/light/src/client/mod.rs
@@ -1,39 +1,38 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Light client implementation. Stores data from light sync

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

+use ethcore::block_status::BlockStatus;
 use ethcore::client::{ClientReport, EnvInfo, ClientIoMessage};
 use ethcore::engines::{epoch, EthEngine, EpochChange, EpochTransition, Proof};
 use ethcore::machine::EthereumMachine;
 use ethcore::error::{Error, EthcoreResult};
+use ethcore::ids::BlockId;
+use ethcore::header::{BlockNumber, Header};
 use ethcore::verification::queue::{self, HeaderQueue};
+use ethcore::blockchain_info::BlockChainInfo;
 use ethcore::spec::{Spec, SpecHardcodedSync};
+use ethcore::encoded;
 use io::IoChannel;
 use parking_lot::{Mutex, RwLock};
 use ethereum_types::{H256, U256};
 use futures::{IntoFuture, Future};
-use common_types::BlockNumber;
-use common_types::block_status::BlockStatus;
-use common_types::blockchain_info::BlockChainInfo;
-use common_types::encoded;
-use common_types::header::Header;
-use common_types::ids::BlockId;

 use kvdb::KeyValueDB;

@@ -116,9 +115,6 @@ pub trait LightChainClient: Send + Sync {
 	/// Query whether a block is known.
 	fn is_known(&self, hash: &H256) -> bool;

-	/// Set the chain via a spec name.
-	fn set_spec_name(&self, new_spec_name: String) -> Result<(), ()>;
-
 	/// Clear the queue.
 	fn clear_queue(&self);

@@ -167,8 +163,6 @@ pub struct Client<T> {
 	listeners: RwLock<Vec<Weak<LightChainNotify>>>,
 	fetcher: T,
 	verify_full: bool,
-	/// A closure to call when we want to restart the client
-	exit_handler: Mutex<Option<Box<Fn(String) + 'static + Send>>>,
 }

 impl<T: ChainDataFetcher> Client<T> {
@@ -195,7 +189,6 @@ impl<T: ChainDataFetcher> Client<T> {
 			listeners: RwLock::new(vec![]),
 			fetcher,
 			verify_full: config.verify_full,
-			exit_handler: Mutex::new(None),
 		})
 	}

@@ -366,14 +359,6 @@ impl<T: ChainDataFetcher> Client<T> {
 		self.chain.heap_size_of_children()
 	}

-	/// Set a closure to call when the client wants to be restarted.
-	///
-	/// The parameter passed to the callback is the name of the new chain spec to use after
-	/// the restart.
-	pub fn set_exit_handler<F>(&self, f: F) where F: Fn(String) + 'static + Send {
-		*self.exit_handler.lock() = Some(Box::new(f));
-	}
-
 	/// Get a handle to the verification engine.
 	pub fn engine(&self) -> &Arc<EthEngine> {
 		&self.engine
@@ -577,17 +562,6 @@ impl<T: ChainDataFetcher> LightChainClient for Client<T> {
 		Client::engine(self)
 	}

-	fn set_spec_name(&self, new_spec_name: String) -> Result<(), ()> {
-		trace!(target: "mode", "Client::set_spec_name({:?})", new_spec_name);
-		if let Some(ref h) = *self.exit_handler.lock() {
-			(*h)(new_spec_name);
-			Ok(())
-		} else {
-			warn!("Not hypervised; cannot change chain.");
-			Err(())
-		}
-	}
-
 	fn is_known(&self, hash: &H256) -> bool {
 		self.status(hash) == BlockStatus::InChain
 	}
--- a/ethcore/light/src/client/service.rs
+++ b/ethcore/light/src/client/service.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Minimal IO service for light client.
 //! Just handles block import messages and passes them to the client.
@@ -20,9 +20,8 @@
 use std::fmt;
 use std::sync::Arc;

-use ethcore_db as db;
-use ethcore_blockchain::BlockChainDB;
 use ethcore::client::ClientIoMessage;
+use ethcore::{db, BlockChainDB};
 use ethcore::error::Error as CoreError;
 use ethcore::spec::Spec;
 use io::{IoContext, IoError, IoHandler, IoService};
--- a/ethcore/light/src/lib.rs
+++ b/ethcore/light/src/lib.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Light client logic and implementation.
 //!
@@ -54,22 +54,19 @@ extern crate serde_derive;
 extern crate log;

 extern crate bincode;
-extern crate common_types;
-extern crate ethcore_blockchain;
-extern crate ethcore_db;
 extern crate ethcore_io as io;
 extern crate ethcore_network as network;
 extern crate parity_bytes as bytes;
+extern crate ethcore_transaction as transaction;
 extern crate ethereum_types;
 extern crate ethcore;
-extern crate hash_db;
+extern crate hashdb;
 extern crate heapsize;
-extern crate failsafe;
 extern crate futures;
 extern crate itertools;
 extern crate keccak_hasher;
-extern crate memory_db;
-extern crate trie_db as trie;
+extern crate memorydb;
+extern crate patricia_trie as trie;
 extern crate patricia_trie_ethereum as ethtrie;
 extern crate fastmap;
 extern crate rand;
@@ -92,4 +89,3 @@ extern crate error_chain;
 extern crate kvdb_memorydb;
 #[cfg(test)]
 extern crate tempdir;
-extern crate journaldb;
--- a/ethcore/light/src/net/context.rs
+++ b/ethcore/light/src/net/context.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! I/O and event context generalizations.

--- a/ethcore/light/src/net/error.rs
+++ b/ethcore/light/src/net/error.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Defines error types and levels of punishment to use upon
 //! encountering.
--- a/ethcore/light/src/net/load_timer.rs
+++ b/ethcore/light/src/net/load_timer.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Request load timer and distribution manager.
 //!
--- a/ethcore/light/src/net/mod.rs
+++ b/ethcore/light/src/net/mod.rs
@@ -1,24 +1,25 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! PLP Protocol Version 1 implementation.
 //!
 //! This uses a "Provider" to answer requests.

-use common_types::transaction::UnverifiedTransaction;
+use transaction::UnverifiedTransaction;
+
 use ethereum_types::{H256, U256};
 use io::TimerToken;
 use kvdb::DBValue;
@@ -533,9 +534,6 @@ impl LightProtocol {
 			// the timer approach will skip 1 (possibly 2) in rare occasions.
 			if peer_info.sent_head == announcement.head_hash ||
 				peer_info.status.head_num >= announcement.head_num ||
-				// fix for underflow reported in
-				// https://github.com/paritytech/parity-ethereum/issues/10419
-				now < peer_info.last_update ||
 				now - peer_info.last_update < UPDATE_INTERVAL {
 				continue
 			}
--- a/ethcore/light/src/net/request_credits.rs
+++ b/ethcore/light/src/net/request_credits.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Request credit management.
 //!
--- a/ethcore/light/src/net/request_set.rs
+++ b/ethcore/light/src/net/request_set.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Pending request set.
 //!
--- a/ethcore/light/src/net/status.rs
+++ b/ethcore/light/src/net/status.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Peer status and capabilities.

--- a/ethcore/light/src/net/tests/mod.rs
+++ b/ethcore/light/src/net/tests/mod.rs
@@ -1,37 +1,37 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Tests for the `LightProtocol` implementation.
 //! These don't test of the higher level logic on top of

-use common_types::blockchain_info::BlockChainInfo;
-use common_types::encoded;
-use common_types::ids::BlockId;
-use common_types::transaction::{Action, PendingTransaction};
+use ethcore::blockchain_info::BlockChainInfo;
 use ethcore::client::{EachBlockWith, TestBlockChainClient};
+use ethcore::encoded;
+use ethcore::ids::BlockId;
 use ethereum_types::{H256, U256, Address};
-use net::context::IoContext;
-use net::load_timer::MOVING_SAMPLE_SIZE;
-use net::status::{Capabilities, Status};
 use net::{LightProtocol, Params, packet, Peer, Statistics};
+use net::context::IoContext;
+use net::status::{Capabilities, Status};
+use net::load_timer::MOVING_SAMPLE_SIZE;
 use network::{PeerId, NodeId};
 use provider::Provider;
-use request::*;
 use request;
+use request::*;
 use rlp::{Rlp, RlpStream};
+use transaction::{Action, PendingTransaction};

 use std::sync::Arc;
 use std::time::Instant;
--- a/ethcore/light/src/on_demand/mod.rs
+++ b/ethcore/light/src/on_demand/mod.rs
@@ -1,72 +1,62 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! On-demand chain requests over LES. This is a major building block for RPCs.
 //! The request service is implemented using Futures. Higher level request handlers
 //! will take the raw data received here and extract meaningful results from it.

 use std::cmp;
-use std::collections::HashMap;
+use std::collections::{HashMap, BTreeSet};
 use std::marker::PhantomData;
 use std::sync::Arc;
-use std::time::Duration;

 use ethcore::executed::{Executed, ExecutionError};
+
 use futures::{Poll, Future, Async};
 use futures::sync::oneshot::{self, Receiver};
 use network::PeerId;
 use parking_lot::{RwLock, Mutex};
 use rand;
-use rand::Rng;
+use std::time::{Duration, SystemTime};

 use net::{
-	Handler, PeerStatus, Status, Capabilities,
+	self, Handler, PeerStatus, Status, Capabilities,
 	Announcement, EventContext, BasicContext, ReqId,
 };
-
 use cache::Cache;
 use request::{self as basic_request, Request as NetworkRequest};
 use self::request::CheckedRequest;

-pub use self::request::{Request, Response, HeaderRef, Error as ValidityError};
-pub use self::request_guard::{RequestGuard, Error as RequestError};
-pub use self::response_guard::{ResponseGuard, Error as ResponseGuardError, Inner as ResponseGuardInner};
-
-pub use types::request::ResponseError;
+pub use self::request::{Request, Response, HeaderRef};

 #[cfg(test)]
 mod tests;

 pub mod request;
-mod request_guard;
-mod response_guard;

 /// The result of execution
 pub type ExecutionResult = Result<Executed, ExecutionError>;

-/// The initial backoff interval for OnDemand queries
-pub const DEFAULT_REQUEST_MIN_BACKOFF_DURATION: Duration = Duration::from_secs(10);
-/// The maximum request interval for OnDemand queries
-pub const DEFAULT_REQUEST_MAX_BACKOFF_DURATION: Duration = Duration::from_secs(100);
-/// The default window length a response is evaluated
-pub const DEFAULT_RESPONSE_TIME_TO_LIVE: Duration = Duration::from_secs(10);
-/// The default number of maximum backoff iterations
-pub const DEFAULT_MAX_REQUEST_BACKOFF_ROUNDS: usize = 10;
-/// The default number failed request to be regarded as failure
-pub const DEFAULT_NUM_CONSECUTIVE_FAILED_REQUESTS: usize = 1;
+/// The default number of retries for OnDemand queries to send to the other nodes
+pub const DEFAULT_RETRY_COUNT: usize = 10;
+
+/// The default time limit in milliseconds for inactive (no new peer to connect to) OnDemand queries (0 for unlimited)
+pub const DEFAULT_QUERY_TIME_LIMIT: Duration = Duration::from_millis(10000);
+
+const NULL_DURATION: Duration = Duration::from_secs(0);

 /// OnDemand related errors
 pub mod error {
@@ -79,19 +69,22 @@ pub mod error {
 		}

 		errors {
-			#[doc = "Timeout bad response"]
-			BadResponse(err: String) {
-				description("Max response evaluation time exceeded")
-				display("{}", err)
+			#[doc = "Max number of on-demand query attempts reached without result."]
+			MaxAttemptReach(query_index: usize) {
+				description("On-demand query limit reached")
+				display("On-demand query limit reached on query #{}", query_index)
 			}

-			#[doc = "OnDemand requests limit exceeded"]
-			RequestLimit {
-				description("OnDemand request maximum backoff iterations exceeded")
-				display("OnDemand request maximum backoff iterations exceeded")
+			#[doc = "No reply with current peer set, time out occured while waiting for new peers for additional query attempt."]
+			TimeoutOnNewPeers(query_index: usize, remaining_attempts: usize) {
+				description("Timeout for On-demand query")
+				display("Timeout for On-demand query; {} query attempts remain for query #{}", remaining_attempts, query_index)
 			}
+
 		}
+
 	}
+
 }

 // relevant peer info.
@@ -120,6 +113,7 @@ impl Peer {
 	}
 }

+
 /// Either an array of responses or a single error.
 type PendingResponse = self::error::Result<Vec<Response>>;

@@ -130,8 +124,10 @@ struct Pending {
 	required_capabilities: Capabilities,
 	responses: Vec<Response>,
 	sender: oneshot::Sender<PendingResponse>,
-	request_guard: RequestGuard,
-	response_guard: ResponseGuard,
+	base_query_index: usize,
+	remaining_query_count: usize,
+	query_id_history: BTreeSet<PeerId>,
+	inactive_time_limit: Option<SystemTime>,
 }

 impl Pending {
@@ -194,7 +190,7 @@ impl Pending {
 	fn try_complete(self) -> Option<Self> {
 		if self.requests.is_complete() {
 			if self.sender.send(Ok(self.responses)).is_err() {
-				debug!(target: "on_demand", "Dropped oneshot channel receiver on request");
+				debug!(target: "on_demand", "Dropped oneshot channel receiver on complete request at query #{}", self.query_id_history.len());
 			}
 			None
 		} else {
@@ -231,38 +227,20 @@ impl Pending {
 		self.required_capabilities = capabilities;
 	}

-	// received too many empty responses, may be away to indicate a faulty request
-	fn bad_response(self, response_err: ResponseGuardError) {
-		let reqs: Vec<&str> = self.requests.requests().iter().map(|req| {
-			match req {
-				CheckedRequest::HeaderProof(_, _) => "HeaderProof",
-				CheckedRequest::HeaderByHash(_, _) => "HeaderByHash",
-				CheckedRequest::HeaderWithAncestors(_, _) => "HeaderWithAncestors",
-				CheckedRequest::TransactionIndex(_, _) => "TransactionIndex",
-				CheckedRequest::Receipts(_, _) => "Receipts",
-				CheckedRequest::Body(_, _) => "Body",
-				CheckedRequest::Account(_, _) => "Account",
-				CheckedRequest::Code(_, _) => "Code",
-				CheckedRequest::Execution(_, _) => "Execution",
-				CheckedRequest::Signal(_, _) => "Signal",
-			}
-		}).collect();
-
-		let err = format!("Bad response on {}: [ {} ]. {}",
-			if reqs.len() > 1 { "requests" } else { "request" },
-			reqs.join(", "),
-			response_err
-		);
-
-		let err = self::error::ErrorKind::BadResponse(err);
+	// returning no reponse, it will result in an error.
+	// self is consumed on purpose.
+	fn no_response(self) {
+		trace!(target: "on_demand", "Dropping a pending query (no reply) at query #{}", self.query_id_history.len());
+		let err = self::error::ErrorKind::MaxAttemptReach(self.requests.num_answered());
 		if self.sender.send(Err(err.into())).is_err() {
 			debug!(target: "on_demand", "Dropped oneshot channel receiver on no response");
 		}
 	}

 	// returning a peer discovery timeout during query attempts
-	fn request_limit_reached(self) {
-		let err = self::error::ErrorKind::RequestLimit;
+	fn time_out(self) {
+		trace!(target: "on_demand", "Dropping a pending query (no new peer time out) at query #{}", self.query_id_history.len());
+		let err = self::error::ErrorKind::TimeoutOnNewPeers(self.requests.num_answered(), self.query_id_history.len());
 		if self.sender.send(Err(err.into())).is_err() {
 			debug!(target: "on_demand", "Dropped oneshot channel receiver on time out");
 		}
@@ -348,68 +326,30 @@ pub struct OnDemand {
 	in_transit: RwLock<HashMap<ReqId, Pending>>,
 	cache: Arc<Mutex<Cache>>,
 	no_immediate_dispatch: bool,
-	response_time_window: Duration,
-	request_backoff_start: Duration,
-	request_backoff_max: Duration,
-	request_backoff_rounds_max: usize,
-	request_number_of_consecutive_errors: usize
+	base_retry_count: usize,
+	query_inactive_time_limit: Option<Duration>,
 }

 impl OnDemand {

 	/// Create a new `OnDemand` service with the given cache.
-	pub fn new(
-		cache: Arc<Mutex<Cache>>,
-		response_time_window: Duration,
-		request_backoff_start: Duration,
-		request_backoff_max: Duration,
-		request_backoff_rounds_max: usize,
-		request_number_of_consecutive_errors: usize,
-	) -> Self {
-
-		Self {
+	pub fn new(cache: Arc<Mutex<Cache>>) -> Self {
+		OnDemand {
 			pending: RwLock::new(Vec::new()),
 			peers: RwLock::new(HashMap::new()),
 			in_transit: RwLock::new(HashMap::new()),
 			cache,
 			no_immediate_dispatch: false,
-			response_time_window: Self::sanitize_circuit_breaker_input(response_time_window, "Response time window"),
-			request_backoff_start: Self::sanitize_circuit_breaker_input(request_backoff_start, "Request initial backoff time window"),
-			request_backoff_max: Self::sanitize_circuit_breaker_input(request_backoff_max, "Request maximum backoff time window"),
-			request_backoff_rounds_max,
-			request_number_of_consecutive_errors,
-		}
-	}
-
-	fn sanitize_circuit_breaker_input(dur: Duration, name: &'static str) -> Duration {
-		if dur.as_secs() < 1 {
-			warn!(target: "on_demand",
-				"{} is too short must be at least 1 second, configuring it to 1 second", name);
-			Duration::from_secs(1)
-		} else {
-			dur
+			base_retry_count: DEFAULT_RETRY_COUNT,
+			query_inactive_time_limit: Some(DEFAULT_QUERY_TIME_LIMIT),
 		}
 	}

 	// make a test version: this doesn't dispatch pending requests
 	// until you trigger it manually.
 	#[cfg(test)]
-	fn new_test(
-		cache: Arc<Mutex<Cache>>,
-		request_ttl: Duration,
-		request_backoff_start: Duration,
-		request_backoff_max: Duration,
-		request_backoff_rounds_max: usize,
-		request_number_of_consecutive_errors: usize,
-	) -> Self {
-		let mut me = OnDemand::new(
-			cache,
-			request_ttl,
-			request_backoff_start,
-			request_backoff_max,
-			request_backoff_rounds_max,
-			request_number_of_consecutive_errors,
-		);
+	fn new_test(cache: Arc<Mutex<Cache>>) -> Self {
+		let mut me = OnDemand::new(cache);
 		me.no_immediate_dispatch = true;

 		me
@@ -463,13 +403,10 @@ impl OnDemand {
 			required_capabilities: capabilities,
 			responses,
 			sender,
-			request_guard: RequestGuard::new(
-				self.request_number_of_consecutive_errors as u32,
-				self.request_backoff_rounds_max,
-				self.request_backoff_start,
-				self.request_backoff_max,
-			),
-			response_guard: ResponseGuard::new(self.response_time_window),
+			base_query_index: 0,
+			remaining_query_count: 0,
+			query_id_history: BTreeSet::new(),
+			inactive_time_limit: None,
 		});

 		Ok(receiver)
@@ -498,56 +435,82 @@ impl OnDemand {
 	// dispatch pending requests, and discard those for which the corresponding
 	// receiver has been dropped.
 	fn dispatch_pending(&self, ctx: &BasicContext) {
-		if self.pending.read().is_empty() {
-			return
-		}
-
+		if self.pending.read().is_empty() { return }
 		let mut pending = self.pending.write();

+		debug!(target: "on_demand", "Attempting to dispatch {} pending requests", pending.len());
+
 		// iterate over all pending requests, and check them for hang-up.
 		// then, try and find a peer who can serve it.
 		let peers = self.peers.read();
-
-		*pending = ::std::mem::replace(&mut *pending, Vec::new())
-			.into_iter()
+		*pending = ::std::mem::replace(&mut *pending, Vec::new()).into_iter()
 			.filter(|pending| !pending.sender.is_canceled())
 			.filter_map(|mut pending| {
-
+				// the peer we dispatch to is chosen randomly
 				let num_peers = peers.len();
-				// The first peer to dispatch the request is chosen at random
-				let rand = rand::thread_rng().gen_range(0, cmp::max(1, num_peers));
-
-				for (peer_id, peer) in peers
-					.iter()
-					.cycle()
-					.skip(rand)
-					.take(num_peers)
-				{
-
-					if !peer.can_fulfill(&pending.required_capabilities) {
-						trace!(target: "on_demand", "Peer {} without required capabilities, skipping", peer_id);
-						continue
+				let history_len = pending.query_id_history.len();
+				let offset = if history_len == 0 {
+					pending.remaining_query_count = self.base_retry_count;
+					let rand = rand::random::<usize>();
+					pending.base_query_index = rand;
+					rand
+				} else {
+					pending.base_query_index + history_len
+				} % cmp::max(num_peers, 1);
+				let init_remaining_query_count = pending.remaining_query_count; // to fail in case of big reduction of nb of peers
+				for (peer_id, peer) in peers.iter().chain(peers.iter())
+					.skip(offset).take(num_peers) {
+					// TODO: see which requests can be answered by the cache?
+					if pending.remaining_query_count == 0 {
+						break
 					}

-					if pending.request_guard.is_call_permitted() {
-						if let Ok(req_id) = ctx.request_from(*peer_id, pending.net_requests.clone()) {
-							self.in_transit.write().insert(req_id, pending);
-							return None;
+					if pending.query_id_history.insert(peer_id.clone()) {
+
+						if !peer.can_fulfill(&pending.required_capabilities) {
+							trace!(target: "on_demand", "Peer {} without required capabilities, skipping, {} remaining attempts", peer_id, pending.remaining_query_count);
+							continue
+						}
+
+						pending.remaining_query_count -= 1;
+						pending.inactive_time_limit = None;
+
+						match ctx.request_from(*peer_id, pending.net_requests.clone()) {
+							Ok(req_id) => {
+								trace!(target: "on_demand", "Dispatched request {} to peer {}, {} remaining attempts", req_id, peer_id, pending.remaining_query_count);
+								self.in_transit.write().insert(req_id, pending);
+								return None
+							}
+							Err(net::Error::NoCredits) | Err(net::Error::NotServer) => {}
+							Err(e) => debug!(target: "on_demand", "Error dispatching request to peer: {}", e),
 						}
 					}
 				}

-				// Register that the request round failed
-				if let RequestError::ReachedLimit = pending.request_guard.register_error() {
-					pending.request_limit_reached();
+				if pending.remaining_query_count == 0	{
+					pending.no_response();
 					None
+				} else if init_remaining_query_count == pending.remaining_query_count {
+					if let Some(query_inactive_time_limit) = self.query_inactive_time_limit {
+						let now = SystemTime::now();
+						if let Some(inactive_time_limit) = pending.inactive_time_limit {
+							if now > inactive_time_limit {
+								pending.time_out();
+								return None
+							}
+						} else {
+							debug!(target: "on_demand", "No more peers to query, waiting for {} seconds until dropping query", query_inactive_time_limit.as_secs());
+							pending.inactive_time_limit = Some(now + query_inactive_time_limit);
+						}
+					}
+					Some(pending)
 				} else {
 					Some(pending)
 				}
-		})
-		.collect(); // `pending` now contains all requests we couldn't dispatch
+			})
+			.collect(); // `pending` now contains all requests we couldn't dispatch.

-		trace!(target: "on_demand", "Was unable to dispatch {} requests.", pending.len());
+		debug!(target: "on_demand", "Was unable to dispatch {} requests.", pending.len());
 	}

 	// submit a pending request set. attempts to answer from cache before
@@ -558,14 +521,26 @@ impl OnDemand {

 		pending.answer_from_cache(&*self.cache);
 		if let Some(mut pending) = pending.try_complete() {
-			// update cached requests
 			pending.update_net_requests();
-			// push into `pending` buffer
 			self.pending.write().push(pending);
-			// try to dispatch
 			self.attempt_dispatch(ctx);
 		}
 	}
+
+	/// Set the retry count for a query.
+	pub fn default_retry_number(&mut self, nb_retry: usize) {
+		self.base_retry_count = nb_retry;
+	}
+
+	/// Set the time limit for a query.
+	pub fn query_inactive_time_limit(&mut self, inactive_time_limit: Duration) {
+		self.query_inactive_time_limit = if inactive_time_limit == NULL_DURATION {
+			None
+		} else {
+			Some(inactive_time_limit)
+		};
+	}
+
 }

 impl Handler for OnDemand {
@@ -619,11 +594,13 @@ impl Handler for OnDemand {
 		};

 		if responses.is_empty() {
-			// Max number of `bad` responses reached, drop the request
-			if let Err(e) = pending.response_guard.register_error(&ResponseError::Validity(ValidityError::Empty)) {
-				pending.bad_response(e);
+			if pending.remaining_query_count == 0 {
+				pending.no_response();
 				return;
 			}
+		} else {
+			// do not keep query counter for others elements of this batch
+			pending.query_id_history.clear();
 		}

 		// for each incoming response
@@ -636,11 +613,7 @@ impl Handler for OnDemand {
 				debug!(target: "on_demand", "Peer {} gave bad response: {:?}", peer, e);
 				ctx.disable_peer(peer);

-				// Max number of `bad` responses reached, drop the request
-				if let Err(err) = pending.response_guard.register_error(&e) {
-					pending.bad_response(err);
-					return;
-				}
+				break;
 			}
 		}

--- a/ethcore/light/src/on_demand/request.rs
+++ b/ethcore/light/src/on_demand/request.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Request types, verification, and verification errors.

@@ -20,21 +20,22 @@ use std::cmp;
 use std::sync::Arc;

 use bytes::Bytes;
-use common_types::basic_account::BasicAccount;
-use common_types::encoded;
-use common_types::receipt::Receipt;
-use common_types::transaction::SignedTransaction;
+use ethcore::basic_account::BasicAccount;
+use ethcore::encoded;
 use ethcore::engines::{EthEngine, StateDependentProof};
 use ethcore::machine::EthereumMachine;
+use ethcore::receipt::Receipt;
 use ethcore::state::{self, ProvedExecution};
 use ethereum_types::{H256, U256, Address};
 use ethtrie::{TrieError, TrieDB};
 use hash::{KECCAK_NULL_RLP, KECCAK_EMPTY, KECCAK_EMPTY_LIST_RLP, keccak};
-use hash_db::HashDB;
+use hashdb::HashDB;
 use kvdb::DBValue;
+use memorydb::MemoryDB;
 use parking_lot::Mutex;
 use request::{self as net_request, IncompleteRequest, CompleteRequest, Output, OutputKind, Field};
 use rlp::{RlpStream, Rlp};
+use transaction::SignedTransaction;
 use trie::Trie;
 use vm::EnvInfo;

@@ -980,7 +981,7 @@ impl Account {
 		let header = self.header.as_ref()?;
 		let state_root = header.state_root();

-		let mut db = journaldb::new_memory_db();
+		let mut db = MemoryDB::new();
 		for node in proof { db.insert(&node[..]); }

 		match TrieDB::new(&db, &state_root).and_then(|t| t.get(&keccak(&self.address)))? {
@@ -1100,16 +1101,17 @@ mod tests {
 	use super::*;
 	use std::time::Duration;
 	use ethereum_types::{H256, Address};
+	use memorydb::MemoryDB;
 	use parking_lot::Mutex;
 	use trie::{Trie, TrieMut};
 	use ethtrie::{SecTrieDB, SecTrieDBMut};
 	use trie::Recorder;
 	use hash::keccak;

-	use ethcore::client::{BlockChainClient, BlockInfo, TestBlockChainClient, EachBlockWith};
-	use common_types::header::Header;
-	use common_types::encoded;
-	use common_types::receipt::{Receipt, TransactionOutcome};
+	use ::ethcore::client::{BlockChainClient, BlockInfo, TestBlockChainClient, EachBlockWith};
+	use ethcore::header::Header;
+	use ethcore::encoded;
+	use ethcore::receipt::{Receipt, TransactionOutcome};

 	fn make_cache() -> ::cache::Cache {
 		::cache::Cache::new(Default::default(), Duration::from_secs(1))
@@ -1279,7 +1281,7 @@ mod tests {
 		use rlp::RlpStream;

 		let mut root = H256::default();
-		let mut db = journaldb::new_memory_db();
+		let mut db = MemoryDB::new();
 		let mut header = Header::new();
 		header.set_number(123_456);
 		header.set_extra_data(b"test_header".to_vec());
--- a/ethcore/light/src/on_demand/request_guard.rs
+++ b/ethcore/light/src/on_demand/request_guard.rs
@@ -1,123 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use failsafe;
-use std::time::Duration;
-
-type RequestPolicy = failsafe::failure_policy::ConsecutiveFailures<failsafe::backoff::Exponential>;
-
-/// Error wrapped on-top of `FailsafeError`
-#[derive(Debug, PartialEq)]
-pub enum Error {
-	/// The call is let through
-	LetThrough,
-	/// The call rejected by the guard
-	Rejected,
-	/// The request reached the maximum of backoff iterations
-	ReachedLimit,
-}
-
-/// Handle and register requests that can fail
-#[derive(Debug)]
-pub struct RequestGuard {
-	backoff_round: usize,
-	max_backoff_rounds: usize,
-	state: failsafe::StateMachine<RequestPolicy, ()>,
-}
-
-impl RequestGuard {
-	/// Constructor
-	pub fn new(
-		consecutive_failures: u32,
-		max_backoff_rounds: usize,
-		start_backoff: Duration,
-		max_backoff: Duration,
-	) -> Self {
-		let backoff = failsafe::backoff::exponential(start_backoff, max_backoff);
-		// success_rate not used because only errors are registered
-		let policy = failsafe::failure_policy::consecutive_failures(consecutive_failures as u32, backoff);
-
-		Self {
-			backoff_round: 0,
-			max_backoff_rounds,
-			state: failsafe::StateMachine::new(policy, ()),
-		}
-	}
-
-	/// Update the state after a `faulty` call
-	pub fn register_error(&mut self) -> Error {
-		trace!(target: "circuit_breaker", "RequestGuard; backoff_round: {}/{}, state {:?}",
-			   self.backoff_round, self.max_backoff_rounds, self.state);
-
-		if self.backoff_round >= self.max_backoff_rounds {
-			Error::ReachedLimit
-		} else if self.state.is_call_permitted() {
-			self.state.on_error();
-			if self.state.is_call_permitted() {
-				Error::LetThrough
-			} else {
-				self.backoff_round += 1;
-				Error::Rejected
-			}
-		} else {
-			Error::Rejected
-		}
-	}
-
-	/// Poll the circuit breaker, to check if the call is permitted
-	pub fn is_call_permitted(&self) -> bool {
-		self.state.is_call_permitted()
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use std::iter;
-	use std::time::Instant;
-	use super::*;
-
-	#[test]
-	fn one_consecutive_failure_with_10_backoffs() {
-		// 1, 2, 4, 5, 5 .... 5
-		let binary_exp_backoff = vec![1_u64, 2, 4].into_iter().chain(iter::repeat(5_u64).take(7));
-		let mut guard = RequestGuard::new(1, 10, Duration::from_secs(1), Duration::from_secs(5));
-		for backoff in binary_exp_backoff {
-			assert_eq!(guard.register_error(), Error::Rejected);
-			let now = Instant::now();
-			while now.elapsed() <= Duration::from_secs(backoff) {}
-		}
-		assert_eq!(guard.register_error(), Error::ReachedLimit, "10 backoffs should be error");
-	}
-
-	#[test]
-	fn five_consecutive_failures_with_3_backoffs() {
-		let mut guard = RequestGuard::new(5, 3, Duration::from_secs(1), Duration::from_secs(30));
-
-		// register five errors
-		for _ in 0..4 {
-			assert_eq!(guard.register_error(), Error::LetThrough);
-		}
-
-		let binary_exp_backoff = [1, 2, 4];
-		for backoff in &binary_exp_backoff {
-			assert_eq!(guard.register_error(), Error::Rejected);
-			let now = Instant::now();
-			while now.elapsed() <= Duration::from_secs(*backoff) {}
-		}
-
-		assert_eq!(guard.register_error(), Error::ReachedLimit, "3 backoffs should be an error");
-	}
-}
--- a/ethcore/light/src/on_demand/response_guard.rs
+++ b/ethcore/light/src/on_demand/response_guard.rs
@@ -1,173 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity Ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! ResponseGuard implementation.
-//! It is responsible for the receiving end of `Pending Request` (see `OnDemand` module docs for more information)
-//! The major functionality is the following:
-//!    1) Register non-successful responses which will reported back if it fails
-//!    2) A timeout mechanism that will wait for successful response at most t seconds
-
-use std::time::{Duration, Instant};
-use std::collections::HashMap;
-use std::fmt;
-
-use super::{ResponseError, ValidityError};
-
-/// Response guard error type
-#[derive(Debug, Eq, PartialEq)]
-pub enum Error {
-	/// No majority, the error reason can't be determined
-	NoMajority(usize),
-	/// Majority, with the error reason
-	Majority(Inner, usize, usize),
-}
-
-impl fmt::Display for Error {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		match self {
-			Error::Majority(err, majority, total) => {
-				write!(f, "Error cause was {:?}, (majority count: {} / total: {})",
-					err, majority, total)
-			}
-			Error::NoMajority(total) => {
-				write!(f, "Error cause couldn't be determined, the total number of responses was {}", total)
-			}
-		}
-	}
-}
-
-/// Dummy type to convert a generic type with no trait bounds
-#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq, PartialOrd, Ord)]
-pub enum Inner {
-	/// Bad execution proof
-	BadProof,
-	/// RLP decoding
-	Decoder,
-	/// Empty response
-	EmptyResponse,
-	/// Wrong header sequence
-	HeaderByNumber,
-	/// Too few results
-	TooFewResults,
-	/// Too many results
-	TooManyResults,
-	/// Trie error
-	Trie,
-	/// Unresolved header
-	UnresolvedHeader,
-	/// No responses expected.
-	Unexpected,
-	/// Wrong hash
-	WrongHash,
-	/// Wrong Header sequence
-	WrongHeaderSequence,
-	/// Wrong response kind
-	WrongKind,
-	/// Wrong number
-	WrongNumber,
-	/// Wrong Trie Root
-	WrongTrieRoot,
-}
-
-/// Handle and register responses that can fail
-#[derive(Debug)]
-pub struct ResponseGuard {
-	request_start: Instant,
-	time_to_live: Duration,
-	responses: HashMap<Inner, usize>,
-	number_responses: usize,
-}
-
-impl ResponseGuard {
-	/// Constructor
-	pub fn new(time_to_live: Duration) -> Self {
-		Self {
-			request_start: Instant::now(),
-			time_to_live,
-			responses: HashMap::new(),
-			number_responses: 0,
-		}
-	}
-
-	fn into_reason(&self, err: &ResponseError<super::request::Error>) -> Inner {
-		match err {
-			ResponseError::Unexpected => Inner::Unexpected,
-			ResponseError::Validity(ValidityError::BadProof) => Inner::BadProof,
-			ResponseError::Validity(ValidityError::Decoder(_)) => Inner::Decoder,
-			ResponseError::Validity(ValidityError::Empty) => Inner::EmptyResponse,
-			ResponseError::Validity(ValidityError::HeaderByNumber) => Inner::HeaderByNumber,
-			ResponseError::Validity(ValidityError::TooFewResults(_, _)) => Inner::TooFewResults,
-			ResponseError::Validity(ValidityError::TooManyResults(_, _)) => Inner::TooManyResults,
-			ResponseError::Validity(ValidityError::Trie(_)) => Inner::Trie,
-			ResponseError::Validity(ValidityError::UnresolvedHeader(_)) => Inner::UnresolvedHeader,
-			ResponseError::Validity(ValidityError::WrongHash(_, _)) => Inner::WrongHash,
-			ResponseError::Validity(ValidityError::WrongHeaderSequence) => Inner::WrongHeaderSequence,
-			ResponseError::Validity(ValidityError::WrongKind) => Inner::WrongKind,
-			ResponseError::Validity(ValidityError::WrongNumber(_, _)) => Inner::WrongNumber,
-			ResponseError::Validity(ValidityError::WrongTrieRoot(_, _)) => Inner::WrongTrieRoot,
-		}
-	}
-
-	/// Update the state after a `faulty` call
-	pub fn register_error(&mut self, err: &ResponseError<super::request::Error>) -> Result<(), Error> {
-		let err = self.into_reason(err);
-		*self.responses.entry(err).or_insert(0) += 1;
-		self.number_responses = self.number_responses.saturating_add(1);
-		trace!(target: "circuit_breaker", "ResponseGuard: {:?}", self.responses);
-		// The request has exceeded its timeout
-		if self.request_start.elapsed() >= self.time_to_live {
-			let (&err, &max_count) = self.responses.iter().max_by_key(|(_k, v)| *v).expect("got at least one element; qed");
-			let majority = self.responses.values().filter(|v| **v == max_count).count() == 1;
-			if majority {
-				Err(Error::Majority(err, max_count, self.number_responses))
-			} else {
-				Err(Error::NoMajority(self.number_responses))
-			}
-		} else {
-			Ok(())
-		}
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use std::thread;
-	use super::*;
-
-	#[test]
-	fn test_basic_by_majority() {
-		let mut guard = ResponseGuard::new(Duration::from_secs(5));
-		guard.register_error(&ResponseError::Validity(ValidityError::Empty)).unwrap();
-		guard.register_error(&ResponseError::Unexpected).unwrap();
-		guard.register_error(&ResponseError::Unexpected).unwrap();
-		guard.register_error(&ResponseError::Unexpected).unwrap();
-		thread::sleep(Duration::from_secs(5));
-
-		assert_eq!(guard.register_error(&ResponseError::Validity(ValidityError::WrongKind)), Err(Error::Majority(Inner::Unexpected, 3, 5)));
-	}
-
-	#[test]
-	fn test_no_majority() {
-		let mut guard = ResponseGuard::new(Duration::from_secs(5));
-		guard.register_error(&ResponseError::Validity(ValidityError::Empty)).unwrap();
-		guard.register_error(&ResponseError::Validity(ValidityError::Empty)).unwrap();
-		guard.register_error(&ResponseError::Unexpected).unwrap();
-		guard.register_error(&ResponseError::Unexpected).unwrap();
-		thread::sleep(Duration::from_secs(5));
-
-		assert_eq!(guard.register_error(&ResponseError::Validity(ValidityError::WrongKind)), Err(Error::NoMajority(5)));
-	}
-}
--- a/ethcore/light/src/on_demand/tests.rs
+++ b/ethcore/light/src/on_demand/tests.rs
@@ -1,33 +1,32 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Tests for the on-demand service.

 use cache::Cache;
+use ethcore::header::Header;
 use futures::Future;
 use network::{PeerId, NodeId};
 use net::*;
-use common_types::header::Header;
 use ethereum_types::H256;
 use parking_lot::Mutex;
-use request::{self as basic_request, Response};
+use std::time::Duration;
+use ::request::{self as basic_request, Response};

 use std::sync::Arc;
-use std::time::{Duration, Instant};
-use std::thread;

 use super::{request, OnDemand, Peer, HeaderRef};

@@ -37,7 +36,6 @@ enum Context {
 	WithPeer(PeerId),
 	RequestFrom(PeerId, ReqId),
 	Punish(PeerId),
-	FaultyRequest,
 }

 impl EventContext for Context {
@@ -46,7 +44,6 @@ impl EventContext for Context {
 			Context::WithPeer(id)
 			| Context::RequestFrom(id, _)
 			| Context::Punish(id) => id,
-			| Context::FaultyRequest => 0,
 			_ => panic!("didn't expect to have peer queried."),
 		}
 	}
@@ -63,7 +60,6 @@ impl BasicContext for Context {
 	fn request_from(&self, peer_id: PeerId, _: ::request::NetworkRequests) -> Result<ReqId, Error> {
 		match *self {
 			Context::RequestFrom(id, req_id) => if peer_id == id { Ok(req_id) } else { Err(Error::NoCredits) },
-			Context::FaultyRequest => Err(Error::NoCredits),
 			_ => panic!("didn't expect to have requests dispatched."),
 		}
 	}
@@ -93,17 +89,7 @@ impl Harness {
 	fn create() -> Self {
 		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(60))));
 		Harness {
-			service: OnDemand::new_test(
-				cache,
-				// Response `time_to_live`
-				Duration::from_secs(5),
-				// Request start backoff
-				Duration::from_secs(1),
-				// Request max backoff
-				Duration::from_secs(20),
-				super::DEFAULT_MAX_REQUEST_BACKOFF_ROUNDS,
-				super::DEFAULT_NUM_CONSECUTIVE_FAILED_REQUESTS
-			)
+			service: OnDemand::new_test(cache),
 		}
 	}

@@ -509,90 +495,3 @@ fn fill_from_cache() {

 	assert!(recv.wait().is_ok());
 }
-
-#[test]
-fn request_without_response_should_backoff_and_then_be_dropped() {
-	let harness = Harness::create();
-	let peer_id = 0;
-	let req_id = ReqId(13);
-
-	harness.inject_peer(
-		peer_id,
-		Peer {
-			status: dummy_status(),
-			capabilities: dummy_capabilities(),
-		}
-	);
-
-	let binary_exp_backoff: Vec<u64> = vec![1, 2, 4, 8, 16, 20, 20, 20, 20, 20];
-
-	let _recv = harness.service.request_raw(
-		&Context::RequestFrom(peer_id, req_id),
-		vec![request::HeaderByHash(Header::default().encoded().hash().into()).into()],
-	).unwrap();
-	assert_eq!(harness.service.pending.read().len(), 1);
-
-	for backoff in &binary_exp_backoff {
-		harness.service.dispatch_pending(&Context::FaultyRequest);
-		assert_eq!(harness.service.pending.read().len(), 1, "Request should not be dropped");
-		let now = Instant::now();
-		while now.elapsed() < Duration::from_secs(*backoff) {}
-	}
-
-	harness.service.dispatch_pending(&Context::FaultyRequest);
-	assert_eq!(harness.service.pending.read().len(), 0, "Request exceeded the 10 backoff rounds should be dropped");
-}
-
-#[test]
-fn empty_responses_exceeds_limit_should_be_dropped() {
-	let harness = Harness::create();
-	let peer_id = 0;
-	let req_id = ReqId(13);
-
-	harness.inject_peer(
-		peer_id,
-		Peer {
-			status: dummy_status(),
-			capabilities: dummy_capabilities(),
-		}
-	);
-
-	let _recv = harness.service.request_raw(
-		&Context::RequestFrom(peer_id, req_id),
-		vec![request::HeaderByHash(Header::default().encoded().hash().into()).into()],
-	).unwrap();
-
-	harness.service.dispatch_pending(&Context::RequestFrom(peer_id, req_id));
-
-	assert_eq!(harness.service.pending.read().len(), 0);
-	assert_eq!(harness.service.in_transit.read().len(), 1);
-
-	let now = Instant::now();
-
-	// Send `empty responses` in the current time window
-	// Use only half of the `time_window` because we can't be sure exactly
-	// when the window started and the clock accurancy
-	while now.elapsed() < harness.service.response_time_window / 2 {
-		harness.service.on_responses(
-			&Context::RequestFrom(13, req_id),
-			req_id,
-			&[]
-		);
-		assert!(harness.service.pending.read().len() != 0);
-		let pending = harness.service.pending.write().remove(0);
-		harness.service.in_transit.write().insert(req_id, pending);
-	}
-
-	// Make sure we passed the first `time window`
-	thread::sleep(Duration::from_secs(5));
-
-	// Now, response is in failure state but need another response to be `polled`
-	harness.service.on_responses(
-			&Context::RequestFrom(13, req_id),
-			req_id,
-			&[]
-	);
-
-	assert!(harness.service.in_transit.read().is_empty());
-	assert!(harness.service.pending.read().is_empty());
-}
--- a/ethcore/light/src/provider.rs
+++ b/ethcore/light/src/provider.rs
@@ -1,31 +1,31 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! A provider for the PIP protocol. This is typically a full node, who can
 //! give as much data as necessary to its peers.

 use std::sync::Arc;

-use common_types::blockchain_info::BlockChainInfo;
-use common_types::encoded;
-use common_types::ids::BlockId;
-use common_types::transaction::PendingTransaction;
+use ethcore::blockchain_info::BlockChainInfo;
 use ethcore::client::{BlockChainClient, ProvingBlockChainClient, ChainInfo, BlockInfo as ClientBlockInfo};
+use ethcore::ids::BlockId;
+use ethcore::encoded;
 use ethereum_types::H256;
 use parking_lot::RwLock;
+use transaction::PendingTransaction;

 use cht::{self, BlockInfo};
 use client::{LightChainClient, AsLightClient};
@@ -161,7 +161,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 	fn transaction_index(&self, req: request::CompleteTransactionIndexRequest)
 		-> Option<request::TransactionIndexResponse>
 	{
-		use common_types::ids::TransactionId;
+		use ethcore::ids::TransactionId;

 		self.transaction_receipt(TransactionId::Hash(req.hash)).map(|receipt| request::TransactionIndexResponse {
 			num: receipt.block_number,
@@ -265,7 +265,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 	}

 	fn transaction_proof(&self, req: request::CompleteExecutionRequest) -> Option<request::ExecutionResponse> {
-		use common_types::transaction::Transaction;
+		use transaction::Transaction;

 		let id = BlockId::Hash(req.block_hash);
 		let nonce = match self.nonce(&req.from, id) {
--- a/ethcore/light/src/transaction_queue.rs
+++ b/ethcore/light/src/transaction_queue.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Light Transaction Queue.
 //!
@@ -27,7 +27,7 @@ use std::fmt;
 use std::collections::{BTreeMap, HashMap};
 use std::collections::hash_map::Entry;

-use common_types::transaction::{self, Condition, PendingTransaction, SignedTransaction};
+use transaction::{self, Condition, PendingTransaction, SignedTransaction};
 use ethereum_types::{H256, U256, Address};
 use fastmap::H256FastMap;

@@ -95,7 +95,7 @@ impl AccountTransactions {
 	}

 	fn next_nonce(&self) -> U256 {
-		self.current.last().map(|last| last.nonce.saturating_add(1.into()))
+		self.current.last().map(|last| last.nonce + 1)
 			.unwrap_or_else(|| *self.cur_nonce.value())
 	}

@@ -107,7 +107,7 @@ impl AccountTransactions {
 		while let Some(tx) = self.future.remove(&next_nonce) {
 			promoted.push(tx.hash);
 			self.current.push(tx);
-			next_nonce = next_nonce.saturating_add(1.into());
+			next_nonce = next_nonce + 1;
 		}

 		promoted
@@ -370,7 +370,7 @@ impl TransactionQueue {
 mod tests {
 	use super::TransactionQueue;
 	use ethereum_types::Address;
-	use common_types::transaction::{Transaction, PendingTransaction, Condition};
+	use transaction::{Transaction, PendingTransaction, Condition};

 	#[test]
 	fn queued_senders() {
--- a/ethcore/light/src/types/mod.rs
+++ b/ethcore/light/src/types/mod.rs
@@ -1,17 +1,17 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 pub mod request;
--- a/ethcore/light/src/types/request/batch.rs
+++ b/ethcore/light/src/types/request/batch.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Request chain builder utility.
 //! Push requests with `push`. Back-references and data required to verify responses must be
--- a/ethcore/light/src/types/request/mod.rs
+++ b/ethcore/light/src/types/request/mod.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Light protocol request types.

@@ -670,7 +670,7 @@ pub trait ResponseLike {
 /// Header request.
 pub mod header {
 	use super::{Field, HashOrNumber, NoSuchOutput, OutputKind, Output};
-	use common_types::encoded;
+	use ethcore::encoded;
 	use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp};

 	/// Potentially incomplete headers request.
@@ -753,7 +753,7 @@ pub mod header {

 	impl Decodable for Response {
 		fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
-			use common_types::header::Header as FullHeader;
+			use ethcore::header::Header as FullHeader;

 			let mut headers = Vec::new();

@@ -954,7 +954,7 @@ pub mod transaction_index {
 /// Request and response for block receipts
 pub mod block_receipts {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use common_types::receipt::Receipt;
+	use ethcore::receipt::Receipt;
 	use ethereum_types::H256;

 	/// Potentially incomplete block receipts request.
@@ -1022,7 +1022,7 @@ pub mod block_receipts {
 /// Request and response for a block body
 pub mod block_body {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use common_types::encoded;
+	use ethcore::encoded;
 	use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp};
 	use ethereum_types::H256;

@@ -1089,8 +1089,8 @@ pub mod block_body {

 	impl Decodable for Response {
 		fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
-			use common_types::header::Header as FullHeader;
-			use common_types::transaction::UnverifiedTransaction;
+			use ethcore::header::Header as FullHeader;
+			use transaction::UnverifiedTransaction;

 			// check body validity.
 			let _: Vec<UnverifiedTransaction> = rlp.list_at(0)?;
@@ -1406,7 +1406,7 @@ pub mod contract_code {
 /// A request for proof of execution.
 pub mod execution {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use common_types::transaction::Action;
+	use transaction::Action;
 	use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp};
 	use ethereum_types::{H256, U256, Address};
 	use kvdb::DBValue;
@@ -1629,7 +1629,7 @@ pub mod epoch_signal {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use common_types::header::Header;
+	use ethcore::header::Header;

 	fn check_roundtrip<T>(val: T)
 		where T: ::rlp::Encodable + ::rlp::Decodable + PartialEq + ::std::fmt::Debug
@@ -1676,7 +1676,7 @@ mod tests {
 		let full_req = Request::Headers(req.clone());
 		let res = HeadersResponse {
 			headers: vec![
-				::common_types::encoded::Header::new(::rlp::encode(&Header::default()))
+				::ethcore::encoded::Header::new(::rlp::encode(&Header::default()))
 			]
 		};
 		let full_res = Response::Headers(res.clone());
@@ -1729,7 +1729,7 @@ mod tests {

 	#[test]
 	fn receipts_roundtrip() {
-		use common_types::receipt::{Receipt, TransactionOutcome};
+		use ethcore::receipt::{Receipt, TransactionOutcome};
 		let req = IncompleteReceiptsRequest {
 			hash: Field::Scalar(Default::default()),
 		};
@@ -1749,7 +1749,7 @@ mod tests {

 	#[test]
 	fn body_roundtrip() {
-		use common_types::transaction::{Transaction, UnverifiedTransaction};
+		use transaction::{Transaction, UnverifiedTransaction};
 		let req = IncompleteBodyRequest {
 			hash: Field::Scalar(Default::default()),
 		};
@@ -1757,13 +1757,13 @@ mod tests {
 		let full_req = Request::Body(req.clone());
 		let res = BodyResponse {
 			body: {
-				let header = ::common_types::header::Header::default();
+				let header = ::ethcore::header::Header::default();
 				let tx = UnverifiedTransaction::from(Transaction::default().fake_sign(Default::default()));
 				let mut stream = RlpStream::new_list(2);
 				stream.begin_list(2).append(&tx).append(&tx)
 					.begin_list(1).append(&header);

-				::common_types::encoded::Body::new(stream.out())
+				::ethcore::encoded::Body::new(stream.out())
 			},
 		};
 		let full_res = Response::Body(res.clone());
@@ -1844,7 +1844,7 @@ mod tests {
 		let req = IncompleteExecutionRequest {
 			block_hash: Field::Scalar(Default::default()),
 			from: Default::default(),
-			action: ::common_types::transaction::Action::Create,
+			action: ::transaction::Action::Create,
 			gas: 100_000.into(),
 			gas_price: 0.into(),
 			value: 100_000_001.into(),
@@ -1874,7 +1874,7 @@ mod tests {
 		let reqs: Vec<_> = (0..10).map(|_| IncompleteExecutionRequest {
 			block_hash: Field::Scalar(Default::default()),
 			from: Default::default(),
-			action: ::common_types::transaction::Action::Create,
+			action: ::transaction::Action::Create,
 			gas: 100_000.into(),
 			gas_price: 0.into(),
 			value: 100_000_001.into(),
@@ -1892,11 +1892,11 @@ mod tests {

 	#[test]
 	fn responses_vec() {
-		use common_types::receipt::{Receipt, TransactionOutcome};
+		use ethcore::receipt::{Receipt, TransactionOutcome};
 		let mut stream = RlpStream::new_list(2);
 				stream.begin_list(0).begin_list(0);

-		let body = ::common_types::encoded::Body::new(stream.out());
+		let body = ::ethcore::encoded::Body::new(stream.out());
 		let reqs = vec![
 			Response::Headers(HeadersResponse { headers: vec![] }),
 			Response::HeaderProof(HeaderProofResponse { proof: vec![], hash: Default::default(), td: 100.into()}),
--- a/ethcore/node_filter/Cargo.toml
+++ b/ethcore/node_filter/Cargo.toml
@@ -12,7 +12,7 @@ ethcore-network = { path = "../../util/network" }
 ethcore-network-devp2p = { path = "../../util/network-devp2p" }
 ethereum-types = "0.4"
 log = "0.4"
-parking_lot = "0.7"
+parking_lot = "0.6"
 ethabi = "6.0"
 ethabi-derive = "6.0"
 ethabi-contract = "6.0"
--- a/ethcore/node_filter/res/node_filter.json
+++ b/ethcore/node_filter/res/node_filter.json
--- a/ethcore/node_filter/res/peer_set.json
+++ b/ethcore/node_filter/res/peer_set.json
--- a/ethcore/node_filter/src/lib.rs
+++ b/ethcore/node_filter/src/lib.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Smart contract based node filter.

@@ -39,6 +39,9 @@ extern crate log;

 use std::sync::Weak;

+use lru_cache::LruCache;
+use parking_lot::Mutex;
+
 use ethcore::client::{BlockChainClient, BlockId};
 use ethereum_types::{H256, Address};
 use ethabi::FunctionOutputDecoder;
@@ -47,10 +50,13 @@ use devp2p::NodeId;

 use_contract!(peer_set, "res/peer_set.json");

+const MAX_CACHE_SIZE: usize = 4096;
+
 /// Connection filter that uses a contract to manage permissions.
 pub struct NodeFilter {
 	client: Weak<BlockChainClient>,
 	contract_address: Address,
+	permission_cache: Mutex<LruCache<(H256, NodeId), bool>>,
 }

 impl NodeFilter {
@@ -59,6 +65,7 @@ impl NodeFilter {
 		NodeFilter {
 			client,
 			contract_address,
+			permission_cache: Mutex::new(LruCache::new(MAX_CACHE_SIZE)),
 		}
 	}
 }
@@ -70,6 +77,18 @@ impl ConnectionFilter for NodeFilter {
 			None => return false,
 		};

+		let block_hash = match client.block_hash(BlockId::Latest) {
+			Some(block_hash) => block_hash,
+			None => return false,
+		};
+
+		let key = (block_hash, *connecting_id);
+
+		let mut cache = self.permission_cache.lock();
+		if let Some(res) = cache.get_mut(&key) {
+			return *res;
+		}
+
 		let address = self.contract_address;
 		let own_low = H256::from_slice(&own_id[0..32]);
 		let own_high = H256::from_slice(&own_id[32..64]);
@@ -84,6 +103,7 @@ impl ConnectionFilter for NodeFilter {
 				false
 			});

+		cache.insert(key, allowed);
 		allowed
 	}
 }
--- a/ethcore/private-tx/Cargo.toml
+++ b/ethcore/private-tx/Cargo.toml
@@ -6,31 +6,31 @@ license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
-common-types = { path = "../types" }
 error-chain = { version = "0.12", default-features = false }
 ethabi = "6.0"
-ethabi-contract = "6.0"
 ethabi-derive = "6.0"
+ethabi-contract = "6.0"
 ethcore = { path = ".." }
-ethcore-call-contract = { path = "../call-contract" }
+parity-bytes = "0.1"
+parity-crypto = "0.2"
 ethcore-io = { path = "../../util/io" }
+ethcore-logger = { path = "../../logger" }
 ethcore-miner = { path = "../../miner" }
+ethcore-transaction = { path = "../transaction" }
 ethereum-types = "0.4"
 ethjson = { path = "../../json" }
-ethkey = { path = "../../accounts/ethkey" }
+ethkey = { path = "../../ethkey" }
 fetch = { path = "../../util/fetch" }
 futures = "0.1"
 heapsize = "0.4"
 keccak-hash = "0.1.2"
 log = "0.4"
-parity-bytes = "0.1"
-parity-crypto = "0.3.0"
-parking_lot = "0.7"
-trie-db = "0.11.0"
+parking_lot = "0.6"
+patricia-trie = "0.3.0"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 rand = "0.3"
 rlp = { version = "0.3.0", features = ["ethereum"] }
-rlp_derive = { path = "../../util/rlp-derive" }
+rlp_derive = { path = "../../util/rlp_derive" }
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
@@ -40,5 +40,4 @@ transaction-pool = "1.13.2"
 url = "1"

 [dev-dependencies]
-env_logger = "0.5"
 ethcore = { path = "..", features = ["test-helpers"] }
--- a/ethcore/private-tx/res/keys_acl.json
+++ b/ethcore/private-tx/res/keys_acl.json
@@ -1,43 +0,0 @@
-[
-	{
-		"constant": true,
-		"inputs": [
-			{
-				"name":"user",
-				"type":"address"
-			}
-		],
-		"name": "availableKeys",
-		"outputs": [
-			{
-				"name": "",
-				"type": "bytes32[]"
-			}
-		],
-		"payable": false,
-		"stateMutability": "view",
-		"type": "function"
-	},
-	{
-		"constant":true,
-		"inputs": [
-			{
-				"name":"user",
-				"type":"address"
-			},
-			{
-				"name":"document",
-				"type":"bytes32"
-			}
-		],
-		"name":"checkPermissions",
-		"outputs": [
-			{
-				"name":"",
-				"type":"bool"
-			}
-		],
-		"payable":false,
-		"type":"function"
-	}
-]
--- a/ethcore/private-tx/res/private.evm
+++ b/ethcore/private-tx/res/private.evm
--- a/ethcore/private-tx/res/private.json
+++ b/ethcore/private-tx/res/private.json
@@ -1,171 +1 @@
-[
-	{
-		"constant": true,
-		"inputs": [],
-		"name": "getVersion",
-		"outputs": [
-			{
-				"name": "",
-				"type": "uint8"
-			}
-		],
-		"payable": false,
-		"stateMutability": "pure",
-		"type": "function"
-	},
-	{
-		"constant": false,
-		"inputs": [
-			{
-				"name": "newState",
-				"type": "bytes"
-			},
-			{
-				"name": "v",
-				"type": "uint8[]"
-			},
-			{
-				"name": "r",
-				"type": "bytes32[]"
-			},
-			{
-				"name": "s",
-				"type": "bytes32[]"
-			}
-		],
-		"name": "setState",
-		"outputs": [],
-		"payable": false,
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"constant": true,
-		"inputs": [],
-		"name": "code",
-		"outputs": [
-			{
-				"name": "",
-				"type": "bytes"
-			}
-		],
-		"payable": false,
-		"stateMutability": "view",
-		"type": "function"
-	},
-	{
-		"constant": true,
-		"inputs": [
-			{
-				"name": "",
-				"type": "uint256"
-			}
-		],
-		"name": "validators",
-		"outputs": [
-			{
-				"name": "",
-				"type": "address"
-			}
-		],
-		"payable": false,
-		"stateMutability": "view",
-		"type": "function"
-	},
-	{
-		"constant": false,
-		"inputs": [
-			{
-				"name": "changesOriginator",
-				"type": "address"
-			},
-			{
-				"name": "originalTransactionHash",
-				"type": "bytes"
-			}
-		],
-		"name": "notifyChanges",
-		"outputs": [],
-		"payable": false,
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"constant": true,
-		"inputs": [],
-		"name": "nonce",
-		"outputs": [
-			{
-				"name": "",
-				"type": "uint256"
-			}
-		],
-		"payable": false,
-		"stateMutability": "view",
-		"type": "function"
-	},
-	{
-		"constant": true,
-		"inputs": [],
-		"name": "getValidators",
-		"outputs": [
-			{
-				"name": "",
-				"type": "address[]"
-			}
-		],
-		"payable": false,
-		"stateMutability": "view",
-		"type": "function"
-	},
-	{
-		"constant": true,
-		"inputs": [],
-		"name": "state",
-		"outputs": [
-			{
-				"name": "",
-				"type": "bytes"
-			}
-		],
-		"payable": false,
-		"stateMutability": "view",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"name": "initialValidators",
-				"type": "address[]"
-			},
-			{
-				"name": "initialCode",
-				"type": "bytes"
-			},
-			{
-				"name": "initialState",
-				"type": "bytes"
-			}
-		],
-		"payable": false,
-		"stateMutability": "nonpayable",
-		"type": "constructor"
-	},
-	{
-		"anonymous": false,
-		"inputs": [
-			{
-				"indexed": false,
-				"name": "changesOriginator",
-				"type": "address"
-			},
-			{
-				"indexed": false,
-				"name": "originalTransactionHash",
-				"type": "bytes"
-			}
-		],
-		"name": "PrivateStateChanged",
-		"type": "event"
-	}
-]
+[{"constant": false,"inputs": [{"name": "newState","type": "bytes"},{"name": "v","type": "uint8[]"},{"name": "r","type": "bytes32[]"},{"name": "s","type": "bytes32[]"}],"name": "setState","outputs": [],"payable": false,"stateMutability": "nonpayable","type": "function"},{"constant": true,"inputs": [],"name": "code","outputs": [{"name": "","type": "bytes"}],"payable": false,"stateMutability": "view","type": "function"},{"constant": true,"inputs": [{"name": "","type": "uint256"}],"name": "validators","outputs": [{"name": "","type": "address"}],"payable": false,"stateMutability": "view","type": "function"},{"constant": true,"inputs": [],"name": "nonce","outputs": [{"name": "","type": "uint256"}],"payable": false,"stateMutability": "view","type": "function"},{"constant": true,"inputs": [],"name": "getValidators","outputs": [{"name": "","type": "address[]"}],"payable": false,"stateMutability": "view","type": "function"},{"constant": true,"inputs": [],"name": "state","outputs": [{"name": "","type": "bytes"}],"payable": false,"stateMutability": "view","type": "function"},{"inputs": [{"name": "initialValidators","type": "address[]"},{"name": "initialCode","type": "bytes"},{"name": "initialState","type": "bytes"}],"payable": false,"stateMutability": "nonpayable","type": "constructor"}]
--- a/ethcore/private-tx/src/encryptor.rs
+++ b/ethcore/private-tx/src/encryptor.rs
@@ -1,40 +1,39 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Encryption providers.

 use std::io::Read;
 use std::str::FromStr;
-use std::sync::Arc;
 use std::iter::repeat;
 use std::time::{Instant, Duration};
 use std::collections::HashMap;
 use std::collections::hash_map::Entry;
 use parking_lot::Mutex;
+use ethcore::account_provider::AccountProvider;
 use ethereum_types::{H128, H256, Address};
 use ethjson;
-use ethkey::{Signature, Public};
+use ethkey::{Signature, Password, Public};
 use crypto;
 use futures::Future;
 use fetch::{Fetch, Client as FetchClient, Method, BodyReader, Request};
 use bytes::{Bytes, ToPretty};
 use error::{Error, ErrorKind};
 use url::Url;
-use super::Signer;
-use super::key_server_keys::address_to_key;
+use super::find_account_password;

 /// Initialization vector length.
 const INIT_VEC_LEN: usize = 16;
@@ -48,6 +47,7 @@ pub trait Encryptor: Send + Sync + 'static {
 	fn encrypt(
 		&self,
 		contract_address: &Address,
+		accounts: &AccountProvider,
 		initialisation_vector: &H128,
 		plain_data: &[u8],
 	) -> Result<Bytes, Error>;
@@ -56,6 +56,7 @@ pub trait Encryptor: Send + Sync + 'static {
 	fn decrypt(
 		&self,
 		contract_address: &Address,
+		accounts: &AccountProvider,
 		cypher: &[u8],
 	) -> Result<Bytes, Error>;
 }
@@ -69,6 +70,8 @@ pub struct EncryptorConfig {
 	pub threshold: u32,
 	/// Account used for signing requests to key server
 	pub key_server_account: Option<Address>,
+	/// Passwords used to unlock accounts
+	pub passwords: Vec<Password>,
 }

 struct EncryptionSession {
@@ -81,20 +84,14 @@ pub struct SecretStoreEncryptor {
 	config: EncryptorConfig,
 	client: FetchClient,
 	sessions: Mutex<HashMap<Address, EncryptionSession>>,
-	signer: Arc<Signer>,
 }

 impl SecretStoreEncryptor {
 	/// Create new encryptor
-	pub fn new(
-		config: EncryptorConfig,
-		client: FetchClient,
-		signer: Arc<Signer>,
-	) -> Result<Self, Error> {
+	pub fn new(config: EncryptorConfig, client: FetchClient) -> Result<Self, Error> {
 		Ok(SecretStoreEncryptor {
 			config,
 			client,
-			signer,
 			sessions: Mutex::default(),
 		})
 	}
@@ -105,12 +102,13 @@ impl SecretStoreEncryptor {
 		url_suffix: &str,
 		use_post: bool,
 		contract_address: &Address,
+		accounts: &AccountProvider,
 	) -> Result<Bytes, Error> {
 		// check if the key was already cached
 		if let Some(key) = self.obtained_key(contract_address) {
 			return Ok(key);
 		}
-		let contract_address_signature = self.sign_contract_address(contract_address)?;
+		let contract_address_signature = self.sign_contract_address(contract_address, accounts)?;
 		let requester = self.config.key_server_account.ok_or_else(|| ErrorKind::KeyServerAccountNotSet)?;

 		// key id in SS is H256 && we have H160 here => expand with assitional zeros
@@ -150,9 +148,10 @@ impl SecretStoreEncryptor {

 		// response is JSON string (which is, in turn, hex-encoded, encrypted Public)
 		let encrypted_bytes: ethjson::bytes::Bytes = result.trim_matches('\"').parse().map_err(|e| ErrorKind::Encrypt(e))?;
+		let password = find_account_password(&self.config.passwords, &*accounts, &requester);

 		// decrypt Public
-		let decrypted_bytes = self.signer.decrypt(requester, &crypto::DEFAULT_MAC, &encrypted_bytes)?;
+		let decrypted_bytes = accounts.decrypt(requester, password, &crypto::DEFAULT_MAC, &encrypted_bytes)?;
 		let decrypted_key = Public::from_slice(&decrypted_bytes);

 		// and now take x coordinate of Public as a key
@@ -188,9 +187,12 @@ impl SecretStoreEncryptor {
 		}
 	}

-	fn sign_contract_address(&self, contract_address: &Address) -> Result<Signature, Error> {
+	fn sign_contract_address(&self, contract_address: &Address, accounts: &AccountProvider) -> Result<Signature, Error> {
+		// key id in SS is H256 && we have H160 here => expand with assitional zeros
+		let contract_address_extended: H256 = contract_address.into();
 		let key_server_account = self.config.key_server_account.ok_or_else(|| ErrorKind::KeyServerAccountNotSet)?;
-		Ok(self.signer.sign(key_server_account, address_to_key(contract_address))?)
+		let password = find_account_password(&self.config.passwords, accounts, &key_server_account);
+		Ok(accounts.sign(key_server_account, password, H256::from_slice(&contract_address_extended))?)
 	}
 }

@@ -198,15 +200,16 @@ impl Encryptor for SecretStoreEncryptor {
 	fn encrypt(
 		&self,
 		contract_address: &Address,
+		accounts: &AccountProvider,
 		initialisation_vector: &H128,
 		plain_data: &[u8],
 	) -> Result<Bytes, Error> {
 		// retrieve the key, try to generate it if it doesn't exist yet
-		let key = match self.retrieve_key("", false, contract_address) {
+		let key = match self.retrieve_key("", false, contract_address, &*accounts) {
 			Ok(key) => Ok(key),
 			Err(Error(ErrorKind::EncryptionKeyNotFound(_), _)) => {
 				trace!(target: "privatetx", "Key for account wasnt found in sstore. Creating. Address: {:?}", contract_address);
-				self.retrieve_key(&format!("/{}", self.config.threshold), true, contract_address)
+				self.retrieve_key(&format!("/{}", self.config.threshold), true, contract_address, &*accounts)
 			}
 			Err(err) => Err(err),
 		}?;
@@ -225,6 +228,7 @@ impl Encryptor for SecretStoreEncryptor {
 	fn decrypt(
 		&self,
 		contract_address: &Address,
+		accounts: &AccountProvider,
 		cypher: &[u8],
 	) -> Result<Bytes, Error> {
 		// initialization vector takes INIT_VEC_LEN bytes
@@ -234,7 +238,7 @@ impl Encryptor for SecretStoreEncryptor {
 		}

 		// retrieve existing key
-		let key = self.retrieve_key("", false, contract_address)?;
+		let key = self.retrieve_key("", false, contract_address, accounts)?;

 		// use symmetric decryption to decrypt document
 		let (cypher, iv) = cypher.split_at(cypher_len - INIT_VEC_LEN);
@@ -254,6 +258,7 @@ impl Encryptor for NoopEncryptor {
 	fn encrypt(
 		&self,
 		_contract_address: &Address,
+		_accounts: &AccountProvider,
 		_initialisation_vector: &H128,
 		data: &[u8],
 	) -> Result<Bytes, Error> {
@@ -263,6 +268,7 @@ impl Encryptor for NoopEncryptor {
 	fn decrypt(
 		&self,
 		_contract_address: &Address,
+		_accounts: &AccountProvider,
 		data: &[u8],
 	) -> Result<Bytes, Error> {
 		Ok(data.to_vec())
--- a/ethcore/private-tx/src/error.rs
+++ b/ethcore/private-tx/src/error.rs
@@ -1,26 +1,26 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use ethereum_types::Address;
 use rlp::DecoderError;
 use ethtrie::TrieError;
+use ethcore::account_provider::SignError;
 use ethcore::error::{Error as EthcoreError, ExecutionError};
-use types::transaction::Error as TransactionError;
+use transaction::Error as TransactionError;
 use ethkey::Error as KeyError;
-use ethkey::crypto::Error as CryptoError;
 use txpool::Error as TxPoolError;

 error_chain! {
@@ -29,7 +29,6 @@ error_chain! {
 		Decoder(DecoderError) #[doc = "RLP decoding error."];
 		Trie(TrieError) #[doc = "Error concerning TrieDBs."];
 		Txpool(TxPoolError) #[doc = "Tx pool error."];
-		Crypto(CryptoError) #[doc = "Crypto error."];
 	}

 	errors {
@@ -76,7 +75,7 @@ error_chain! {
 		}

 		#[doc = "Wrong private transaction type."]
-		BadTransactionType {
+		BadTransactonType {
 			description("Wrong private transaction type."),
 			display("Wrong private transaction type"),
 		}
@@ -153,6 +152,12 @@ error_chain! {
 			display("General signing error {}", err),
 		}

+		#[doc = "Account provider signing error."]
+		Sign(err: SignError) {
+			description("Account provider signing error."),
+			display("Account provider signing error {}", err),
+		}
+
 		#[doc = "Error of transactions processing."]
 		Transaction(err: TransactionError) {
 			description("Error of transactions processing."),
@@ -167,6 +172,12 @@ error_chain! {
 	}
 }

+impl From<SignError> for Error {
+	fn from(err: SignError) -> Self {
+		ErrorKind::Sign(err).into()
+	}
+}
+
 impl From<KeyError> for Error {
 	fn from(err: KeyError) -> Self {
 		ErrorKind::Key(err).into()
--- a/ethcore/private-tx/src/key_server_keys.rs
+++ b/ethcore/private-tx/src/key_server_keys.rs
@@ -1,173 +0,0 @@
-// Copyright 2015-2018 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Wrapper around key server responsible for access keys processing.
-
-use std::sync::Arc;
-use parking_lot::RwLock;
-use ethereum_types::{H256, Address};
-use call_contract::{CallContract, RegistryInfo};
-use ethcore::client::BlockId;
-use ethabi::FunctionOutputDecoder;
-
-const ACL_CHECKER_CONTRACT_REGISTRY_NAME: &'static str = "secretstore_acl_checker";
-
-use_contract!(keys_acl_contract, "res/keys_acl.json");
-
-/// Returns the address (of the contract), that corresponds to the key
-pub fn key_to_address(key: &H256) -> Address {
-	Address::from_slice(&key.to_vec()[..10])
-}
-
-/// Returns the key from the key server associated with the contract
-pub fn address_to_key(contract_address: &Address) -> H256 {
-	// Current solution uses contract address extended with 0 as id
-	let contract_address_extended: H256 = contract_address.into();
-
-	H256::from_slice(&contract_address_extended)
-}
-
-/// Trait for keys server keys provider.
-pub trait KeyProvider: Send + Sync + 'static {
-	/// Account, that is used for communication with key server
-	fn key_server_account(&self) -> Option<Address>;
-
-	/// List of keys available for the account
-	fn available_keys(&self, block: BlockId, account: &Address) -> Option<Vec<Address>>;
-
-	/// Update permissioning contract
-	fn update_acl_contract(&self);
-}
-
-/// Secret Store keys provider
-pub struct SecretStoreKeys<C> where C: CallContract + RegistryInfo + Send + Sync + 'static {
-	client: Arc<C>,
-	key_server_account: Option<Address>,
-	keys_acl_contract: RwLock<Option<Address>>,
-}
-
-impl<C> SecretStoreKeys<C> where C: CallContract + RegistryInfo + Send + Sync + 'static {
-	/// Create provider
-	pub fn new(client: Arc<C>, key_server_account: Option<Address>) -> Self {
-		SecretStoreKeys {
-			client,
-			key_server_account,
-			keys_acl_contract: RwLock::new(None),
-		}
-	}
-}
-
-impl<C> KeyProvider for SecretStoreKeys<C> where C: CallContract + RegistryInfo + Send + Sync + 'static {
-	fn key_server_account(&self) -> Option<Address> {
-		self.key_server_account
-	}
-
-	fn available_keys(&self, block: BlockId, account: &Address) -> Option<Vec<Address>> {
-		match *self.keys_acl_contract.read() {
-			Some(acl_contract_address) => {
-				let (data, decoder) = keys_acl_contract::functions::available_keys::call(*account);
-				if let Ok(value) = self.client.call_contract(block, acl_contract_address, data) {
-					decoder.decode(&value).ok().map(|key_values| {
-						key_values.iter().map(key_to_address).collect()
-					})
-				} else {
-					None
-				}
-			}
-			None => None,
-		}
-	}
-
-	fn update_acl_contract(&self) {
-		let contract_address = self.client.registry_address(ACL_CHECKER_CONTRACT_REGISTRY_NAME.into(), BlockId::Latest);
-		if *self.keys_acl_contract.read() != contract_address {
-			trace!(target: "privatetx", "Configuring for ACL checker contract from address {:?}",
-				contract_address);
-			*self.keys_acl_contract.write() = contract_address;
-		}
-	}
-}
-
-/// Dummy keys provider.
-pub struct StoringKeyProvider {
-	available_keys: RwLock<Option<Vec<Address>>>,
-	key_server_account: Option<Address>,
-}
-
-impl StoringKeyProvider {
-	/// Store available keys
-	pub fn set_available_keys(&self, keys: &Vec<Address>) {
-		*self.available_keys.write() = Some(keys.clone())
-	}
-}
-
-impl Default for StoringKeyProvider {
-	fn default() -> Self {
-		StoringKeyProvider {
-			available_keys: RwLock::new(None),
-			key_server_account: Some(Address::default()),
-		}
-	}
-}
-
-impl KeyProvider for StoringKeyProvider {
-	fn key_server_account(&self) -> Option<Address> {
-		self.key_server_account
-	}
-
-	fn available_keys(&self, _block: BlockId, _account: &Address) -> Option<Vec<Address>> {
-		self.available_keys.read().clone()
-	}
-
-	fn update_acl_contract(&self) {}
-}
-
-#[cfg(test)]
-mod tests {
-	use std::sync::Arc;
-	use ethkey::{Secret, KeyPair};
-	use bytes::Bytes;
-	use super::*;
-
-	struct DummyRegistryClient {
-		registry_address: Option<Address>,
-	}
-
-	impl DummyRegistryClient {
-		pub fn new(registry_address: Option<Address>) -> Self {
-			DummyRegistryClient {
-				registry_address
-			}
-		}
-	}
-
-	impl RegistryInfo for DummyRegistryClient {
-		fn registry_address(&self, _name: String, _block: BlockId) -> Option<Address> { self.registry_address }
-	}
-
-	impl CallContract for DummyRegistryClient {
-		fn call_contract(&self, _id: BlockId, _address: Address, _data: Bytes) -> Result<Bytes, String> { Ok(vec![]) }
-	}
-
-	#[test]
-	fn should_update_acl_contract() {
-		let key = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000011")).unwrap();
-		let client = DummyRegistryClient::new(Some(key.address()));
-		let keys_data = SecretStoreKeys::new(Arc::new(client), None);
-		keys_data.update_acl_contract();
-		assert_eq!(keys_data.keys_acl_contract.read().unwrap(), key.address());
-	}
-}
--- a/ethcore/private-tx/src/lib.rs
+++ b/ethcore/private-tx/src/lib.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Private transactions module.

@@ -21,33 +21,31 @@
 #![recursion_limit="256"]

 mod encryptor;
-mod key_server_keys;
 mod private_transactions;
 mod messages;
 mod error;

-extern crate common_types as types;
-extern crate ethabi;
 extern crate ethcore;
-extern crate ethcore_call_contract as call_contract;
+extern crate parity_bytes as bytes;
+extern crate parity_crypto as crypto;
 extern crate ethcore_io as io;
 extern crate ethcore_miner;
+extern crate ethcore_transaction as transaction;
+extern crate ethabi;
 extern crate ethereum_types;
-extern crate ethjson;
 extern crate ethkey;
+extern crate ethjson;
 extern crate fetch;
 extern crate futures;
 extern crate heapsize;
 extern crate keccak_hash as hash;
-extern crate parity_bytes as bytes;
-extern crate parity_crypto as crypto;
 extern crate parking_lot;
-extern crate trie_db as trie;
+extern crate patricia_trie as trie;
+extern crate transaction_pool as txpool;
 extern crate patricia_trie_ethereum as ethtrie;
 extern crate rlp;
-extern crate rustc_hex;
-extern crate transaction_pool as txpool;
 extern crate url;
+extern crate rustc_hex;
 #[macro_use]
 extern crate log;
 #[macro_use]
@@ -62,16 +60,15 @@ extern crate rlp_derive;
 #[cfg(test)]
 extern crate rand;
 #[cfg(test)]
-extern crate env_logger;
+extern crate ethcore_logger;

 pub use encryptor::{Encryptor, SecretStoreEncryptor, EncryptorConfig, NoopEncryptor};
-pub use key_server_keys::{KeyProvider, SecretStoreKeys, StoringKeyProvider};
 pub use private_transactions::{VerifiedPrivateTransaction, VerificationStore, PrivateTransactionSigningDesc, SigningStore};
 pub use messages::{PrivateTransaction, SignedPrivateTransaction};
 pub use error::{Error, ErrorKind};

 use std::sync::{Arc, Weak};
-use std::collections::{HashMap, HashSet, BTreeMap};
+use std::collections::{HashMap, HashSet};
 use ethereum_types::{H128, H256, U256, Address};
 use hash::keccak;
 use rlp::*;
@@ -81,17 +78,16 @@ use ethkey::{Signature, recover, public_to_address};
 use io::IoChannel;
 use ethcore::executive::{Executive, TransactOptions};
 use ethcore::executed::{Executed};
-use types::transaction::{SignedTransaction, Transaction, Action, UnverifiedTransaction};
+use transaction::{SignedTransaction, Transaction, Action, UnverifiedTransaction};
 use ethcore::{contract_address as ethcore_contract_address};
 use ethcore::client::{
-	Client, ChainNotify, NewBlocks, ChainMessageType, ClientIoMessage, BlockId,
-	Call, BlockInfo
+	Client, ChainNotify, NewBlocks, ChainMessageType, ClientIoMessage, BlockId, CallContract
 };
+use ethcore::account_provider::AccountProvider;
 use ethcore::miner::{self, Miner, MinerService, pool_client::NonceCache};
-use ethcore::{state, state_db};
 use ethcore::trace::{Tracer, VMTracer};
-use call_contract::CallContract;
 use rustc_hex::FromHex;
+use ethkey::Password;
 use ethabi::FunctionOutputDecoder;

 // Source avaiable at https://github.com/parity-contracts/private-tx/blob/master/contracts/PrivateContract.sol
@@ -118,6 +114,8 @@ pub struct ProviderConfig {
 	pub validator_accounts: Vec<Address>,
 	/// Account used for signing public transactions created from private transactions
 	pub signer_account: Option<Address>,
+	/// Passwords used to unlock accounts
+	pub passwords: Vec<Password>,
 }

 #[derive(Debug)]
@@ -125,85 +123,50 @@ pub struct ProviderConfig {
 pub struct Receipt {
 	/// Private transaction hash.
 	pub hash: H256,
-	/// Contract address.
-	pub contract_address: Address,
+	/// Created contract address if any.
+	pub contract_address: Option<Address>,
 	/// Execution status.
 	pub status_code: u8,
 }

-/// Payload signing and decrypting capabilities.
-pub trait Signer: Send + Sync {
-	/// Decrypt payload using private key of given address.
-	fn decrypt(&self, account: Address, shared_mac: &[u8], payload: &[u8]) -> Result<Vec<u8>, Error>;
-	/// Sign given hash using provided account.
-	fn sign(&self, account: Address, hash: ethkey::Message) -> Result<Signature, Error>;
-}
-
-/// Signer implementation that errors on any request.
-pub struct DummySigner;
-impl Signer for DummySigner {
-	fn decrypt(&self, _account: Address, _shared_mac: &[u8], _payload: &[u8]) -> Result<Vec<u8>, Error> {
-		Err("Decrypting is not supported.".to_owned())?
-	}
-
-	fn sign(&self, _account: Address, _hash: ethkey::Message) -> Result<Signature, Error> {
-		Err("Signing is not supported.".to_owned())?
-	}
-}
-
-/// Signer implementation using multiple keypairs
-pub struct KeyPairSigner(pub Vec<ethkey::KeyPair>);
-impl Signer for KeyPairSigner {
-	fn decrypt(&self, account: Address, shared_mac: &[u8], payload: &[u8]) -> Result<Vec<u8>, Error> {
-		let kp = self.0.iter().find(|k| k.address() == account).ok_or(ethkey::Error::InvalidAddress)?;
-		Ok(ethkey::crypto::ecies::decrypt(kp.secret(), shared_mac, payload)?)
-	}
-
-	fn sign(&self, account: Address, hash: ethkey::Message) -> Result<Signature, Error> {
-		let kp = self.0.iter().find(|k| k.address() == account).ok_or(ethkey::Error::InvalidAddress)?;
-		Ok(ethkey::sign(kp.secret(), &hash)?)
-	}
-}
-
 /// Manager of private transactions
 pub struct Provider {
 	encryptor: Box<Encryptor>,
 	validator_accounts: HashSet<Address>,
 	signer_account: Option<Address>,
+	passwords: Vec<Password>,
 	notify: RwLock<Vec<Weak<ChainNotify>>>,
 	transactions_for_signing: RwLock<SigningStore>,
 	transactions_for_verification: VerificationStore,
 	client: Arc<Client>,
 	miner: Arc<Miner>,
-	accounts: Arc<Signer>,
+	accounts: Arc<AccountProvider>,
 	channel: IoChannel<ClientIoMessage>,
-	keys_provider: Arc<KeyProvider>,
 }

 #[derive(Debug)]
 pub struct PrivateExecutionResult<T, V> where T: Tracer, V: VMTracer {
 	code: Option<Bytes>,
 	state: Bytes,
-	contract_address: Address,
+	contract_address: Option<Address>,
 	result: Executed<T::Output, V::Output>,
 }

-impl Provider {
+impl Provider where {
 	/// Create a new provider.
 	pub fn new(
 		client: Arc<Client>,
 		miner: Arc<Miner>,
-		accounts: Arc<Signer>,
+		accounts: Arc<AccountProvider>,
 		encryptor: Box<Encryptor>,
 		config: ProviderConfig,
 		channel: IoChannel<ClientIoMessage>,
-		keys_provider: Arc<KeyProvider>,
 	) -> Self {
-		keys_provider.update_acl_contract();
 		Provider {
 			encryptor,
 			validator_accounts: config.validator_accounts.into_iter().collect(),
 			signer_account: config.signer_account,
+			passwords: config.passwords,
 			notify: RwLock::default(),
 			transactions_for_signing: RwLock::default(),
 			transactions_for_verification: VerificationStore::default(),
@@ -211,7 +174,6 @@ impl Provider {
 			miner,
 			accounts,
 			channel,
-			keys_provider,
 		}
 	}

@@ -241,11 +203,15 @@ impl Provider {
 			bail!(ErrorKind::SignerAccountNotSet);
 		}
 		let tx_hash = signed_transaction.hash();
-		let contract = Self::contract_address_from_transaction(&signed_transaction).map_err(|_| ErrorKind::BadTransactionType)?;
+		match signed_transaction.action {
+			Action::Create => {
+				bail!(ErrorKind::BadTransactonType);
+			}
+			Action::Call(contract) => {
 		let data = signed_transaction.rlp_bytes();
 		let encrypted_transaction = self.encrypt(&contract, &Self::iv_from_transaction(&signed_transaction), &data)?;
 		let private = PrivateTransaction::new(encrypted_transaction, contract);
-		// TODO #9825 [ToDr] Using BlockId::Latest is bad here,
+				// TODO [ToDr] Using BlockId::Latest is bad here,
 		// the block may change in the middle of execution
 		// causing really weird stuff to happen.
 		// We should retrieve hash and stick to that. IMHO
@@ -262,9 +228,11 @@ impl Provider {
 		self.broadcast_private_transaction(private.hash(), private.rlp_bytes());
 		Ok(Receipt {
 			hash: tx_hash,
-			contract_address: contract,
+			contract_address: Some(contract),
 			status_code: 0,
 		})
+			}
+		}
 	}

 	/// Calculate hash from united private state and contract nonce
@@ -276,20 +244,21 @@ impl Provider {
 		keccak(&state_buf.as_ref())
 	}

-	fn pool_client<'a>(&'a self, nonce_cache: &'a NonceCache, local_accounts: &'a HashSet<Address>) -> miner::pool_client::PoolClient<'a, Client> {
+	fn pool_client<'a>(&'a self, nonce_cache: &'a NonceCache) -> miner::pool_client::PoolClient<'a, Client> {
 		let engine = self.client.engine();
 		let refuse_service_transactions = true;
 		miner::pool_client::PoolClient::new(
 			&*self.client,
 			nonce_cache,
 			engine,
-			local_accounts,
+			Some(&*self.accounts),
 			refuse_service_transactions,
 		)
 	}

 	/// Retrieve and verify the first available private transaction for every sender
 	fn process_verification_queue(&self) -> Result<(), Error> {
+		let nonce_cache = NonceCache::new(NONCE_CACHE_SIZE);
 		let process_transaction = |transaction: &VerifiedPrivateTransaction| -> Result<_, String> {
 			let private_hash = transaction.private_transaction.hash();
 			match transaction.validator_account {
@@ -304,9 +273,9 @@ impl Provider {
 						self.broadcast_private_transaction(private_hash, transaction.private_transaction.rlp_bytes());
 						return Ok(());
 					}
-					let contract = Self::contract_address_from_transaction(&transaction.transaction)
-						.map_err(|_| "Incorrect type of action for the transaction")?;
-					// TODO #9825 [ToDr] Usage of BlockId::Latest
+					let tx_action = transaction.transaction.action.clone();
+					if let Action::Call(contract) = tx_action {
+						// TODO [ToDr] Usage of BlockId::Latest
 					let contract_nonce = self.get_contract_nonce(&contract, BlockId::Latest);
 					if let Err(e) = contract_nonce {
 						bail!("Cannot retrieve contract nonce: {:?}", e);
@@ -319,7 +288,8 @@ impl Provider {
 					let private_state = private_state.expect("Error was checked before");
 					let private_state_hash = self.calculate_state_hash(&private_state, contract_nonce);
 					trace!(target: "privatetx", "Hashed effective private state for validator: {:?}", private_state_hash);
-					let signed_state = self.accounts.sign(validator_account, private_state_hash);
+					let password = find_account_password(&self.passwords, &*self.accounts, &validator_account);
+					let signed_state = self.accounts.sign(validator_account, password, private_state_hash);
 					if let Err(e) = signed_state {
 						bail!("Cannot sign the state: {:?}", e);
 					}
@@ -327,13 +297,14 @@ impl Provider {
 					let signed_private_transaction = SignedPrivateTransaction::new(private_hash, signed_state, None);
 					trace!(target: "privatetx", "Sending signature for private transaction: {:?}", signed_private_transaction);
 					self.broadcast_signed_private_transaction(signed_private_transaction.hash(), signed_private_transaction.rlp_bytes());
+					} else {
+						bail!("Incorrect type of action for the transaction");
+					}
 				}
 			}
 			Ok(())
 		};
-		let nonce_cache = NonceCache::new(NONCE_CACHE_SIZE);
-		let local_accounts = HashSet::new();
-		let ready_transactions = self.transactions_for_verification.drain(self.pool_client(&nonce_cache, &local_accounts));
+		let ready_transactions = self.transactions_for_verification.drain(self.pool_client(&nonce_cache));
 		for transaction in ready_transactions {
 			if let Err(e) = process_transaction(&transaction) {
 				warn!(target: "privatetx", "Error: {:?}", e);
@@ -374,7 +345,8 @@ impl Provider {
 			let chain_id = desc.original_transaction.chain_id();
 			let hash = public_tx.hash(chain_id);
 			let signer_account = self.signer_account.ok_or_else(|| ErrorKind::SignerAccountNotSet)?;
-			let signature = self.accounts.sign(signer_account, hash)?;
+			let password = find_account_password(&self.passwords, &*self.accounts, &signer_account);
+			let signature = self.accounts.sign(signer_account, password, hash)?;
 			let signed = SignedTransaction::new(public_tx.with_signature(signature, chain_id))?;
 			match self.miner.import_own_transaction(&*self.client, signed.into()) {
 				Ok(_) => trace!(target: "privatetx", "Public transaction added to queue"),
@@ -383,15 +355,6 @@ impl Provider {
 					bail!(err);
 				}
 			}
-			// Notify about state changes
-			let contract = Self::contract_address_from_transaction(&desc.original_transaction)?;
-			// TODO #9825 Usage of BlockId::Latest
-			if self.get_contract_version(BlockId::Latest, &contract) >= PRIVATE_CONTRACT_WITH_NOTIFICATION_VER {
-				match self.state_changes_notify(BlockId::Latest, &contract, &desc.original_transaction.sender(), desc.original_transaction.hash()) {
-					Ok(_) => trace!(target: "privatetx", "Notification about private state changes sent"),
-					Err(err) => warn!(target: "privatetx", "Failed to send private state changed notification, error: {:?}", err),
-				}
-			}
 			// Remove from store for signing
 			if let Err(err) = self.transactions_for_signing.write().remove(&private_hash) {
 				warn!(target: "privatetx", "Failed to remove transaction from signing store, error: {:?}", err);
@@ -410,16 +373,6 @@ impl Provider {
 		Ok(())
 	}

-	fn contract_address_from_transaction(transaction: &SignedTransaction) -> Result<Address, Error> {
-		match transaction.action {
-			Action::Call(contract) => Ok(contract),
-			_ => {
-				warn!(target: "privatetx", "Incorrect type of action for the transaction");
-				bail!(ErrorKind::BadTransactionType);
-			}
-		}
-	}
-
 	fn last_required_signature(&self, desc: &PrivateTransactionSigningDesc, sign: Signature) -> Result<bool, Error>  {
 		if desc.received_signatures.contains(&sign) {
 			return Ok(false);
@@ -469,12 +422,12 @@ impl Provider {

 	fn encrypt(&self, contract_address: &Address, initialisation_vector: &H128, data: &[u8]) -> Result<Bytes, Error> {
 		trace!(target: "privatetx", "Encrypt data using key(address): {:?}", contract_address);
-		Ok(self.encryptor.encrypt(contract_address, initialisation_vector, data)?)
+		Ok(self.encryptor.encrypt(contract_address, &*self.accounts, initialisation_vector, data)?)
 	}

 	fn decrypt(&self, contract_address: &Address, data: &[u8]) -> Result<Bytes, Error> {
 		trace!(target: "privatetx", "Decrypt data using key(address): {:?}", contract_address);
-		Ok(self.encryptor.decrypt(contract_address, data)?)
+		Ok(self.encryptor.decrypt(contract_address, &*self.accounts, data)?)
 	}

 	fn get_decrypted_state(&self, address: &Address, block: BlockId) -> Result<Bytes, Error> {
@@ -509,23 +462,13 @@ impl Provider {

 	fn snapshot_from_storage(storage: &HashMap<H256, H256>) -> Bytes {
 		let mut raw = Vec::with_capacity(storage.len() * 64);
-		// Sort the storage to guarantee the order for all parties
-		let sorted_storage: BTreeMap<&H256, &H256> = storage.iter().collect();
-		for (key, value) in sorted_storage {
+		for (key, value) in storage {
 			raw.extend_from_slice(key);
 			raw.extend_from_slice(value);
 		};
 		raw
 	}

-	fn patch_account_state(&self, contract_address: &Address, block: BlockId, state: &mut state::State<state_db::StateDB>) -> Result<(), Error> {
-		let contract_code = Arc::new(self.get_decrypted_code(contract_address, block)?);
-		let contract_state = self.get_decrypted_state(contract_address, block)?;
-		trace!(target: "privatetx", "Patching contract at {:?}, code: {:?}, state: {:?}", contract_address, contract_code, contract_state);
-		state.patch_account(contract_address, contract_code, Self::snapshot_to_storage(contract_state))?;
-		Ok(())
-	}
-
 	pub fn execute_private<T, V>(&self, transaction: &SignedTransaction, options: TransactOptions<T, V>, block: BlockId) -> Result<PrivateExecutionResult<T, V>, Error>
 		where
 			T: Tracer,
@@ -535,51 +478,44 @@ impl Provider {
 		env_info.gas_limit = transaction.gas;

 		let mut state = self.client.state_at(block).ok_or(ErrorKind::StatePruned)?;
-		// TODO #9825 in case of BlockId::Latest these need to operate on the same state
+		// TODO: in case of BlockId::Latest these need to operate on the same state
 		let contract_address = match transaction.action {
 			Action::Call(ref contract_address) => {
-				// Patch current contract state
-				self.patch_account_state(contract_address, block, &mut state)?;
+				let contract_code = Arc::new(self.get_decrypted_code(contract_address, block)?);
+				let contract_state = self.get_decrypted_state(contract_address, block)?;
+				trace!(target: "privatetx", "Patching contract at {:?}, code: {:?}, state: {:?}", contract_address, contract_code, contract_state);
+				state.patch_account(contract_address, contract_code, Self::snapshot_to_storage(contract_state))?;
 				Some(*contract_address)
 			},
 			Action::Create => None,
 		};

 		let engine = self.client.engine();
-		let sender = transaction.sender();
-		let nonce = state.nonce(&sender)?;
-		let contract_address = contract_address.unwrap_or_else(|| {
+		let contract_address = contract_address.or({
+			let sender = transaction.sender();
+			let nonce = state.nonce(&sender)?;
 			let (new_address, _) = ethcore_contract_address(engine.create_address_scheme(env_info.number), &sender, &nonce, &transaction.data);
-			new_address
+			Some(new_address)
 		});
-		// Patch other available private contracts' states as well
-		// TODO: #10133 patch only required for the contract states
-		if let Some(key_server_account) = self.keys_provider.key_server_account() {
-			if let Some(available_contracts) = self.keys_provider.available_keys(block, &key_server_account) {
-				for private_contract in available_contracts {
-					if private_contract == contract_address {
-						continue;
-					}
-					self.patch_account_state(&private_contract, block, &mut state)?;
-				}
-			}
-		}
 		let machine = engine.machine();
 		let schedule = machine.schedule(env_info.number);
 		let result = Executive::new(&mut state, &env_info, &machine, &schedule).transact_virtual(transaction, options)?;
-		let (encrypted_code, encrypted_storage) = {
-			let (code, storage) = state.into_account(&contract_address)?;
-			trace!(target: "privatetx", "Private contract executed. code: {:?}, state: {:?}, result: {:?}", code, storage, result.output);
-			let enc_code = match code {
-				Some(c) => Some(self.encrypt(&contract_address, &Self::iv_from_address(&contract_address), &c)?),
-				None => None,
-			};
-			(enc_code, self.encrypt(&contract_address, &Self::iv_from_transaction(transaction), &Self::snapshot_from_storage(&storage))?)
+		let (encrypted_code, encrypted_storage) = match contract_address {
+			None => bail!(ErrorKind::ContractDoesNotExist),
+			Some(address) => {
+				let (code, storage) = state.into_account(&address)?;
+				let enc_code = match code {
+					Some(c) => Some(self.encrypt(&address, &Self::iv_from_address(&address), &c)?),
+					None => None,
+				};
+				(enc_code, self.encrypt(&address, &Self::iv_from_transaction(transaction), &Self::snapshot_from_storage(&storage))?)
+			},
 		};
+		trace!(target: "privatetx", "Private contract executed. code: {:?}, state: {:?}, result: {:?}", encrypted_code, encrypted_storage, result.output);
 		Ok(PrivateExecutionResult {
 			code: encrypted_code,
 			state: encrypted_storage,
-			contract_address: contract_address,
+			contract_address,
 			result,
 		})
 	}
@@ -604,52 +540,40 @@ impl Provider {

 	/// Returns the key from the key server associated with the contract
 	pub fn contract_key_id(&self, contract_address: &Address) -> Result<H256, Error> {
-		Ok(key_server_keys::address_to_key(contract_address))
+		//current solution uses contract address extended with 0 as id
+		let contract_address_extended: H256 = contract_address.into();
+
+		Ok(H256::from_slice(&contract_address_extended))
 	}

 	/// Create encrypted public contract deployment transaction.
-	pub fn public_creation_transaction(&self, block: BlockId, source: &SignedTransaction, validators: &[Address], gas_price: U256) -> Result<(Transaction, Address), Error> {
+	pub fn public_creation_transaction(&self, block: BlockId, source: &SignedTransaction, validators: &[Address], gas_price: U256) -> Result<(Transaction, Option<Address>), Error> {
 		if let Action::Call(_) = source.action {
-			bail!(ErrorKind::BadTransactionType);
+			bail!(ErrorKind::BadTransactonType);
 		}
 		let sender = source.sender();
 		let state = self.client.state_at(block).ok_or(ErrorKind::StatePruned)?;
 		let nonce = state.nonce(&sender)?;
 		let executed = self.execute_private(source, TransactOptions::with_no_tracing(), block)?;
-		let header = self.client.block_header(block)
-			.ok_or(ErrorKind::StatePruned)
-			.and_then(|h| h.decode().map_err(|_| ErrorKind::StateIncorrect).into())?;
-		let (executed_code, executed_state) = (executed.code.unwrap_or_default(), executed.state);
-		let tx_data = Self::generate_constructor(validators, executed_code.clone(), executed_state.clone());
-		let mut tx = Transaction {
+		let gas: u64 = 650000 +
+			validators.len() as u64 * 30000 +
+			executed.code.as_ref().map_or(0, |c| c.len() as u64) * 8000 +
+			executed.state.len() as u64 * 8000;
+		Ok((Transaction {
 			nonce: nonce,
 			action: Action::Create,
-			gas: u64::max_value().into(),
+			gas: gas.into(),
 			gas_price: gas_price,
 			value: source.value,
-			data: tx_data,
-		};
-		tx.gas = match self.client.estimate_gas(&tx.clone().fake_sign(sender), &state, &header) {
-			Ok(estimated_gas) => estimated_gas,
-			Err(_) => self.estimate_tx_gas(validators, &executed_code, &executed_state, &[]),
-		};
-
-		Ok((tx, executed.contract_address))
-	}
-
-	fn estimate_tx_gas(&self, validators: &[Address], code: &Bytes, state: &Bytes, signatures: &[Signature]) -> U256 {
-		let default_gas = 650000 +
-			validators.len() as u64 * 30000 +
-			code.len() as u64 * 8000 +
-			signatures.len() as u64 * 50000 +
-			state.len() as u64 * 8000;
-		default_gas.into()
+			data: Self::generate_constructor(validators, executed.code.unwrap_or_default(), executed.state)
+		},
+		executed.contract_address))
 	}

 	/// Create encrypted public contract deployment transaction. Returns updated encrypted state.
 	pub fn execute_private_transaction(&self, block: BlockId, source: &SignedTransaction) -> Result<Bytes, Error> {
 		if let Action::Create = source.action {
-			bail!(ErrorKind::BadTransactionType);
+			bail!(ErrorKind::BadTransactonType);
 		}
 		let result = self.execute_private(source, TransactOptions::with_no_tracing(), block)?;
 		Ok(result.state)
@@ -657,7 +581,7 @@ impl Provider {

 	/// Create encrypted public transaction from private transaction.
 	pub fn public_transaction(&self, state: Bytes, source: &SignedTransaction, signatures: &[Signature], nonce: U256, gas_price: U256) -> Result<Transaction, Error> {
-		let gas = self.estimate_tx_gas(&[], &Vec::new(), &state, signatures);
+		let gas: u64 = 650000 + state.len() as u64 * 8000 + signatures.len() as u64 * 50000;
 		Ok(Transaction {
 			nonce: nonce,
 			action: source.action.clone(),
@@ -680,21 +604,6 @@ impl Provider {
 		let value = self.client.call_contract(block, *address, data)?;
 		decoder.decode(&value).map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)).into())
 	}
-
-	fn get_contract_version(&self, block: BlockId, address: &Address) -> usize {
-		let (data, decoder) = private_contract::functions::get_version::call();
-		match self.client.call_contract(block, *address, data)
-			.and_then(|value| decoder.decode(&value).map_err(|e| e.to_string())) {
-			Ok(version) => version.low_u64() as usize,
-			Err(_) => INITIAL_PRIVATE_CONTRACT_VER,
-		}
-	}
-
-	fn state_changes_notify(&self, block: BlockId, address: &Address, originator: &Address, transaction_hash: H256) -> Result<(), Error> {
-		let (data, _) = private_contract::functions::notify_changes::call(*originator, transaction_hash.0.to_vec());
-		let _value = self.client.call_contract(block, *address, data)?;
-		Ok(())
-	}
 }

 pub trait Importer {
@@ -724,18 +633,17 @@ impl Importer for Arc<Provider> {
 			.iter()
 			.find(|address| self.validator_accounts.contains(address));

-		// Extract the original transaction
+		//extract the original transaction
 		let encrypted_data = private_tx.encrypted();
 		let transaction_bytes = self.decrypt(&contract, &encrypted_data)?;
 		let original_tx: UnverifiedTransaction = Rlp::new(&transaction_bytes).as_val()?;
 		let nonce_cache = NonceCache::new(NONCE_CACHE_SIZE);
-		let local_accounts = HashSet::new();
-		// Add to the queue for further verification
+		//add to the queue for further verification
 		self.transactions_for_verification.add_transaction(
 			original_tx,
 			validation_account.map(|&account| account),
 			private_tx,
-			self.pool_client(&nonce_cache, &local_accounts),
+			self.pool_client(&nonce_cache),
 		)?;
 		let provider = Arc::downgrade(self);
 		let result = self.channel.send(ClientIoMessage::execute(move |_| {
@@ -770,13 +678,22 @@ impl Importer for Arc<Provider> {
 	}
 }

+/// Try to unlock account using stored password, return found password if any
+fn find_account_password(passwords: &Vec<Password>, account_provider: &AccountProvider, account: &Address) -> Option<Password> {
+	for password in passwords {
+		if let Ok(true) = account_provider.test_password(account, password) {
+			return Some(password.clone());
+		}
+	}
+	None
+}
+
 impl ChainNotify for Provider {
 	fn new_blocks(&self, new_blocks: NewBlocks) {
 		if new_blocks.imported.is_empty() || new_blocks.has_more_blocks_to_import { return }
-		trace!(target: "privatetx", "New blocks imported, try to prune the queue");
-		if let Err(err) = self.process_verification_queue() {
-			warn!(target: "privatetx", "Cannot prune private transactions queue. error: {:?}", err);
+			trace!(target: "privatetx", "New blocks imported, try to prune the queue");
+			if let Err(err) = self.process_verification_queue() {
+				warn!(target: "privatetx", "Cannot prune private transactions queue. error: {:?}", err);
 		}
-		self.keys_provider.update_acl_contract();
 	}
 }
--- a/ethcore/private-tx/src/messages.rs
+++ b/ethcore/private-tx/src/messages.rs
@@ -1,25 +1,25 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use ethereum_types::{H256, U256, Address};
 use bytes::Bytes;
 use hash::keccak;
 use rlp::Encodable;
 use ethkey::Signature;
-use types::transaction::signature::{add_chain_replay_protection, check_replay_protection};
+use transaction::signature::{add_chain_replay_protection, check_replay_protection};

 /// Message with private transaction encrypted
 #[derive(Default, Debug, Clone, PartialEq, RlpEncodable, RlpDecodable, Eq)]
--- a/ethcore/private-tx/src/private_transactions.rs
+++ b/ethcore/private-tx/src/private_transactions.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::sync::Arc;
 use std::cmp;
@@ -25,7 +25,7 @@ use heapsize::HeapSizeOf;
 use ethkey::Signature;
 use messages::PrivateTransaction;
 use parking_lot::RwLock;
-use types::transaction::{UnverifiedTransaction, SignedTransaction};
+use transaction::{UnverifiedTransaction, SignedTransaction};
 use txpool;
 use txpool::{VerifiedTransaction, Verifier};
 use error::{Error, ErrorKind};
--- a/ethcore/private-tx/tests/private_contract.rs
+++ b/ethcore/private-tx/tests/private_contract.rs
@@ -1,77 +1,79 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// Parity is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.

-// Parity Ethereum is distributed in the hope that it will be useful,
+// Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.

 // You should have received a copy of the GNU General Public License
-// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Contract for private transactions tests.

-extern crate common_types as types;
-extern crate env_logger;
+extern crate rustc_hex;
 extern crate ethcore;
-extern crate ethcore_io;
-extern crate ethcore_private_tx;
 extern crate ethkey;
 extern crate keccak_hash as hash;
-extern crate rustc_hex;
+extern crate ethcore_io;
+extern crate ethcore_logger;
+extern crate ethcore_private_tx;
+extern crate ethcore_transaction;

 #[macro_use]
 extern crate log;

 use std::sync::Arc;
-use rustc_hex::{FromHex, ToHex};
+use rustc_hex::FromHex;

-use types::ids::BlockId;
-use types::transaction::{Transaction, Action};
 use ethcore::CreateContractAddress;
+use ethcore::account_provider::AccountProvider;
 use ethcore::client::BlockChainClient;
+use ethcore::client::BlockId;
 use ethcore::executive::{contract_address};
 use ethcore::miner::Miner;
 use ethcore::test_helpers::{generate_dummy_client, push_block_with_transactions};
+use ethcore_transaction::{Transaction, Action};
 use ethkey::{Secret, KeyPair, Signature};
 use hash::keccak;

-use ethcore_private_tx::{NoopEncryptor, Provider, ProviderConfig, StoringKeyProvider};
+use ethcore_private_tx::{NoopEncryptor, Provider, ProviderConfig};

 #[test]
 fn private_contract() {
 	// This uses a simple private contract: contract Test1 { bytes32 public x; function setX(bytes32 _x) { x = _x; } }
-	let _ = ::env_logger::try_init();
+	ethcore_logger::init_log();
 	let client = generate_dummy_client(0);
 	let chain_id = client.signing_chain_id();
 	let key1 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000011")).unwrap();
 	let _key2 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000012")).unwrap();
 	let key3 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000013")).unwrap();
 	let key4 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000014")).unwrap();
-
-	let signer = Arc::new(ethcore_private_tx::KeyPairSigner(vec![key1.clone(), key3.clone(), key4.clone()]));
+	let ap = Arc::new(AccountProvider::transient_provider());
+	ap.insert_account(key1.secret().clone(), &"".into()).unwrap();
+	ap.insert_account(key3.secret().clone(), &"".into()).unwrap();
+	ap.insert_account(key4.secret().clone(), &"".into()).unwrap();

 	let config = ProviderConfig{
 		validator_accounts: vec![key3.address(), key4.address()],
 		signer_account: None,
+		passwords: vec!["".into()],
 	};

 	let io = ethcore_io::IoChannel::disconnected();
 	let miner = Arc::new(Miner::new_for_tests(&::ethcore::spec::Spec::new_test(), None));
-	let private_keys = Arc::new(StoringKeyProvider::default());
 	let pm = Arc::new(Provider::new(
 			client.clone(),
 			miner,
-			signer.clone(),
+			ap.clone(),
 			Box::new(NoopEncryptor::default()),
 			config,
 			io,
-			private_keys,
 	));

 	let (address, _) = contract_address(CreateContractAddress::FromSenderAndNonce, &key1.address(), &0.into(), &[]);
@@ -89,17 +91,6 @@ fn private_contract() {
 	trace!("Transaction created. Pushing block");
 	push_block_with_transactions(&client, &[public_tx]);

-	trace!("Querying default private state");
-	let mut query_tx = Transaction::default();
-	query_tx.action = Action::Call(address.clone());
-	query_tx.data = "0c55699c".from_hex().unwrap();  // getX
-	query_tx.gas = 50000.into();
-	query_tx.nonce = 1.into();
-	let query_tx = query_tx.sign(&key1.secret(), chain_id);
-	let result = pm.private_call(BlockId::Latest, &query_tx).unwrap();
-	assert_eq!(&result.output[..], &("0000000000000000000000000000000000000000000000000000000000000000".from_hex().unwrap()[..]));
-	assert_eq!(pm.get_validators(BlockId::Latest, &address).unwrap(), validators);
-
 	trace!("Modifying private state");
 	let mut private_tx = Transaction::default();
 	private_tx.action = Action::Call(address.clone());
@@ -153,123 +144,3 @@ fn private_contract() {
 	let result = pm.private_call(BlockId::Latest, &query_tx).unwrap();
 	assert_eq!(result.output, "2a00000000000000000000000000000000000000000000000000000000000000".from_hex().unwrap());
 }
-
-#[test]
-fn call_other_private_contract() {
-	// This test verifies calls private contract methods from another one
-	// Two contract will be deployed
-	// The same contract A:
-	// contract Test1 {
-	//	bytes32 public x;
-	//	function setX(bytes32 _x) {
-	//		 x = _x;
-	//	}
-	// }
-	// And the following contract B:
-	// contract Deployed {
-	//	function setX(uint) {}
-	//	function x() returns (uint) {}
-	//}
-	// contract Existing {
-	//	Deployed dc;
-	//	function Existing(address t) {
-	//		dc = Deployed(t);
-	//	}
-	//	function getX() returns (uint) {
-	//		return dc.x();
-	//	}
-	// }
-	//ethcore_logger::init_log();
-
-	// Create client and provider
-	let client = generate_dummy_client(0);
-	let chain_id = client.signing_chain_id();
-	let key1 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000011")).unwrap();
-	let _key2 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000012")).unwrap();
-	let key3 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000013")).unwrap();
-	let key4 = KeyPair::from_secret(Secret::from("0000000000000000000000000000000000000000000000000000000000000014")).unwrap();
-	let signer = Arc::new(ethcore_private_tx::KeyPairSigner(vec![key1.clone(), key3.clone(), key4.clone()]));
-
-	let config = ProviderConfig{
-		validator_accounts: vec![key3.address(), key4.address()],
-		signer_account: None,
-	};
-
-	let io = ethcore_io::IoChannel::disconnected();
-	let miner = Arc::new(Miner::new_for_tests(&::ethcore::spec::Spec::new_test(), None));
-	let private_keys = Arc::new(StoringKeyProvider::default());
-	let pm = Arc::new(Provider::new(
-			client.clone(),
-			miner,
-			signer.clone(),
-			Box::new(NoopEncryptor::default()),
-			config,
-			io,
-			private_keys.clone(),
-	));
-
-	// Deploy contract A
-	let (address_a, _) = contract_address(CreateContractAddress::FromSenderAndNonce, &key1.address(), &0.into(), &[]);
-	trace!("Creating private contract A");
-	let private_contract_a_test = "6060604052341561000f57600080fd5b60d88061001d6000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630c55699c146046578063bc64b76d14607457600080fd5b3415605057600080fd5b60566098565b60405180826000191660001916815260200191505060405180910390f35b3415607e57600080fd5b6096600480803560001916906020019091905050609e565b005b60005481565b8060008160001916905550505600a165627a7a723058206acbdf4b15ca4c2d43e1b1879b830451a34f1e9d02ff1f2f394d8d857e79d2080029".from_hex().unwrap();
-	let mut private_create_tx1 = Transaction::default();
-	private_create_tx1.action = Action::Create;
-	private_create_tx1.data = private_contract_a_test;
-	private_create_tx1.gas = 200000.into();
-	private_create_tx1.nonce = 0.into();
-	let private_create_tx_signed = private_create_tx1.sign(&key1.secret(), None);
-	let validators = vec![key3.address(), key4.address()];
-	let (public_tx1, _) = pm.public_creation_transaction(BlockId::Latest, &private_create_tx_signed, &validators, 0.into()).unwrap();
-	let public_tx1 = public_tx1.sign(&key1.secret(), chain_id);
-	trace!("Transaction created. Pushing block");
-	push_block_with_transactions(&client, &[public_tx1]);
-
-	// Deploy contract B
-	let (address_b, _) = contract_address(CreateContractAddress::FromSenderAndNonce, &key1.address(), &1.into(), &[]);
-	trace!("Creating private contract B");
-	// Build constructor data
-	let mut deploy_data = "6060604052341561000f57600080fd5b6040516020806101c583398101604052808051906020019091905050806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505061014a8061007b6000396000f300606060405260043610610041576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680635197c7aa14610046575b600080fd5b341561005157600080fd5b61005961006f565b6040518082815260200191505060405180910390f35b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16630c55699c6000604051602001526040518163ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401602060405180830381600087803b15156100fe57600080fd5b6102c65a03f1151561010f57600080fd5b505050604051805190509050905600a165627a7a723058207f8994e02725b47d76ec73e5c54a338d27b306dd1c830276bff2d75fcd1a5c920029000000000000000000000000".to_string();
-	deploy_data.push_str(&address_a.to_vec().to_hex());
-	let private_contract_b_test = deploy_data.from_hex().unwrap();
-	let mut private_create_tx2 = Transaction::default();
-	private_create_tx2.action = Action::Create;
-	private_create_tx2.data = private_contract_b_test;
-	private_create_tx2.gas = 200000.into();
-	private_create_tx2.nonce = 1.into();
-	let private_create_tx_signed = private_create_tx2.sign(&key1.secret(), None);
-	let (public_tx2, _) = pm.public_creation_transaction(BlockId::Latest, &private_create_tx_signed, &validators, 0.into()).unwrap();
-	let public_tx2 = public_tx2.sign(&key1.secret(), chain_id);
-	trace!("Transaction created. Pushing block");
-	push_block_with_transactions(&client, &[public_tx2]);
-
-	// Let provider know, that it has access to both keys for A and B
-	private_keys.set_available_keys(&vec![address_a, address_b]);
-
-	// Call A.setx(42)
-	trace!("Modifying private state");
-	let mut private_tx = Transaction::default();
-	private_tx.action = Action::Call(address_a.clone());
-	private_tx.data = "bc64b76d2a00000000000000000000000000000000000000000000000000000000000000".from_hex().unwrap(); //setX(42)
-	private_tx.gas = 120000.into();
-	private_tx.nonce = 2.into();
-	let private_tx = private_tx.sign(&key1.secret(), None);
-	let private_contract_nonce = pm.get_contract_nonce(&address_b, BlockId::Latest).unwrap();
-	let private_state = pm.execute_private_transaction(BlockId::Latest, &private_tx).unwrap();
-	let nonced_state_hash = pm.calculate_state_hash(&private_state, private_contract_nonce);
-	let signatures: Vec<_> = [&key3, &key4].iter().map(|k|
-		Signature::from(::ethkey::sign(&k.secret(), &nonced_state_hash).unwrap().into_electrum())).collect();
-	let public_tx = pm.public_transaction(private_state, &private_tx, &signatures, 2.into(), 0.into()).unwrap();
-	let public_tx = public_tx.sign(&key1.secret(), chain_id);
-	push_block_with_transactions(&client, &[public_tx]);
-
-	// Call B.getX()
-	trace!("Querying private state");
-	let mut query_tx = Transaction::default();
-	query_tx.action = Action::Call(address_b.clone());
-	query_tx.data = "5197c7aa".from_hex().unwrap();  // getX
-	query_tx.gas = 50000.into();
-	query_tx.nonce = 3.into();
-	let query_tx = query_tx.sign(&key1.secret(), chain_id);
-	let result = pm.private_call(BlockId::Latest, &query_tx).unwrap();
-	assert_eq!(&result.output[..], &("2a00000000000000000000000000000000000000000000000000000000000000".from_hex().unwrap()[..]));
-}
--- a/ethcore/res/contracts/service_transaction.json
+++ b/ethcore/res/contracts/service_transaction.json
--- a/ethcore/res/ethereum/byzantium_test.json
+++ b/ethcore/res/ethereum/byzantium_test.json
@@ -28,6 +28,7 @@
 		"eip160Transition": "0x0",
 		"eip161abcTransition": "0x0",
 		"eip161dTransition": "0x0",
+		"eip98Transition": "0xffffffffffffffff",
 		"eip140Transition": "0x0",
 		"eip211Transition": "0x0",
 		"eip214Transition": "0x0",
--- a/ethcore/res/ethereum/callisto.json
+++ b/ethcore/res/ethereum/callisto.json
@@ -9,7 +9,7 @@
 				"durationLimit": "0x0d",
 				"blockReward": "0x16c4abbebea0100000",
 				"homesteadTransition": 0,
-				"blockRewardContractCode": "0x6080604052600436106100405763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663f91c28988114610045575b600080fd5b34801561005157600080fd5b50610071602460048035828101929082013591813591820191013561010a565b604051808060200180602001838103835285818151815260200191508051906020019060200280838360005b838110156100b557818101518382015260200161009d565b50505050905001838103825284818151815260200191508051906020019060200280838360005b838110156100f45781810151838201526020016100dc565b5050505090500194505050505060405180910390f35b606080808060008080803373fffffffffffffffffffffffffffffffffffffffe1461013457600080fd5b8a891461014057600080fd5b60408051600380825260808201909252906020820160608038833950506040805160038082526080820190925292985090506020820160608038833901905050945061018a6103cd565b86600181518110151561019957fe5b73ffffffffffffffffffffffffffffffffffffffff9092166020928302909101909101526101c561040e565b8560018151811015156101d457fe5b6020908102909101015285517374682fc32007af0b6118f259cbe7bccc21641600908790600290811061020357fe5b73ffffffffffffffffffffffffffffffffffffffff90921660209283029091019091015261022f610438565b85600281518110151561023e57fe5b60209081029091010152600093505b8a8410156103bb5789898581811061026157fe5b9050602002013561ffff1661ffff16600014156103105767b6255df5f50080006000198c01026816c4abbebea01000000192508b8b858181106102a057fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff168660008151811015156102cc57fe5b73ffffffffffffffffffffffffffffffffffffffff909216602092830290910190910152845183908690600090811061030157fe5b602090810290910101526103b0565b60648a8a8681811061031e57fe5b9050602002013561ffff1661ffff161015156103b05760648a8a8681811061034257fe5b9050602002013561ffff1603915060038260080361ffff166816c4abbebea0100000029060020a900490506103a1868d8d87818110151561037f57fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff16610462565b95506103ad8582610539565b94505b60019093019261024d565b50939a92995091975050505050505050565b600062155cc043106103f4575073d813419749b3c2cdc94a2f9cfcf154113264a9d661040b565b50733c06f218ce6dd8e2c535a8925a2edf81674984d95b90565b600062155cc0431061042a575068068155a43676e0000061040b565b50680340aad21b3b70000090565b600062155cc043106104545750680340aad21b3b70000061040b565b5068068155a43676e0000090565b60608060008451600101604051908082528060200260200182016040528015610495578160200160208202803883390190505b509150600090505b84518110156104f85784818151811015156104b457fe5b9060200190602002015182828151811015156104cc57fe5b73ffffffffffffffffffffffffffffffffffffffff90921660209283029091019091015260010161049d565b8382600184510381518110151561050b57fe5b73ffffffffffffffffffffffffffffffffffffffff9290921660209283029190910190910152509392505050565b6060806000845160010160405190808252806020026020018201604052801561056c578160200160208202803883390190505b509150600090505b84518110156105b557848181518110151561058b57fe5b9060200190602002015182828151811015156105a357fe5b60209081029091010152600101610574565b838260018451038151811015156105c857fe5b60209081029190910101525093925050505600a165627a7a72305820688daf5d035cad147f6386ed782d90bb84846c46a2a9165c38b86c25c73b929a0029",
+				"blockRewardContractCode": "0x6080604052600436106100405763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663f91c28988114610045575b600080fd5b34801561005157600080fd5b50610071602460048035828101929082013591813591820191013561010a565b604051808060200180602001838103835285818151815260200191508051906020019060200280838360005b838110156100b557818101518382015260200161009d565b50505050905001838103825284818151815260200191508051906020019060200280838360005b838110156100f45781810151838201526020016100dc565b5050505090500194505050505060405180910390f35b606080808060008080803373fffffffffffffffffffffffffffffffffffffffe1461013457600080fd5b8a891461014057600080fd5b604080516003808252608082019092529060208201606080388339505060408051600380825260808201909252929850905060208201606080388339019050509450733c06f218ce6dd8e2c535a8925a2edf81674984d98660018151811015156101a657fe5b73ffffffffffffffffffffffffffffffffffffffff9092166020928302909101909101528451680340aad21b3b70000090869060019081106101e457fe5b6020908102909101015285517374682fc32007af0b6118f259cbe7bccc21641600908790600290811061021357fe5b73ffffffffffffffffffffffffffffffffffffffff909216602092830290910190910152845168068155a43676e00000908690600290811061025157fe5b60209081029091010152600093505b8a8410156103ce5789898581811061027457fe5b9050602002013561ffff1661ffff16600014156103235767b6255df5f50080006000198c01026816c4abbebea01000000192508b8b858181106102b357fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff168660008151811015156102df57fe5b73ffffffffffffffffffffffffffffffffffffffff909216602092830290910190910152845183908690600090811061031457fe5b602090810290910101526103c3565b60648a8a8681811061033157fe5b9050602002013561ffff1661ffff161015156103c35760648a8a8681811061035557fe5b9050602002013561ffff1603915060038260080361ffff166816c4abbebea0100000029060020a900490506103b4868d8d87818110151561039257fe5b9050602002013573ffffffffffffffffffffffffffffffffffffffff166103e0565b95506103c085826104b7565b94505b600190930192610260565b50939a92995091975050505050505050565b60608060008451600101604051908082528060200260200182016040528015610413578160200160208202803883390190505b509150600090505b845181101561047657848181518110151561043257fe5b90602001906020020151828281518110151561044a57fe5b73ffffffffffffffffffffffffffffffffffffffff90921660209283029091019091015260010161041b565b8382600184510381518110151561048957fe5b73ffffffffffffffffffffffffffffffffffffffff9290921660209283029190910190910152509392505050565b606080600084516001016040519080825280602002602001820160405280156104ea578160200160208202803883390190505b509150600090505b845181101561053357848181518110151561050957fe5b90602001906020020151828281518110151561052157fe5b602090810290910101526001016104f2565b8382600184510381518110151561054657fe5b60209081029190910101525093925050505600a165627a7a7230582056d78ee4f7397a0950a3692a9e267500e619b5d3eb5937b9142689bc9ee137f10029",
 				"eip100bTransition": 20,
 				"difficultyBombDelays": {
 					"20": 3000000
@@ -32,6 +32,7 @@
 		"eip161abcTransition": 10,
 		"eip161dTransition": 10,
 		"eip155Transition": 10,
+		"eip98Transition": "0xffffffffffffffff",
 		"eip140Transition": 20,
 		"eip211Transition": 20,
 		"eip214Transition": 20,
@@ -57,14 +58,11 @@
 		"enode://9e2d9dc2639e02893aa17c80e6ba8e8803fd3166083b622a841fc852161112720281514436f7605c89041d5efa1738215185c4c4024ff812b0f500c403cc0ab1@206.189.47.198:30303",
 		"enode://149ba679e8851c3e0d030e0dc0336984b97c83ef649e68ec113dcf266449364cc1ec8ee27950f71b00c2182ef504894fa7bff19f6741978ced67e9e4b6536d2a@206.189.45.31:30303",
 		"enode://eeb3b1680f651b291a19454345721b5196a2a689dcd280e5f66dc3207636366d4b25e84d205303c2f8aa0a38467dad9e6f2536e195a4760df56aeac428ebea0b@199.247.18.157:30303",
+		"enode://eeb3b1680f651b291a19454345721b5196a2a689dcd280e5f66dc3207636366d4b25e84d205303c2f8aa0a38467dad9e6f2536e195a4760df56aeac428ebea0b@199.247.18.157:30303",
 		"enode://c21418c02f5ba480d64fbdf3dd7e1a276cbea441f9d55b8bb1c653fa3a05cc07e32a332f63df53f51d275dadc9b50925375a699dd39bdad991594326d6b8afab@199.247.3.3:30303",
 		"enode://40aa8ff2c3d98ffc12004cb6a3636e7c9b79400153667163cfc24123f2ee3ee693ac45775183f5f6a7e315a4884899ac32ef0616e26cdd23a7b00f80d07cdeae@45.32.126.82:30303",
 		"enode://3beb80913887d985a857076621baca66ea27b62ff159c5a41243d02a8614f537003c03ba1fe082b63a47e7f6f7ba1caf6bb14343560dbff6ba1e456e99e6119d@144.202.73.111:30303",
-		"enode://b79a50393b16b76a6c94d7ddae80c44464c9e5ecc59fc2b7e83d0c248190de781e7e2aebeab8d466b3869677e6388e6fac8bd36f3925cbeebbe4cf0372a7eac1@207.148.31.238:30303",
-		"enode://dcc091d6da928681e76993cffa047e434b0c0b1388c33330499cd006547de6641f8e5b885c2be12dee07f79d8bd86612cd1b16b4ab2536cbcdfceb278bf403f7@165.227.5.237:30303",
-		"enode://019faf0a35f3bcf6ac47c54d9d73917378f82acc6ae7197e0cdc037325e934cf12c7587bcbf0358abb2ab5b139780c97ed7d15ec2bd7784a5570e2cc58479bed@104.156.230.179:30303",
-		"enode://cd85a09fddddfed9ad6858ba1cffb7b6688e4197b85b722f79ccd8b97a7ee8d6d6ef173af91618c24032b5dbaff3265b63bb85dc768d58d830e9aa654cc51838@46.101.190.119:30303",
-		"enode://d34e34dc0d57694a71611d9bb3df73c928ef77feb05f1e6e3a6243d26b75034c09a6eab37872f7ce830890d87ca180a8d359fa0a649c2d12a05c853c52bae264@159.65.237.29:30303"
+		"enode://b79a50393b16b76a6c94d7ddae80c44464c9e5ecc59fc2b7e83d0c248190de781e7e2aebeab8d466b3869677e6388e6fac8bd36f3925cbeebbe4cf0372a7eac1@207.148.31.238:30303"
 	],
 	"accounts": {
 		"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
--- a/ethcore/res/ethereum/classic.json
+++ b/ethcore/res/ethereum/classic.json
--- a/ethcore/res/ethereum/constantinople_test.json
+++ b/ethcore/res/ethereum/constantinople_test.json
@@ -24,6 +24,7 @@
 		"networkID" : "0x1",
 		"maxCodeSize": 24576,
 		"maxCodeSizeTransition": "0x0",
+		"eip98Transition": "0xffffffffffffffff",
 		"eip150Transition": "0x0",
 		"eip160Transition": "0x0",
 		"eip161abcTransition": "0x0",
--- a/ethcore/res/ethereum/easthub.json
+++ b/ethcore/res/ethereum/easthub.json
@@ -26,7 +26,8 @@
 		"eip160Transition": "0x0",
 		"eip155Transition": "0x0",
 		"eip161abcTransition": "0x7fffffffffffffff",
-		"eip161dTransition": "0x7fffffffffffffff"
+		"eip161dTransition": "0x7fffffffffffffff",
+		"eip98Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
--- a/ethcore/res/ethereum/eip150_test.json
+++ b/ethcore/res/ethereum/eip150_test.json
@@ -22,6 +22,7 @@
 		"eip160Transition": "0x7fffffffffffffff",
 		"eip161abcTransition": "0x7fffffffffffffff",
 		"eip161dTransition": "0x7fffffffffffffff",
+		"eip98Transition": "0x7fffffffffffffff",
 		"eip155Transition": "0x7fffffffffffffff",
 		"maxCodeSize": 24576,
 		"maxCodeSizeTransition": "0x7fffffffffffffff"
--- a/ethcore/res/ethereum/eip161_test.json
+++ b/ethcore/res/ethereum/eip161_test.json
@@ -22,6 +22,7 @@
 		"eip160Transition": "0x0",
 		"eip161abcTransition": "0x0",
 		"eip161dTransition": "0x0",
+		"eip98Transition": "0x7fffffffffffffff",
 		"eip155Transition": "0x0",
 		"maxCodeSize": 24576,
 		"maxCodeSizeTransition": "0x0"
--- a/ethcore/res/ethereum/eip210_test.json
+++ b/ethcore/res/ethereum/eip210_test.json
@@ -20,6 +20,7 @@
 		"networkID" : "0x1",
 		"maxCodeSize": 24576,
 		"maxCodeSizeTransition": "0x0",
+		"eip98Transition": "0xffffffffffffffff",
 		"eip150Transition": "0x0",
 		"eip160Transition": "0x0",
 		"eip161abcTransition": "0x0",
--- a/ethcore/res/ethereum/ellaism.json
+++ b/ethcore/res/ethereum/ellaism.json
@@ -28,6 +28,7 @@
 		"eip161abcTransition": "0x7fffffffffffffff",
 		"eip161dTransition": "0x7fffffffffffffff",
 		"eip155Transition": "0x0",
+		"eip98Transition": "0x7fffffffffffff",
 		"wasmActivationTransition": 2000000,
 		"eip140Transition": 2000000,
 		"eip211Transition": 2000000,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Afri Schoedon	b00a21f39a	backports for stable 2.2.7 (#10163 ) * version: bump stable to 2.2.7 * version: mark 2.2 track stable * version: mark update critical on all networks * version: commit cargo lock * Ping nodes from discovery (#10167) * snap: fix path in script (#10157) * snap: fix path in script * debug, revert me * fix * necromancer awk magic * awk necromancy and path fixing * working track selection * Fix _cannot recursively call into `Core`_ issue (#10144) * Change igd to github:maufl/rust-igd * Run `igd::search_gateway_from_timeout` from own thread * Handle the case for contract creation on an empty but exist account with storage items (#10065) * Add is_base_storage_root_unchanged * Fix compile, use a shortcut for check, and remove ignored tests * Add a warn! * Update ethereum/tests to v6.0.0-beta.2 * grumble: use {:#x} instead of 0x{:x} Co-Authored-By: sorpaas <accounts@that.world> * version: bump fork blocks for kovan and foundation (#10186) * pull constantinople on ethereum network (#10189) * ethcore: pull constantinople on ethereum network * version: mark update as critical * ethcore: remove constantinople alltogether from chain spec * version: revert fork block for ethereum	2019-01-15 22:25:31 +01:00
Afri Schoedon	e9396e158b	beta backports v2.2.6 (#10113 ) * version: bump beta to v2.2.6 * Update pwasm-utils to 0.6.1 (#10134) * version: mark upgrade critical on kovan * Identity fix (#10128) * fix #10125 fix service transaction version detection if --identity is enabled, change test to match how --identity actually works * fix wrong var * get the index of v, not / * idx, not idx.len() * Update ethcore/sync/src/chain/propagator.rs Co-Authored-By: joshua-mir <43032097+joshua-mir@users.noreply.github.com> * Update ethcore/sync/src/chain/propagator.rs Co-Authored-By: joshua-mir <43032097+joshua-mir@users.noreply.github.com> * change version prefix to a const * space Co-Authored-By: joshua-mir <43032097+joshua-mir@users.noreply.github.com> * [Hit return to continue] * ethcore: update hardcoded headers for foundation * ethcore: update hardcoded headers for ropsten * ethcore: update hardcoded headers for kovan * ethcore: use consistant formatting * ethcore: restore spaces after colon in chain spec * ethcore: fix bootnodes in chain specs * ethcore: fix bootnodes in chain specs * ethcore: enforce newline at the end of chainspecs * Follow-up to #10105 (#10107) * HF in POA Sokol (2019-01-04) (#10077) * HF in POA Sokol (2019-01-04) https://github.com/poanetwork/poa-chain-spec/pull/91 * Update POA Core bootnodes * Autogen docs for the "Configuring Parity Ethereum" wiki page. (#10067) * publish docs changes for autogen config docs * Update publish-docs.sh adding an environment variable so js knows not to download git master and just grab the local repo * Update publish-docs.sh made some changes making this unnecessary * fix env variable env variable passes to node properly now * use yarn * test pipeline, revert me * fix test pipeline, revert me * change runner tag * change runner tag 2 * change runner tag * global git config * supress upload_files output * Update .gitlab-ci.yml reverting testing changes * Replace tag if exists Very unlikely to be important/useful * Autogen docs for the "Configuring Parity Ethereum" wiki page. (#10067) * publish docs changes for autogen config docs * Update publish-docs.sh adding an environment variable so js knows not to download git master and just grab the local repo * Update publish-docs.sh made some changes making this unnecessary * fix env variable env variable passes to node properly now * use yarn * test pipeline, revert me * fix test pipeline, revert me * change runner tag * change runner tag 2 * change runner tag * global git config * supress upload_files output * Update .gitlab-ci.yml reverting testing changes * Replace tag if exists Very unlikely to be important/useful * finality: dont require chain head to be in the chain (#10054) * Fill transaction hash on ethGetLog of light client. (#9938) * Fill transaction hash on ethGetLog of light client. This is enifficient but we keep align with spec. * Using better variables names. * Expose old fast light get log as `parity_getLogsLight`. * Update rpc/src/v1/helpers/light_fetch.rs Fix indent. Co-Authored-By: cheme <emericchevalier.pro@gmail.com> * Factor common code between light_logs and logs. * Remove useless check * Rename parity light logs to 'parity_getLogsNoTransactionHash'. Fix indent and extra white lines. * Use vec instead of tree map to avoid inner function. * better loop * fix pubsub new_blocks notifications to include all blocks (#9987) Fix: new blocks notifications sometimes missing in pubsub RPC Implement new struct to pass to `new_blocks()` with extra parameter - `has_more_blocks_to_import`, which was previously used to determine whether the notification should be sent. Now it's up to each implementation to decide what to do. Updated all implementations to behave as before, except `eth_pubsub`, which will send notification even when the queue is not empty. Update tests. * Revert part of 70a6db7 * HF in POA Core (2019-01-18) - Constantinople (#10155) https://github.com/poanetwork/poa-chain-spec/pull/100 * ci: re-enable snap publishing (#10142) * ci: enable snap publishing~ * ci: add publish snap script * ci: add snapcraft skeleton * ci: group export statements * ci: enable snaps on pr branch * ci: enable snaps on pr branch * ci: set default BUILD_ARCH * ci: enable snaps on pr branch * ci: enable snaps on pr branch * ci: add libdb to snap * ci: reinitiate gitlabci * ci: reinitiate publish-snap script * ci: fix yaml syntax * cargo/gitlab env vars * debug, revert me * version? * debug vars * vars * vars fix * vars fix * revert * Update scripts/gitlab/publish-snap.sh Co-Authored-By: 5chdn <5chdn@users.noreply.github.com> * ci: read track from cargo toml * Make sure parent block is not in importing queue when importing ancient blocks (#10138) * Make sure parent block is not in importing queue when importing ancient blocks * Clear queue when an ancient import fails * Lock only once in clear * Add comments why queued check is needed * Should push the value back to the queue * Directly check in chain.read() * Remove extra empty line * Revert unused verification change	2019-01-09 15:15:57 +01:00
Thibaut Sardan	7fbcdfeed4	Backports for beta 2.2.5 (#10047 ) * bump beta to 2.2.5 * Fix empty steps (#9939) * Don't send empty step twice or empty step then block. * Perform basic validation of locally sealed blocks. * Don't include empty step twice. * Strict empty steps validation (#10041) * Add two failings tests for strict empty steps. * Implement strict validation of empty steps. * ethcore: enable constantinople on ethereum (#10031) * ethcore: change blockreward to 2e18 for foundation after constantinople * ethcore: delay diff bomb by 2e6 blocks for foundation after constantinople * ethcore: enable eip-{145,1014,1052,1283} for foundation after constantinople * Change test miner max memory to malloc reports. (#10024) * Fix: test corpus_inaccessible panic (#10019) If system uptime is less than the duration in the test, thread will panic due to: 'overflow when subtracting duration from instant'. Changed duration to 20 seconds to make it unlikely the test will fail due to this condition. Since no operations that carry a similar risk of panic occur outside of the tests, it doesn't seem warranted to depend on an external crate to fix this. * Bump crossbeam. (#10048)	2018-12-13 17:52:49 +01:00
Afri Schoedon	f44d885b6d	patch beta release pipeline (#10020 ) * version: bump beta to 2.2.4 * ci: move future releases to ethereum subdir on s3 (#10017) * ci: move future releases to ethereum subdir on s3 * ci: redesign s3 bucket logic * ci: use the releases bucket * Handle failing case for update account cache in require (#9989) * state: remove accidently merged test * state: remove merge leftovers	2018-12-05 16:07:11 +01:00
Afri Schoedon	6b0a280685	Beta patch release 2.2.3 (#10002 ) * version: bump beta to 2.2.3 * Fix Bloom migration (#9992) * Fix wrong block number in blooms migration * Fix wrong `const` type (usize -> u64) 😬 * Fix daemonize (#10000) * Revert "prevent silent errors in daemon mode, closes #9367 (#9946)" This reverts commit `52d5278a62`. * deps(daemonize): switch back to crates.io * move daemonize before creating account provider (#10003) * move daemonize before creating account provider * daemonize: add a future-proofing comment	2018-11-30 16:13:58 +01:00
Afri Schoedon	78ceec6c6e	Backports for beta 2.2.2 (#9976 ) * version: bump beta to 2.2.2 * Add experimental RPCs flag (#9928) * WiP * Enable experimental RPCs. * Keep existing blocks when restoring a Snapshot (#8643) * Rename db_restore => client * First step: make it compile! * Second step: working implementation! * Refactoring * Fix tests * PR Grumbles * PR Grumbles WIP * Migrate ancient blocks interating backward * Early return in block migration if snapshot is aborted * Remove RwLock getter (PR Grumble I) * Remove dependency on `Client`: only used Traits * Add test for recovering aborted snapshot recovery * Add test for migrating old blocks * Fix build * PR Grumble I * PR Grumble II * PR Grumble III * PR Grumble IV * PR Grumble V * PR Grumble VI * Fix one test * Fix test * PR Grumble * PR Grumbles * PR Grumbles II * Fix tests * Release RwLock earlier * Revert Cargo.lock * Update _update ancient block_ logic: set local in `commit` * Update typo in ethcore/src/snapshot/service.rs Co-Authored-By: ngotchac <ngotchac@gmail.com> * Adjust requests costs for light client (#9925) * PIP Table Cost relative to average peers instead of max peers * Add tracing in PIP new_cost_table * Update stat peer_count * Use number of leeching peers for Light serve costs * Fix test::light_params_load_share_depends_on_max_peers (wrong type) * Remove (now) useless test * Remove `load_share` from LightParams.Config Prevent div. by 0 * Add LEECHER_COUNT_FACTOR * PR Grumble: u64 to u32 for f64 casting * Prevent u32 overflow for avg_peer_count * Add tests for LightSync::Statistics * Fix empty steps (#9939) * Don't send empty step twice or empty step then block. * Perform basic validation of locally sealed blocks. * Don't include empty step twice. * prevent silent errors in daemon mode, closes #9367 (#9946) * Fix a deadlock (#9952) * Update informant: - decimal in Mgas/s - print every 5s (not randomly between 5s and 10s) * Fix dead-lock in `blockchain.rs` * Update locks ordering * Fix light client informant while syncing (#9932) * Add `is_idle` to LightSync to check importing status * Use SyncStateWrapper to make sure is_idle gets updates * Update is_major_import to use verified queue size as well * Add comment for `is_idle` * Add Debug to `SyncStateWrapper` * `fn get` -> `fn into_inner` * ci: rearrange pipeline by logic (#9970) * ci: rearrange pipeline by logic * ci: rename docs script * fix docker build (#9971) * Deny unknown fields for chainspec (#9972) * Add deny_unknown_fields to chainspec * Add tests and fix existing one * Remove serde_ignored dependency for chainspec * Fix rpc test eth chain spec * Fix starting_nonce_test spec * Improve block and transaction propagation (#9954) * Refactor sync to add priority tasks. * Send priority tasks notifications. * Propagate blocks, optimize transactions. * Implement transaction propagation. Use sync_channel. * Tone down info. * Prevent deadlock by not waiting forever for sync lock. * Fix lock order. * Don't use sync_channel to prevent deadlocks. * Fix tests. * Fix unstable peers and slowness in sync (#9967) * Don't sync all peers after each response * Update formating * Fix tests: add `continue_sync` to `Sync_step` * Update ethcore/sync/src/chain/mod.rs Co-Authored-By: ngotchac <ngotchac@gmail.com> * fix rpc middlewares * fix Cargo.lock * json: resolve merge in spec * rpc: fix starting_nonce_test * ci: allow nightl job to fail	2018-11-29 10:57:49 +01:00
Thibaut Sardan	5c56fc5023	Backport Beta 2.2.1 (#9905 ) * Bump beta to version 2.2.1 * fix: Intermittent failing CI due to addr in use (#9885) Allow OS to set port at runtime * Use Weak reference in PubSubClient (#9886) * Fix json tracer overflow (#9873) * Fix json tracer overflow * Replace trace_executed with a direct trace push * Remove unused variable * Add test for 5a51 * Remove duplicate json! * Fix docker script (#9854) * Dockerfile: change source path of the newly added check_sync.sh (#9869) * Allow to seal work on latest block (#9876) * Allow to seal work on latest block. * Test from @todr to check sealing conditions. * gitlab-ci: make android release build succeed (#9743) * use docker cargo config file for android builds * make android build succeed * ethcore: use Machine::verify_transaction on parent block (#9900) * ethcore: use Machine::verify_transaction on parent block also fixes off-by-one activation of transaction permission contract * ethcore: clarify call to verify_transaction * foundation: #6692865, ropsten: #4417537, kovan: #9363457 * Remove rust-toolchain file (#9906) * EIP-712 implementation (#9631) * EIP-712 impl * added more tests * removed size parsing unwrap * corrected TYPE_REGEX to disallow zero sized fixed length arrays, replaced LinkedHashSet with IndexSet, added API spec to docs, fixed Type::Byte encoding branch * use Option<u64> instead of u64 for Type::Array::Length * replace `.iter()` with `.values()` Co-Authored-By: seunlanlege <seunlanlege@gmail.com> * tabify eip712.rs * use proper comments for docs * Cargo.lock: revert unrelated changes * tabify encode.rs * EIP 191 (#9701) * added sign_191 rpc method * fixed hash_structured_data return type * added ConfirmationPayload::SignMessage for non-prefixed signatures, added tests for sign191 * renamed WithValidator -> PresignedTransaction * rename applicationData to data in test * adds docs for EIP191Version, renamed SignRequest to EIP191SignRequest * light-fetch: Differentiate between out-of-gas/manual throw and use required gas from response on failure (#9824) * fix start_gas, handle OOG exceptions & NotEnoughGas * Change START_GAS: 50_000 -> 60_000 * When the `OutOfGas exception` is received then try to double the gas until it succeeds or block gas limit is reached * When `NotEnoughBasGas error` is received then use the required gas provided in the response * fix(light-fetch): ensure block_gas_limit is tried Try the `block_gas_limit` before regard the execution as an error * Update rpc/src/v1/helpers/light_fetch.rs Co-Authored-By: niklasad1 <niklasadolfsson1@gmail.com> * simplify cargo audit * Use block header for building finality (#9914) * ci: nuke the gitlab caches (#9855)	2018-11-14 15:23:44 +01:00
Afri Schoedon	5a7e54fb9e	version: mark 2.2.0 beta (#9820 ) * version: mark 2.2.0 beta * ci: remove failing tests for android, windows, and macos (#9788) * ci: remove failing tests for android, windows, and macos * ci: restore android build jobs * Move state root verification before gas used (#9841) * Classic.json Bootnode Update (#9828) * fix: Update bootnodes list to only responsive nodes * feat: Add more bootnodes to classic.json list * feat: Add retested bootnodes * Implement NoProof for json tests and update tests reference (replaces #9744) (#9814) * Update test reference. Block test are really not working so I disabled a few by commenting directly in source. * Move ethtest commit cursor. * Implements 'NoProof' engine from https://github.com/ethereum/tests/issues/464 . Since tests has been regenerated those one were failing on block difficulty check. Update ethereum/tests, waiting for cost fix (block test are still commented). * Update tests submodule reference to latest (all test passing except an identified case). Fix block reward of constantinople json. * Restore broken test by using old json tests files. * Use CanonNoSeal instead of a custom engine, still have to include some additional tests code. * Gas upper limit check in json_chain test was bad, moving the test to verification, the test is running in `verify_header_param`. Note that test was previously only for ethash, and now for any engine. * Restore old behavior (gas uper limit only for ethash engine), at the cost of an additional trait method. * Proper rpc test fix. * Update tests submodule, add SStore bug tests. * Fix json issue tabulation. Update tests submodule to latest master (lot of new sstore tests passing) * Switch ethereum/tests to tag 6.0.0-beta.1 (no tests changes from latest synch). * Display hex with separator, use indirection instead of clone for copy types.	2018-11-02 10:02:46 +01:00