2.4.2 beta backports (#10488 )

* version: bump beta * Сaching through docker volume (#10477) * _old codebase_ before docker update * before docker update, testing runnr * docker update, testing the caching * distributed job cargo homes * distributed job cargo homes 2 * distributed job cargo homes 3 * dockerfile with gitlab checkout, audit uses template * dockerfile gets repo in volume * change builds_dir * trying docker cache for repo * repo cached automatically * after script is not concatenated * check sccache non-cacheable reasons nature * watch cache * log sccache * log sccache 2 * debug log sccache * fix debug log sccache * fix debug log sccache 2 * debug log cache 3 * debug log cache 3 * trace log all sccache * test wo cargo cache * test w removed cargo cache * report non-cacheable reasons, cargo cache is back and empty * report non-cacheable reasons, cargo cache is back and empty 2 * report non-cacheable reasons, cargo cache is back and empty 3 * wrap into after_script * restore CI tags `qa` -> `linux-docker` * return to main runners, this will fail until config on runners And Dockerfile won't be updated * typo fix CI lint * return to docker tag * fix win&mac build (#10486) add CARGO_HOME: "${CI_PROJECT_DIR}/.cargo" * fix(extract `timestamp_checked_add` as lib) (#10383) * fix(extract `timestamp_checked_add` as lib) * fix(whisper types): remove unused `EmptyTopics` * fix(time-lib): feature-flag to use time-lib or std This commit adds conditional compilation checks that falls back to `our time-lib` when `time_checked_add` is not available in the standard library Note, `time_checked_add` covers both `checked_add` and `checked_sub` * fix(grumble): use cfg_attr to define rustc feature
2.4.1 beta backports (#10471 )
2019-03-20 09:17:30 +01:00 · 2019-03-19 09:10:36 +01:00 · 2019-02-27 16:33:29 +01:00 · 2019-02-25 15:24:51 +01:00 · 2019-02-21 11:25:29 +01:00
390 changed files with 16210 additions and 27160 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -24,42 +24,7 @@ Also, try to include **steps to reproduce** the issue and expand on the **actual

 If you would like to contribute to Parity Ethereum, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/paritytech/parity-ethereum/compare).

-### Labels & Milestones
-
-We use [labels](https://github.com/paritytech/parity-ethereum/labels) to manage PRs and issues and communicate the state of a PR. Please familiarize yourself with them. Furthermore we are organizing issues in [milestones](https://github.com/paritytech/parity-ethereum/milestones). Best way to get started is to a pick a ticket from the current milestone tagged [`easy`](https://github.com/paritytech/parity-ethereum/labels/Q2-easy%20%F0%9F%92%83) and get going, or [`mentor`](https://github.com/paritytech/parity-ethereum/labels/Q1-mentor%20%F0%9F%95%BA) and get in contact with the mentor offering their support on that larger task.
-
-### Rules
-
-There are a few basic ground-rules for contributors (including the maintainer(s) of the project):
-
-* **No pushing directly to the master branch**.
-* **All modifications** must be made in a **pull-request** to solicit feedback from other contributors.
-* Pull-requests cannot be merged before CI runs green and two reviewers have given their approval.
-* Contributors should adhere to the [Parity Ethereum Style Guide](https://wiki.parity.io/Parity-Ethereum-Style-Guide).
-
-### Recommendations
-
-* **Non-master branch names** *should* be prefixed with a short name moniker, followed by the associated Github Issue ID (if any), and a brief description of the task using the format `<GITHUB_USERNAME>-<ISSUE_ID>-<BRIEF_DESCRIPTION>` (e.g. `gavin-123-readme`). The name moniker helps people to inquiry about their unfinished work, and the GitHub Issue ID helps your future self and other developers (particularly those who are onboarding) find out about and understand the original scope of the task, and where it fits into Parity Ethereum [Projects](https://github.com/paritytech/parity-ethereum/projects).
-* **Remove stale branches periodically**
-
-### Preparing Pull Requests
-
-* If your PR does not alter any logic (e.g. comments, dependencies, docs), then it may be tagged [`insubstantial`](https://github.com/paritytech/parity-ethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22).
-
-* Once a PR is ready for review please add the [`pleasereview`](https://github.com/paritytech/parity-ethereum/pulls?utf8=%E2%9C%93&q=is%3Aopen+is%3Apr+label%3A%22A0-pleasereview+%F0%9F%A4%93%22+) label.
-
-### Reviewing Pull Requests*:
-
-* At least two reviewers are required to review PRs (even for PRs tagged [`insubstantial`](https://github.com/paritytech/parity-ethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22)).
-
-When doing a review, make sure to look for any:
-
-* Buggy behavior.
-* Undue maintenance burden.
-* Breaking with house coding style.
-* Pessimization (i.e. reduction of speed as measured in the projects benchmarks).
-* Breaking changes should be carefuly reviewed and tagged as such so they end up in the [changelog](../CHANGELOG.md).
-* Uselessness (i.e. it does not strictly add a feature or fix a known issue).
+Please, refer to the [Coding Guide](https://wiki.parity.io/Coding-guide) in our wiki for more details about hacking on Parity.

 ## License.

--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,3 @@ parity-clib-examples/cpp/build/
 .vscode
 rls/
 /parity.*
-
-# cargo remote artifacts
-remote-target
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,15 +4,17 @@ stages:
  - publish
  - optional

-image:                             ${REGISTRY}/parity-ci-linux:latest
-
+image:                             parity/rust-parity-ethereum-build:xenial
 variables:
  GIT_STRATEGY:                    fetch
  GIT_SUBMODULE_STRATEGY:          recursive
  CI_SERVER_NAME:                  "GitLab CI"
-  CARGO_HOME:                      "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}"
  CARGO_TARGET:                    x86_64-unknown-linux-gnu
-  REGISTRY:                        registry.parity.io/parity/infrastructure/scripts
+
+.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
@@ -28,208 +30,151 @@ variables:
    expire_in:                     1 mos
    paths:
      - artifacts/
-      - tools/

 .docker-cache-status:              &docker-cache-status
  variables:
-    CARGO_HOME:                    "/ci-cache/parity-ethereum/cargo/${CI_JOB_NAME}"
-  dependencies:                    []
+    CARGO_HOME:                    "/cargo/${CI_JOB_NAME}"
  before_script:
-    - rustup show
-    - cargo --version
-  retry:
-    max: 2
-    when:
-      - runner_system_failure
-      - unknown_failure
-      - api_failure
+    - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log RUST_LOG=sccache::server=debug sccache --start-server
+    - sccache -s
+  after_script:
+    - echo "All crate-types:"
+    - grep 'parse_arguments.*--crate-type' sccache_error.log | sed -re 's/.*"--crate-type", "([^"]+)".*/\1/' | sort | uniq -c
+    - echo "Non-cacheable reasons:"
+    - grep CannotCache sccache_error.log | sed -re 's/.*CannotCache\((.+)\).*/\1/' | sort | uniq -c
  tags:
    - linux-docker

-.build-on-linux:                   &build-on-linux
-  stage:                           build
-  <<:                              *docker-cache-status
-  <<:                              *collect_artifacts
-  script:
-    - scripts/gitlab/build-linux.sh
-  after_script:
-    - mkdir -p tools
-    - cp -r scripts/docker/hub/* ./tools
-    - cp scripts/gitlab/publish-snap.sh ./tools
-    - cp scripts/gitlab/publish-onchain.sh ./tools
-    - cp scripts/gitlab/safe-curl.sh ./tools
-    - echo v"$(sed -r -n '1,/^version/s/^version\s*=\s*"([^"]+)".*$/\1/p' Cargo.toml)" |
-      tee ./tools/VERSION
-    - echo "$(sed -r -n '1,/^track/s/^track\s*=\s*"([^"]+)".*$/\1/p' ./util/version/Cargo.toml)" |
-      tee ./tools/TRACK
-

 cargo-check 0 3:
  stage:                           test
  <<:                              *docker-cache-status
  script:
-    - time cargo check --target $CARGO_TARGET --locked --no-default-features --verbose --color=always
-    - sccache --show-stats
+    - time cargo check --target $CARGO_TARGET --locked --no-default-features
+    - sccache -s

 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 --verbose --color=always
-    - sccache --show-stats
+    - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --no-default-features
+    - sccache -s

 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" --verbose --color=always
-    - sccache --show-stats
-
-cargo-check-evmbin:
-  stage:                           test
-  <<:                              *docker-cache-status
-  script:
-    - time cargo check -p evmbin --target $CARGO_TARGET --locked --verbose --color=always
-    - sccache --show-stats
-
-cargo-check-benches:
-  stage:                           test
-  <<:                              *docker-cache-status
-  script:
-    - time cargo check --all --benches --target $CARGO_TARGET --locked --verbose --color=always
-    - sccache --show-stats
+    - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --features "mio"
+    - sccache -s

 cargo-audit:
  stage:                           test
  <<:                              *docker-cache-status
  script:
    - cargo audit
-  allow_failure:                   true # failed cargo audit shouldn't prevent a PR from being merged
+    - sccache -s

 validate-chainspecs:
  stage:                           test
  <<:                              *docker-cache-status
  script:
    - ./scripts/gitlab/validate-chainspecs.sh
+    - sccache -s

 test-cpp:
  stage:                           build
  <<:                              *docker-cache-status
  script:
    - ./scripts/gitlab/test-cpp.sh
+    - sccache -s

 test-linux:
  stage:                           build
  <<:                              *docker-cache-status
  script:
-    - ./scripts/gitlab/test-linux.sh stable
-
-test-linux-beta:
-  stage:                           build
-  only:                            *releaseable_branches
-  <<:                              *docker-cache-status
-  script:
-    - ./scripts/gitlab/test-linux.sh beta
-
-test-linux-nightly:
-  stage:                           build
-  only:                            *releaseable_branches
-  <<:                              *docker-cache-status
-  script:
-    - ./scripts/gitlab/test-linux.sh nightly
-  allow_failure:                   true
+    - ./scripts/gitlab/test-linux.sh
+    - sccache -s

 build-android:
-  <<:                              *build-on-linux
-  image:                           ${REGISTRY}/parity-ci-android:stretch
+  stage:                           build
+  image:                           parity/rust-android:gitlab-ci
  variables:
    CARGO_TARGET:                  armv7-linux-androideabi
+  script:
+    - scripts/gitlab/build-linux.sh
+  tags:
+    - linux-docker
+  <<:                              *collect_artifacts

-build-linux:
-  <<:                              *build-on-linux
+build-linux:                       &build-linux
+  stage:                           build
  only:                            *releaseable_branches
+  <<:                              *docker-cache-status
+  script:
+    - scripts/gitlab/build-linux.sh
+    - sccache -s
+  <<:                              *collect_artifacts

 build-linux-i386:
-  <<:                              *build-on-linux
-  only:                            *releaseable_branches
-  image:                           ${REGISTRY}/parity-ci-i386:latest
+  <<:                              *build-linux
+  image:                           parity/rust-parity-ethereum-build:i386
  variables:
    CARGO_TARGET:                  i686-unknown-linux-gnu

 build-linux-arm64:
-  <<:                              *build-on-linux
-  only:                            *releaseable_branches
-  image:                           ${REGISTRY}/parity-ci-arm64:latest
+  <<:                              *build-linux
+  image:                           parity/rust-parity-ethereum-build:arm64
  variables:
    CARGO_TARGET:                  aarch64-unknown-linux-gnu

 build-linux-armhf:
-  <<:                              *build-on-linux
-  only:                            *releaseable_branches
-  image:                           ${REGISTRY}/parity-ci-armhf:latest
+  <<:                              *build-linux
+  image:                           parity/rust-parity-ethereum-build:armhf
  variables:
    CARGO_TARGET:                  armv7-unknown-linux-gnueabihf

 build-darwin:
  stage:                           build
-  <<:                              *collect_artifacts
  only:                            *releaseable_branches
  variables:
    CARGO_TARGET:                  x86_64-apple-darwin
-    CARGO_HOME:                    "${CI_PROJECT_DIR}/.cargo"
+    CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
    CC:                            gcc
    CXX:                           g++
  script:
    - scripts/gitlab/build-linux.sh
  tags:
    - rust-osx
+  <<:                              *collect_artifacts

 build-windows:
  stage:                           build
-  <<:                              *collect_artifacts
  only:                            *releaseable_branches
  variables:
    CARGO_TARGET:                  x86_64-pc-windows-msvc
-    CARGO_HOME:                    "C:/ci-cache/parity-ethereum/cargo/$CI_JOB_NAME"
-    GIT_SUBMODULE_STRATEGY:        none
+    CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
  script:
    - sh scripts/gitlab/build-windows.sh
  tags:
    - rust-windows
+  <<:                              *collect_artifacts

 publish-docker:
  stage:                           publish
  only:                            *releaseable_branches
-  except:
-    - nightly
-  when:                            manual
+  cache:                           {}
  dependencies:
    - build-linux
-  environment:
-    name: parity-build
-  cache:                           {}
-  image:                           docker:stable
-  services:
-    - docker:dind
-  variables:
-    GIT_STRATEGY:                  none
-    DOCKER_HOST:                   tcp://localhost:2375
-    DOCKER_DRIVER:                 overlay2
-    GIT_STRATEGY:                  none
-    # DOCKERFILE:                  tools/Dockerfile
-    # CONTAINER_IMAGE:             parity/parity
-  script:
-    - ./tools/publish-docker.sh
  tags:
-    - kubernetes-parity-build
+    - shell
+  script:
+    - scripts/gitlab/publish-docker.sh parity

-publish-snap-nightly:              &publish-snap
+publish-snap:                      &publish-snap
  stage:                           publish
-  only:
-    - nightly
+  only:                            *releaseable_branches
  image:                           snapcore/snapcraft
  variables:
-    GIT_STRATEGY:                  none
    BUILD_ARCH:                    amd64
  cache:                           {}
  dependencies:
@@ -237,80 +182,48 @@ publish-snap-nightly:              &publish-snap
  tags:
    - linux-docker
  script:
-    - ./tools/publish-snap.sh
+    - scripts/gitlab/publish-snap.sh
+  <<:                              *collect_artifacts

-publish-snap-manually:
-  <<:                              *publish-snap
-  only:                            *releaseable_branches
-  when:                            manual
-
-publish-snap-i386-nightly:         &publish-snap-i386
+publish-snap-i386:
  <<:                              *publish-snap
  variables:
    BUILD_ARCH:                    i386
-    CARGO_TARGET:                  i686-unknown-linux-gnu
  dependencies:
    - build-linux-i386

-publish-snap-i386-manually:
-  <<:                              *publish-snap-i386
-  only:                            *releaseable_branches
-  when:                            manual
-
-publish-snap-arm64-nightly:        &publish-snap-arm64
+publish-snap-arm64:
  <<:                              *publish-snap
  variables:
    BUILD_ARCH:                    arm64
-    CARGO_TARGET:                  aarch64-unknown-linux-gnu
  dependencies:
    - build-linux-arm64

-publish-snap-arm64-manually:
-  <<:                              *publish-snap-arm64
-  only:                            *releaseable_branches
-  when:                            manual
-
-publish-snap-armhf-nightly:        &publish-snap-armhf
+publish-snap-armhf:
  <<:                              *publish-snap
  variables:
    BUILD_ARCH:                    armhf
-    CARGO_TARGET:                  armv7-unknown-linux-gnueabihf
  dependencies:
    - build-linux-armhf

-publish-snap-armhf-manually:
-  <<:                              *publish-snap-armhf
-  only:                            *releaseable_branches
-  when:                            manual
-
-publish-onchain-nightly:           &publish-onchain
+publish-onchain:
  stage:                           publish
-  only:
-    - nightly
+  only:                            *releaseable_branches
  cache:                           {}
-  variables:
-    GIT_STRATEGY:                  none
  dependencies:
    - build-linux
    - build-darwin
    - build-windows
  script:
-    - ./tools/publish-onchain.sh
+    - scripts/gitlab/publish-onchain.sh
  tags:
    - linux-docker

-publish-onchain-manually:
-  <<:                              *publish-onchain
-  only:                            *releaseable_branches
-  when:                            manual
-
-publish-release-awss3-nightly:     &publish-release-awss3
-  image:                           ${REGISTRY}/awscli:latest
+publish-awss3-release:
+  image:                           parity/awscli:latest
  stage:                           publish
-  only:
-    - nightly
-  variables:
-    GIT_STRATEGY:                  none
+  only:                            *releaseable_branches
+  <<:                              *no_git
  cache:                           {}
  dependencies:
    - build-linux
@@ -332,39 +245,16 @@ publish-release-awss3-nightly:     &publish-release-awss3
  tags:
    - linux-docker

-publish-release-awss3-manually:
-  <<:                              *publish-release-awss3
-  only:                            *releaseable_branches
-  when:                            manual
-
 publish-docs:
-  stage:                           publish
-  image:                           ${REGISTRY}/parity-ci-docs:latest
+  stage:                            publish
+  # <<:                              *no_git
  only:
    - tags
  except:
    - nightly
-  when:                            manual
-  cache:                           {}
-  dependencies:                    []
+  cache:                            {}
  script:
    - scripts/gitlab/publish-docs.sh
  tags:
    - linux-docker
-  allow_failure:                   true

-publish-av-whitelist:
-  stage:                          publish
-  variables:
-    GIT_STRATEGY:                  none
-  only:                           *releaseable_branches
-  except:
-    - nightly
-  when:                           manual
-  cache:                          {}
-  dependencies:
-    - build-windows
-  script:
-    - scripts/gitlab/publish-av-whitelists.sh
-  tags:
-    - linux-docker
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,220 +1,174 @@
-## Parity-Ethereum [v2.5.13](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.13)
+## Parity-Ethereum [v2.3.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.0) (2019-01-16)

-Parity Ethereum v2.5.13-stable is a security release. Valid blocks with manipulated transactions (added/replaced) cause the client to stall.
+Parity-Ethereum 2.3.0-beta is a consensus-relevant security release that reverts Constantinople on the Ethereum network. Upgrading is mandatory for Ethereum, and strongly recommended for other networks.

-The full list of included changes:
-* Make sure to not mark block header hash as invalid if only the body is wrong (#11356)
+- **Consensus** - Ethereum Network: Pull Constantinople protocol upgrade on Ethereum (#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)
+- **Wasm** - Kovan Network: Update pwasm-utils to 0.6.1 (#10134)

-## Parity-Ethereum [v2.5.12](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.12)
+Other notable changes:

-Parity Ethereum v2.5.12-stable is a patch release that adds Istanbul hardfork
-block numbers for POA and xDai networks, implements ECIP-1056 and implements
-EIP-2384/2387 - Muir Glacier.
+- Existing blocks in the database are now kept when restoring a Snapshot. (#8643)
+- Block and transaction propagation is improved significantly. (#9954)
+- The ERC-191 Signed Data Standard is now supported by `personal_sign191`. (#9701)
+- Add support for ERC-191/712 `eth_signTypedData` as a standard for machine-verifiable and human-readable typed data signing with Ethereum keys. (#9631)
+- Add support for ERC-1186 `eth_getProof` (#9001)
+- Add experimental RPCs flag to enable ERC-191, ERC-712, and ERC-1186 APIs via `--jsonrpc-experimental` (#9928)
+- Make `CALLCODE` to trace value to be the code address. (#9881)

-The full list of included changes:
-* Enable EIP-2384 for ice age hard fork (#11281)
-* ethcore/res: activate agharta on classic 9573000 (#11331)
-* Istanbul HF in xDai (2019-12-12) (#11299)
-* Istanbul HF in POA Core (2019-12-19) (#11298)
-* Istanbul HF in POA Sokol (2019-12-05) (#11282)
-* Activate ecip-1061 on kotti and mordor (#11338)
-* Enable basic verification of local transactions (#11332)
-* Disallow EIP-86 style null signatures for transactions outside tests (#11335)
+Configuration changes:

+- The EIP-98 transition is now disabled by default. If you previously had no `eip98transition` specified in your chain specification, you would enable this now manually on block `0x0`. (#9955)
+- Also, unknown fields in chain specs are now rejected. (#9972)
+- The Tendermint engine was removed from Parity Ethereum and is no longer available and maintained. (#9980)
+- Ropsten testnet data and keys moved from `test/` to `ropsten/` subdir. To reuse your old keys and data either copy or symlink them to the new location.  (#10123)
+- Strict empty steps validation (#10041)
+  - 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 `0x0` for any chain with `empty_steps`.
+  - If your network uses `empty_steps` you **must** (A) plan a hard fork and change `strict_empty_steps_transition` to the desired fork block and (B) update the clients of the whole network to 2.2.7-stable / 2.3.0-beta. If for some reason you don't want to do this please set`strict_empty_steps_transition` to `0xfffffffff` to disable it.

-## Parity-Ethereum [v2.5.11](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.11)
-
-Parity Ethereum v2.5.11-stable is an emergency patch release that adds the missing
-eip1344_transition for mainnet - Users are advised to update as soon as possible
-to prevent any issues with the imminent Istanbul hardfork
-
-The full list of included changes:
- [chainspec]: add `eip1344_transition` for istanbul (#11301)
-
-## Parity-Ethereum [v2.5.10](https://github.com/paritytech/parity-ethereum/releases/tag/2.5.10)
-
-Parity Ethereum v2.5.10-stable is a patch release that adds block numbers for
-activating the Istanbul hardfork on mainnet, as well as a large number of
-various bugfixes, QoL changes, some code cleanup/refactoring and other
-miscellaneous changes.
-
-This release removes legacy aliases for the mainnet. If you specify `--chain homestead`, `--chain frontier` or `--chain byzantium`, this will need to be changed to one of: `--chain eth`, `--chain ethereum`, `--chain foundation` or `--chain mainnet`.
+_Note:_ This release marks Parity 2.3 as _beta_. All versions of Parity 2.2 are now considered _stable_.

 The full list of included changes:

-* ropsten #6631425 foundation #8798209 (#11201)
-* [stable] builtin, istanbul and mordor testnet backports (#11234)
-  * ethcore-builtin (#10850)
-  * [builtin]: support `multiple prices and activations` in chain spec (#11039)
-  * [chain specs]: activate `Istanbul` on mainnet (#11228)
-  * ethcore/res: add mordor testnet configuration (#11200)
-* Update list of bootnodes for xDai chain (#11236)
-* ethcore: remove `test-helper feat` from build (#11047)
-* Secret store: fix Instant::now() related race in net_keep_alive (#11155) (#11159)
-* [stable]: backport #10691 and #10683 (#11143)
-  * Fix compiler warning (that will become an error) (#10683)
-  * Refactor Clique stepping (#10691)
-* Add Constantinople eips to the dev (instant_seal) config (#10809)
-* Add cargo-remote dir to .gitignore (?)
-* Insert explicit warning into the panic hook (#11225)
-* Fix docker centos build (#11226)
-* Update MIX bootnodes. (#11203)
-* Use provided usd-per-eth value if an endpoint is specified (#11209)
-* Add new line after writing block to hex file. (#10984)
-* Type annotation for next_key() matching of json filter options (#11192) (but no `FilterOption` in 2.5 so…)
-* Upgrade jsonrpc to latest (#11206)
-* [CI] check evmbin build (#11096)
-* Correct EIP-712 encoding (#11092)
-* [client]: Fix for incorrectly dropped consensus messages (#11086)
-* Fix block detail updating (#11015)
-* Switching sccache from local to Redis (#10971)
-* Made ecrecover implementation trait public (#11188)
-* [dependencies]: jsonrpc `14.0.1` (#11183)
-* [receipt]: add `sender` & `receiver` to `RichReceipts` (#11179)
-* [ethcore/builtin]: do not panic in blake2pricer on short input (#11180)
-* util Host: fix a double Read Lock bug in fn Host::session_readable() (#11175)
-* ethcore client: fix a double Read Lock bug in fn Client::logs() (#11172)
-* Change how RPCs eth_call and eth_estimateGas handle "Pending" (#11127)
-* Cleanup stratum a bit (#11161)
-* Upgrade to jsonrpc v14 (#11151)
-* SecretStore: expose restore_key_public in HTTP API (#10241)
+- Backports for 2.3.0 beta ([#10164](https://github.com/paritytech/parity-ethereum/pull/10164))
+- Snap: fix path in script ([#10157](https://github.com/paritytech/parity-ethereum/pull/10157))
+- 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))
+- Update EWF's tobalaba chainspec ([#10152](https://github.com/paritytech/parity-ethereum/pull/10152))
+- Replace ethcore-logger with env-logger. ([#10102](https://github.com/paritytech/parity-ethereum/pull/10102))
+- Finality: dont require chain head to be in the chain ([#10054](https://github.com/paritytech/parity-ethereum/pull/10054))
+- Remove caching for node connections ([#10143](https://github.com/paritytech/parity-ethereum/pull/10143))
+- Blooms file iterator empty on out of range position. ([#10145](https://github.com/paritytech/parity-ethereum/pull/10145))
+- Autogen docs for the "Configuring Parity Ethereum" wiki page. ([#10067](https://github.com/paritytech/parity-ethereum/pull/10067))
+- Misc: bump license header to 2019 ([#10135](https://github.com/paritytech/parity-ethereum/pull/10135))
+- Hide most of the logs from cpp example. ([#10139](https://github.com/paritytech/parity-ethereum/pull/10139))
+- Don't try to send oversized packets ([#10042](https://github.com/paritytech/parity-ethereum/pull/10042))
+- Private tx enabled flag added into STATUS packet ([#9999](https://github.com/paritytech/parity-ethereum/pull/9999))
+- Update pwasm-utils to 0.6.1 ([#10134](https://github.com/paritytech/parity-ethereum/pull/10134))
+- Extract blockchain from ethcore ([#10114](https://github.com/paritytech/parity-ethereum/pull/10114))
+- Ethcore: update hardcoded headers ([#10123](https://github.com/paritytech/parity-ethereum/pull/10123))
+- Identity fix ([#10128](https://github.com/paritytech/parity-ethereum/pull/10128))
+- Use LenCachingMutex to optimize verification. ([#10117](https://github.com/paritytech/parity-ethereum/pull/10117))
+- Pyethereum keystore support ([#9710](https://github.com/paritytech/parity-ethereum/pull/9710))
+- Bump rocksdb-sys to 0.5.5 ([#10124](https://github.com/paritytech/parity-ethereum/pull/10124))
+- Parity-clib: `async C bindings to RPC requests` + `subscribe/unsubscribe to websocket events` ([#9920](https://github.com/paritytech/parity-ethereum/pull/9920))
+- Refactor (hardware wallet) : reduce the number of threads ([#9644](https://github.com/paritytech/parity-ethereum/pull/9644))
+- Hf in POA Sokol (2019-01-04) ([#10077](https://github.com/paritytech/parity-ethereum/pull/10077))
+- Fix broken links ([#10119](https://github.com/paritytech/parity-ethereum/pull/10119))
+- Follow-up to [#10105](https://github.com/paritytech/parity-ethereum/issues/10105) ([#10107](https://github.com/paritytech/parity-ethereum/pull/10107))
+- Move EIP-712 crate back to parity-ethereum ([#10106](https://github.com/paritytech/parity-ethereum/pull/10106))
+- Move a bunch of stuff around ([#10101](https://github.com/paritytech/parity-ethereum/pull/10101))
+- Revert "Add --frozen when running cargo ([#10081](https://github.com/paritytech/parity-ethereum/pull/10081))" ([#10105](https://github.com/paritytech/parity-ethereum/pull/10105))
+- Fix left over small grumbles on whitespaces ([#10084](https://github.com/paritytech/parity-ethereum/pull/10084))
+- Add --frozen when running cargo ([#10081](https://github.com/paritytech/parity-ethereum/pull/10081))
+- Fix pubsub new_blocks notifications to include all blocks ([#9987](https://github.com/paritytech/parity-ethereum/pull/9987))
+- Update some dependencies for compilation with pc-windows-gnu ([#10082](https://github.com/paritytech/parity-ethereum/pull/10082))
+- Fill transaction hash on ethGetLog of light client. ([#9938](https://github.com/paritytech/parity-ethereum/pull/9938))
+- Update changelog update for 2.2.5-beta and 2.1.10-stable ([#10064](https://github.com/paritytech/parity-ethereum/pull/10064))
+- Implement len caching for parking_lot RwLock ([#10032](https://github.com/paritytech/parity-ethereum/pull/10032))
+- Update parking_lot to 0.7 ([#10050](https://github.com/paritytech/parity-ethereum/pull/10050))
+- Bump crossbeam. ([#10048](https://github.com/paritytech/parity-ethereum/pull/10048))
+- Ethcore: enable constantinople on ethereum ([#10031](https://github.com/paritytech/parity-ethereum/pull/10031))
+- Strict empty steps validation ([#10041](https://github.com/paritytech/parity-ethereum/pull/10041))
+- Center the Subtitle, use some CAPS ([#10034](https://github.com/paritytech/parity-ethereum/pull/10034))
+- Change test miner max memory to malloc reports. ([#10024](https://github.com/paritytech/parity-ethereum/pull/10024))
+- Sort the storage for private state ([#10018](https://github.com/paritytech/parity-ethereum/pull/10018))
+- Fix: test corpus_inaccessible panic ([#10019](https://github.com/paritytech/parity-ethereum/pull/10019))
+- Ci: move future releases to ethereum subdir on s3 ([#10017](https://github.com/paritytech/parity-ethereum/pull/10017))
+- Light(on_demand): decrease default time window to 10 secs ([#10016](https://github.com/paritytech/parity-ethereum/pull/10016))
+- Light client : failsafe crate (circuit breaker) ([#9790](https://github.com/paritytech/parity-ethereum/pull/9790))
+- Lencachingmutex ([#9988](https://github.com/paritytech/parity-ethereum/pull/9988))
+- Version and notification for private contract wrapper added ([#9761](https://github.com/paritytech/parity-ethereum/pull/9761))
+- Handle failing case for update account cache in require ([#9989](https://github.com/paritytech/parity-ethereum/pull/9989))
+- Add tokio runtime to ethcore io worker ([#9979](https://github.com/paritytech/parity-ethereum/pull/9979))
+- Move daemonize before creating account provider ([#10003](https://github.com/paritytech/parity-ethereum/pull/10003))
+- Docs: update changelogs ([#9990](https://github.com/paritytech/parity-ethereum/pull/9990))
+- Fix daemonize ([#10000](https://github.com/paritytech/parity-ethereum/pull/10000))
+- Fix Bloom migration ([#9992](https://github.com/paritytech/parity-ethereum/pull/9992))
+- Remove tendermint engine support ([#9980](https://github.com/paritytech/parity-ethereum/pull/9980))
+- Calculate gas for deployment transaction ([#9840](https://github.com/paritytech/parity-ethereum/pull/9840))
+- Fix unstable peers and slowness in sync ([#9967](https://github.com/paritytech/parity-ethereum/pull/9967))
+- Adds parity_verifySignature RPC method ([#9507](https://github.com/paritytech/parity-ethereum/pull/9507))
+- Improve block and transaction propagation ([#9954](https://github.com/paritytech/parity-ethereum/pull/9954))
+- Deny unknown fields for chainspec ([#9972](https://github.com/paritytech/parity-ethereum/pull/9972))
+- Fix docker build ([#9971](https://github.com/paritytech/parity-ethereum/pull/9971))
+- Ci: rearrange pipeline by logic ([#9970](https://github.com/paritytech/parity-ethereum/pull/9970))
+- Add changelogs for 2.0.9, 2.1.4, 2.1.6, and 2.2.1 ([#9963](https://github.com/paritytech/parity-ethereum/pull/9963))
+- Add Error message when sync is still in progress. ([#9475](https://github.com/paritytech/parity-ethereum/pull/9475))
+- Make CALLCODE to trace value to be the code address ([#9881](https://github.com/paritytech/parity-ethereum/pull/9881))
+- Fix light client informant while syncing ([#9932](https://github.com/paritytech/parity-ethereum/pull/9932))
+- Add a optional json dump state to evm-bin ([#9706](https://github.com/paritytech/parity-ethereum/pull/9706))
+- Disable EIP-98 transition by default ([#9955](https://github.com/paritytech/parity-ethereum/pull/9955))
+- Remove secret_store runtimes. ([#9888](https://github.com/paritytech/parity-ethereum/pull/9888))
+- Fix a deadlock ([#9952](https://github.com/paritytech/parity-ethereum/pull/9952))
+- Chore(eip712): remove unused `failure-derive` ([#9958](https://github.com/paritytech/parity-ethereum/pull/9958))
+- Do not use the home directory as the working dir in docker ([#9834](https://github.com/paritytech/parity-ethereum/pull/9834))
+- 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 empty steps ([#9939](https://github.com/paritytech/parity-ethereum/pull/9939))
+- Adjust requests costs for light client ([#9925](https://github.com/paritytech/parity-ethereum/pull/9925))
+- Eip-1186: add `eth_getProof` RPC-Method ([#9001](https://github.com/paritytech/parity-ethereum/pull/9001))
+- Missing blocks in filter_changes RPC ([#9947](https://github.com/paritytech/parity-ethereum/pull/9947))
+- Allow rust-nightly builds fail in nightly builds ([#9944](https://github.com/paritytech/parity-ethereum/pull/9944))
+- Update eth-secp256k1 to include fix for BSDs ([#9935](https://github.com/paritytech/parity-ethereum/pull/9935))
+- Unbreak build on rust -stable ([#9934](https://github.com/paritytech/parity-ethereum/pull/9934))
+- Keep existing blocks when restoring a Snapshot ([#8643](https://github.com/paritytech/parity-ethereum/pull/8643))
+- Add experimental RPCs flag ([#9928](https://github.com/paritytech/parity-ethereum/pull/9928))
+- Clarify poll lifetime ([#9922](https://github.com/paritytech/parity-ethereum/pull/9922))
+- Docs(require rust 1.30) ([#9923](https://github.com/paritytech/parity-ethereum/pull/9923))
+- Use block header for building finality ([#9914](https://github.com/paritytech/parity-ethereum/pull/9914))
+- Simplify cargo audit ([#9918](https://github.com/paritytech/parity-ethereum/pull/9918))
+- 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 191 ([#9701](https://github.com/paritytech/parity-ethereum/pull/9701))
+- Fix(logger): `reqwest` no longer a dependency ([#9908](https://github.com/paritytech/parity-ethereum/pull/9908))
+- Remove rust-toolchain file ([#9906](https://github.com/paritytech/parity-ethereum/pull/9906))
+- Foundation: 6692865, ropsten: 4417537, kovan: 9363457 ([#9907](https://github.com/paritytech/parity-ethereum/pull/9907))
+- Ethcore: use Machine::verify_transaction on parent block ([#9900](https://github.com/paritytech/parity-ethereum/pull/9900))
+- Chore(rpc-tests): remove unused rand ([#9896](https://github.com/paritytech/parity-ethereum/pull/9896))
+- Fix: Intermittent failing CI due to addr in use ([#9885](https://github.com/paritytech/parity-ethereum/pull/9885))
+- Chore(bump docopt): 0.8 -> 1.0 ([#9889](https://github.com/paritytech/parity-ethereum/pull/9889))
+- Use expect ([#9883](https://github.com/paritytech/parity-ethereum/pull/9883))
+- Use Weak reference in PubSubClient ([#9886](https://github.com/paritytech/parity-ethereum/pull/9886))
+- Ci: nuke the gitlab caches ([#9855](https://github.com/paritytech/parity-ethereum/pull/9855))
+- Remove unused code ([#9884](https://github.com/paritytech/parity-ethereum/pull/9884))
+- Fix json tracer overflow ([#9873](https://github.com/paritytech/parity-ethereum/pull/9873))
+- Allow to seal work on latest block ([#9876](https://github.com/paritytech/parity-ethereum/pull/9876))
+- Fix docker script ([#9854](https://github.com/paritytech/parity-ethereum/pull/9854))
+- Health endpoint ([#9847](https://github.com/paritytech/parity-ethereum/pull/9847))
+- Gitlab-ci: make android release build succeed ([#9743](https://github.com/paritytech/parity-ethereum/pull/9743))
+- Clean up existing benchmarks ([#9839](https://github.com/paritytech/parity-ethereum/pull/9839))
+- Update Callisto block reward code to support HF1 ([#9811](https://github.com/paritytech/parity-ethereum/pull/9811))
+- Option to disable keep alive for JSON-RPC http transport ([#9848](https://github.com/paritytech/parity-ethereum/pull/9848))
+- Classic.json Bootnode Update ([#9828](https://github.com/paritytech/parity-ethereum/pull/9828))
+- Support MIX. ([#9767](https://github.com/paritytech/parity-ethereum/pull/9767))
+- 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 (replaces [#9744](https://github.com/paritytech/parity-ethereum/issues/9744)) ([#9814](https://github.com/paritytech/parity-ethereum/pull/9814))
+- Chore(bump regex) ([#9842](https://github.com/paritytech/parity-ethereum/pull/9842))
+- Ignore global cache for patched accounts ([#9752](https://github.com/paritytech/parity-ethereum/pull/9752))
+- Move state root verification before gas used ([#9841](https://github.com/paritytech/parity-ethereum/pull/9841))
+- Fix(docker-aarch64) : cross-compile config ([#9798](https://github.com/paritytech/parity-ethereum/pull/9798))
+- Version: bump nightly to 2.3.0 ([#9819](https://github.com/paritytech/parity-ethereum/pull/9819))
+- Tests modification for windows CI ([#9671](https://github.com/paritytech/parity-ethereum/pull/9671))
+- Eip-712 implementation ([#9631](https://github.com/paritytech/parity-ethereum/pull/9631))
+- Fix typo ([#9826](https://github.com/paritytech/parity-ethereum/pull/9826))
+- Clean up serde rename and use rename_all = camelCase when possible ([#9823](https://github.com/paritytech/parity-ethereum/pull/9823))

-## Parity-Ethereum [v2.5.9](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.9)
-
-Parity Ethereum v2.5.9-stable is a patch release that adds the block numbers for activating the Istanbul hardfork on test networks: Ropsten, Görli, Rinkeby and Kovan.
-
-The full list of included changes:
-
-* ethcore/res: activate Istanbul on Ropsten, Görli, Rinkeby, Kovan (#11068)
-* [json-spec] make blake2 pricing spec more readable (#11034)
-
-## Parity-Ethereum [v2.5.8](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.8)
-
-Parity Ethereum v2.5.8-stable is a patch release that improves security, stability and performance.
-
-* The most noteworthy improvement in this release is incorporating all the EIPs required for the Istanbul hard fork.
-* This release also fixes certain security and performance issues, one of which was suspected to be consensus-threatening but turned out to be benign. Thanks to Martin Holst Swende and Felix Lange from the Ethereum Foundation for bringing the suspicious issue to our attention.
-
-The full list of included changes:
-
-* add more tx tests (#11038)
-* Fix parallel transactions race-condition (#10995)
-* Add blake2_f precompile (#11017)
-* [trace] introduce trace failed to Ext (#11019)
-* Edit publish-onchain.sh to use https (#11016)
-* Fix deadlock in network-devp2p (#11013)
-* EIP 1108: Reduce alt_bn128 precompile gas costs (#11008)
-* xDai chain support and nodes list update (#10989)
-* EIP 2028: transaction gas lowered from 68 to 16 (#10987)
-* EIP-1344 Add CHAINID op-code (#10983)
-* manual publish jobs for releases, no changes for nightlies (#10977)
-* [blooms-db] Fix benchmarks (#10974)
-* Verify transaction against its block during import (#10954)
-* Better error message for rpc gas price errors (#10931)
-* tx-pool: accept local tx with higher gas price when pool full (#10901)
-* Fix fork choice (#10837)
-* Cleanup unused vm dependencies (#10787)
-* Fix compilation on recent nightlies (#10991)
-* Don't build rpc with ethcore test-helpers (#11048) 
-* EIP 1884 Re-pricing of trie-size dependent operations  (#10992)
-* Implement EIP-1283 reenable transition, EIP-1706 and EIP-2200  (#10191)
-
-## Parity-Ethereum [v2.5.7](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.7)
-
-Parity Ethereum v2.5.7-stable is a bugfix release that fixes a potential DoS attack in the trace_call RPC method. This is a critical upgrade for anyone running Parity nodes with RPC exposed to the public internet (and highly recommended for anyone else). For details see this blog post.
-
-## Parity-Ethereum [v2.5.6](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.6)
-
-Parity-Ethereum v2.5.6-stable is a bugfix release that improves stability.
-
-* Allow specifying hostnames for node URLs
-* Fix a bug where archive nodes were losing peers
-
-The full list of included changes:
-
-* Kaspersky AV whitelisting (#10919)
-* Avast whitelist script (#10900) 
-* Docker images renaming (#10863) 
-* Remove excessive warning (#10831) 
-* Allow --nat extip:your.host.here.org (#10830) 
-* When updating the client or when called from RPC, sleep should mean sleep (#10814)
-* added new ropsten-bootnode and removed old one (#10794)
-* ethkey no longer uses byteorder (#10786) 
-* Do not drop the peer with None difficulty (#10772)
-* docs: Update Readme with TOC, Contributor Guideline. Update Cargo package descriptions (#10652)
-
-## Parity-Ethereum [v2.5.5](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.5)
-
-Parity-Ethereum v2.5.5-stable is a minor release that improves performance and stability.
-This release stabilises the 2.5 branch.
-
-As of today, Parity-Ethereum 2.4 reaches end of life and everyone is
-encouraged to upgrade.
-
-## Parity-Ethereum [v2.5.4](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.4)
-
-Parity Ethereum v2.5.4-beta is a security update that addresses servo/rust-smallvec#148
-
-The full list of included changes:
-
-* cargo update -p smallvec ([#10822](https://github.com/paritytech/parity-ethereum/pull/10822))
-
-## Parity-Ethereum [v2.5.3](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.3)
-
-Parity-Ethereum 2.5.3-beta is a bugfix release that improves performance and stability.
-
-* EthereumClassic: activate the Atlantis Hardfork
-* Clique: fix time overflow
-* State tests: treat empty accounts the same as non-existant accounts (EIP 1052)
-* Networking: support discovery-only peers (geth bootnodes)
-* Snapshotting: fix unclean shutdown while snappshotting is under way
-
-The full list of included changes:
-
-* ethcore/res: activate atlantis classic hf on block 8772000 ([#10766](https://github.com/paritytech/parity-ethereum/pull/10766))
-* fix docker tags for publishing ([#10741](https://github.com/paritytech/parity-ethereum/pull/10741))
-* fix: aura don't add `SystemTime::now()` ([#10720](https://github.com/paritytech/parity-ethereum/pull/10720))
-* Treat empty account the same as non-exist accounts in EIP-1052 ([#10775](https://github.com/paritytech/parity-ethereum/pull/10775))
-* DevP2p: Get node IP address and udp port from Socket, if not included in PING packet ([#10705](https://github.com/paritytech/parity-ethereum/pull/10705))
-* Add a way to signal shutdown to snapshotting threads ([#10744](https://github.com/paritytech/parity-ethereum/pull/10744))
-
-## Parity-Ethereum [v2.5.2](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.2)
-
-Parity-Ethereum 2.5.2-beta is a bugfix release that improves performance and stability.
-
-Among others, it enables the _Atlantis_ hardfork on **Morden** and **Kotti** Classic networks.
-
-The full list of included changes:
-
-* [CI] allow cargo audit to fail ([#10676](https://github.com/paritytech/parity-ethereum/pull/10676))
-* Reset blockchain properly ([#10669](https://github.com/paritytech/parity-ethereum/pull/10669))
-* new image ([#10673](https://github.com/paritytech/parity-ethereum/pull/10673))
-* Update publishing ([#10644](https://github.com/paritytech/parity-ethereum/pull/10644))
-* enable lto for release builds ([#10717](https://github.com/paritytech/parity-ethereum/pull/10717))
-* Use RUSTFLAGS to set the optimization level ([#10719](https://github.com/paritytech/parity-ethereum/pull/10719))
-* ethcore: enable ECIP-1054 for classic ([#10731](https://github.com/paritytech/parity-ethereum/pull/10731))
-
-## Parity-Ethereum [v2.5.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.1)
-
-Parity-Ethereum 2.5.1-beta is a bugfix release that improves performance and stability. 
-
-Among others, it enables the Petersburg hardfork on **Rinkeby** and **POA-Core** Network, as well as the **Kovan** Network community hardfork.
-
-The full list of included changes:
-
-* ci: publish docs debug ([#10638](https://github.com/paritytech/parity-ethereum/pull/10638))
-
-## Parity-Ethereum [v2.5.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.0)
-
-Parity-Ethereum 2.5.0-beta is a minor release that improves performance and stabilizes the 2.5 branch by marking it as beta release. 
-
- This release adds support for the Clique consensus engine ([#9981](https://github.com/paritytech/parity-ethereum/pull/9981))
-  - This enables Parity-Ethereum users to use the Görli, the Kotti Classic, and the legacy Rinkeby testnet. To get started try `parity --chain goerli`; note that light client support is currently not yet fully functional.
- This release removes the dead chain configs for Easthub and Ethereum Social ([#10531](https://github.com/paritytech/parity-ethereum/pull/10531))
-
-As of today, Parity-Ethereum 2.3 reaches end of life and everyone is encouraged to upgrade.
-
-The full list of included changes:
-
-* fix(light cull): poll light cull instead of timer ([#10559](https://github.com/paritytech/parity-ethereum/pull/10559))
+## Previous releases

+- [CHANGELOG-2.2](docs/CHANGELOG-2.2.md) (_stable_)
+- [CHANGELOG-2.1](docs/CHANGELOG-2.1.md) (EOL: 2019-01-16)
+- [CHANGELOG-2.0](docs/CHANGELOG-2.0.md) (EOL: 2018-11-15)
+- [CHANGELOG-1.11](docs/CHANGELOG-1.11.md) (EOL: 2018-09-19)
+- [CHANGELOG-1.10](docs/CHANGELOG-1.10.md) (EOL: 2018-07-18)
+- [CHANGELOG-1.9](docs/CHANGELOG-1.9.md) (EOL: 2018-05-09)
+- [CHANGELOG-1.8](docs/CHANGELOG-1.8.md) (EOL: 2018-03-22)
+- [CHANGELOG-1.7](docs/CHANGELOG-1.7.md) (EOL: 2018-01-25)
+- [CHANGELOG-1.6](docs/CHANGELOG-1.6.md) (EOL: 2017-10-15)
+- [CHANGELOG-1.5](docs/CHANGELOG-1.5.md) (EOL: 2017-07-28)
+- [CHANGELOG-1.4](docs/CHANGELOG-1.4.md) (EOL: 2017-03-13)
+- [CHANGELOG-1.3](docs/CHANGELOG-1.3.md) (EOL: 2017-01-19)
+- [CHANGELOG-1.2](docs/CHANGELOG-1.2.md) (EOL: 2016-11-07)
+- [CHANGELOG-1.1](docs/CHANGELOG-1.1.md) (EOL: 2016-08-12)
+- [CHANGELOG-1.0](docs/CHANGELOG-1.0.md) (EOL: 2016-06-24)
+- [CHANGELOG-0.9](docs/CHANGELOG-0.9.md) (EOL: 2016-05-02)
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 description = "Parity Ethereum client"
 name = "parity-ethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "2.5.13"
+version = "2.4.2"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]

@@ -29,7 +29,7 @@ serde_derive = "1.0"
 futures = "0.1"
 fdlimit = "0.1"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
-jsonrpc-core = "14.0.0"
+jsonrpc-core = "10.0.1"
 parity-bytes = "0.1"
 common-types = { path = "ethcore/types" }
 ethcore = { path = "ethcore", features = ["parity"] }
@@ -118,13 +118,10 @@ path = "parity/lib.rs"
 path = "parity/main.rs"
 name = "parity"

-[profile.test]
-lto = false
-opt-level = 3 # makes tests slower to compile, but faster to run
+[profile.dev]

 [profile.release]
 debug = false
-lto = true

 [workspace]
 # This should only list projects that are not
--- a/README.md
+++ b/README.md
@@ -7,25 +7,6 @@
 <p align="center"><a href="https://gitlab.parity.io/parity/parity-ethereum/commits/master" target="_blank"><img src="https://gitlab.parity.io/parity/parity-ethereum/badges/master/build.svg" /></a>
 <a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank"><img src="https://img.shields.io/badge/license-GPL%20v3-green.svg" /></a></p>

-## Table of Contents
-
-1. [Description](#chapter-001)
-2. [Technical Overview](#chapter-002)
-3. [Building](#chapter-003)<br>
-  3.1 [Building Dependencies](#chapter-0031)<br>
-  3.2 [Building from Source Code](#chapter-0032)<br>
-  3.3 [Simple One-Line Installer for Mac and Linux](#chapter-0033)<br>
-  3.4 [Starting Parity Ethereum](#chapter-0034)
-4. [Testing](#chapter-004)
-5. [Documentation](#chapter-005)
-6. [Toolchain](#chapter-006)
-7. [Community](#chapter-007)
-8. [Contributing](#chapter-008)
-9. [License](#chapter-009)
-
-
-## 1. Description <a id="chapter-001"></a>
-
 **Built for mission-critical use**: Miners, service providers, and exchanges need fast synchronisation and maximum uptime. Parity Ethereum provides the core infrastructure essential for speedy and reliable services.

 - Clean, modular codebase for easy customisation
@@ -34,7 +15,7 @@
 - Synchronise in hours, not days with Warp Sync
 - Modular for light integration into your service or product

-## 2. Technical Overview <a id="chapter-002"></a>
+## Technical Overview

 Parity Ethereum's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing Parity Ethereum using the sophisticated and cutting-edge **Rust programming language**. Parity Ethereum is licensed under the GPLv3 and can be used for all your Ethereum needs.

@@ -42,11 +23,9 @@ By default, Parity Ethereum runs a JSON-RPC HTTP server on port `:8545` and a We

 If you run into problems while using Parity Ethereum, check out the [wiki for documentation](https://wiki.parity.io/), feel free to [file an issue in this repository](https://github.com/paritytech/parity-ethereum/issues/new), or hop on our [Gitter](https://gitter.im/paritytech/parity) or [Riot](https://riot.im/app/#/group/+parity:matrix.parity.io) chat room to ask a question. We are glad to help! **For security-critical issues**, please refer to the security policy outlined in [SECURITY.md](SECURITY.md).

-Parity Ethereum's current beta-release is 2.6. You can download it at [the releases page](https://github.com/paritytech/parity-ethereum/releases) or follow the instructions below to build from source. Please, mind the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions.
+Parity Ethereum's current beta-release is 2.1. You can download it at [the releases page](https://github.com/paritytech/parity-ethereum/releases) or follow the instructions below to build from source. Please, mind the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions.

-## 3. Building <a id="chapter-003"></a>
-
-### 3.1 Build Dependencies <a id="chapter-0031"></a>
+## Build Dependencies

 Parity Ethereum requires **latest stable Rust version** to build.

@@ -66,7 +45,7 @@ We recommend installing Rust through [rustup](https://www.rustup.rs/). If you do

  `clang` is required. It comes with Xcode command line tools or can be installed with homebrew.

- Windows:
+- Windows
  Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the `rustup` installer from
  https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe, start "VS2015 x64 Native Tools Command Prompt", and use the following command to install and set up the `msvc` toolchain:
  ```bash
@@ -79,7 +58,7 @@ Once you have `rustup` installed, then you need to install:

 Make sure that these binaries are in your `PATH`. After that, you should be able to build Parity Ethereum from source.

-### 3.2 Build from Source Code <a id="chapter-0032"></a>
+## Build from Source Code

 ```bash
 # download Parity Ethereum code
@@ -116,7 +95,7 @@ or
 $ git checkout beta
 ```

-### 3.3 Simple One-Line Installer for Mac and Linux <a id="chapter-0033"></a>
+## Simple One-Line Installer for Mac and Linux

 ```bash
 bash <(curl https://get.parity.io -L)
@@ -128,9 +107,9 @@ The one-line installer always defaults to the latest beta release. To install a
 bash <(curl https://get.parity.io -L) -r stable
 ```

-### 3.4 Starting Parity Ethereum <a id="chapter-0034"></a>
+## Start Parity Ethereum

-#### Manually
+### Manually

 To start Parity Ethereum manually, just run

@@ -140,7 +119,7 @@ $ ./target/release/parity

 so Parity Ethereum begins syncing the Ethereum blockchain.

-#### Using `systemd` service file
+### Using `systemd` service file

 To start Parity Ethereum as a regular user using `systemd` init:

@@ -149,225 +128,17 @@ To start Parity Ethereum as a regular user using `systemd` init:
 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.

-## 4. Testing <a id="chapter-004"></a>
-
-Download the required test files: `git submodule update --init --recursive`. You can run tests with the following commands:
-
-* **All** packages
-  ```
-  cargo test --all
-  ```
-
-* Specific package
-  ```
-  cargo test --package <spec>
-  ```
-
-Replace `<spec>` with one of the packages from the [package list](#package-list) (e.g. `cargo test --package evmbin`).
-
-You can show your logs in the test output by passing `--nocapture` (i.e. `cargo test --package evmbin -- --nocapture`)
-
-## 5. Documentation <a id="chapter-005"></a>
-
-Official website: https://parity.io
-
-Be sure to [check out our wiki](https://wiki.parity.io) for more information.
-
-### Viewing documentation for Parity Ethereum packages
-
-You can generate documentation for Parity Ethereum Rust packages that automatically opens in your web browser using [rustdoc with Cargo](https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html#using-rustdoc-with-cargo) (of the The Rustdoc Book), by running the the following commands:
-
-* **All** packages
-  ```
-  cargo doc --document-private-items --open
-  ```
-
-* Specific package
-  ```
-  cargo doc --package <spec> -- --document-private-items --open
-  ```
-
-Use`--document-private-items` to also view private documentation and `--no-deps` to exclude building documentation for dependencies.
-
-Replacing `<spec>` with one of the following from the details section below (i.e. `cargo doc --package parity-ethereum --open`):
-
-<a id="package-list"></a>
-**Package List**
-<details><p>
-
-* Parity Ethereum (EthCore) Client Application
-  ```bash
-  parity-ethereum
-  ```
-* Parity Ethereum Account Management, Key Management Tool, and Keys Generator
-  ```bash
-  ethcore-accounts, ethkey-cli, ethstore, ethstore-cli
-  ```
-* Parity Chain Specification
-  ```bash
-  chainspec
-  ```
-* Parity CLI Signer Tool & RPC Client
-  ```bash
-  cli-signer parity-rpc-client
-  ```
-* Parity Ethereum Ethash & ProgPoW Implementations
-  ```bash
-  ethash
-  ```
-* Parity (EthCore) Library
-  ```bash
-  ethcore
-  ```
-  * Parity Ethereum Blockchain Database, Test Generator, Configuration,
-Caching, Importing Blocks, and Block Information
-    ```bash
-    ethcore-blockchain
-    ```
-  * Parity Ethereum (EthCore) Contract Calls and Blockchain Service & Registry Information
-    ```bash
-    ethcore-call-contract
-    ```
-  * Parity Ethereum (EthCore) Database Access & Utilities, Database Cache Manager
-    ```bash
-    ethcore-db
-    ```
-  * Parity Ethereum Virtual Machine (EVM) Rust Implementation
-    ```bash
-    evm
-    ```
-  * Parity Ethereum (EthCore) Light Client Implementation
-    ```bash
-    ethcore-light
-    ```
-  * Parity Smart Contract based Node Filter, Manage Permissions of Network Connections
-    ```bash
-    node-filter
-    ```
-  * Parity Private Transactions
-    ```bash
-    ethcore-private-tx
-    ```
-  * Parity Ethereum (EthCore) Client & Network Service Creation & Registration with the I/O Subsystem
-    ```bash
-    ethcore-service
-    ```
-  * Parity Ethereum (EthCore) Blockchain Synchronization
-    ```bash
-    ethcore-sync
-    ```
-  * Parity Ethereum Common Types
-    ```bash
-    common-types
-    ```
-  * Parity Ethereum Virtual Machines (VM) Support Library
-    ```bash
-    vm
-    ```
-  * Parity Ethereum WASM Interpreter
-    ```bash
-    wasm
-    ```
-  * Parity Ethereum WASM Test Runner
-    ```bash
-    pwasm-run-test
-    ```
-  * Parity EVM Implementation
-    ```bash
-    evmbin
-    ```
-  * Parity Ethereum IPFS-compatible API
-    ```bash
-    parity-ipfs-api
-    ```
-  * Parity Ethereum JSON Deserialization
-    ```bash
-    ethjson
-    ```
-  * Parity Ethereum State Machine Generalization for Consensus Engines
-    ```bash
-    parity-machine
-    ```
-* Parity Ethereum (EthCore) Miner Interface
-  ```bash
-  ethcore-miner parity-local-store price-info ethcore-stratum using_queue
-  ```
-* Parity Ethereum (EthCore) Logger Implementation
-  ```bash
-  ethcore-logger
-  ```
-* C bindings library for the Parity Ethereum client
-  ```bash
-  parity-clib
-  ```
-* Parity Ethereum JSON-RPC Servers
-  ```bash
-  parity-rpc
-  ```
-* Parity Ethereum (EthCore) Secret Store
-  ```bash
-  ethcore-secretstore
-  ```
-* Parity Updater Service
-  ```bash
-  parity-updater parity-hash-fetch
-  ```
-* Parity Core Libraries (Parity Util)
-  ```bash
-  ethcore-bloom-journal blooms-db dir eip-712 fake-fetch fastmap fetch ethcore-io
-  journaldb keccak-hasher len-caching-lock macros memory-cache memzero
-  migration-rocksdb ethcore-network ethcore-network-devp2p panic_hook
-  patricia-trie-ethereum registrar rlp_compress rlp_derive parity-runtime stats
-  time-utils triehash-ethereum unexpected parity-version
-  ```
-* Parity Whisper Protocol Implementation
-  ```bash
-  parity-whisper whisper-cli
-  ```
-
-</p></details>
-
-### Contributing to documentation for Parity Ethereum packages
-
-[Document source code](https://doc.rust-lang.org/1.9.0/book/documentation.html) for Parity Ethereum packages by annotating the source code with documentation comments.
-
-Example (generic documentation comment):
-```markdown
-/// Summary
-///
-/// Description
-///
-/// # Panics
-///
-/// # Errors
-///
-/// # Safety
-///
-/// # Examples
-///
-/// Summary of Example 1
-///
-/// ```rust
-/// // insert example 1 code here for use with documentation as tests
-/// ```
-///
-```
-
-## 6. Toolchain <a id="chapter-006"></a>
+## Parity Ethereum toolchain

 In addition to the Parity Ethereum client, there are additional tools in this repository available:

- [evmbin](./evmbin) - Parity Ethereum EVM Implementation.
- [ethstore](./accounts/ethstore) - Parity Ethereum Key Management.
- [ethkey](./accounts/ethkey) - Parity Ethereum Keys Generator.
- [whisper](./whisper) - Parity Ethereum Whisper-v2 PoC Implementation.
+- [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.
+- [whisper](https://github.com/paritytech/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.

-The following tool is available in a separate repository:
- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum Encoding of Function Calls. [Docs here](https://crates.io/crates/ethabi)
-
-## 7. Community <a id="chapter-007"></a>
-
-### Join the chat!
+## Join the chat!

 Questions? Get in touch with us on Gitter:
 [![Gitter: Parity](https://img.shields.io/badge/gitter-parity-4AB495.svg)](https://gitter.im/paritytech/parity)
@@ -378,14 +149,8 @@ Questions? Get in touch with us on Gitter:
 Alternatively, join our community on Matrix:
 [![Riot: +Parity](https://img.shields.io/badge/riot-%2Bparity%3Amatrix.parity.io-orange.svg)](https://riot.im/app/#/group/+parity:matrix.parity.io)

-## 8. Contributing <a id="chapter-008"></a>
+## Documentation

-An introduction has been provided in the ["So You Want to be a Core Developer" presentation slides by Hernando Castano](http://tiny.cc/contrib-to-parity-eth). Additional guidelines are provided in [CONTRIBUTING](./.github/CONTRIBUTING.md).
+Official website: https://parity.io

-### Contributor Code of Conduct
-
-[CODE_OF_CONDUCT](./.github/CODE_OF_CONDUCT.md)
-
-## 9. License <a id="chapter-009"></a>
-
-[LICENSE](./LICENSE)
+Be sure to [check out our wiki](https://wiki.parity.io) for more information.
--- a/accounts/Cargo.toml
+++ b/accounts/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-description = "Parity Ethereum Account Management"
+description = "Account management for Parity Ethereum"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-accounts"
--- a/accounts/ethkey/Cargo.toml
+++ b/accounts/ethkey/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
-description = "Parity Ethereum Keys Generator"
 name = "ethkey"
 version = "0.3.0"
 authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
+byteorder = "1.0"
 edit-distance = "2.0"
 parity-crypto = "0.3.0"
-eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1", rev = "ccc06e7480148b723eb44ac56cf4d20eec380b6f" }
+eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
 ethereum-types = "0.4"
 lazy_static = "1.0"
 log = "0.4"
 memzero = { path = "../../util/memzero" }
-parity-wordlist = "1.3"
+parity-wordlist = "1.2"
 quick-error = "1.2.2"
 rand = "0.4"
 rustc-hex = "1.0"
--- a/accounts/ethkey/README.md
+++ b/accounts/ethkey/README.md
@@ -5,7 +5,7 @@ Parity Ethereum keys generator.
 ### Usage

 ```
-Parity Ethereum Keys Generator.
+Parity Ethereum keys generator.
  Copyright 2015-2019 Parity Technologies (UK) Ltd.

 Usage:
--- a/accounts/ethkey/cli/Cargo.toml
+++ b/accounts/ethkey/cli/Cargo.toml
@@ -1,5 +1,4 @@
 [package]
-description = "Parity Ethereum Keys Generator CLI"
 name = "ethkey-cli"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
@@ -9,7 +8,7 @@ docopt = "1.0"
 env_logger = "0.5"
 ethkey = { path = "../" }
 panic_hook = { path = "../../../util/panic-hook" }
-parity-wordlist="1.3"
+parity-wordlist="1.2"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
--- a/accounts/ethkey/src/extended.rs
+++ b/accounts/ethkey/src/extended.rs
@@ -35,8 +35,9 @@ impl Label for u32 {
 	fn len() -> usize { 4 }

 	fn store(&self, target: &mut [u8]) {
-		let bytes = self.to_be_bytes();
-		target[0..4].copy_from_slice(&bytes);
+		use byteorder::{BigEndian, ByteOrder};
+
+		BigEndian::write_u32(&mut target[0..4], *self);
 	}
 }

--- a/accounts/ethkey/src/lib.rs
+++ b/accounts/ethkey/src/lib.rs
@@ -16,6 +16,7 @@

 // #![warn(missing_docs)]

+extern crate byteorder;
 extern crate edit_distance;
 extern crate parity_crypto;
 extern crate ethereum_types;
--- a/accounts/ethstore/Cargo.toml
+++ b/accounts/ethstore/Cargo.toml
@@ -1,5 +1,4 @@
 [package]
-description = "Parity Ethereum Key Management"
 name = "ethstore"
 version = "0.2.1"
 authors = ["Parity Technologies <admin@parity.io>"]
@@ -21,7 +20,7 @@ parity-crypto = "0.3.0"
 ethereum-types = "0.4"
 dir = { path = "../../util/dir" }
 smallvec = "0.6"
-parity-wordlist = "1.3"
+parity-wordlist = "1.0"
 tempdir = "0.3"
 lazy_static = "1.2.0"

--- a/accounts/ethstore/cli/Cargo.toml
+++ b/accounts/ethstore/cli/Cargo.toml
@@ -1,5 +1,4 @@
 [package]
-description = "Parity Ethereum Key Management CLI"
 name = "ethstore-cli"
 version = "0.1.1"
 authors = ["Parity Technologies <admin@parity.io>"]
--- a/chainspec/Cargo.toml
+++ b/chainspec/Cargo.toml
@@ -1,5 +1,4 @@
 [package]
-description = "Parity Ethereum Chain Specification"
 name = "chainspec"
 version = "0.1.0"
 authors = ["Marek Kotewicz <marek@parity.io>"]
--- a/cli-signer/Cargo.toml
+++ b/cli-signer/Cargo.toml
@@ -1,13 +1,12 @@
 [package]
-description = "Parity Ethereum CLI Signer Tool"
+authors = ["Parity <admin@parity.io>"]
+description = "Parity Cli Tool"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "cli-signer"
 version = "1.4.0"
-authors = ["Parity <admin@parity.io>"]

 [dependencies]
-ethereum-types = "0.4"
 futures = "0.1"
 rpassword = "1.0"
 parity-rpc = { path = "../rpc" }
--- a/cli-signer/rpc-client/Cargo.toml
+++ b/cli-signer/rpc-client/Cargo.toml
@@ -1,21 +1,20 @@
 [package]
-description = "Parity Ethereum RPC Client"
+authors = ["Parity <admin@parity.io>"]
+description = "Parity Rpc Client"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "parity-rpc-client"
 version = "1.4.0"
-authors = ["Parity <admin@parity.io>"]

 [dependencies]
-ethereum-types = "0.4"
 futures = "0.1"
 log = "0.4"
 serde = "1.0"
 serde_json = "1.0"
-url = "2"
+url = "1.2.0"
 matches = "0.1"
-parking_lot = "0.9"
-jsonrpc-core = "14.0.3"
-jsonrpc-ws-server = "14.0.3"
+parking_lot = "0.7"
+jsonrpc-core = "10.0.1"
+jsonrpc-ws-server = "10.0.1"
 parity-rpc = { path = "../../rpc" }
 keccak-hash = "0.1"
--- a/cli-signer/rpc-client/src/lib.rs
+++ b/cli-signer/rpc-client/src/lib.rs
@@ -17,7 +17,6 @@
 pub mod client;
 pub mod signer_client;

-extern crate ethereum_types;
 extern crate futures;
 extern crate jsonrpc_core;
 extern crate jsonrpc_ws_server as ws;
--- a/cli-signer/rpc-client/src/signer_client.rs
+++ b/cli-signer/rpc-client/src/signer_client.rs
@@ -15,8 +15,7 @@
 // along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.

 use client::{Rpc, RpcError};
-use ethereum_types::U256;
-use rpc::signer::{ConfirmationRequest, TransactionModification, TransactionCondition};
+use rpc::signer::{ConfirmationRequest, TransactionModification, U256, TransactionCondition};
 use serde;
 use serde_json::{Value as JsonValue, to_value};
 use std::path::PathBuf;
--- a/cli-signer/src/lib.rs
+++ b/cli-signer/src/lib.rs
@@ -14,15 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.

-extern crate ethereum_types;
 extern crate futures;
 extern crate rpassword;

 extern crate parity_rpc as rpc;
 extern crate parity_rpc_client as client;

-use ethereum_types::U256;
-use rpc::signer::ConfirmationRequest;
+use rpc::signer::{U256, ConfirmationRequest};
 use client::signer_client::SignerRpc;
 use std::io::{Write, BufRead, BufReader, stdout, stdin};
 use std::path::PathBuf;
--- a/docs/CHANGELOG-2.2.md
+++ b/docs/CHANGELOG-2.2.md
@@ -1,78 +1,3 @@
-Note: Parity Ethereum 2.2 reached End-of-Life on 2019-02-25 (EOL).
-
-## Parity-Ethereum [v2.2.11](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.11) (2019-02-21)
-
-Parity-Ethereum 2.2.11-stable is a maintenance release that fixes snap and docker installations.
-
-The full list of included changes:
-
- Stable: snap: release untagged versions from branches to the candidate ([#10357](https://github.com/paritytech/parity-ethereum/pull/10357)) ([#10372](https://github.com/paritytech/parity-ethereum/pull/10372))
-  - Snap: release untagged versions from branches to the candidate snap channel ([#10357](https://github.com/paritytech/parity-ethereum/pull/10357))
-  - Snap: add the removable-media plug ([#10377](https://github.com/paritytech/parity-ethereum/pull/10377))
-  - Exchanged old(azure) bootnodes with new(ovh) ones ([#10309](https://github.com/paritytech/parity-ethereum/pull/10309))
- Stable Backports ([#10353](https://github.com/paritytech/parity-ethereum/pull/10353))
-  - Version: bump stable to 2.2.11
-  - Snap: prefix version and populate candidate channel ([#10343](https://github.com/paritytech/parity-ethereum/pull/10343))
-  - Snap: populate candidate releases with beta snaps to avoid stale channel
-  - Snap: prefix version with v*
-  - No volumes are needed, just run -v volume:/path/in/the/container ([#10345](https://github.com/paritytech/parity-ethereum/pull/10345))
-
-## Parity-Ethereum [v2.2.10](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.10) (2019-02-13)
-
-Parity-Ethereum 2.2.10-stable is a security-relevant release. A bug in the JSONRPC-deserialization module can cause crashes of all versions of Parity Ethereum nodes if an attacker is able to submit a specially-crafted RPC to certain publicly available endpoints.
-
- https://www.parity.io/new-parity-ethereum-update-fixes-several-rpc-vulnerabilities/
-
-The full list of included changes:
-
-  Additional error for invalid gas ([#10327](https://github.com/paritytech/parity-ethereum/pull/10327)) ([#10329](https://github.com/paritytech/parity-ethereum/pull/10329))
-  Backports for Stable 2.2.10 ([#10332](https://github.com/paritytech/parity-ethereum/pull/10332))
-    - fix(docker-aarch64) : cross-compile config ([#9798](https://github.com/paritytech/parity-ethereum/pull/9798))
-    - import rpc transactions sequentially ([#10051](https://github.com/paritytech/parity-ethereum/pull/10051))
-    - fix(docker): fix not receives SIGINT ([#10059](https://github.com/paritytech/parity-ethereum/pull/10059))
-    - snap: official image / test ([#10168](https://github.com/paritytech/parity-ethereum/pull/10168))
-    - perform stripping during build ([#10208](https://github.com/paritytech/parity-ethereum/pull/10208))
-    - Additional tests for uint/hash/bytes deserialization. ([#10279](https://github.com/paritytech/parity-ethereum/pull/10279))
-    - Don't run the CPP example on CI ([#10285](https://github.com/paritytech/parity-ethereum/pull/10285))
-    - CI optimizations ([#10297](https://github.com/paritytech/parity-ethereum/pull/10297))
-    - fix publish job ([#10317](https://github.com/paritytech/parity-ethereum/pull/10317))
-    - Add Statetest support for Constantinople Fix ([#10323](https://github.com/paritytech/parity-ethereum/pull/10323))
-    - Add helper for Timestamp overflows ([#10330](https://github.com/paritytech/parity-ethereum/pull/10330))
-    - Don't add discovery initiators to the node table ([#10305](https://github.com/paritytech/parity-ethereum/pull/10305))
-    - change docker image based on debian instead of ubuntu due to the chan ([#10336](https://github.com/paritytech/parity-ethereum/pull/10336))
-    - role back docker build image and docker deploy image to ubuntu:xenial based ([#10338](https://github.com/paritytech/parity-ethereum/pull/10338))
-
-## Parity-Ethereum [v2.2.9](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.9) (2019-02-03)
-
-Parity-Ethereum 2.2.9-stable is a security-relevant release. A bug in the JSONRPC-deserialization module can cause crashes of all versions of Parity Ethereum nodes if an attacker is able to submit a specially-crafted RPC to certain publicly available endpoints.
-
- https://www.parity.io/security-alert-parity-ethereum-03-02/
-
-The full list of included changes:
-
-  Additional tests for uint deserialization. ([#10279](https://github.com/paritytech/parity-ethereum/pull/10279)) ([#10281](https://github.com/paritytech/parity-ethereum/pull/10281))
-  Version: bump stable to 2.2.9 ([#10282](https://github.com/paritytech/parity-ethereum/pull/10282))
-
-## Parity-Ethereum [v2.2.8](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.8) (2019-02-01)
-
-Parity-Ethereum 2.2.8-stable is a consensus-relevant release that enables _St. Petersfork_ on:
-
- Ethereum Block `7280000` (along with Constantinople)
- Kovan Block `10255201`
- Ropsten Block `4939394`
- POA Sokol Block `7026400`
-
-In addition to this, Constantinople is cancelled for the POA Core network. Upgrading is mandatory for clients on any of these chains.
-
-The full list of included changes:
-
- Backports for stable 2.2.8 ([#10224](https://github.com/paritytech/parity-ethereum/pull/10224))
-  - Update for Android cross-compilation. ([#10180](https://github.com/paritytech/parity-ethereum/pull/10180))
-  - Cancel Constantinople HF on POA Core ([#10198](https://github.com/paritytech/parity-ethereum/pull/10198))
-  - Add EIP-1283 disable transition ([#10214](https://github.com/paritytech/parity-ethereum/pull/10214))
-  - Enable St-Peters-Fork ("Constantinople Fix") ([#10223](https://github.com/paritytech/parity-ethereum/pull/10223))
- Stable: Macos heapsize force jemalloc ([#10234](https://github.com/paritytech/parity-ethereum/pull/10234)) ([#10258](https://github.com/paritytech/parity-ethereum/pull/10258))
-
 ## 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.
--- a/docs/CHANGELOG-2.3.md
+++ b/docs/CHANGELOG-2.3.md
@@ -1,288 +0,0 @@
-## Parity-Ethereum [v2.3.8](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.8) (2019-03-22)
-
-Parity-Ethereum 2.3.8-stable is a bugfix release that improves performance and stability. This patch release contains a critical bug fix where serving light clients previously led to client crashes. Upgrading is highly recommended.
-
-The full list of included changes:
- 2.3.8 stable backports ([#10507](https://github.com/paritytech/parity-ethereum/pull/10507))
-  - Version: bump stable
-  - Add additional request tests ([#10503](https://github.com/paritytech/parity-ethereum/pull/10503))
-
-## Parity-Ethereum [v2.3.7](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.7) (2019-03-20)
-
-Parity-Ethereum 2.3.7-stable is a bugfix release that improves performance and stability.
-
-The full list of included changes:
- 2.3.7 stable backports ([#10487](https://github.com/paritytech/parity-ethereum/pull/10487))
-  - Version: bump stable
-  - Сaching through docker volume ([#10477](https://github.com/paritytech/parity-ethereum/pull/10477))
-  - fix win&mac build ([#10486](https://github.com/paritytech/parity-ethereum/pull/10486))
-  - fix(extract `timestamp_checked_add` as lib) ([#10383](https://github.com/paritytech/parity-ethereum/pull/10383))
-
-## Parity-Ethereum [v2.3.6](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.6) (2019-03-19)
-
-Parity-Ethereum 2.3.6-stable is a bugfix release that improves performance and stability.
-
-The full list of included changes:
- 2.3.6 stable backports ([#10470](https://github.com/paritytech/parity-ethereum/pull/10470))
-  - Version: bump stable
-  - CI publish to aws ([#10446](https://github.com/paritytech/parity-ethereum/pull/10446))
-  - Ensure static validator set changes are recognized ([#10467](https://github.com/paritytech/parity-ethereum/pull/10467))
-  - CI aws git checkout ([#10451](https://github.com/paritytech/parity-ethereum/pull/10451))
-  - Revert "CI aws git checkout ([#10451](https://github.com/paritytech/parity-ethereum/pull/10451))" ([#10456](https://github.com/paritytech/parity-ethereum/pull/10456))
-  - Tests parallelized ([#10452](https://github.com/paritytech/parity-ethereum/pull/10452))
-
-## Parity-Ethereum [v2.3.5](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.5) (2019-02-25)
-
-Parity-Ethereum 2.3.5-stable is a bugfix release that improves performance and stability.
-
-Note, all 2.2 releases and older are now unsupported and upgrading is recommended.
-
-The full list of included changes:
-
- More Backports for Stable 2.3.5 ([#10430](https://github.com/paritytech/parity-ethereum/pull/10430))
-  - Revert some changes, could be buggy ([#10399](https://github.com/paritytech/parity-ethereum/pull/10399))
-  - Ci: clean up gitlab-ci.yml leftovers from previous merge ([#10429](https://github.com/paritytech/parity-ethereum/pull/10429))
-  - 10000 > 5000 ([#10422](https://github.com/paritytech/parity-ethereum/pull/10422))
-  - Fix underflow in pip, closes [#10419](https://github.com/paritytech/parity-ethereum/pull/10419) ([#10423](https://github.com/paritytech/parity-ethereum/pull/10423))
-  - Fix panic when logging directory does not exist, closes [#10420](https://github.com/paritytech/parity-ethereum/pull/10420) ([#10424](https://github.com/paritytech/parity-ethereum/pull/10424))
-  - Update hardcoded headers for Foundation, Ropsten, Kovan and Classic ([#10417](https://github.com/paritytech/parity-ethereum/pull/10417))
- Backports for Stable 2.3.5 ([#10414](https://github.com/paritytech/parity-ethereum/pull/10414))
-  - No-git for publish jobs, empty artifacts dir ([#10393](https://github.com/paritytech/parity-ethereum/pull/10393))
-  - Snap: reenable i386, arm64, armhf architecture publishing ([#10386](https://github.com/paritytech/parity-ethereum/pull/10386))
-  - Tx pool: always accept local transactions ([#10375](https://github.com/paritytech/parity-ethereum/pull/10375))
-  - Fix to_pod storage trie value decoding ([#10368)](https://github.com/paritytech/parity-ethereum/pull/10368))
- Version: mark 2.3.5 as stable
-
-## Parity-Ethereum [v2.3.4](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.4) (2019-02-21)
-
-Parity-Ethereum 2.3.4-beta is a maintenance release that fixes snap and docker installations.
-
-The full list of included changes:
- Beta: snap: release untagged versions from branches to the candidate ([#10357](https://github.com/paritytech/parity-ethereum/pull/10357)) ([#10373](https://github.com/paritytech/parity-ethereum/pull/10373))
-  - Snap: release untagged versions from branches to the candidate snap channel ([#10357](https://github.com/paritytech/parity-ethereum/pull/10357))
-  - Snap: add the removable-media plug ([#10377](https://github.com/paritytech/parity-ethereum/pull/10377))
-  - Exchanged old(azure) bootnodes with new(ovh) ones ([#10309](https://github.com/paritytech/parity-ethereum/pull/10309))
- Beta Backports ([#10354](https://github.com/paritytech/parity-ethereum/pull/10354))
-  - Version: bump beta to 2.3.4
-  - Snap: prefix version and populate candidate channel ([#10343](https://github.com/paritytech/parity-ethereum/pull/10343))
-  - Snap: populate candidate releases with beta snaps to avoid stale channel
-  - Snap: prefix version with v*
-  - No volumes are needed, just run -v volume:/path/in/the/container ([#10345](https://github.com/paritytech/parity-ethereum/pull/10345))
-
-## Parity-Ethereum [v2.3.3](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.3) (2019-02-13)
-
-Parity-Ethereum 2.3.3-beta is a security-relevant release. A bug in the JSONRPC-deserialization module can cause crashes of all versions of Parity Ethereum nodes if an attacker is able to submit a specially-crafted RPC to certain publicly available endpoints.
-
- https://www.parity.io/new-parity-ethereum-update-fixes-several-rpc-vulnerabilities/
-
-The full list of included changes:
-
- Additional error for invalid gas ([#10327](https://github.com/paritytech/parity-ethereum/pull/10327)) ([#10328](https://github.com/paritytech/parity-ethereum/pull/10328))
- Backports for Beta 2.3.3 ([#10333](https://github.com/paritytech/parity-ethereum/pull/10333))
-    - Properly handle check_epoch_end_signal errors ([#10015](https://github.com/paritytech/parity-ethereum/pull/10015))
-    - import rpc transactions sequentially ([#10051](https://github.com/paritytech/parity-ethereum/pull/10051))
-    - fix(docker): fix not receives SIGINT ([#10059](https://github.com/paritytech/parity-ethereum/pull/10059))
-    - snap: official image / test ([#10168](https://github.com/paritytech/parity-ethereum/pull/10168))
-    - Extract CallContract and RegistryInfo traits into their own crate ([#10178](https://github.com/paritytech/parity-ethereum/pull/10178))
-    - perform stripping during build ([#10208](https://github.com/paritytech/parity-ethereum/pull/10208))
-    - Remove CallContract and RegistryInfo re-exports from `ethcore/client` ([#10205](https://github.com/paritytech/parity-ethereum/pull/10205))
-    - fixed: types::transaction::SignedTransaction; ([#10229](https://github.com/paritytech/parity-ethereum/pull/10229))
-    - Additional tests for uint/hash/bytes deserialization. ([#10279](https://github.com/paritytech/parity-ethereum/pull/10279))
-    - Fix Windows build ([#10284](https://github.com/paritytech/parity-ethereum/pull/10284))
-    - Don't run the CPP example on CI ([#10285](https://github.com/paritytech/parity-ethereum/pull/10285))
-    - CI optimizations ([#10297](https://github.com/paritytech/parity-ethereum/pull/10297))
-    - fix publish job ([#10317](https://github.com/paritytech/parity-ethereum/pull/10317))
-    - Add Statetest support for Constantinople Fix ([#10323](https://github.com/paritytech/parity-ethereum/pull/10323))
-    - Add helper for Timestamp overflows ([#10330](https://github.com/paritytech/parity-ethereum/pull/10330))
-    - Don't add discovery initiators to the node table ([#10305](https://github.com/paritytech/parity-ethereum/pull/10305))
-    - change docker image based on debian instead of ubuntu due to the chan ([#10336](https://github.com/paritytech/parity-ethereum/pull/10336))
-    - role back docker build image and docker deploy image to ubuntu:xenial based ([#10338](https://github.com/paritytech/parity-ethereum/pull/10338))
-
-## Parity-Ethereum [v2.3.2](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.2) (2019-02-03)
-
-Parity-Ethereum 2.3.2-stable is a security-relevant release. A bug in the JSONRPC-deserialization module can cause crashes of all versions of Parity Ethereum nodes if an attacker is able to submit a specially-crafted RPC to certain publicly available endpoints.
-
- https://www.parity.io/security-alert-parity-ethereum-03-02/
-
-The full list of included changes:
- Version: bump beta to 2.3.2 ([#10283](https://github.com/paritytech/parity-ethereum/pull/10283))
- Additional tests for uint deserialization. ([#10279](https://github.com/paritytech/parity-ethereum/pull/10279)) ([#10280](https://github.com/paritytech/parity-ethereum/pull/10280))
- Backport [#10285](https://github.com/paritytech/parity-ethereum/pull/10285) to beta ([#10286](https://github.com/paritytech/parity-ethereum/pull/10286))
-
-## Parity-Ethereum [v2.3.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.1) (2019-02-01)
-
-Parity-Ethereum 2.3.1-beta is a consensus-relevant release that enables _St. Petersfork_ on:
-
- Ethereum Block `7280000` (along with Constantinople)
- Kovan Block `10255201`
- Ropsten Block `4939394`
- POA Sokol Block `7026400`
-
-In addition to this, Constantinople is cancelled for the POA Core network. Upgrading is mandatory for clients on any of these chains.
-
-The full list of included changes:
-
- Backports for beta 2.3.1 ([#10225](https://github.com/paritytech/parity-ethereum/pull/10225))
-  - Fix _cannot recursively call into `Core`_ issue ([#10144](https://github.com/paritytech/parity-ethereum/pull/10144))
-  - Update for Android cross-compilation. ([#10180](https://github.com/paritytech/parity-ethereum/pull/10180))
-  - Fix _cannot recursively call into `Core`_ - Part 2 ([#10195](https://github.com/paritytech/parity-ethereum/pull/10195))
-  - Cancel Constantinople HF on POA Core ([#10198](https://github.com/paritytech/parity-ethereum/pull/10198))
-  - Add EIP-1283 disable transition ([#10214](https://github.com/paritytech/parity-ethereum/pull/10214))
-  - Enable St-Peters-Fork ("Constantinople Fix") ([#10223](https://github.com/paritytech/parity-ethereum/pull/10223))
- Beta: Macos heapsize force jemalloc ([#10234](https://github.com/paritytech/parity-ethereum/pull/10234)) ([#10259](https://github.com/paritytech/parity-ethereum/pull/10259))
-
-## Parity-Ethereum [v2.3.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.0) (2019-01-16)
-
-Parity-Ethereum 2.3.0-beta 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))
-
-Other notable changes:
-
- Existing blocks in the database are now kept when restoring a Snapshot. ([#8643](https://github.com/paritytech/parity-ethereum/pull/8643))
- Block and transaction propagation is improved significantly. ([#9954](https://github.com/paritytech/parity-ethereum/pull/9954))
- The ERC-191 Signed Data Standard is now supported by `personal_sign191`. ([#9701](https://github.com/paritytech/parity-ethereum/pull/9701))
- Add support for ERC-191/712 `eth_signTypedData` as a standard for machine-verifiable and human-readable typed data signing with Ethereum keys. ([#9631](https://github.com/paritytech/parity-ethereum/pull/9631))
- Add support for ERC-1186 `eth_getProof` ([#9001](https://github.com/paritytech/parity-ethereum/pull/9001))
- Add experimental RPCs flag to enable ERC-191, ERC-712, and ERC-1186 APIs via `--jsonrpc-experimental` ([#9928](https://github.com/paritytech/parity-ethereum/pull/9928))
- Make `CALLCODE` to trace value to be the code address. ([#9881](https://github.com/paritytech/parity-ethereum/pull/9881))
-
-Configuration changes:
-
- The EIP-98 transition is now disabled by default. If you previously had no `eip98transition` specified in your chain specification, you would enable this now manually on block `0x0`. ([#9955](https://github.com/paritytech/parity-ethereum/pull/9955))
- Also, unknown fields in chain specs are now rejected. ([#9972](https://github.com/paritytech/parity-ethereum/pull/9972))
- The Tendermint engine was removed from Parity Ethereum and is no longer available and maintained. ([#9980](https://github.com/paritytech/parity-ethereum/pull/9980))
- Ropsten testnet data and keys moved from `test/` to `ropsten/` subdir. To reuse your old keys and data either copy or symlink them to the new location.  ([#10123](https://github.com/paritytech/parity-ethereum/pull/10123))
- Strict empty steps validation ([#10041](https://github.com/paritytech/parity-ethereum/pull/10041))
-  - 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 `0x0` for any chain with `empty_steps`.
-  - If your network uses `empty_steps` you **must** (A) plan a hard fork and change `strict_empty_steps_transition` to the desired fork block and (B) update the clients of the whole network to 2.2.7-stable / 2.3.0-beta. If for some reason you don't want to do this please set`strict_empty_steps_transition` to `0xfffffffff` to disable it.
-
-_Note:_ This release marks Parity 2.3 as _beta_. All versions of Parity 2.2 are now considered _stable_.
-
-The full list of included changes:
-
- Backports for 2.3.0 beta ([#10164](https://github.com/paritytech/parity-ethereum/pull/10164))
- Snap: fix path in script ([#10157](https://github.com/paritytech/parity-ethereum/pull/10157))
- 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))
- Update EWF's tobalaba chainspec ([#10152](https://github.com/paritytech/parity-ethereum/pull/10152))
- Replace ethcore-logger with env-logger. ([#10102](https://github.com/paritytech/parity-ethereum/pull/10102))
- Finality: dont require chain head to be in the chain ([#10054](https://github.com/paritytech/parity-ethereum/pull/10054))
- Remove caching for node connections ([#10143](https://github.com/paritytech/parity-ethereum/pull/10143))
- Blooms file iterator empty on out of range position. ([#10145](https://github.com/paritytech/parity-ethereum/pull/10145))
- Autogen docs for the "Configuring Parity Ethereum" wiki page. ([#10067](https://github.com/paritytech/parity-ethereum/pull/10067))
- Misc: bump license header to 2019 ([#10135](https://github.com/paritytech/parity-ethereum/pull/10135))
- Hide most of the logs from cpp example. ([#10139](https://github.com/paritytech/parity-ethereum/pull/10139))
- Don't try to send oversized packets ([#10042](https://github.com/paritytech/parity-ethereum/pull/10042))
- Private tx enabled flag added into STATUS packet ([#9999](https://github.com/paritytech/parity-ethereum/pull/9999))
- Update pwasm-utils to 0.6.1 ([#10134](https://github.com/paritytech/parity-ethereum/pull/10134))
- Extract blockchain from ethcore ([#10114](https://github.com/paritytech/parity-ethereum/pull/10114))
- Ethcore: update hardcoded headers ([#10123](https://github.com/paritytech/parity-ethereum/pull/10123))
- Identity fix ([#10128](https://github.com/paritytech/parity-ethereum/pull/10128))
- Use LenCachingMutex to optimize verification. ([#10117](https://github.com/paritytech/parity-ethereum/pull/10117))
- Pyethereum keystore support ([#9710](https://github.com/paritytech/parity-ethereum/pull/9710))
- Bump rocksdb-sys to 0.5.5 ([#10124](https://github.com/paritytech/parity-ethereum/pull/10124))
- Parity-clib: `async C bindings to RPC requests` + `subscribe/unsubscribe to websocket events` ([#9920](https://github.com/paritytech/parity-ethereum/pull/9920))
- Refactor (hardware wallet) : reduce the number of threads ([#9644](https://github.com/paritytech/parity-ethereum/pull/9644))
- Hf in POA Sokol (2019-01-04) ([#10077](https://github.com/paritytech/parity-ethereum/pull/10077))
- Fix broken links ([#10119](https://github.com/paritytech/parity-ethereum/pull/10119))
- Follow-up to [#10105](https://github.com/paritytech/parity-ethereum/issues/10105) ([#10107](https://github.com/paritytech/parity-ethereum/pull/10107))
- Move EIP-712 crate back to parity-ethereum ([#10106](https://github.com/paritytech/parity-ethereum/pull/10106))
- Move a bunch of stuff around ([#10101](https://github.com/paritytech/parity-ethereum/pull/10101))
- Revert "Add --frozen when running cargo ([#10081](https://github.com/paritytech/parity-ethereum/pull/10081))" ([#10105](https://github.com/paritytech/parity-ethereum/pull/10105))
- Fix left over small grumbles on whitespaces ([#10084](https://github.com/paritytech/parity-ethereum/pull/10084))
- Add --frozen when running cargo ([#10081](https://github.com/paritytech/parity-ethereum/pull/10081))
- Fix pubsub new_blocks notifications to include all blocks ([#9987](https://github.com/paritytech/parity-ethereum/pull/9987))
- Update some dependencies for compilation with pc-windows-gnu ([#10082](https://github.com/paritytech/parity-ethereum/pull/10082))
- Fill transaction hash on ethGetLog of light client. ([#9938](https://github.com/paritytech/parity-ethereum/pull/9938))
- Update changelog update for 2.2.5-beta and 2.1.10-stable ([#10064](https://github.com/paritytech/parity-ethereum/pull/10064))
- Implement len caching for parking_lot RwLock ([#10032](https://github.com/paritytech/parity-ethereum/pull/10032))
- Update parking_lot to 0.7 ([#10050](https://github.com/paritytech/parity-ethereum/pull/10050))
- Bump crossbeam. ([#10048](https://github.com/paritytech/parity-ethereum/pull/10048))
- Ethcore: enable constantinople on ethereum ([#10031](https://github.com/paritytech/parity-ethereum/pull/10031))
- Strict empty steps validation ([#10041](https://github.com/paritytech/parity-ethereum/pull/10041))
- Center the Subtitle, use some CAPS ([#10034](https://github.com/paritytech/parity-ethereum/pull/10034))
- Change test miner max memory to malloc reports. ([#10024](https://github.com/paritytech/parity-ethereum/pull/10024))
- Sort the storage for private state ([#10018](https://github.com/paritytech/parity-ethereum/pull/10018))
- Fix: test corpus_inaccessible panic ([#10019](https://github.com/paritytech/parity-ethereum/pull/10019))
- Ci: move future releases to ethereum subdir on s3 ([#10017](https://github.com/paritytech/parity-ethereum/pull/10017))
- Light(on_demand): decrease default time window to 10 secs ([#10016](https://github.com/paritytech/parity-ethereum/pull/10016))
- Light client : failsafe crate (circuit breaker) ([#9790](https://github.com/paritytech/parity-ethereum/pull/9790))
- Lencachingmutex ([#9988](https://github.com/paritytech/parity-ethereum/pull/9988))
- Version and notification for private contract wrapper added ([#9761](https://github.com/paritytech/parity-ethereum/pull/9761))
- Handle failing case for update account cache in require ([#9989](https://github.com/paritytech/parity-ethereum/pull/9989))
- Add tokio runtime to ethcore io worker ([#9979](https://github.com/paritytech/parity-ethereum/pull/9979))
- Move daemonize before creating account provider ([#10003](https://github.com/paritytech/parity-ethereum/pull/10003))
- Docs: update changelogs ([#9990](https://github.com/paritytech/parity-ethereum/pull/9990))
- Fix daemonize ([#10000](https://github.com/paritytech/parity-ethereum/pull/10000))
- Fix Bloom migration ([#9992](https://github.com/paritytech/parity-ethereum/pull/9992))
- Remove tendermint engine support ([#9980](https://github.com/paritytech/parity-ethereum/pull/9980))
- Calculate gas for deployment transaction ([#9840](https://github.com/paritytech/parity-ethereum/pull/9840))
- Fix unstable peers and slowness in sync ([#9967](https://github.com/paritytech/parity-ethereum/pull/9967))
- Adds parity_verifySignature RPC method ([#9507](https://github.com/paritytech/parity-ethereum/pull/9507))
- Improve block and transaction propagation ([#9954](https://github.com/paritytech/parity-ethereum/pull/9954))
- Deny unknown fields for chainspec ([#9972](https://github.com/paritytech/parity-ethereum/pull/9972))
- Fix docker build ([#9971](https://github.com/paritytech/parity-ethereum/pull/9971))
- Ci: rearrange pipeline by logic ([#9970](https://github.com/paritytech/parity-ethereum/pull/9970))
- Add changelogs for 2.0.9, 2.1.4, 2.1.6, and 2.2.1 ([#9963](https://github.com/paritytech/parity-ethereum/pull/9963))
- Add Error message when sync is still in progress. ([#9475](https://github.com/paritytech/parity-ethereum/pull/9475))
- Make CALLCODE to trace value to be the code address ([#9881](https://github.com/paritytech/parity-ethereum/pull/9881))
- Fix light client informant while syncing ([#9932](https://github.com/paritytech/parity-ethereum/pull/9932))
- Add a optional json dump state to evm-bin ([#9706](https://github.com/paritytech/parity-ethereum/pull/9706))
- Disable EIP-98 transition by default ([#9955](https://github.com/paritytech/parity-ethereum/pull/9955))
- Remove secret_store runtimes. ([#9888](https://github.com/paritytech/parity-ethereum/pull/9888))
- Fix a deadlock ([#9952](https://github.com/paritytech/parity-ethereum/pull/9952))
- Chore(eip712): remove unused `failure-derive` ([#9958](https://github.com/paritytech/parity-ethereum/pull/9958))
- Do not use the home directory as the working dir in docker ([#9834](https://github.com/paritytech/parity-ethereum/pull/9834))
- 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 empty steps ([#9939](https://github.com/paritytech/parity-ethereum/pull/9939))
- Adjust requests costs for light client ([#9925](https://github.com/paritytech/parity-ethereum/pull/9925))
- Eip-1186: add `eth_getProof` RPC-Method ([#9001](https://github.com/paritytech/parity-ethereum/pull/9001))
- Missing blocks in filter_changes RPC ([#9947](https://github.com/paritytech/parity-ethereum/pull/9947))
- Allow rust-nightly builds fail in nightly builds ([#9944](https://github.com/paritytech/parity-ethereum/pull/9944))
- Update eth-secp256k1 to include fix for BSDs ([#9935](https://github.com/paritytech/parity-ethereum/pull/9935))
- Unbreak build on rust -stable ([#9934](https://github.com/paritytech/parity-ethereum/pull/9934))
- Keep existing blocks when restoring a Snapshot ([#8643](https://github.com/paritytech/parity-ethereum/pull/8643))
- Add experimental RPCs flag ([#9928](https://github.com/paritytech/parity-ethereum/pull/9928))
- Clarify poll lifetime ([#9922](https://github.com/paritytech/parity-ethereum/pull/9922))
- Docs(require rust 1.30) ([#9923](https://github.com/paritytech/parity-ethereum/pull/9923))
- Use block header for building finality ([#9914](https://github.com/paritytech/parity-ethereum/pull/9914))
- Simplify cargo audit ([#9918](https://github.com/paritytech/parity-ethereum/pull/9918))
- 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 191 ([#9701](https://github.com/paritytech/parity-ethereum/pull/9701))
- Fix(logger): `reqwest` no longer a dependency ([#9908](https://github.com/paritytech/parity-ethereum/pull/9908))
- Remove rust-toolchain file ([#9906](https://github.com/paritytech/parity-ethereum/pull/9906))
- Foundation: 6692865, ropsten: 4417537, kovan: 9363457 ([#9907](https://github.com/paritytech/parity-ethereum/pull/9907))
- Ethcore: use Machine::verify_transaction on parent block ([#9900](https://github.com/paritytech/parity-ethereum/pull/9900))
- Chore(rpc-tests): remove unused rand ([#9896](https://github.com/paritytech/parity-ethereum/pull/9896))
- Fix: Intermittent failing CI due to addr in use ([#9885](https://github.com/paritytech/parity-ethereum/pull/9885))
- Chore(bump docopt): 0.8 -> 1.0 ([#9889](https://github.com/paritytech/parity-ethereum/pull/9889))
- Use expect ([#9883](https://github.com/paritytech/parity-ethereum/pull/9883))
- Use Weak reference in PubSubClient ([#9886](https://github.com/paritytech/parity-ethereum/pull/9886))
- Ci: nuke the gitlab caches ([#9855](https://github.com/paritytech/parity-ethereum/pull/9855))
- Remove unused code ([#9884](https://github.com/paritytech/parity-ethereum/pull/9884))
- Fix json tracer overflow ([#9873](https://github.com/paritytech/parity-ethereum/pull/9873))
- Allow to seal work on latest block ([#9876](https://github.com/paritytech/parity-ethereum/pull/9876))
- Fix docker script ([#9854](https://github.com/paritytech/parity-ethereum/pull/9854))
- Health endpoint ([#9847](https://github.com/paritytech/parity-ethereum/pull/9847))
- Gitlab-ci: make android release build succeed ([#9743](https://github.com/paritytech/parity-ethereum/pull/9743))
- Clean up existing benchmarks ([#9839](https://github.com/paritytech/parity-ethereum/pull/9839))
- Update Callisto block reward code to support HF1 ([#9811](https://github.com/paritytech/parity-ethereum/pull/9811))
- Option to disable keep alive for JSON-RPC http transport ([#9848](https://github.com/paritytech/parity-ethereum/pull/9848))
- Classic.json Bootnode Update ([#9828](https://github.com/paritytech/parity-ethereum/pull/9828))
- Support MIX. ([#9767](https://github.com/paritytech/parity-ethereum/pull/9767))
- 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 (replaces [#9744](https://github.com/paritytech/parity-ethereum/issues/9744)) ([#9814](https://github.com/paritytech/parity-ethereum/pull/9814))
- Chore(bump regex) ([#9842](https://github.com/paritytech/parity-ethereum/pull/9842))
- Ignore global cache for patched accounts ([#9752](https://github.com/paritytech/parity-ethereum/pull/9752))
- Move state root verification before gas used ([#9841](https://github.com/paritytech/parity-ethereum/pull/9841))
- Fix(docker-aarch64) : cross-compile config ([#9798](https://github.com/paritytech/parity-ethereum/pull/9798))
- Version: bump nightly to 2.3.0 ([#9819](https://github.com/paritytech/parity-ethereum/pull/9819))
- Tests modification for windows CI ([#9671](https://github.com/paritytech/parity-ethereum/pull/9671))
- Eip-712 implementation ([#9631](https://github.com/paritytech/parity-ethereum/pull/9631))
- Fix typo ([#9826](https://github.com/paritytech/parity-ethereum/pull/9826))
- Clean up serde rename and use rename_all = camelCase when possible ([#9823](https://github.com/paritytech/parity-ethereum/pull/9823))
--- a/docs/CHANGELOG-2.4.md
+++ b/docs/CHANGELOG-2.4.md
@@ -1,128 +0,0 @@
-## Parity-Ethereum [v2.4.9](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.9)
-
-Parity Ethereum v2.4.9-stable is a security update which addresses servo/rust-smallvec#148
-
-The full list of included changes:
-
-* cargo update -p smallvec ([#10822](https://github.com/paritytech/parity-ethereum/pull/10822))
-
-## Parity-Ethereum [v2.4.8](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.8)
-
-Parity-Ethereum 2.4.8-stable is a bugfix release that improves performance and stability.
-
-* Blockchain: fix reset chain
-* State tests: treat empty accounts the same as non-existant accounts (EIP 1052)
-* Aura: fix Timestamp Overflow
-* Networking: support discovery-only peers (geth bootnodes)
-* Snapshotting: fix unclean shutdown while snappshotting is under way
-
-The full list of included changes:
-
-* ethcore/res: activate atlantis classic hf on block 8772000 ([#10766](https://github.com/paritytech/parity-ethereum/pull/10766))
-* fix docker tags for publishing ([#10741](https://github.com/paritytech/parity-ethereum/pull/10741))
-* Reset blockchain properly ([#10669](https://github.com/paritytech/parity-ethereum/pull/10669))
-* adds rpc error message for --no-ancient-blocks ([#10608](https://github.com/paritytech/parity-ethereum/pull/10608))
-* Treat empty account the same as non-exist accounts in EIP-1052 ([#10775](https://github.com/paritytech/parity-ethereum/pull/10775))
-* fix: aura don't add `SystemTime::now()` ([#10720](https://github.com/paritytech/parity-ethereum/pull/10720))
-* DevP2p: Get node IP address and udp port from Socket, if not included in PING packet ([#10705](https://github.com/paritytech/parity-ethereum/pull/10705))
-* Revert "fix: aura don't add `SystemTime::now()` ([#10720](https://github.com/paritytech/parity-ethereum/pull/10720))"
-* Add a way to signal shutdown to snapshotting threads ([#10744](https://github.com/paritytech/parity-ethereum/pull/10744))
-
-## Parity-Ethereum [v2.4.7](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.7)
-
-Parity-Ethereum 2.4.7-stable is a bugfix release that improves performance and stability.
-
-Among others, it enables the _Atlantis_ hardfork on **Morden** and **Kotti** Classic networks.
-
-The full list of included changes:
-
-* [CI] allow cargo audit to fail ([#10676](https://github.com/paritytech/parity-ethereum/pull/10676))
-* new image ([#10673](https://github.com/paritytech/parity-ethereum/pull/10673))
-* Update publishing ([#10644](https://github.com/paritytech/parity-ethereum/pull/10644))
-* enable lto for release builds ([#10717](https://github.com/paritytech/parity-ethereum/pull/10717))
-* Use RUSTFLAGS to set the optimization level ([#10719](https://github.com/paritytech/parity-ethereum/pull/10719))
-* ethcore: enable ECIP-1054 for classic ([#10731](https://github.com/paritytech/parity-ethereum/pull/10731))
-
-## Parity-Ethereum [v2.4.6](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.6)
-
-Parity-Ethereum 2.4.6-stable is a bugfix release that improves performance and stability.
-
-Among others, it enables the Petersburg hardfork on **Rinkeby** and **POA-Core** Network, as well as the **Kovan** Network community hardfork.
-
-The full list of included changes:
-
-* ci: publish docs debug ([#10638](https://github.com/paritytech/parity-ethereum/pull/10638))
-
-## Parity-Ethereum [v2.4.5](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.5)
-
-Parity-Ethereum 2.4.5-stable is a bugfix release that improves performance and stability. This release improves memory optimizations around timestamp handling and stabilizes the 2.4 release branch.
-
-As of today, Parity-Ethereum 2.3 reaches end of life and everyone is encouraged to upgrade.
-
-## Parity-Ethereum [v2.4.4](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.4)
-
-Parity-Ethereum 2.4.4-beta is a bugfix release that improves performance and stability. This patch release removes the dead chain configs for Easthub and Ethereum Social.
-
-The full list of included changes:
-
-* fix(rpc-types): replace uint and hash with `ethereum_types v0.4` ([#10217](https://github.com/paritytech/parity-ethereum/pull/10217))
-* chore(bump ethereum-types) ([#10396](https://github.com/paritytech/parity-ethereum/pull/10396))
-* fix(light eth_gasPrice): ask network if not in cache ([#10535](https://github.com/paritytech/parity-ethereum/pull/10535))
-* fix(light account response): update `tx_queue` ([#10545](https://github.com/paritytech/parity-ethereum/pull/10545))
-* fix(bump dependencies) ([#10540](https://github.com/paritytech/parity-ethereum/pull/10540))
-* tx-pool: check transaction readiness before replacing ([#10526](https://github.com/paritytech/parity-ethereum/pull/10526))
-* fix #10390 ([#10391](https://github.com/paritytech/parity-ethereum/pull/10391))
-* private-tx: replace error_chain ([#10510](https://github.com/paritytech/parity-ethereum/pull/10510))
-
-## Parity-Ethereum [v2.4.3](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.3)
-
-Parity-Ethereum 2.4.3-beta is a bugfix release that improves performance and stability. This patch release contains a critical bug fix where serving light clients previously led to client crashes. Upgrading is highly recommended.
-
-The full list of included changes:
-
-* Add additional request tests ([#10503](https://github.com/paritytech/parity-ethereum/pull/10503))
-
-## Parity-Ethereum [v2.4.2](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.2)
-
-Parity-Ethereum 2.4.2-beta is a bugfix release that improves performance and stability.
-
-The full list of included changes:
-
-* Сaching through docker volume ([#10477](https://github.com/paritytech/parity-ethereum/pull/10477))
-* fix win&mac build ([#10486](https://github.com/paritytech/parity-ethereum/pull/10486))
-* fix(extract `timestamp_checked_add` as lib) ([#10383](https://github.com/paritytech/parity-ethereum/pull/10383))
-
-## Parity-Ethereum [v2.4.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.1)
-
-Parity-Ethereum 2.4.1-beta is a bugfix release that improves performance and stability.
-
-The full list of included changes:
-
-* Implement parity_versionInfo & parity_setChain on LC; fix parity_setChain ([#10312](https://github.com/paritytech/parity-ethereum/pull/10312))
-* CI publish to aws ([#10446](https://github.com/paritytech/parity-ethereum/pull/10446))
-* CI aws git checkout ([#10451](https://github.com/paritytech/parity-ethereum/pull/10451))
-* Revert "CI aws git checkout ([#10451](https://github.com/paritytech/parity-ethereum/pull/10451))" (#10456)
-* Revert "CI aws git checkout ([#10451](https://github.com/paritytech/parity-ethereum/pull/10451))"
-* Tests parallelized ([#10452](https://github.com/paritytech/parity-ethereum/pull/10452))
-* Ensure static validator set changes are recognized ([#10467](https://github.com/paritytech/parity-ethereum/pull/10467))
-
-## Parity-Ethereum [v2.4.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.0)
-
-Parity-Ethereum 2.4.0-beta is our trifortnightly minor version release coming with a lot of new features as well as bugfixes and performance improvements.
-
-Notable changes:
- Account management is now deprecated ([#10213](https://github.com/paritytech/parity-ethereum/pull/10213))
- Local accounts can now be specified via CLI ([#9960](https://github.com/paritytech/parity-ethereum/pull/9960))
- Chains can now be reset to a particular block via CLI ([#9782](https://github.com/paritytech/parity-ethereum/pull/9782))
- Ethash now additionally implements ProgPoW ([#9762](https://github.com/paritytech/parity-ethereum/pull/9762)) 
- The `eip1283DisableTransition` flag was added to revert EIP-1283 ([#10214](https://github.com/paritytech/parity-ethereum/pull/10214))
-
-The full list of included changes:
-
-* revert some changes, could be buggy ([#10399](https://github.com/paritytech/parity-ethereum/pull/10399))
-* 10000 > 5000 ([#10422](https://github.com/paritytech/parity-ethereum/pull/10422))
-* fix panic when logging directory does not exist, closes #10420 ([#10424](https://github.com/paritytech/parity-ethereum/pull/10424))
-* fix underflow in pip, closes #10419 ([#10423](https://github.com/paritytech/parity-ethereum/pull/10423))
-* ci: clean up gitlab-ci.yml leftovers from previous merge ([#10429](https://github.com/paritytech/parity-ethereum/pull/10429))
-* Update hardcoded headers for Foundation, Ropsten, Kovan and Classic ([#10417](https://github.com/paritytech/parity-ethereum/pull/10417))
-
--- a/ethash/Cargo.toml
+++ b/ethash/Cargo.toml
@@ -1,5 +1,4 @@
 [package]
-description = "Parity Ethereum Ethash & ProgPoW Implementations"
 name = "ethash"
 version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]
@@ -27,9 +26,7 @@ bench = []
 [[bench]]
 name = "basic"
 harness = false
-required-features = ['bench']

 [[bench]]
 name = "progpow"
 harness = false
-required-features = ['bench']
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-description = "Parity Ethereum (EthCore) Library"
+description = "Ethcore library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore"
@@ -9,10 +9,10 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 ansi_term = "0.10"
 blooms-db = { path = "../util/blooms-db", optional = true }
+bn = { git = "https://github.com/paritytech/bn", default-features = false }
 byteorder = "1.0"
 common-types = { path = "types" }
-crossbeam-utils = "0.6"
-eip-152 = { version = "0.1", path = "../util/EIP-152" }
+crossbeam = "0.4"
 env_logger = { version = "0.5", optional = true }
 error-chain = { version = "0.12", default-features = false }
 ethabi = "6.0"
@@ -21,7 +21,6 @@ ethabi-derive = "6.0"
 ethash = { path = "../ethash" }
 ethcore-blockchain = { path = "./blockchain" }
 ethcore-bloom-journal = { path = "../util/bloom" }
-ethcore-builtin = { path = "./builtin" }
 ethcore-call-contract = { path = "./call-contract" }
 ethcore-db = { path = "./db" }
 ethcore-io = { path = "../util/io" }
@@ -40,21 +39,24 @@ keccak-hasher = { path = "../util/keccak-hasher" }
 kvdb = "0.1"
 kvdb-memorydb = "0.1"
 kvdb-rocksdb = { version = "0.1.3", optional = true }
-lazy_static = "1.2.0"
+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"
+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"
-rayon = "1.1"
+rayon = "1.0"
 rlp = { version = "0.3.0", features = ["ethereum"] }
 rlp_derive = { path = "../util/rlp-derive" }
 rustc-hex = "1.0"
@@ -76,7 +78,6 @@ criterion = "0.2"
 env_logger = "0.5"
 ethcore-accounts = { path = "../accounts" }
 fetch = { path = "../util/fetch" }
-hex-literal = "0.2.1"
 kvdb-rocksdb = "0.1.3"
 parity-runtime = { path = "../util/runtime" }
 rlp_compress = { path = "../util/rlp-compress" }
@@ -89,8 +90,7 @@ parity = ["work-notify", "price-info", "stratum"]
 # but might be omitted for other dependent crates.
 work-notify = ["ethcore-miner/work-notify"]
 price-info = ["ethcore-miner/price-info"]
-stratum = [ "ethcore-stratum" ]
-
+stratum = ["ethcore-stratum"]

 # Disables seal verification for mined blocks.
 # This allows you to submit any seal via RPC to test and benchmark
--- a/ethcore/benches/builtin.rs
+++ b/ethcore/benches/builtin.rs
@@ -19,7 +19,7 @@ extern crate criterion;

 #[macro_use]
 extern crate lazy_static;
-extern crate ethcore_builtin;
+
 extern crate ethcore;
 extern crate ethereum_types;
 extern crate parity_bytes as bytes;
@@ -27,7 +27,7 @@ extern crate rustc_hex;

 use criterion::{Criterion, Bencher};
 use bytes::BytesRef;
-use ethcore_builtin::Builtin;
+use ethcore::builtin::Builtin;
 use ethcore::machine::EthereumMachine;
 use ethereum_types::U256;
 use ethcore::ethereum::new_byzantium_test_machine;
@@ -56,6 +56,10 @@ impl<'a> BuiltinBenchmark<'a> {
 		}
 	}

+	fn gas_cost(&self) -> U256 {
+		self.builtin.cost(&self.input)
+	}
+
 	fn run(&self, b: &mut Bencher) {
 		let mut output = vec![0; self.expected.len()];

--- a/ethcore/blockchain/Cargo.toml
+++ b/ethcore/blockchain/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-description = "Parity Ethereum Blockchain Database, Test Generator, Configuration, Caching, Importing Blocks, and Block Information"
+description = "Ethcore blockchain database"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-blockchain"
@@ -8,28 +8,26 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"

 [dependencies]
-ansi_term = "0.11"
+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"
-keccak-hash = "0.1"
 kvdb = "0.1"
 log = "0.4"
 parity-bytes = "0.1"
 parking_lot = "0.7"
-rand = "0.6"
-rayon = "1.1"
+rayon = "1.0"
 rlp = { version = "0.3.0", features = ["ethereum"] }
 rlp_compress = { path = "../../util/rlp-compress" }
 rlp_derive = { path = "../../util/rlp-derive" }
-triehash-ethereum = { version = "0.2",  path = "../../util/triehash-ethereum" }

 [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/blockchain/src/blockchain.rs
+++ b/ethcore/blockchain/src/blockchain.rs
@@ -195,12 +195,6 @@ pub trait BlockProvider {
 		where F: Fn(&LogEntry) -> bool + Send + Sync, Self: Sized;
 }

-/// Interface for querying blocks with pending db transaction by hash and by number.
-trait InTransactionBlockProvider {
-	/// Get the familial details concerning a block.
-	fn uncommitted_block_details(&self, hash: &H256) -> Option<BlockDetails>;
-}
-
 #[derive(Debug, Hash, Eq, PartialEq, Clone)]
 enum CacheId {
 	BlockHeader(H256),
@@ -430,19 +424,6 @@ impl BlockProvider for BlockChain {
 	}
 }

-impl InTransactionBlockProvider for BlockChain {
-	fn uncommitted_block_details(&self, hash: &H256) -> Option<BlockDetails> {
-		let result = self.db.key_value().read_with_two_layer_cache(
-			db::COL_EXTRA,
-			&self.pending_block_details,
-			&self.block_details,
-			hash
-		)?;
-		self.cache_man.lock().note_used(CacheId::BlockDetails(*hash));
-		Some(result)
-	}
-}
-
 /// An iterator which walks the blockchain towards the genesis.
 #[derive(Clone)]
 pub struct AncestryIter<'a> {
@@ -611,7 +592,7 @@ impl BlockChain {
 			let best_block_rlp = bc.block(&best_block_hash)
 				.expect("Best block is from a known block hash; qed");

-			// and write them to the cache.
+			// and write them
 			let mut best_block = bc.best_block.write();
 			*best_block = BestBlock {
 				total_difficulty: best_block_total_difficulty,
@@ -687,6 +668,21 @@ impl BlockChain {
 		self.db.key_value().read_with_cache(db::COL_EXTRA, &self.block_details, parent).map_or(false, |d| d.children.contains(hash))
 	}

+	/// fetches the list of blocks from best block to n, and n's parent hash
+	/// where n > 0
+	pub fn block_headers_from_best_block(&self, n: u32) -> Option<(Vec<encoded::Header>, H256)> {
+		let mut blocks = Vec::with_capacity(n as usize);
+		let mut hash = self.best_block_hash();
+
+		for _ in 0..n {
+			let current_hash = self.block_header_data(&hash)?;
+			hash = current_hash.parent_hash();
+			blocks.push(current_hash);
+		}
+
+		Some((blocks, hash))
+	}
+
 	/// Returns a tree route between `from` and `to`, which is a tuple of:
 	///
 	/// - a vector of hashes of all blocks, ordered from `from` to `to`.
@@ -732,10 +728,6 @@ impl BlockChain {
 	///
 	/// If the tree route verges into pruned or unknown blocks,
 	/// `None` is returned.
-	///
-	/// `is_from_route_finalized` returns whether the `from` part of the
-	/// route contains a finalized block. This only holds if the two parts (from
-	/// and to) are on different branches, ie. on 2 different forks.
 	pub fn tree_route(&self, from: H256, to: H256) -> Option<TreeRoute> {
 		let mut from_branch = vec![];
 		let mut is_from_route_finalized = false;
@@ -749,9 +741,9 @@ impl BlockChain {
 		// reset from && to to the same level
 		while from_details.number > to_details.number {
 			from_branch.push(current_from);
-			is_from_route_finalized = is_from_route_finalized || from_details.is_finalized;
 			current_from = from_details.parent.clone();
 			from_details = self.block_details(&from_details.parent)?;
+			is_from_route_finalized = is_from_route_finalized || from_details.is_finalized;
 		}

 		while to_details.number > from_details.number {
@@ -765,9 +757,9 @@ impl BlockChain {
 		// move to shared parent
 		while current_from != current_to {
 			from_branch.push(current_from);
-			is_from_route_finalized = is_from_route_finalized || from_details.is_finalized;
 			current_from = from_details.parent.clone();
 			from_details = self.block_details(&from_details.parent)?;
+			is_from_route_finalized = is_from_route_finalized || from_details.is_finalized;

 			to_branch.push(current_to);
 			current_to = to_details.parent.clone();
@@ -814,7 +806,7 @@ impl BlockChain {
 		batch.put(db::COL_HEADERS, &hash, &compressed_header);
 		batch.put(db::COL_BODIES, &hash, &compressed_body);

-		let maybe_parent = self.uncommitted_block_details(&block_parent_hash);
+		let maybe_parent = self.block_details(&block_parent_hash);

 		if let Some(parent_details) = maybe_parent {
 			// parent known to be in chain.
@@ -877,33 +869,6 @@ impl BlockChain {
 		}
 	}

-	/// clears all caches, re-loads best block from disk for testing purposes
-	pub fn clear_cache(&self) {
-		self.block_bodies.write().clear();
-		self.block_details.write().clear();
-		self.block_hashes.write().clear();
-		self.block_headers.write().clear();
-		// Fetch best block details from disk
-		let best_block_hash = self.db.key_value().get(db::COL_EXTRA, b"best")
-			.expect("Low-level database error when fetching 'best' block. Some issue with disk?")
-			.as_ref()
-			.map(|r| H256::from_slice(r))
-			.unwrap();
-		let best_block_total_difficulty = self.block_details(&best_block_hash)
-			.expect("Best block is from a known block hash; a known block hash always comes with a known block detail; qed")
-			.total_difficulty;
-		let best_block_rlp = self.block(&best_block_hash)
-			.expect("Best block is from a known block hash; qed");
-
-		// and write them to the cache
-		let mut best_block = self.best_block.write();
-		*best_block = BestBlock {
-			total_difficulty: best_block_total_difficulty,
-			header: best_block_rlp.decode_header(),
-			block: best_block_rlp,
-		};
-	}
-
 	/// Update the best ancient block to the given hash, after checking that
 	/// it's directly linked to the currently known best ancient block
 	pub fn update_best_ancient_block(&self, hash: &H256) {
@@ -1071,7 +1036,7 @@ impl BlockChain {
 	///
 	/// Used in snapshots to glue the chunks together at the end.
 	pub fn add_child(&self, batch: &mut DBTransaction, block_hash: H256, child_hash: H256) {
-		let mut parent_details = self.uncommitted_block_details(&block_hash)
+		let mut parent_details = self.block_details(&block_hash)
 			.unwrap_or_else(|| panic!("Invalid block hash: {:?}", block_hash));

 		parent_details.children.push(child_hash);
@@ -1178,7 +1143,7 @@ impl BlockChain {
 	/// Mark a block to be considered finalized. Returns `Some(())` if the operation succeeds, and `None` if the block
 	/// hash is not found.
 	pub fn mark_finalized(&self, batch: &mut DBTransaction, block_hash: H256) -> Option<()> {
-		let mut block_details = self.uncommitted_block_details(&block_hash)?;
+		let mut block_details = self.block_details(&block_hash)?;
 		block_details.is_finalized = true;

 		self.update_block_details(batch, block_hash, block_details);
@@ -1371,7 +1336,7 @@ impl BlockChain {
 	/// Uses the given parent details or attempts to load them from the database.
 	fn prepare_block_details_update(&self, parent_hash: H256, info: &BlockInfo, is_finalized: bool) -> HashMap<H256, BlockDetails> {
 		// update parent
-		let mut parent_details = self.uncommitted_block_details(&parent_hash).unwrap_or_else(|| panic!("Invalid parent hash: {:?}", parent_hash));
+		let mut parent_details = self.block_details(&parent_hash).unwrap_or_else(|| panic!("Invalid parent hash: {:?}", parent_hash));
 		parent_details.children.push(info.hash);

 		// create current block details.
@@ -1676,7 +1641,7 @@ mod tests {
 		let fork_choice = {
 			let header = block.header_view();
 			let parent_hash = header.parent_hash();
-			let parent_details = bc.uncommitted_block_details(&parent_hash).unwrap_or_else(|| panic!("Invalid parent hash: {:?}", parent_hash));
+			let parent_details = bc.block_details(&parent_hash).unwrap_or_else(|| panic!("Invalid parent hash: {:?}", parent_hash));
 			let block_total_difficulty = parent_details.total_difficulty + header.difficulty();
 			if block_total_difficulty > bc.best_block_total_difficulty() {
 				common_types::engines::ForkChoice::New
@@ -2533,74 +2498,4 @@ mod tests {
 			assert_eq!(bc.epoch_transition_for(fork_hash).unwrap().block_number, 0);
 		}
 	}
-
-	#[test]
-	fn tree_rout_with_finalization() {
-		let genesis = BlockBuilder::genesis();
-		let a = genesis.add_block();
-		// First branch
-		let a1 = a.add_block_with_random_transactions();
-		let a2 = a1.add_block_with_random_transactions();
-		let a3 = a2.add_block_with_random_transactions();
-		// Second branch
-		let b1 = a.add_block_with_random_transactions();
-		let b2 = b1.add_block_with_random_transactions();
-
-		let a_hash = a.last().hash();
-		let a1_hash = a1.last().hash();
-		let a2_hash = a2.last().hash();
-		let a3_hash = a3.last().hash();
-		let b2_hash = b2.last().hash();
-
-		let bootstrap_chain = |blocks: Vec<&BlockBuilder>| {
-			let db = new_db();
-			let bc = new_chain(genesis.last().encoded(), db.clone());
-			let mut batch = db.key_value().transaction();
-			for block in blocks {
-				insert_block_batch(&mut batch, &bc, block.last().encoded(), vec![]);
-				bc.commit();
-			}
-			db.key_value().write(batch).unwrap();
-			(db, bc)
-		};
-
-		let mark_finalized = |block_hash: H256, db: &Arc<dyn BlockChainDB>, bc: &BlockChain| {
-			let mut batch = db.key_value().transaction();
-			bc.mark_finalized(&mut batch, block_hash).unwrap();
-			bc.commit();
-			db.key_value().write(batch).unwrap();
-		};
-
-		// Case 1: fork, with finalized common ancestor
-		{
-			let (db, bc) = bootstrap_chain(vec![&a, &a1, &a2, &a3, &b1, &b2]);
-			assert_eq!(bc.best_block_hash(), a3_hash);
-			assert_eq!(bc.block_hash(2).unwrap(), a1_hash);
-
-			mark_finalized(a_hash, &db, &bc);
-			assert!(!bc.tree_route(a3_hash, b2_hash).unwrap().is_from_route_finalized);
-			assert!(!bc.tree_route(b2_hash, a3_hash).unwrap().is_from_route_finalized);
-		}
-
-		// Case 2: fork with a finalized block on a branch
-		{
-			let (db, bc) = bootstrap_chain(vec![&a, &a1, &a2, &a3, &b1, &b2]);
-			assert_eq!(bc.best_block_hash(), a3_hash);
-			assert_eq!(bc.block_hash(2).unwrap(), a1_hash);
-
-			mark_finalized(a2_hash, &db, &bc);
-			assert!(bc.tree_route(a3_hash, b2_hash).unwrap().is_from_route_finalized);
-			assert!(!bc.tree_route(b2_hash, a3_hash).unwrap().is_from_route_finalized);
-		}
-
-		// Case 3: no-fork, with a finalized block
-		{
-			let (db, bc) = bootstrap_chain(vec![&a, &a1, &a2]);
-			assert_eq!(bc.best_block_hash(), a2_hash);
-
-			mark_finalized(a1_hash, &db, &bc);
-			assert!(!bc.tree_route(a1_hash, a2_hash).unwrap().is_from_route_finalized);
-			assert!(!bc.tree_route(a2_hash, a1_hash).unwrap().is_from_route_finalized);
-		}
-	}
 }
--- a/ethcore/blockchain/src/generator.rs
+++ b/ethcore/blockchain/src/generator.rs
@@ -21,13 +21,11 @@ use ethereum_types::{U256, H256, Bloom};

 use common_types::encoded;
 use common_types::header::Header;
-use common_types::transaction::{SignedTransaction, Transaction, Action};
+use common_types::transaction::SignedTransaction;
 use common_types::view;
 use common_types::views::BlockView;
-use keccak_hash::keccak;
 use rlp::encode;
 use rlp_derive::RlpEncodable;
-use triehash_ethereum::ordered_trie_root;

 /// Helper structure, used for encoding blocks.
 #[derive(Default, Clone, RlpEncodable)]
@@ -138,29 +136,6 @@ impl BlockBuilder {
 		})
 	}

-	/// Add a block with randomly generated transactions.
-	#[inline]
-	pub fn add_block_with_random_transactions(&self) -> Self {
-		// Maximum of ~50 transactions
-		let count = rand::random::<u8>() as usize / 5;
-		let transactions = std::iter::repeat_with(|| {
-			let data_len = rand::random::<u8>();
-			let data = std::iter::repeat_with(|| rand::random::<u8>())
-				.take(data_len as usize)
-				.collect::<Vec<_>>();
-			Transaction {
-				nonce: 0.into(),
-				gas_price: 0.into(),
-				gas: 100_000.into(),
-				action: Action::Create,
-				value: 100.into(),
-				data,
-			}.sign(&keccak("").into(), None)
-		}).take(count);
-
-		self.add_block_with_transactions(transactions)
-	}
-
 	/// Add a block with given transactions.
 	#[inline]
 	pub fn add_block_with_transactions<T>(&self, transactions: T) -> Self
@@ -191,15 +166,11 @@ impl BlockBuilder {
 			let mut block = Block::default();
 			let metadata = get_metadata();
 			let block_number = parent_number + 1;
-			let transactions = metadata.transactions;
-			let transactions_root = ordered_trie_root(transactions.iter().map(rlp::encode));
-
 			block.header.set_parent_hash(parent_hash);
 			block.header.set_number(block_number);
 			block.header.set_log_bloom(metadata.bloom);
 			block.header.set_difficulty(metadata.difficulty);
-			block.header.set_transactions_root(transactions_root);
-			block.transactions = transactions;
+			block.transactions = metadata.transactions;

 			parent_hash = block.hash();
 			parent_number = block_number;
--- a/ethcore/builtin/Cargo.toml
+++ b/ethcore/builtin/Cargo.toml
@@ -1,23 +0,0 @@
-[package]
-description = "ethereum vm builtin"
-name = "ethcore-builtin"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-bn = { git = "https://github.com/paritytech/bn", default-features = false }
-byteorder = "1.3.2"
-eip-152 = { path = "../../util/EIP-152" }
-ethereum-types = "0.4"
-ethjson = { path = "../../json" }
-ethkey = { path = "../../accounts/ethkey" }
-keccak-hash = "0.1.0"
-log = "0.4"
-macros = { path = "../../util/macros" }
-num = { version = "0.1", default-features = false, features = ["bigint"] }
-parity-bytes = "0.1"
-parity-crypto = "0.4.0"
-
-[dev-dependencies]
-hex-literal = "0.2.1"
--- a/ethcore/builtin/src/lib.rs
+++ b/ethcore/builtin/src/lib.rs
--- a/ethcore/call-contract/Cargo.toml
+++ b/ethcore/call-contract/Cargo.toml
@@ -1,5 +1,4 @@
 [package]
-description = "Parity Ethereum (EthCore) Contract Calls and Blockchain Service & Registry Information"
 name = "ethcore-call-contract"
 version = "0.1.0"
 license = "GPL-3.0"
--- a/ethcore/db/src/db.rs
+++ b/ethcore/db/src/db.rs
@@ -188,21 +188,6 @@ pub trait Readable {
 		})
 	}

-	/// Returns value for given key either in two-layered cache or in database.
-	fn read_with_two_layer_cache<K, T, C>(&self, col: Option<u32>, l1_cache: &RwLock<C>, l2_cache: &RwLock<C>, key: &K) -> Option<T> where
-		K: Key<T> + Eq + Hash + Clone,
-		T: Clone + rlp::Decodable,
-		C: Cache<K, T> {
-		{
-			let read = l1_cache.read();
-			if let Some(v) = read.get(key) {
-				return Some(v.clone());
-			}
-		}
-
-		self.read_with_cache(col, l2_cache, key)
-	}
-
 	/// Returns true if given value exists.
 	fn exists<T, R>(&self, col: Option<u32>, key: &Key<T, Target = R>) -> bool where R: Deref<Target= [u8]>;

--- a/ethcore/evm/Cargo.toml
+++ b/ethcore/evm/Cargo.toml
@@ -1,5 +1,4 @@
 [package]
-description = "Parity Ethereum Virtual Machine (EVM) Rust Implementation"
 name = "evm"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
@@ -15,12 +14,10 @@ vm = { path = "../vm" }
 keccak-hash = "0.1"
 parking_lot = "0.7"
 memory-cache = { path = "../../util/memory-cache" }
-num-bigint = "0.2"

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

 [features]
 evm-debug = []
--- a/ethcore/evm/benches/basic.rs
+++ b/ethcore/evm/benches/basic.rs
@@ -45,9 +45,7 @@ criterion_group!(
 	mem_gas_calculation_same_usize,
 	mem_gas_calculation_same_u256,
 	mem_gas_calculation_increasing_usize,
-	mem_gas_calculation_increasing_u256,
-	blockhash_mulmod_small,
-	blockhash_mulmod_large,
+	mem_gas_calculation_increasing_u256
 );
 criterion_main!(basic);

@@ -152,54 +150,6 @@ fn mem_gas_calculation_increasing(gas: U256, b: &mut Bencher) {
 	});
 }

-fn blockhash_mulmod_small(b: &mut Criterion) {
-	b.bench_function("blockhash_mulmod_small", |b| {
-		let factory = Factory::default();
-		let mut ext = FakeExt::new();
-
-		let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
-
-		b.iter(|| {
-			let code = black_box(
-				"6080604052348015600f57600080fd5b5060005a90505b60c881111560de5760017effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095060017effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095060017effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095060017effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095060017effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8009505a90506016565b506035806100ed6000396000f3fe6080604052600080fdfea165627a7a72305820bde4a0ac6d0fac28fc879244baf8a6a0eda514bc95fb7ecbcaaebf2556e2687c0029".from_hex().unwrap()
-			);
-
-			let mut params = ActionParams::default();
-			params.address = address.clone();
-			params.gas = U256::from(4_000u64);
-			params.code = Some(Arc::new(code.clone()));
-
-			let vm = factory.create(params, ext.schedule(), 0);
-
-			result(vm.exec(&mut ext).ok().unwrap())
-		});
-	});
-}
-
-fn blockhash_mulmod_large(b: &mut Criterion) {
-	b.bench_function("blockhash_mulmod_large", |b| {
-		let factory = Factory::default();
-		let mut ext = FakeExt::new();
-
-		let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
-
-		b.iter(|| {
-			let code = black_box(
-				"608060405234801561001057600080fd5b5060005a90505b60c8811115610177577efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff17efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff08009507efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff17efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff08009507efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff17efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff08009507efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff17efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff08009507efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff17efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff08009505a9050610017565b506035806101866000396000f3fe6080604052600080fdfea165627a7a72305820dcaec306f67bb96f3044fff25c9af2ec66f01d0954d0656964f046f42f2780670029".from_hex().unwrap()
-			);
-
-			let mut params = ActionParams::default();
-			params.address = address.clone();
-			params.gas = U256::from(4_000u64);
-			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,
--- a/ethcore/evm/src/evm.rs
+++ b/ethcore/evm/src/evm.rs
@@ -44,18 +44,12 @@ pub trait Finalize {
 impl Finalize for Result<GasLeft> {
 	fn finalize<E: Ext>(self, ext: E) -> Result<FinalizationResult> {
 		match self {
-			Ok(GasLeft::Known(gas_left)) => {
-				Ok(FinalizationResult {
-					gas_left,
-					apply_state: true,
-					return_data: ReturnData::empty()
-				})
-			},
-			Ok(GasLeft::NeedsReturn { gas_left, data, apply_state }) => {
-				ext.ret(&gas_left, &data, apply_state).map(|gas_left|
-					FinalizationResult { gas_left, apply_state, return_data: data }
-				)
-			},
+			Ok(GasLeft::Known(gas_left)) => Ok(FinalizationResult { gas_left: gas_left, apply_state: true, return_data: ReturnData::empty() }),
+			Ok(GasLeft::NeedsReturn { gas_left, data, apply_state }) => ext.ret(&gas_left, &data, apply_state).map(|gas_left| FinalizationResult {
+				gas_left: gas_left,
+				apply_state: apply_state,
+				return_data: data,
+			}),
 			Err(err) => Err(err),
 		}
 	}
--- a/ethcore/evm/src/factory.rs
+++ b/ethcore/evm/src/factory.rs
@@ -47,7 +47,7 @@ impl Factory {
 	/// for caching jump destinations.
 	pub fn new(evm: VMType, cache_size: usize) -> Self {
 		Factory {
-			evm,
+			evm: evm,
 			evm_cache: Arc::new(SharedCache::new(cache_size)),
 		}
 	}
--- a/ethcore/evm/src/instructions.rs
+++ b/ethcore/evm/src/instructions.rs
@@ -149,10 +149,6 @@ enum_with_from_u8! {
 		DIFFICULTY = 0x44,
 		#[doc = "get the block's gas limit"]
 		GASLIMIT = 0x45,
-		#[doc = "get chain ID"]
-		CHAINID = 0x46,
-		#[doc = "get balance of own account"]
-		SELFBALANCE = 0x47,

 		#[doc = "remove item from stack"]
 		POP = 0x50,
@@ -446,7 +442,12 @@ pub struct InstructionInfo {
 impl InstructionInfo {
 	/// Create new instruction info.
 	pub fn new(name: &'static str, args: usize, ret: usize, tier: GasPriceTier) -> Self {
-		InstructionInfo { name, args, ret, tier }
+		InstructionInfo {
+			name: name,
+			args: args,
+			ret: ret,
+			tier: tier
+		}
 	}
 }

@@ -503,8 +504,6 @@ lazy_static! {
 		arr[NUMBER as usize] = Some(InstructionInfo::new("NUMBER", 0, 1, GasPriceTier::Base));
 		arr[DIFFICULTY as usize] = Some(InstructionInfo::new("DIFFICULTY", 0, 1, GasPriceTier::Base));
 		arr[GASLIMIT as usize] = Some(InstructionInfo::new("GASLIMIT", 0, 1, GasPriceTier::Base));
-		arr[CHAINID as usize] = Some(InstructionInfo::new("CHAINID", 0, 1, GasPriceTier::Base));
-		arr[SELFBALANCE as usize] = Some(InstructionInfo::new("SELFBALANCE", 0, 1, GasPriceTier::Low));
 		arr[POP as usize] = Some(InstructionInfo::new("POP", 1, 0, GasPriceTier::Base));
 		arr[MLOAD as usize] = Some(InstructionInfo::new("MLOAD", 1, 1, GasPriceTier::VeryLow));
 		arr[MSTORE as usize] = Some(InstructionInfo::new("MSTORE", 2, 0, GasPriceTier::VeryLow));
--- a/ethcore/evm/src/interpreter/gasometer.rs
+++ b/ethcore/evm/src/interpreter/gasometer.rs
@@ -121,9 +121,6 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 				Request::Gas(Gas::from(1))
 			},
 			instructions::SSTORE => {
-				if schedule.eip1706 && self.current_gas <= Gas::from(schedule.call_stipend) {
-					return Err(vm::Error::OutOfGas);
-				}
 				let address = H256::from(stack.peek(0));
 				let newval = stack.peek(1);
 				let val = U256::from(&*ext.storage_at(&address)?);
--- a/ethcore/evm/src/interpreter/mod.rs
+++ b/ethcore/evm/src/interpreter/mod.rs
@@ -28,8 +28,7 @@ use std::{cmp, mem};
 use std::sync::Arc;
 use hash::keccak;
 use bytes::Bytes;
-use ethereum_types::{U256, H256, Address};
-use num_bigint::BigUint;
+use ethereum_types::{U256, U512, H256, Address};

 use vm::{
 	self, ActionParams, ParamsType, ActionValue, CallType, MessageCallResult,
@@ -62,17 +61,6 @@ const TWO_POW_96: U256 = U256([0, 0x100000000, 0, 0]); //0x1 00000000 00000000 0
 const TWO_POW_224: U256 = U256([0, 0, 0, 0x100000000]); //0x1 00000000 00000000 00000000 00000000 00000000 00000000 00000000
 const TWO_POW_248: U256 = U256([0, 0, 0, 0x100000000000000]); //0x1 00000000 00000000 00000000 00000000 00000000 00000000 00000000 000000

-fn to_biguint(x: U256) -> BigUint {
-	let mut bytes = [0u8; 32];
-	x.to_little_endian(&mut bytes);
-	BigUint::from_bytes_le(&bytes)
-}
-
-fn from_biguint(x: BigUint) -> U256 {
-	let bytes = x.to_bytes_le();
-	U256::from_little_endian(&bytes)
-}
-
 /// Abstraction over raw vector of Bytes. Easier state management of PC.
 struct CodeReader {
 	position: ProgramCounter,
@@ -119,6 +107,8 @@ enum InstructionResult<Gas> {
 	Trap(TrapKind),
 }

+enum Never {}
+
 /// ActionParams without code, so that it can be feed into CodeReader.
 #[derive(Debug)]
 struct InterpreterParams {
@@ -176,6 +166,12 @@ pub enum InterpreterResult {
 	Trap(TrapKind),
 }

+impl From<vm::Error> for InterpreterResult {
+	fn from(error: vm::Error) -> InterpreterResult {
+		InterpreterResult::Done(Err(error))
+	}
+}
+
 /// Intepreter EVM implementation
 pub struct Interpreter<Cost: CostType> {
 	mem: Vec<u8>,
@@ -286,8 +282,6 @@ impl<Cost: CostType> Interpreter<Cost> {
 			cache, params, reader, informant,
 			valid_jump_destinations, gasometer, stack,
 			done: false,
-			// Overridden in `step_inner` based on
-			// the result of `ext.trace_next_instruction`.
 			do_trace: true,
 			mem: Vec::new(),
 			return_data: ReturnData::empty(),
@@ -308,26 +302,21 @@ impl<Cost: CostType> Interpreter<Cost> {
 		let result = if self.gasometer.is_none() {
 			InterpreterResult::Done(Err(vm::Error::OutOfGas))
 		} else if self.reader.len() == 0 {
-			let current_gas = self.gasometer
-				.as_ref()
-				.expect("Gasometer None case is checked above; qed")
-				.current_gas
-				.as_u256();
-			InterpreterResult::Done(Ok(GasLeft::Known(current_gas)))
+			InterpreterResult::Done(Ok(GasLeft::Known(self.gasometer.as_ref().expect("Gasometer None case is checked above; qed").current_gas.as_u256())))
 		} else {
-			self.step_inner(ext)
+			self.step_inner(ext).err().expect("step_inner never returns Ok(()); qed")
 		};

 		if let &InterpreterResult::Done(_) = &result {
 			self.done = true;
 			self.informant.done();
 		}
-		result
+		return result;
 	}

 	/// Inner helper function for step.
 	#[inline(always)]
-	fn step_inner(&mut self, ext: &mut dyn vm::Ext) -> InterpreterResult {
+	fn step_inner(&mut self, ext: &mut vm::Ext) -> Result<Never, InterpreterResult> {
 		let result = match self.resume_result.take() {
 			Some(result) => result,
 			None => {
@@ -342,31 +331,22 @@ impl<Cost: CostType> Interpreter<Cost> {

 				let instruction = match instruction {
 					Some(i) => i,
-					None => return InterpreterResult::Done(Err(vm::Error::BadInstruction {
+					None => return Err(InterpreterResult::Done(Err(vm::Error::BadInstruction {
 						instruction: opcode
-					})),
+					}))),
 				};

 				let info = instruction.info();
 				self.last_stack_ret_len = info.ret;
-				if let Err(e) = self.verify_instruction(ext, instruction, info) {
-					return InterpreterResult::Done(Err(e));
-				};
+				self.verify_instruction(ext, instruction, info)?;

 				// Calculate gas cost
-				let requirements = match self.gasometer.as_mut().expect(GASOMETER_PROOF).requirements(ext, instruction, info, &self.stack, self.mem.size()) {
-					Ok(t) => t,
-					Err(e) => return InterpreterResult::Done(Err(e)),
-				};
+				let requirements = self.gasometer.as_mut().expect(GASOMETER_PROOF).requirements(ext, instruction, info, &self.stack, self.mem.size())?;
 				if self.do_trace {
 					ext.trace_prepare_execute(self.reader.position - 1, opcode, requirements.gas_cost.as_u256(), Self::mem_written(instruction, &self.stack), Self::store_written(instruction, &self.stack));
 				}
-				if let Err(e) = self.gasometer.as_mut().expect(GASOMETER_PROOF).verify_gas(&requirements.gas_cost) {
-					if self.do_trace {
-						ext.trace_failed();
-					}
-					return InterpreterResult::Done(Err(e));
-				}
+
+				self.gasometer.as_mut().expect(GASOMETER_PROOF).verify_gas(&requirements.gas_cost)?;
 				self.mem.expand(requirements.memory_required_size);
 				self.gasometer.as_mut().expect(GASOMETER_PROOF).current_mem_gas = requirements.memory_total_gas;
 				self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas = self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas - requirements.gas_cost;
@@ -375,24 +355,18 @@ impl<Cost: CostType> Interpreter<Cost> {

 				// Execute instruction
 				let current_gas = self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas;
-				let result = match self.exec_instruction(
+				let result = self.exec_instruction(
 					current_gas, ext, instruction, requirements.provide_gas
-				) {
-					Err(x) => {
-						if self.do_trace {
-							ext.trace_failed();
-						}
-						return InterpreterResult::Done(Err(x));
-					},
-					Ok(x) => x,
-				};
+				)?;
+
 				evm_debug!({ self.informant.after_instruction(instruction) });
+
 				result
 			},
 		};

 		if let InstructionResult::Trap(trap) = result {
-			return InterpreterResult::Trap(trap);
+			return Err(InterpreterResult::Trap(trap));
 		}

 		if let InstructionResult::UnusedGas(ref gas) = result {
@@ -414,31 +388,28 @@ impl<Cost: CostType> Interpreter<Cost> {
 					self.valid_jump_destinations = Some(self.cache.jump_destinations(&self.params.code_hash, &self.reader.code));
 				}
 				let jump_destinations = self.valid_jump_destinations.as_ref().expect("jump_destinations are initialized on first jump; qed");
-				let pos = match self.verify_jump(position, jump_destinations) {
-					Ok(x) => x,
-					Err(e) => return InterpreterResult::Done(Err(e))
-				};
+				let pos = self.verify_jump(position, jump_destinations)?;
 				self.reader.position = pos;
 			},
 			InstructionResult::StopExecutionNeedsReturn {gas, init_off, init_size, apply} => {
 				let mem = mem::replace(&mut self.mem, Vec::new());
-				return InterpreterResult::Done(Ok(GasLeft::NeedsReturn {
+				return Err(InterpreterResult::Done(Ok(GasLeft::NeedsReturn {
 					gas_left: gas.as_u256(),
 					data: mem.into_return_data(init_off, init_size),
 					apply_state: apply
-				}));
+				})));
 			},
 			InstructionResult::StopExecution => {
-				return InterpreterResult::Done(Ok(GasLeft::Known(self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas.as_u256())));
+				return Err(InterpreterResult::Done(Ok(GasLeft::Known(self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas.as_u256()))));
 			},
 			_ => {},
 		}

 		if self.reader.position >= self.reader.len() {
-			return InterpreterResult::Done(Ok(GasLeft::Known(self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas.as_u256())));
+			return Err(InterpreterResult::Done(Ok(GasLeft::Known(self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas.as_u256()))));
 		}

-		InterpreterResult::Continue
+		Err(InterpreterResult::Continue)
 	}

 	fn verify_instruction(&self, ext: &vm::Ext, instruction: Instruction, info: &InstructionInfo) -> vm::Result<()> {
@@ -450,9 +421,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 			((instruction == instructions::RETURNDATACOPY || instruction == instructions::RETURNDATASIZE) && !schedule.have_return_data) ||
 			(instruction == instructions::REVERT && !schedule.have_revert) ||
 			((instruction == instructions::SHL || instruction == instructions::SHR || instruction == instructions::SAR) && !schedule.have_bitwise_shifting) ||
-			(instruction == instructions::EXTCODEHASH && !schedule.have_extcodehash) ||
-			(instruction == instructions::CHAINID && !schedule.have_chain_id) ||
-			(instruction == instructions::SELFBALANCE && !schedule.have_selfbalance)
+			(instruction == instructions::EXTCODEHASH && !schedule.have_extcodehash)
 		{
 			return Err(vm::Error::BadInstruction {
 				instruction: instruction as u8
@@ -867,12 +836,6 @@ impl<Cost: CostType> Interpreter<Cost> {
 			instructions::GASLIMIT => {
 				self.stack.push(ext.env_info().gas_limit.clone());
 			},
-			instructions::CHAINID => {
-				self.stack.push(ext.chain_id().into())
-			},
-			instructions::SELFBALANCE => {
-				self.stack.push(ext.balance(&self.params.address)?);
-			}

 			// Stack instructions

@@ -1046,12 +1009,11 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let c = self.stack.pop_back();

 				self.stack.push(if !c.is_zero() {
-					let a_num = to_biguint(a);
-					let b_num = to_biguint(b);
-					let c_num = to_biguint(c);
-					let res = a_num + b_num;
-					let x = res % c_num;
-					from_biguint(x)
+					// upcast to 512
+					let a5 = U512::from(a);
+					let res = a5.overflowing_add(U512::from(b)).0;
+					let x = res % U512::from(c);
+					U256::from(x)
 				} else {
 					U256::zero()
 				});
@@ -1062,12 +1024,10 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let c = self.stack.pop_back();

 				self.stack.push(if !c.is_zero() {
-					let a_num = to_biguint(a);
-					let b_num = to_biguint(b);
-					let c_num = to_biguint(c);
-					let res = a_num * b_num;
-					let x = res % c_num;
-					from_biguint(x)
+					let a5 = U512::from(a);
+					let res = a5.overflowing_mul(U512::from(b)).0;
+					let x = res % U512::from(c);
+					U256::from(x)
 				} else {
 					U256::zero()
 				});
--- a/ethcore/evm/src/lib.rs
+++ b/ethcore/evm/src/lib.rs
@@ -24,7 +24,6 @@ extern crate vm;
 extern crate keccak_hash as hash;
 extern crate memory_cache;
 extern crate parity_bytes as bytes;
-extern crate num_bigint;

 #[macro_use]
 extern crate lazy_static;
@@ -34,8 +33,6 @@ extern crate log;

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

 pub mod evm;
 pub mod interpreter;
--- a/ethcore/evm/src/tests.rs
+++ b/ethcore/evm/src/tests.rs
@@ -25,7 +25,6 @@ use vm::{self, ActionParams, ActionValue, Ext};
 use vm::tests::{FakeExt, FakeCall, FakeCallType, test_finalize};
 use factory::Factory;
 use vmtype::VMType;
-use hex_literal::hex;

 evm_test!{test_add: test_add_int}
 fn test_add(factory: super::Factory) {
@@ -109,32 +108,6 @@ fn test_origin(factory: super::Factory) {
 	assert_store(&ext, 0, "000000000000000000000000cd1722f2947def4cf144679da39c4c32bdc35681");
 }

-evm_test!{test_selfbalance: test_selfbalance_int}
-fn test_selfbalance(factory: super::Factory) {
-	let own_addr = Address::from_str("1337000000000000000000000000000000000000").unwrap();
-	// 47       SELFBALANCE
-	// 60 ff    PUSH ff
-	// 55       SSTORE
-	let code = hex!("47 60 ff 55").to_vec();
-
-	let mut params = ActionParams::default();
-	params.address = own_addr.clone();
-	params.gas = U256::from(100_000);
-	params.code = Some(Arc::new(code));
-	let mut ext = FakeExt::new_istanbul();
-	ext.balances = {
-		let mut x = HashMap::new();
-		x.insert(own_addr, U256::from(1_025)); // 0x401
-		x
-	};
-	let gas_left = {
-		let vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
-	};
-	assert_eq!(gas_left, U256::from(79_992)); // TODO[dvdplm]: do the sums here, SELFBALANCE-5 + PUSH1-3 + ONEBYTE-4 + SSTORE-?? = 100_000 - 79_992
-	assert_store(&ext, 0xff, "0000000000000000000000000000000000000000000000000000000000000401");
-}
-
 evm_test!{test_sender: test_sender_int}
 fn test_sender(factory: super::Factory) {
 	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
@@ -157,27 +130,6 @@ fn test_sender(factory: super::Factory) {
 	assert_store(&ext, 0, "000000000000000000000000cd1722f2947def4cf144679da39c4c32bdc35681");
 }

-evm_test!{test_chain_id: test_chain_id_int}
-fn test_chain_id(factory: super::Factory) {
-	// 46       CHAINID
-	// 60 00    PUSH 0
-	// 55       SSTORE
-	let code = hex!("46 60 00 55").to_vec();
-
-	let mut params = ActionParams::default();
-	params.gas = U256::from(100_000);
-	params.code = Some(Arc::new(code));
-	let mut ext = FakeExt::new_istanbul().with_chain_id(9);
-
-	let gas_left = {
-		let vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
-	};
-
-	assert_eq!(gas_left, U256::from(79_995));
-	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000009");
-}
-
 evm_test!{test_extcodecopy: test_extcodecopy_int}
 fn test_extcodecopy(factory: super::Factory) {
 		// 33 - sender
@@ -310,6 +262,7 @@ fn test_calldataload(factory: super::Factory) {

 	assert_eq!(gas_left, U256::from(79_991));
 	assert_store(&ext, 0, "23ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23");
+
 }

 evm_test!{test_author: test_author_int}
--- a/ethcore/light/Cargo.toml
+++ b/ethcore/light/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-description = "Parity Ethereum (EthCore) Light Client Implementation (Block Import IO Service, Blockchain Data Fetching, Light Client Header Chain Storage, Parity Light Protocol (PLP) Provider, Light Transaction Queue, CHT Definitions, Light Client Data Cache), Parity Light Protocol (PLP) Implementation, P2P Network I/O and Event Context Generalization, Peer Error Handling & Punishment, Request Load Timer & Distribution Manager, Pending Request Set Storage, Request Credit Management, Light Client Request Types, Request Chain Builder Utility, On-demand Chain Request Service over LES (for RPCs), ResponseGuard Implementation)"
+description = "Parity Light Client Implementation"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-light"
--- a/ethcore/light/src/client/mod.rs
+++ b/ethcore/light/src/client/mod.rs
@@ -18,7 +18,7 @@

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

-use ethcore::client::{ClientReport, EnvInfo, ClientIoMessage, traits::ForceUpdateSealing};
+use ethcore::client::{ClientReport, EnvInfo, ClientIoMessage};
 use ethcore::engines::{epoch, EthEngine, EpochChange, EpochTransition, Proof};
 use ethcore::machine::EthereumMachine;
 use ethcore::error::{Error, EthcoreResult};
@@ -620,7 +620,7 @@ impl<T: ChainDataFetcher> ::ethcore::client::ChainInfo for Client<T> {
 }

 impl<T: ChainDataFetcher> ::ethcore::client::EngineClient for Client<T> {
-	fn update_sealing(&self, _force: ForceUpdateSealing) {}
+	fn update_sealing(&self) { }
 	fn submit_seal(&self, _block_hash: H256, _seal: Vec<Vec<u8>>) { }
 	fn broadcast_consensus_message(&self, _message: Vec<u8>) { }

--- a/ethcore/light/src/on_demand/mod.rs
+++ b/ethcore/light/src/on_demand/mod.rs
@@ -24,6 +24,7 @@ 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;
@@ -40,10 +41,10 @@ use cache::Cache;
 use request::{self as basic_request, Request as NetworkRequest};
 use self::request::CheckedRequest;

-pub use ethcore::executed::ExecutionResult;
 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;

 #[cfg(test)]
@@ -53,6 +54,9 @@ 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
@@ -66,10 +70,6 @@ pub const DEFAULT_NUM_CONSECUTIVE_FAILED_REQUESTS: usize = 1;

 /// OnDemand related errors
 pub mod error {
-	// Silence: `use of deprecated item 'std::error::Error::cause': replaced by Error::source, which can support downcasting`
-	// https://github.com/paritytech/parity-ethereum/issues/10302
-	#![allow(deprecated)]
-
 	use futures::sync::oneshot::Canceled;

 	error_chain! {
@@ -94,24 +94,6 @@ pub mod error {
 	}
 }

-/// Public interface for performing network requests `OnDemand`
-pub trait OnDemandRequester: Send + Sync {
-	/// Submit a strongly-typed batch of requests.
-	///
-	/// Fails if back-reference are not coherent.
-	fn request<T>(&self, ctx: &BasicContext, requests: T) -> Result<OnResponses<T>, basic_request::NoSuchOutput>
-	where
-		T: request::RequestAdapter;
-
-	/// Submit a vector of requests to be processed together.
-	///
-	/// Fails if back-references are not coherent.
-	/// The returned vector of responses will correspond to the requests exactly.
-	fn request_raw(&self, ctx: &BasicContext, requests: Vec<Request>)
-		-> Result<Receiver<PendingResponse>, basic_request::NoSuchOutput>;
-}
-
-
 // relevant peer info.
 #[derive(Debug, Clone, PartialEq, Eq)]
 struct Peer {
@@ -373,74 +355,6 @@ pub struct OnDemand {
 	request_number_of_consecutive_errors: usize
 }

-impl OnDemandRequester for OnDemand {
-	fn request_raw(&self, ctx: &BasicContext, requests: Vec<Request>)
-		-> Result<Receiver<PendingResponse>, basic_request::NoSuchOutput>
-	{
-		let (sender, receiver) = oneshot::channel();
-		if requests.is_empty() {
-			assert!(sender.send(Ok(Vec::new())).is_ok(), "receiver still in scope; qed");
-			return Ok(receiver);
-		}
-
-		let mut builder = basic_request::Builder::default();
-
-		let responses = Vec::with_capacity(requests.len());
-
-		let mut header_producers = HashMap::new();
-		for (i, request) in requests.into_iter().enumerate() {
-			let request = CheckedRequest::from(request);
-
-			// ensure that all requests needing headers will get them.
-			if let Some((idx, field)) = request.needs_header() {
-				// a request chain with a header back-reference is valid only if it both
-				// points to a request that returns a header and has the same back-reference
-				// for the block hash.
-				match header_producers.get(&idx) {
-					Some(ref f) if &field == *f => {}
-					_ => return Err(basic_request::NoSuchOutput),
-				}
-			}
-			if let CheckedRequest::HeaderByHash(ref req, _) = request {
-				header_producers.insert(i, req.0);
-			}
-
-			builder.push(request)?;
-		}
-
-		let requests = builder.build();
-		let net_requests = requests.clone().map_requests(|req| req.into_net_request());
-		let capabilities = guess_capabilities(requests.requests());
-
-		self.submit_pending(ctx, Pending {
-			requests,
-			net_requests,
-			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),
-		});
-
-		Ok(receiver)
-	}
-
-	fn request<T>(&self, ctx: &BasicContext, requests: T) -> Result<OnResponses<T>, basic_request::NoSuchOutput>
-		where T: request::RequestAdapter
-	{
-		self.request_raw(ctx, requests.make_requests()).map(|recv| OnResponses {
-			receiver: recv,
-			_marker: PhantomData,
-		})
-	}
-
-}
-
 impl OnDemand {

 	/// Create a new `OnDemand` service with the given cache.
@@ -501,6 +415,77 @@ impl OnDemand {
 		me
 	}

+	/// Submit a vector of requests to be processed together.
+	///
+	/// Fails if back-references are not coherent.
+	/// The returned vector of responses will correspond to the requests exactly.
+	pub fn request_raw(&self, ctx: &BasicContext, requests: Vec<Request>)
+		-> Result<Receiver<PendingResponse>, basic_request::NoSuchOutput>
+	{
+		let (sender, receiver) = oneshot::channel();
+		if requests.is_empty() {
+			assert!(sender.send(Ok(Vec::new())).is_ok(), "receiver still in scope; qed");
+			return Ok(receiver);
+		}
+
+		let mut builder = basic_request::Builder::default();
+
+		let responses = Vec::with_capacity(requests.len());
+
+		let mut header_producers = HashMap::new();
+		for (i, request) in requests.into_iter().enumerate() {
+			let request = CheckedRequest::from(request);
+
+			// ensure that all requests needing headers will get them.
+			if let Some((idx, field)) = request.needs_header() {
+				// a request chain with a header back-reference is valid only if it both
+				// points to a request that returns a header and has the same back-reference
+				// for the block hash.
+				match header_producers.get(&idx) {
+					Some(ref f) if &field == *f => {}
+					_ => return Err(basic_request::NoSuchOutput),
+				}
+			}
+			if let CheckedRequest::HeaderByHash(ref req, _) = request {
+				header_producers.insert(i, req.0);
+			}
+
+			builder.push(request)?;
+		}
+
+		let requests = builder.build();
+		let net_requests = requests.clone().map_requests(|req| req.into_net_request());
+		let capabilities = guess_capabilities(requests.requests());
+
+		self.submit_pending(ctx, Pending {
+			requests,
+			net_requests,
+			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),
+		});
+
+		Ok(receiver)
+	}
+
+	/// Submit a strongly-typed batch of requests.
+	///
+	/// Fails if back-reference are not coherent.
+	pub fn request<T>(&self, ctx: &BasicContext, requests: T) -> Result<OnResponses<T>, basic_request::NoSuchOutput>
+		where T: request::RequestAdapter
+	{
+		self.request_raw(ctx, requests.make_requests()).map(|recv| OnResponses {
+			receiver: recv,
+			_marker: PhantomData,
+		})
+	}

 	// maybe dispatch pending requests.
 	// sometimes
--- a/ethcore/light/src/on_demand/tests.rs
+++ b/ethcore/light/src/on_demand/tests.rs
@@ -29,7 +29,7 @@ use std::sync::Arc;
 use std::time::{Duration, Instant};
 use std::thread;

-use super::{request, OnDemand, OnDemandRequester, Peer, HeaderRef};
+use super::{request, OnDemand, Peer, HeaderRef};

 // useful contexts to give the service.
 enum Context {
--- a/ethcore/light/src/types/request/batch.rs
+++ b/ethcore/light/src/types/request/batch.rs
@@ -255,63 +255,4 @@ mod tests {
 			hash: Field::BackReference(0, 0),
 		})).unwrap();
 	}
-
-	#[test]
-	fn batch_tx_index_backreference() {
-		let mut builder = Builder::default();
-		builder.push(Request::HeaderProof(IncompleteHeaderProofRequest {
-			num: 100.into(), // header proof puts hash at output 0.
-		})).unwrap();
-		builder.push(Request::TransactionIndex(IncompleteTransactionIndexRequest {
-			hash: Field::BackReference(0, 0),
-		})).unwrap();
-
-		let mut batch = builder.build();
-		batch.requests[1].fill(|_req_idx, _out_idx| Ok(Output::Hash(42.into())));
-
-		assert!(batch.next_complete().is_some());
-		batch.answered += 1;
-		assert!(batch.next_complete().is_some());
-	}
-
-	#[test]
-	fn batch_tx_index_backreference_public_api() {
-		let mut builder = Builder::default();
-		builder.push(Request::HeaderProof(IncompleteHeaderProofRequest {
-			num: 100.into(), // header proof puts hash at output 0.
-		})).unwrap();
-		builder.push(Request::TransactionIndex(IncompleteTransactionIndexRequest {
-			hash: Field::BackReference(0, 0),
-		})).unwrap();
-
-		let mut batch = builder.build();
-
-		assert!(batch.next_complete().is_some());
-		let hdr_proof_res = header_proof::Response {
-			proof: vec![],
-			hash: 12.into(),
-			td: 21.into(),
-		};
-		batch.supply_response_unchecked(&hdr_proof_res);
-
-		assert!(batch.next_complete().is_some());
-	}
-
-	#[test]
-	fn batch_receipts_backreference() {
-		let mut builder = Builder::default();
-		builder.push(Request::HeaderProof(IncompleteHeaderProofRequest {
-			num: 100.into(), // header proof puts hash at output 0.
-		})).unwrap();
-		builder.push(Request::Receipts(IncompleteReceiptsRequest {
-			hash: Field::BackReference(0, 0),
-		})).unwrap();
-
-		let mut batch = builder.build();
-		batch.requests[1].fill(|_req_idx, _out_idx| Ok(Output::Hash(42.into())));
-
-		assert!(batch.next_complete().is_some());
-		batch.answered += 1;
-		assert!(batch.next_complete().is_some());
-	}
 }
--- a/ethcore/light/src/types/request/mod.rs
+++ b/ethcore/light/src/types/request/mod.rs
@@ -907,7 +907,7 @@ pub mod transaction_index {
 		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
 			if let Field::BackReference(req, idx) = self.hash {
 				self.hash = match oracle(req, idx) {
-					Ok(Output::Hash(hash)) => Field::Scalar(hash.into()),
+					Ok(Output::Number(hash)) => Field::Scalar(hash.into()),
 					_ => Field::BackReference(req, idx),
 				}
 			}
@@ -982,7 +982,7 @@ pub mod block_receipts {
 		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
 			if let Field::BackReference(req, idx) = self.hash {
 				self.hash = match oracle(req, idx) {
-					Ok(Output::Hash(hash)) => Field::Scalar(hash.into()),
+					Ok(Output::Number(hash)) => Field::Scalar(hash.into()),
 					_ => Field::BackReference(req, idx),
 				}
 			}
--- a/ethcore/node-filter/Cargo.toml
+++ b/ethcore/node-filter/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-description = "Parity Smart Contract based Node Filter, Manage Permissions of Network Connections"
+description = "Parity smart network connections"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "node-filter"
--- a/ethcore/private-tx/Cargo.toml
+++ b/ethcore/private-tx/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
 common-types = { path = "../types" }
-derive_more = "0.14.0"
+error-chain = { version = "0.12", default-features = false }
 ethabi = "6.0"
 ethabi-contract = "6.0"
 ethabi-derive = "6.0"
@@ -36,8 +36,8 @@ serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 tiny-keccak = "1.4"
-transaction-pool = "2.0.1"
-url = "2"
+transaction-pool = "1.13.2"
+url = "1"

 [dev-dependencies]
 env_logger = "0.5"
--- a/ethcore/private-tx/src/encryptor.rs
+++ b/ethcore/private-tx/src/encryptor.rs
@@ -31,7 +31,7 @@ use crypto;
 use futures::Future;
 use fetch::{Fetch, Client as FetchClient, Method, BodyReader, Request};
 use bytes::{Bytes, ToPretty};
-use error::Error;
+use error::{Error, ErrorKind};
 use url::Url;
 use super::Signer;
 use super::key_server_keys::address_to_key;
@@ -60,7 +60,7 @@ pub trait Encryptor: Send + Sync + 'static {
 	) -> Result<Bytes, Error>;
 }

-/// Configuration for key server encryptor
+/// Configurtion for key server encryptor
 #[derive(Default, PartialEq, Debug, Clone)]
 pub struct EncryptorConfig {
 	/// URL to key server
@@ -111,11 +111,11 @@ impl SecretStoreEncryptor {
 			return Ok(key);
 		}
 		let contract_address_signature = self.sign_contract_address(contract_address)?;
-		let requester = self.config.key_server_account.ok_or_else(|| Error::KeyServerAccountNotSet)?;
+		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
 		let contract_address_extended: H256 = contract_address.into();
-		let base_url = self.config.base_url.clone().ok_or_else(|| Error::KeyServerNotSet)?;
+		let base_url = self.config.base_url.clone().ok_or_else(|| ErrorKind::KeyServerNotSet)?;

 		// prepare request url
 		let url = format!("{}/{}/{}{}",
@@ -132,16 +132,16 @@ impl SecretStoreEncryptor {
 			Method::GET
 		};

-		let url = Url::from_str(&url).map_err(|e| Error::Encrypt(e.to_string()))?;
+		let url = Url::from_str(&url).map_err(|e| ErrorKind::Encrypt(e.to_string()))?;
 		let response = self.client.fetch(Request::new(url, method), Default::default()).wait()
-			.map_err(|e| Error::Encrypt(e.to_string()))?;
+			.map_err(|e| ErrorKind::Encrypt(e.to_string()))?;

 		if response.is_not_found() {
-			return Err(Error::EncryptionKeyNotFound(*contract_address));
+			bail!(ErrorKind::EncryptionKeyNotFound(*contract_address));
 		}

 		if !response.is_success() {
-			return Err(Error::Encrypt(response.status().canonical_reason().unwrap_or("unknown").into()));
+			bail!(ErrorKind::Encrypt(response.status().canonical_reason().unwrap_or("unknown").into()));
 		}

 		// read HTTP response
@@ -149,7 +149,7 @@ impl SecretStoreEncryptor {
 		BodyReader::new(response).read_to_string(&mut result)?;

 		// 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| Error::Encrypt(e))?;
+		let encrypted_bytes: ethjson::bytes::Bytes = result.trim_matches('\"').parse().map_err(|e| ErrorKind::Encrypt(e))?;

 		// decrypt Public
 		let decrypted_bytes = self.signer.decrypt(requester, &crypto::DEFAULT_MAC, &encrypted_bytes)?;
@@ -189,7 +189,7 @@ impl SecretStoreEncryptor {
 	}

 	fn sign_contract_address(&self, contract_address: &Address) -> Result<Signature, Error> {
-		let key_server_account = self.config.key_server_account.ok_or_else(|| Error::KeyServerAccountNotSet)?;
+		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))?)
 	}
 }
@@ -204,7 +204,7 @@ impl Encryptor for SecretStoreEncryptor {
 		// retrieve the key, try to generate it if it doesn't exist yet
 		let key = match self.retrieve_key("", false, contract_address) {
 			Ok(key) => Ok(key),
-			Err(Error::EncryptionKeyNotFound(_)) => {
+			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)
 			}
@@ -215,7 +215,7 @@ impl Encryptor for SecretStoreEncryptor {
 		let mut cypher = Vec::with_capacity(plain_data.len() + initialisation_vector.len());
 		cypher.extend(repeat(0).take(plain_data.len()));
 		crypto::aes::encrypt_128_ctr(&key, initialisation_vector, plain_data, &mut cypher)
-			.map_err(|e| Error::Encrypt(e.to_string()))?;
+			.map_err(|e| ErrorKind::Encrypt(e.to_string()))?;
 		cypher.extend_from_slice(&initialisation_vector);

 		Ok(cypher)
@@ -230,7 +230,7 @@ impl Encryptor for SecretStoreEncryptor {
 		// initialization vector takes INIT_VEC_LEN bytes
 		let cypher_len = cypher.len();
 		if cypher_len < INIT_VEC_LEN {
-			return Err(Error::Decrypt("Invalid cypher".into()));
+			bail!(ErrorKind::Decrypt("Invalid cypher".into()));
 		}

 		// retrieve existing key
@@ -241,7 +241,7 @@ impl Encryptor for SecretStoreEncryptor {
 		let mut plain_data = Vec::with_capacity(cypher_len - INIT_VEC_LEN);
 		plain_data.extend(repeat(0).take(cypher_len - INIT_VEC_LEN));
 		crypto::aes::decrypt_128_ctr(&key, &iv, cypher, &mut plain_data)
-			.map_err(|e| Error::Decrypt(e.to_string()))?;
+			.map_err(|e| ErrorKind::Decrypt(e.to_string()))?;
 		Ok(plain_data)
 	}
 }
--- a/ethcore/private-tx/src/error.rs
+++ b/ethcore/private-tx/src/error.rs
@@ -14,8 +14,6 @@
 // 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 std::error;
-use derive_more::Display;
 use ethereum_types::Address;
 use rlp::DecoderError;
 use ethtrie::TrieError;
@@ -23,173 +21,173 @@ use ethcore::error::{Error as EthcoreError, ExecutionError};
 use types::transaction::Error as TransactionError;
 use ethkey::Error as KeyError;
 use ethkey::crypto::Error as CryptoError;
-use txpool::VerifiedTransaction;
-use private_transactions::VerifiedPrivateTransaction;
+use txpool::Error as TxPoolError;

-type TxPoolError = txpool::Error<<VerifiedPrivateTransaction as VerifiedTransaction>::Hash>;
+error_chain! {
+	foreign_links {
+		Io(::std::io::Error) #[doc = "Error concerning the Rust standard library's IO subsystem."];
+		Decoder(DecoderError) #[doc = "RLP decoding error."];
+		Trie(TrieError) #[doc = "Error concerning TrieDBs."];
+		Txpool(TxPoolError) #[doc = "Tx pool error."];
+		Crypto(CryptoError) #[doc = "Crypto error."];
+	}

-#[derive(Debug, Display)]
-pub enum Error {
-	/// Error concerning the Rust standard library's IO subsystem.
-	#[display(fmt = "Io Error: {}", _0)]
-	Io(::std::io::Error),
-	/// RLP decoding error.
-	#[display(fmt = "Decoder Error: {}", _0)]
-	Decoder(DecoderError),
-	/// Error concerning TrieDBs.
-	#[display(fmt = "Trie Error: {}", _0)]
-	Trie(TrieError),
-	/// Transaction pool error.
-	#[display(fmt = "Transaction Pool Error: {}", _0)]
-	TxPool(TxPoolError),
-	/// Crypto error.
-	#[display(fmt = "Crypto Error {}", _0)]
-	Crypto(CryptoError),
-	/// Encryption error.
-	#[display(fmt = "Encryption error. ({})", _0)]
-	Encrypt(String),
-	/// Decryption error.
-	#[display(fmt = "Decryption error. ({})", _0)]
-	Decrypt(String),
-	/// Address not authorized.
-	#[display(fmt = "Private transaction execution is not authorised for {}", _0)]
-	NotAuthorised(Address),
-	/// Transaction creates more than one contract.
-	#[display(fmt = "Private transaction created too many contracts")]
-	TooManyContracts,
-	/// Contract call error.
-	#[display(fmt = "Contract call error. ({})", _0)]
-	Call(String),
-	/// State is not available.
-	#[display(fmt = "State is not available")]
-	StatePruned,
-	/// State is incorrect.
-	#[display(fmt = "State is incorrect")]
-	StateIncorrect,
-	/// Wrong private transaction type.
-	#[display(fmt = "Wrong private transaction type")]
-	BadTransactionType,
-	/// Contract does not exist or was not created.
-	#[display(fmt = "Contract does not exist or was not created")]
-	ContractDoesNotExist,
-	/// Reference to the client is corrupted.
-	#[display(fmt = "Reference to the client is corrupted")]
-	ClientIsMalformed,
-	/// Queue of private transactions for verification is full.
-	#[display(fmt = "Queue of private transactions for verification is full")]
-	QueueIsFull,
-	/// The transaction already exists in queue of private transactions.
-	#[display(fmt = "The transaction already exists in queue of private transactions.")]
-	PrivateTransactionAlreadyImported,
-	/// The information about private transaction is not found in the store.
-	#[display(fmt = "The information about private transaction is not found in the store.")]
-	PrivateTransactionNotFound,
-	/// Account for signing public transactions not set.
-	#[display(fmt = "Account for signing public transactions not set.")]
-	SignerAccountNotSet,
-	/// Account for validating private transactions not set.
-	#[display(fmt = "Account for validating private transactions not set.")]
-	ValidatorAccountNotSet,
-	/// Account for signing requests to key server not set.
-	#[display(fmt = "Account for signing requests to key server not set.")]
-	KeyServerAccountNotSet,
-	/// Encryption key is not found on key server.
-	#[display(fmt = "Encryption key is not found on key server for {}", _0)]
-	EncryptionKeyNotFound(Address),
-	/// Key server URL is not set.
-	#[display(fmt = "Key server URL is not set.")]
-	KeyServerNotSet,
-	/// VM execution error.
-	#[display(fmt = "VM execution error {}", _0)]
-	Execution(ExecutionError),
-	/// General signing error.
-	#[display(fmt = "General signing error {}", _0)]
-	Key(KeyError),
-	/// Error of transactions processing.
-	#[display(fmt = "Error of transactions processing {}", _0)]
-	Transaction(TransactionError),
-	/// General ethcore error.
-	#[display(fmt = "General ethcore error {}", _0)]
-	Ethcore(EthcoreError),
-	/// A convenient variant for String.
-	#[display(fmt = "{}", _0)]
-	Msg(String),
-}
-
-impl error::Error for Error {
-	fn source(&self) -> Option<&(error::Error + 'static)> {
-		match self {
-			Error::Io(e) => Some(e),
-			Error::Decoder(e) => Some(e),
-			Error::Trie(e) => Some(e),
-			Error::TxPool(e) => Some(e),
-			Error::Crypto(e) => Some(e),
-			Error::Execution(e) => Some(e),
-			Error::Key(e) => Some(e),
-			Error::Transaction(e) => Some(e),
-			Error::Ethcore(e) => Some(e),
-			_ => None,
+	errors {
+		#[doc = "Encryption error."]
+		Encrypt(err: String) {
+			description("Encryption error"),
+			display("Encryption error. ({})", err),
 		}
-	}
-}

-impl From<String> for Error {
-	fn from(s: String) -> Self {
-		Error::Msg(s)
-	}
-}
+		#[doc = "Decryption error."]
+		Decrypt(err: String) {
+			description("Decryption error"),
+			display("Decryption error. ({})", err),
+		}

-impl From<std::io::Error> for Error {
-	fn from(err: std::io::Error) -> Self {
-		Error::Io(err).into()
+		#[doc = "Address not authorized."]
+		NotAuthorised(address: Address) {
+			description("Address not authorized"),
+			display("Private transaction execution is not authorised for {}", address),
+		}
+
+		#[doc = "Transaction creates more than one contract."]
+		TooManyContracts {
+			description("Transaction creates more than one contract."),
+			display("Private transaction created too many contracts"),
+		}
+
+		#[doc = "Contract call error."]
+		Call(err: String) {
+			description("Contract call error."),
+			display("Contract call error. ({})", err),
+		}
+
+		#[doc = "State is not available."]
+		StatePruned {
+			description("State is not available."),
+			display("State is not available"),
+		}
+
+		#[doc = "State is incorrect."]
+		StateIncorrect {
+			description("State is incorrect."),
+			display("State is incorrect"),
+		}
+
+		#[doc = "Wrong private transaction type."]
+		BadTransactionType {
+			description("Wrong private transaction type."),
+			display("Wrong private transaction type"),
+		}
+
+		#[doc = "Contract does not exist or was not created."]
+		ContractDoesNotExist {
+			description("Contract does not exist or was not created."),
+			display("Contract does not exist or was not created"),
+		}
+
+		#[doc = "Reference to the client is corrupted."]
+		ClientIsMalformed {
+			description("Reference to the client is corrupted."),
+			display("Reference to the client is corrupted"),
+		}
+
+		#[doc = "Queue of private transactions for verification is full."]
+		QueueIsFull {
+			description("Queue of private transactions for verification is full."),
+			display("Queue of private transactions for verification is full"),
+		}
+
+		#[doc = "The transaction already exists in queue of private transactions."]
+		PrivateTransactionAlreadyImported {
+			description("The transaction already exists in queue of private transactions."),
+			display("The transaction already exists in queue of private transactions."),
+		}
+
+		#[doc = "The information about private transaction is not found in the store."]
+		PrivateTransactionNotFound {
+			description("The information about private transaction is not found in the store."),
+			display("The information about private transaction is not found in the store."),
+		}
+
+		#[doc = "Account for signing public transactions not set."]
+		SignerAccountNotSet {
+			description("Account for signing public transactions not set."),
+			display("Account for signing public transactions not set."),
+		}
+
+		#[doc = "Account for validating private transactions not set."]
+		ValidatorAccountNotSet {
+			description("Account for validating private transactions not set."),
+			display("Account for validating private transactions not set."),
+		}
+
+		#[doc = "Account for signing requests to key server not set."]
+		KeyServerAccountNotSet {
+			description("Account for signing requests to key server not set."),
+			display("Account for signing requests to key server not set."),
+		}
+
+		#[doc = "Encryption key is not found on key server."]
+		EncryptionKeyNotFound(address: Address) {
+			description("Encryption key is not found on key server"),
+			display("Encryption key is not found on key server for {}", address),
+		}
+
+		#[doc = "Key server URL is not set."]
+		KeyServerNotSet {
+			description("Key server URL is not set."),
+			display("Key server URL is not set."),
+		}
+
+		#[doc = "VM execution error."]
+		Execution(err: ExecutionError) {
+			description("VM execution error."),
+			display("VM execution error {}", err),
+		}
+
+		#[doc = "General signing error."]
+		Key(err: KeyError) {
+			description("General signing error."),
+			display("General signing error {}", err),
+		}
+
+		#[doc = "Error of transactions processing."]
+		Transaction(err: TransactionError) {
+			description("Error of transactions processing."),
+			display("Error of transactions processing {}", err),
+		}
+
+		#[doc = "General ethcore error."]
+		Ethcore(err: EthcoreError) {
+			description("General ethcore error."),
+			display("General ethcore error {}", err),
+		}
 	}
 }

 impl From<KeyError> for Error {
 	fn from(err: KeyError) -> Self {
-		Error::Key(err).into()
-	}
-}
-
-impl From<CryptoError> for Error {
-	fn from(err: CryptoError) -> Self {
-		Error::Crypto(err).into()
-	}
-}
-
-impl From<DecoderError> for Error {
-	fn from(err: DecoderError) -> Self {
-		Error::Decoder(err).into()
+		ErrorKind::Key(err).into()
 	}
 }

 impl From<ExecutionError> for Error {
 	fn from(err: ExecutionError) -> Self {
-		Error::Execution(err).into()
+		ErrorKind::Execution(err).into()
 	}
 }

 impl From<TransactionError> for Error {
 	fn from(err: TransactionError) -> Self {
-		Error::Transaction(err).into()
-	}
-}
-
-impl From<TrieError> for Error {
-	fn from(err: TrieError) -> Self {
-		Error::Trie(err).into()
-	}
-}
-
-impl From<TxPoolError> for Error {
-	fn from(err: TxPoolError) -> Self {
-		Error::TxPool(err).into()
+		ErrorKind::Transaction(err).into()
 	}
 }

 impl From<EthcoreError> for Error {
 	fn from(err: EthcoreError) -> Self {
-		Error::Ethcore(err).into()
+		ErrorKind::Ethcore(err).into()
 	}
 }

--- a/ethcore/private-tx/src/lib.rs
+++ b/ethcore/private-tx/src/lib.rs
@@ -54,7 +54,8 @@ extern crate log;
 extern crate ethabi_derive;
 #[macro_use]
 extern crate ethabi_contract;
-extern crate derive_more;
+#[macro_use]
+extern crate error_chain;
 #[macro_use]
 extern crate rlp_derive;

@@ -67,7 +68,7 @@ pub use encryptor::{Encryptor, SecretStoreEncryptor, EncryptorConfig, NoopEncryp
 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;
+pub use error::{Error, ErrorKind};

 use std::sync::{Arc, Weak};
 use std::collections::{HashMap, HashSet, BTreeMap};
@@ -237,10 +238,10 @@ impl Provider {
 		trace!(target: "privatetx", "Creating private transaction from regular transaction: {:?}", signed_transaction);
 		if self.signer_account.is_none() {
 			warn!(target: "privatetx", "Signing account not set");
-			return Err(Error::SignerAccountNotSet);
+			bail!(ErrorKind::SignerAccountNotSet);
 		}
 		let tx_hash = signed_transaction.hash();
-		let contract = Self::contract_address_from_transaction(&signed_transaction).map_err(|_| Error::BadTransactionType)?;
+		let contract = Self::contract_address_from_transaction(&signed_transaction).map_err(|_| ErrorKind::BadTransactionType)?;
 		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);
@@ -272,17 +273,18 @@ impl Provider {
 		let mut state_buf = [0u8; 64];
 		state_buf[..32].clone_from_slice(&state_hash);
 		state_buf[32..].clone_from_slice(&H256::from(nonce));
-		keccak(AsRef::<[u8]>::as_ref(&state_buf[..]))
+		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> {
 		let engine = self.client.engine();
+		let refuse_service_transactions = true;
 		miner::pool_client::PoolClient::new(
 			&*self.client,
 			nonce_cache,
 			engine,
 			local_accounts,
-			None,  // refuse_service_transactions = true
+			refuse_service_transactions,
 		)
 	}

@@ -307,19 +309,19 @@ impl Provider {
 					// TODO #9825 [ToDr] Usage of BlockId::Latest
 					let contract_nonce = self.get_contract_nonce(&contract, BlockId::Latest);
 					if let Err(e) = contract_nonce {
-						return Err(format!("Cannot retrieve contract nonce: {:?}", e).into());
+						bail!("Cannot retrieve contract nonce: {:?}", e);
 					}
 					let contract_nonce = contract_nonce.expect("Error was checked before");
 					let private_state = self.execute_private_transaction(BlockId::Latest, &transaction.transaction);
 					if let Err(e) = private_state {
-						return Err(format!("Cannot retrieve private state: {:?}", e).into());
+						bail!("Cannot retrieve private state: {:?}", e);
 					}
 					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);
 					if let Err(e) = signed_state {
-						return Err(format!("Cannot sign the state: {:?}", e).into());
+						bail!("Cannot sign the state: {:?}", e);
 					}
 					let signed_state = signed_state.expect("Error was checked before");
 					let signed_private_transaction = SignedPrivateTransaction::new(private_hash, signed_state, None);
@@ -360,27 +362,25 @@ impl Provider {
 			signatures.push(signed_tx.signature());
 			let rsv: Vec<Signature> = signatures.into_iter().map(|sign| sign.into_electrum().into()).collect();
 			// Create public transaction
-			let signer_account = self.signer_account.ok_or_else(|| Error::SignerAccountNotSet)?;
-			let state = self.client.state_at(BlockId::Latest).ok_or(Error::StatePruned)?;
-			let nonce = state.nonce(&signer_account)?;
 			let public_tx = self.public_transaction(
 				desc.state.clone(),
 				&desc.original_transaction,
 				&rsv,
-				nonce,
+				desc.original_transaction.nonce,
 				desc.original_transaction.gas_price
 			)?;
 			trace!(target: "privatetx", "Last required signature received, public transaction created: {:?}", public_tx);
 			// Sign and add it to the queue
 			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 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"),
 				Err(err) => {
 					warn!(target: "privatetx", "Failed to add transaction to queue, error: {:?}", err);
-					return Err(err.into());
+					bail!(err);
 				}
 			}
 			// Notify about state changes
@@ -395,7 +395,7 @@ impl Provider {
 			// 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);
-				return Err(err);
+				bail!(err);
 			}
 		} else {
 			// Add signature to the store
@@ -403,7 +403,7 @@ impl Provider {
 				Ok(_) => trace!(target: "privatetx", "Signature stored for private transaction"),
 				Err(err) => {
 					warn!(target: "privatetx", "Failed to add signature to signing store, error: {:?}", err);
-					return Err(err);
+					bail!(err);
 				}
 			}
 		}
@@ -415,7 +415,7 @@ impl Provider {
 			Action::Call(contract) => Ok(contract),
 			_ => {
 				warn!(target: "privatetx", "Incorrect type of action for the transaction");
-				return Err(Error::BadTransactionType);
+				bail!(ErrorKind::BadTransactionType);
 			}
 		}
 	}
@@ -434,13 +434,13 @@ impl Provider {
 					}
 					false => {
 						warn!(target: "privatetx", "Sender's state doesn't correspond to validator's");
-						return Err(Error::StateIncorrect);
+						bail!(ErrorKind::StateIncorrect);
 					}
 				}
 			}
 			Err(err) => {
 				warn!(target: "privatetx", "Sender's state doesn't correspond to validator's, error {:?}", err);
-				return Err(err.into());
+				bail!(err);
 			}
 		}
 	}
@@ -480,21 +480,21 @@ impl Provider {
 	fn get_decrypted_state(&self, address: &Address, block: BlockId) -> Result<Bytes, Error> {
 		let (data, decoder) = private_contract::functions::state::call();
 		let value = self.client.call_contract(block, *address, data)?;
-		let state = decoder.decode(&value).map_err(|e| Error::Call(format!("Contract call failed {:?}", e)))?;
+		let state = decoder.decode(&value).map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)))?;
 		self.decrypt(address, &state)
 	}

 	fn get_decrypted_code(&self, address: &Address, block: BlockId) -> Result<Bytes, Error> {
 		let (data, decoder) = private_contract::functions::code::call();
 		let value = self.client.call_contract(block, *address, data)?;
-		let state = decoder.decode(&value).map_err(|e| Error::Call(format!("Contract call failed {:?}", e)))?;
+		let state = decoder.decode(&value).map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)))?;
 		self.decrypt(address, &state)
 	}

 	pub fn get_contract_nonce(&self, address: &Address, block: BlockId) -> Result<U256, Error> {
 		let (data, decoder) = private_contract::functions::nonce::call();
 		let value = self.client.call_contract(block, *address, data)?;
-		decoder.decode(&value).map_err(|e| Error::Call(format!("Contract call failed {:?}", e)).into())
+		decoder.decode(&value).map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)).into())
 	}

 	fn snapshot_to_storage(raw: Bytes) -> HashMap<H256, H256> {
@@ -531,10 +531,10 @@ impl Provider {
 			T: Tracer,
 			V: VMTracer,
 	{
-		let mut env_info = self.client.env_info(block).ok_or(Error::StatePruned)?;
+		let mut env_info = self.client.env_info(block).ok_or(ErrorKind::StatePruned)?;
 		env_info.gas_limit = transaction.gas;

-		let mut state = self.client.state_at(block).ok_or(Error::StatePruned)?;
+		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
 		let contract_address = match transaction.action {
 			Action::Call(ref contract_address) => {
@@ -610,15 +610,15 @@ impl Provider {
 	/// 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> {
 		if let Action::Call(_) = source.action {
-			return Err(Error::BadTransactionType);
+			bail!(ErrorKind::BadTransactionType);
 		}
 		let sender = source.sender();
-		let state = self.client.state_at(block).ok_or(Error::StatePruned)?;
+		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(Error::StatePruned)
-			.and_then(|h| h.decode().map_err(|_| Error::StateIncorrect).into())?;
+			.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 {
@@ -649,7 +649,7 @@ impl Provider {
 	/// 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 {
-			return Err(Error::BadTransactionType);
+			bail!(ErrorKind::BadTransactionType);
 		}
 		let result = self.execute_private(source, TransactOptions::with_no_tracing(), block)?;
 		Ok(result.state)
@@ -678,7 +678,7 @@ impl Provider {
 	pub fn get_validators(&self, block: BlockId, address: &Address) -> Result<Vec<Address>, Error> {
 		let (data, decoder) = private_contract::functions::get_validators::call();
 		let value = self.client.call_contract(block, *address, data)?;
-		decoder.decode(&value).map_err(|e| Error::Call(format!("Contract call failed {:?}", e)).into())
+		decoder.decode(&value).map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)).into())
 	}

 	fn get_contract_version(&self, block: BlockId, address: &Address) -> usize {
--- a/ethcore/private-tx/src/private_transactions.rs
+++ b/ethcore/private-tx/src/private_transactions.rs
@@ -28,7 +28,7 @@ use parking_lot::RwLock;
 use types::transaction::{UnverifiedTransaction, SignedTransaction};
 use txpool;
 use txpool::{VerifiedTransaction, Verifier};
-use error::Error;
+use error::{Error, ErrorKind};

 type Pool = txpool::Pool<VerifiedPrivateTransaction, pool::scoring::NonceAndGasPrice>;

@@ -154,7 +154,7 @@ impl Default for VerificationStore {

 impl VerificationStore {
 	/// Adds private transaction for verification into the store
-	pub fn add_transaction<C: pool::client::Client + pool::client::NonceClient + Clone>(
+	pub fn add_transaction<C: pool::client::Client>(
 		&self,
 		transaction: UnverifiedTransaction,
 		validator_account: Option<Address>,
@@ -164,7 +164,7 @@ impl VerificationStore {

 		let options = self.verification_options.clone();
 		// Use pool's verifying pipeline for original transaction's verification
-		let verifier = pool::verifier::Verifier::new(client.clone(), options, Default::default(), None);
+		let verifier = pool::verifier::Verifier::new(client, options, Default::default(), None);
 		let unverified = pool::verifier::Transaction::Unverified(transaction);
 		let verified_tx = verifier.verify_transaction(unverified)?;
 		let signed_tx: SignedTransaction = verified_tx.signed().clone();
@@ -177,9 +177,8 @@ impl VerificationStore {
 			transaction_hash: signed_hash,
 			transaction_sender: signed_sender,
 		};
-		let replace = pool::replace::ReplaceByScoreAndReadiness::new(
-			self.verification_pool.read().scoring().clone(), client);
-		self.verification_pool.write().import(verified, &replace)?;
+		let mut pool = self.verification_pool.write();
+		pool.import(verified)?;
 		Ok(())
 	}

@@ -229,7 +228,7 @@ impl SigningStore {
 		contract_nonce: U256,
 	) -> Result<(), Error> {
 		if self.transactions.len() > MAX_QUEUE_LEN {
-			return Err(Error::QueueIsFull);
+			bail!(ErrorKind::QueueIsFull);
 		}

 		self.transactions.insert(private_hash, PrivateTransactionSigningDesc {
@@ -255,7 +254,7 @@ impl SigningStore {

 	/// Adds received signature for the stored private transaction
 	pub fn add_signature(&mut self, private_hash: &H256, signature: Signature) -> Result<(), Error> {
-		let desc = self.transactions.get_mut(private_hash).ok_or_else(|| Error::PrivateTransactionNotFound)?;
+		let desc = self.transactions.get_mut(private_hash).ok_or_else(|| ErrorKind::PrivateTransactionNotFound)?;
 		if !desc.received_signatures.contains(&signature) {
 			desc.received_signatures.push(signature);
 		}
--- a/ethcore/res/authority_round.json
+++ b/ethcore/res/authority_round.json
@@ -46,51 +46,9 @@
 		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"0000000000000000000000000000000000000005": { "balance": "1", "builtin": { "name": "modexp", "activate_at": 0, "pricing": { "modexp": { "divisor": 20 } } } },
-		"0000000000000000000000000000000000000006": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
+		"0000000000000000000000000000000000000006": { "balance": "1", "builtin": { "name": "alt_bn128_add", "activate_at": 0, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "balance": "1", "builtin": { "name": "alt_bn128_mul", "activate_at": 0, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "balance": "1", "builtin": { "name": "alt_bn128_pairing", "activate_at": 0, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
 	}
 }
--- a/ethcore/res/authority_round_block_reward_contract.json
+++ b/ethcore/res/authority_round_block_reward_contract.json
@@ -49,51 +49,9 @@
 		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"0000000000000000000000000000000000000005": { "balance": "1", "builtin": { "name": "modexp", "activate_at": 0, "pricing": { "modexp": { "divisor": 20 } } } },
-		"0000000000000000000000000000000000000006": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
+		"0000000000000000000000000000000000000006": { "balance": "1", "builtin": { "name": "alt_bn128_add", "activate_at": 0, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "balance": "1", "builtin": { "name": "alt_bn128_mul", "activate_at": 0, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "balance": "1", "builtin": { "name": "alt_bn128_pairing", "activate_at": 0, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" },
 		"0000000000000000000000000000000000000042": {
 			"balance": "1",
--- a/ethcore/res/basic_authority.json
+++ b/ethcore/res/basic_authority.json
@@ -38,48 +38,9 @@
 		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"0000000000000000000000000000000000000005": { "balance": "1", "builtin": { "name": "modexp", "activate_at": 0, "pricing": { "modexp": { "divisor": 20 } } } },
-		"0000000000000000000000000000000000000006": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0x0": {
-						"price": { "linear": { "base": 500, "word": 0 }}
-					},
-					"0x7fffffffffffff": {
-						"price": { "linear": { "base": 150, "word": 0 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0x0": {
-						"price": { "linear": { "base": 40000, "word": 0 }}
-					},
-					"0x7fffffffffffff": {
-						"price": { "linear": { "base": 6000, "word": 0 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0x0": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
+		"0000000000000000000000000000000000000006": { "balance": "1", "builtin": { "name": "alt_bn128_add", "activate_at": 0, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "balance": "1", "builtin": { "name": "alt_bn128_mul", "activate_at": 0, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "balance": "1", "builtin": { "name": "alt_bn128_pairing", "activate_at": 0, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
 	}
 }
--- a/ethcore/res/constructor.json
+++ b/ethcore/res/constructor.json
@@ -34,51 +34,9 @@
 		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"0000000000000000000000000000000000000005": { "balance": "1", "builtin": { "name": "modexp", "activate_at": 0, "pricing": { "modexp": { "divisor": 20 } } } },
-		"0000000000000000000000000000000000000006": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0": {
-						"price": { "linear": { "base": 500, "word": 0 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP1108 transition",
-						"price": { "linear": { "base": 150, "word": 0 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0": {
-						"price": { "linear": {"base": 40000, "word": 0 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP1108 transition",
-						"price": { "linear": { "base": 6000, "word": 0 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
+		"0000000000000000000000000000000000000006": { "balance": "1", "builtin": { "name": "alt_bn128_add", "activate_at": 0, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "balance": "1", "builtin": { "name": "alt_bn128_mul", "activate_at": 0, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "balance": "1", "builtin": { "name": "alt_bn128_pairing", "activate_at": 0, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"0000000000000000000000000000000000001337": { "balance": "1", "constructor": "60606040526000805460ff19166001179055346000575b6075806100246000396000f300606060405263ffffffff60e060020a60003504166394b91deb81146022575b6000565b34600057602c6040565b604080519115158252519081900360200190f35b60005460ff16815600a165627a7a723058207882eb60ebce23178b3fa06d4cd8e5adc17711937ccddacb18a04abca2a2c9ee0029" }
 	}
 }
--- a/ethcore/res/ethereum/builtin_multi_bench.json
+++ b/ethcore/res/ethereum/builtin_multi_bench.json
@@ -1,112 +0,0 @@
-{
-	"name": "ecrecover legacy",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"blockReward": "0x4563918244F40000",
-				"homesteadTransition": "0x0"
-			}
-		}
-	},
-	"params": {
-		"gasLimitBoundDivisor": "0x0400",
-		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-		"accountStartNonce": "0x00",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID" : "0x1",
-		"eip150Transition": "0x0",
-		"eip160Transition": "0x7fffffffffffffff",
-		"eip161abcTransition": "0x7fffffffffffffff",
-		"eip161dTransition": "0x7fffffffffffffff",
-		"eip155Transition": "0x7fffffffffffffff",
-		"maxCodeSize": 24576,
-		"maxCodeSizeTransition": "0x7fffffffffffffff"
-	},
-	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x0000000000000042",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
-		"difficulty": "0x400000000",
-		"author": "0x0000000000000000000000000000000000000000",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
-		"gasLimit": "0x1388"
-	},
-	"accounts": {
-		"0000000000000000000000000000000000000001": {
-			"balance": "1",
-			"builtin": {
-				"name": "ecrecover",
-				"pricing": {
-					"0": {"price": {"linear": { "base": 1, "word": 0 }}},
-					"1": {"price": {"linear": { "base": 2, "word": 0 }}},
-					"2": {"price": {"linear": { "base": 3, "word": 0 }}},
-					"3": {"price": {"linear": { "base": 4, "word": 0 }}},
-					"4": {"price": {"linear": { "base": 5, "word": 0 }}},
-					"5": {"price": {"linear": { "base": 6, "word": 0 }}},
-					"6": {"price": {"linear": { "base": 7, "word": 0 }}},
-					"7": {"price": {"linear": { "base": 8, "word": 0 }}},
-					"8": {"price": {"linear": { "base": 9, "word": 0 }}},
-					"9": {"price": {"linear": { "base": 1, "word": 0 }}},
-					"10": {"price": {"linear": { "base": 2, "word": 0 }}}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000002": {
-			"balance": "1",
-			"builtin": {
-				"name": "sha256",
-				"pricing": {
-					"0": {"price": {"linear": { "base": 1, "word": 0 }}},
-					"1": {"price": {"linear": { "base": 2, "word": 0 }}},
-					"2": {"price": {"linear": { "base": 3, "word": 0 }}},
-					"3": {"price": {"linear": { "base": 4, "word": 0 }}},
-					"4": {"price": {"linear": { "base": 5, "word": 0 }}},
-					"5": {"price": {"linear": { "base": 6, "word": 0 }}},
-					"6": {"price": {"linear": { "base": 7, "word": 0 }}},
-					"7": {"price": {"linear": { "base": 8, "word": 0 }}},
-					"8": {"price": {"linear": { "base": 9, "word": 0 }}},
-					"9": {"price": {"linear": { "base": 1, "word": 0 }}},
-					"10": {"price": {"linear": { "base": 2, "word": 0 }}},
-					"11": {"price": {"linear": { "base": 3, "word": 0 }}},
-					"12": {"price": {"linear": { "base": 4, "word": 0 }}},
-					"13": {"price": {"linear": { "base": 5, "word": 0 }}},
-					"14": {"price": {"linear": { "base": 6, "word": 0 }}},
-					"15": {"price": {"linear": { "base": 7, "word": 0 }}},
-					"16": {"price": {"linear": { "base": 8, "word": 0 }}},
-					"17": {"price": {"linear": { "base": 9, "word": 0 }}},
-					"18": {"price": {"linear": { "base": 1, "word": 0 }}},
-					"19": {"price": {"linear": { "base": 2, "word": 0 }}},
-					"20": {"price": {"linear": { "base": 3, "word": 0 }}},
-					"21": {"price": {"linear": { "base": 4, "word": 0 }}},
-					"22": {"price": {"linear": { "base": 5, "word": 0 }}},
-					"23": {"price": {"linear": { "base": 6, "word": 0 }}},
-					"24": {"price": {"linear": { "base": 7, "word": 0 }}},
-					"25": {"price": {"linear": { "base": 8, "word": 0 }}},
-					"26": {"price": {"linear": { "base": 9, "word": 0 }}},
-					"27": {"price": {"linear": { "base": 1, "word": 0 }}},
-					"28": {"price": {"linear": { "base": 2, "word": 0 }}},
-					"29": {"price": {"linear": { "base": 3, "word": 0 }}},
-					"30": {"price": {"linear": { "base": 4, "word": 0 }}},
-					"31": {"price": {"linear": { "base": 5, "word": 0 }}},
-					"32": {"price": {"linear": { "base": 6, "word": 0 }}},
-					"33": {"price": {"linear": { "base": 7, "word": 0 }}},
-					"34": {"price": {"linear": { "base": 8, "word": 0 }}},
-					"35": {"price": {"linear": { "base": 9, "word": 0 }}},
-					"36": {"price": {"linear": { "base": 10, "word": 0 }}},
-					"37": {"price": {"linear": { "base": 10, "word": 0 }}},
-					"38": {"price": {"linear": { "base": 10, "word": 0 }}},
-					"39": {"price": {"linear": { "base": 10, "word": 0 }}}
-				}
-			}
-		}
-	}
-}
--- a/ethcore/res/ethereum/builtin_one_activation_bench.json
+++ b/ethcore/res/ethereum/builtin_one_activation_bench.json
@@ -1,54 +0,0 @@
-{
-	"name": "ecrecover legacy chain spec for benchmarking",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"blockReward": "0x4563918244F40000",
-				"homesteadTransition": "0x0"
-			}
-		}
-	},
-	"params": {
-		"gasLimitBoundDivisor": "0x0400",
-		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-		"accountStartNonce": "0x00",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID" : "0x1",
-		"eip150Transition": "0x0",
-		"eip160Transition": "0x7fffffffffffffff",
-		"eip161abcTransition": "0x7fffffffffffffff",
-		"eip161dTransition": "0x7fffffffffffffff",
-		"eip155Transition": "0x7fffffffffffffff",
-		"maxCodeSize": 24576,
-		"maxCodeSizeTransition": "0x7fffffffffffffff"
-	},
-	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x0000000000000042",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
-		"difficulty": "0x400000000",
-		"author": "0x0000000000000000000000000000000000000000",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
-		"gasLimit": "0x1388"
-	},
-	"accounts": {
-		"0000000000000000000000000000000000000001": {
-			"balance": "1",
-			"builtin": {
-				"name": "ecrecover",
-				"pricing": {
-					"linear": { "base": 3000, "word": 0 }
-				}
-			}
-		}
-	}
-}
--- a/ethcore/res/ethereum/byzantium_test.json
+++ b/ethcore/res/ethereum/byzantium_test.json
@@ -54,47 +54,8 @@
 		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x00", "pricing": { "modexp": { "divisor": 20 } } } },
-		"0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		}
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "0x00", "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "0x00", "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "0x00", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } }
 	}
 }
--- a/ethcore/res/ethereum/callisto.json
+++ b/ethcore/res/ethereum/callisto.json
@@ -72,48 +72,9 @@
 		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"0000000000000000000000000000000000000005": { "balance": "1", "builtin": { "name": "modexp", "activate_at": 20, "pricing": { "modexp": { "divisor": 20 } } } },
-		"0000000000000000000000000000000000000006": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"20": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"20": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"20": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
+		"0000000000000000000000000000000000000006": { "balance": "1", "builtin": { "name": "alt_bn128_add", "activate_at": 20, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "balance": "1", "builtin": { "name": "alt_bn128_mul", "activate_at": 20, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "balance": "1", "builtin": { "name": "alt_bn128_pairing", "activate_at": 20, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"183394f52b2c8c034835edba3bcececa6f60b5a8": {
 			"balance": "100491852286952719463755404"
 		}
--- a/ethcore/res/ethereum/classic.json
+++ b/ethcore/res/ethereum/classic.json
@@ -8,12 +8,11 @@
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
 				"blockReward": "0x4563918244F40000",
-				"homesteadTransition": "0x118c30",
-				"ecip1010PauseTransition": "0x2dc6c0",
-				"ecip1010ContinueTransition": "0x4c4b40",
-				"ecip1017EraRounds": "0x4c4b40",
-				"eip100bTransition": "0x85d9a0",
-				"bombDefuseTransition": "0x5a06e0"
+				"homesteadTransition": 1150000,
+				"ecip1010PauseTransition": 3000000,
+				"ecip1010ContinueTransition": 5000000,
+				"ecip1017EraRounds": 5000000,
+				"bombDefuseTransition": 5900000
 			}
 		}
 	},
@@ -27,20 +26,11 @@
 		"chainID": "0x3d",
 		"forkBlock": "0x1d4c00",
 		"forkCanonHash": "0x94365e3a8c0b35089c1d1195081fe7489b528a84b22199c916180db8b28ade7f",
-		"eip150Transition": "0x2625a0",
-		"eip160Transition": "0x2dc6c0",
-		"eip161abcTransition": "0x85d9a0",
-		"eip161dTransition": "0x85d9a0",
-		"eip155Transition": "0x2dc6c0",
-		"maxCodeSize": "0x6000",
-		"maxCodeSizeTransition": "0x85d9a0",
-		"eip140Transition": "0x85d9a0",
-		"eip211Transition": "0x85d9a0",
-		"eip214Transition": "0x85d9a0",
-		"eip658Transition": "0x85d9a0",
-		"eip145Transition": "0x921288",
-		"eip1014Transition": "0x921288",
-		"eip1052Transition": "0x921288"
+		"eip150Transition": 2500000,
+		"eip160Transition": 3000000,
+		"eip161abcTransition": "0x7fffffffffffffff",
+		"eip161dTransition": "0x7fffffffffffffff",
+		"eip155Transition": 3000000
 	},
 	"genesis": {
 		"seal": {
@@ -58,8 +48,8 @@
 		"stateRoot": "0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544"
 	},
 	"hardcodedSync": {
-		"header": "f9021ba0a281d23475d3d5ff03df8636c9f528cdd91498af274a3b2f8989bbd51bfeb809a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794004730417cd2b1d19f6be2679906ded4fa8a64e2a0d5fdd62e7e29dc3da1cd3fe5ad549e000260bfdb55f523fde008f26390220d23a0370ff78457d6c7469ff333a13165f4bb8057d00cfa68365cb4d1a8c8a1da46d5a0dea37365a20f5bb5ad3766a24a9fe7b04b946e35aaba74f862467a7c5cdb7d67b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000004000000000040000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000100000000000000000000000080000000000000000020000000000000000000000000000000000000000000000000000000000000000000000020000000000001000000000000000000000000000000080010000000000000008000000000000000866fc181925a9783763801837a121d830c317c845c9d1efe9b457468657265756d436c6173736963534f4c4f2f326d696e657273a0bb6e626c7ee3d827da18e1b303d9552ba17e92cefcedfc58bdfc5bac6a8ebabe882d8c26402344c24b",
-		"totalDifficulty": "598584828374329723203",
+		"header": "f90210a08eb792fdb134b57fffbdf19bd61d4c1cc351fc38a7fcf6609c82b35ea364208fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794df7d7e053933b5cc24372f878c90e62dadad5d42a0e29a2e741354b453139d244920f7d552f90a579f1dcb99ef6b470bcffc713ebaa04bb64c992b8cf56259177a192d6f0a1eddf192b8daa7dbf1ec8313428cccde20a0ee22efe3b124a0297503fd26e6f7b33c7a88aa75825259297f8e30bee3632a68b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000866a396ffc14908373480183797a1182f618845c7395609165746865726d696e652d6574632d757331a087f3616cc0ba3704e23702bf7461f8f7716f1f1ad3ac4c66391d45adc57d1dea886ecb8e800fe87049",
+		"totalDifficulty": "575603227549295900024",
 		"CHTs": [
 			"0x0eb474b7721727204978e92e27d31cddff56471911e424a4c8271c35f9c982cc",
 			"0xe10e94515fb5ffb7ffa9bf50db4a959b3f50c2ff75e0b8bd5f5e038749e52a11",
@@ -3749,103 +3739,9 @@
 			"0x362ca494021482f0d9dea4abd844ca11b71fbeb0a98e7db7bfb3bb6f864eb58c",
 			"0x09ec27c856f50888e4634ffaca66f8185fd13e0bb2bbf522ce6209886502c7a5",
 			"0x24996d2f96618887c1c5e61d5d7ce6948853ca35811d48f72155a4778308e255",
-			"0x4f199a8efc8615c623902b5c279dd995ac1df4654a07aab0423e070d14bd24d0",
-			"0xe6875990cef0d2ce1f9d100654cdf522bbe345a462ebca769b1e288128c13201",
-			"0x36c141d47991e557f7226d8b1fe791c334f046f867d7865d663f99e2a337d915",
-			"0x337e59da56cde8e3f9e90fafff54d4fa240ba01aec855fd55626e4b3a45a9767",
-			"0x67672d3a29c49e3545d25422b6015a1eebe86596f55d4c9b8772e89c99ac9f8b",
-			"0x6d6e167641bcd2e5241ac2710951f7f0c47fb311e32e998831e6fe38f5bebb25",
-			"0x6dc4fa5ae3f281a90619216491284d951151f37be648694d1952314f43ffe05d",
-			"0x3c865ccee7900b39d671c43ae15df71fad294781d74815537de94d02b48dd8a0",
-			"0x10ba37d2ff46db181ff8a15f38bfeecfd9c21e28bf63cb5ab975a2d7c74c0aef",
-			"0xba265a598f3af5bf4c2b87bd8d28a55f963cfbd09108aaccd5b00294f662e8b9",
-			"0xaab422eb98f7b0ab9a01558069a3666efa2be2510097b0054bd5c8fceb1023df",
-			"0xdbff3ce1e6fb0388029f95bd091c95b88c6539fabfe6f1de8e44c47dab064ff8",
-			"0xb1aa0c7254f3aaa61b58c9d973f3d89f5f4dc6bfee011ad4c4a3e3ae76aaf7df",
-			"0x055e36325029db9e089808ca01b0ee3eae53703f3e91ee51e587e7b7dcaa8a3d",
-			"0x00ec5a25517cf0c0a1bf892e5209fd0185ff1ffc6b2523642bf86f6a3d0c10f3",
-			"0x7bc6a8d5017760f12ace9ebfcdf5a91abcfd6e4f4131df5c4dbe84d2d6a6add9",
-			"0xeb5da64c8d0cc93a44da96ee9c3c0a22054a2a2e87a7491a5618ade1f59a1b96",
-			"0xc0a937729678bb6aca27ae16c662ccd2dd0b53346c610d6e5d5b1655762fa4b3",
-			"0x55c732917d3894ffeb9844fcb1c690d0956c4e2a8eccb6552cdde4ea90c99db2",
-			"0xf1dfd2205daf748da9e8e98bc4ee94cd6b2db5560e4cead28910e14c576337aa",
-			"0x60a271fb20c017f90d99c57783ebb8b1a3233398c49f89d73db14b09adf2893b",
-			"0x8fbd97d55dc64f2124c79054765515f49d79a05f2962b17875f12b353c33f564",
-			"0x5afd5951c5e834fbf22071047f72619496e9a9dbc6073b661c44741b67fabf03",
-			"0x2d05a19223820f92e385d2c942b70cca32804546f3aa7058381ca3f6c1ecde11",
-			"0x267dab323804f2e7bdcc80dde83ccbff56d1aa0fffd0edc7c02ffd4a24bbe027",
-			"0xf4e9e580bbcc5a9be1f942c12d4b34eb1a4c07feffd0b95abe27ddff57a6cc8f",
-			"0x3f146ceffcd100ca9fc1af743fad74acd03a289f4038413acfcfd0eb87d14a56",
-			"0xef98171ed6b269c0ebd6bdbb1d98694316b639bae6a3ad01f4964c3d2eb3d2cf",
-			"0x510013a35d5c71863b3385176c794ad90e17af1fd271b933f9f7ab980311b27c",
-			"0x5eb181d22f30ed203c4d3fad610d31c2338dae6a88eee250af19ae0f58319ad1",
-			"0x50a28d65b51ff086dcf2110feca7d990db95f078394c56bfb850a3b8cfd7f1a2",
-			"0x4148b8f2136b84773b7ff71d73aa8ffb98f0f3952939849f324c28b9173efd70",
-			"0xa980bc7fa736bf6d6d794ffa5e035664c45117c21e40da7ba76de7c2ff8164d0",
-			"0x794a8ef17e48986df700d6e68799a50695086702d6224ae9a71663fd03f8a55e",
-			"0xf354c82e1c75d7d758099dcd4d0592363eef81e85cba773aa6d6b30e1900582a",
-			"0xbb4c8b990add1c4e43ddebf742eb605028ae2daa8b61db7d237386d81e4c3413",
-			"0x61470a53ef9757fa7c452bdbe26d448dd8bf6590fc11420ebeddf441fe56f381",
-			"0x603558b2f72405e9625ac561d62c2bbcdda84d8ef4b5510d06bdac0553025bf2",
-			"0xf52d9ba6ba149d0e4266a8d05b73e4a445e9583560024e0185d4b8b12bd55640",
-			"0x26ef211f77b4a67ddb0a24c4e63f7d247d6ce8635dd9862894bdc067633ff395",
-			"0xed4ce5eb08b63534c5de241513a996322d168f6b8bf5c75167e79dd7ca1cc817",
-			"0x9d5f39f494a36d17db609b7a7a62734ca7222426c3556132bf1e2241d6c45cd2",
-			"0xe664772da4521e1140cc2c5db744010f57c15374dfb78a97701904787846a8f6",
-			"0x93faea0d197923b1578ac190fe608203f637fe4991ad4954c15ea94e17ee948b",
-			"0x2b028c1aaae5217cabb97c46c20541c93e55a868f78e82740f9fb9a0a033d662",
-			"0x529103419484990ad11c05e0c4c696826f67fbcd491e19aaac461cc340747ec4",
-			"0xc1e773415513b7bf47340d7b0a29e5d49d1a88bb3d0ee2a79726169d32012378",
-			"0xf97c43bb4ae25524b180e59cb6cac75858d4a8a0772fcf4f3bd24dfad42169da",
-			"0x19fa7ad12455fd022cfd15897d553e031ca1adf80c963c770250d36f1810a5f0",
-			"0xe67ce6e2444b8318a01150952a537ee47b701555c79f60eb90d3c3cdf93fb6b1",
-			"0x1b49d232180b0922704ebd4e9fabca5dd8ae9cfc2a39ea07226ba903a15037e3",
-			"0x56540b02ffe1743468342b5664b6e51cb3ef6c48dd74d6cd74e0c0c513c13129",
-			"0xd4d9d67f352c7f54d68ce994b3765b032108a5bd0b5b62d14b893949b96008d4",
-			"0x44d1b765df81594fd37e7700019f19b1ebd6d9b50631455931b83ce35238cb6b",
-			"0x2b67aef7cecfec055853cd63e8519bf506d7a1ae69a768e4db9415bdff532c47",
-			"0xc30ac2a4acc33cec2cdc83e114fb8237c4900a2fc89dddb6af3a4dd5e4868e51",
-			"0xe0e7127e086e2011f30fcd0469b35769cae163acb8ee6db8a8e2c032c2b351c5",
-			"0xb46c428070d15ec926fdf1d7465a9168c56dbb959d5391e26480500a98e36047",
-			"0x8dab41ce167633da3c0b5332833dfad5d2c28ef30c94973e5f4647e312781676",
-			"0xc632d30657b39208c254cf4f899d00d7c3196cbdc31248798a760972bf399fec",
-			"0xb4eb2c6c656406a9bc6cc6176dbdfc0e878046530d830a51e04a4e22c4572370",
-			"0xadb48a02c9c87b246360edb45528ba23cceed736a2ee0cfd03177428e6243024",
-			"0x443ac2e63e6d629398e607d6689725dd68fd5254916c1b76c876885456a13338",
-			"0xb66c4d950a9304025654de37c7d0e9759b755d86226a816d1e3b4c7d654a1bc3",
-			"0xded624610c3493bc7806844342c37909c1c1d179025c215108a12a0428ae9e36",
-			"0x28c85177961714ce796f152dcd31c8b19db1c39deebfe383d6fdf2334d4261b6",
-			"0x6d342534c3a4a875c5455ed3ef546e876cedb5aee7b2ecf194c6e47c6a09d3a4",
-			"0x65a84879e014085b7a0de5bf604050bc6bffd8ab7748253203fff49573763558",
-			"0xcb0e4339dfbfc8b420c915149a0d352fda69c31668b32452c432f067462b4325",
-			"0x3466440e4c88895f2642f2986dea4be482c028592530224d73e67254b2bac69f",
-			"0xb7c325fec25c7b278724ebb91c64fc2ac37e91e44b136dd6c29bf48b80990888",
-			"0x7a9a2bd3ab5972c1a4ec5972f959a1e30eb678090ed76947e38d76fc3ed758a5",
-			"0x74deabf896026cb20e2f5f8a88828b265d6696883dab972fe1bc9a4ca98d68b5",
-			"0x195d2e25b1ec8deea095bcbaac5277f4586237e68bd9c9ad24e65a8e53d6d27a",
-			"0xcc343c21f7f18c1d507cc3cf12381d7bbe55d7355363361d05d972343fb4b7fe",
-			"0xd2637aaef2034203e549453225eb1d75633d2c66e8cad0419395250c1e369536",
-			"0x0f8052a87aa435deee2826e6dbc944128835264d5770dbb064373de05333f8c2",
-			"0x2091278a3d6a7ed1ab0458cc307903a51d75c6a1c549ebed1f0aed29ce6533b8",
-			"0x3f7d25feee0dcf39372ccbad55989442d9b7ce16ac93e4b1dca63bd92d5204e4",
-			"0xd0f866c38597038e360af960e3e84c79a0027576bf3fdf4358a9442f0c671b61",
-			"0xc527b3694dc6b46f0562cb36e2f766e5b75793ad2794258d8be5119bff4ea8b0",
-			"0x47f1d7d32904cb0945e97140c2412d12b1e0980c2f72c7878250170aae4124dd",
-			"0x57aa1ef2a7ec01ee7acd0c4baed5407f30d6c34f2bc6bce7fda6366517343199",
-			"0xd392127f856736dd74d16a24309a247682e2736f78fc92713c484a6f13edcdbf",
-			"0x595aa7e3eddba867389d63b2eaa6b16e4e5163076f03d2c8013e40c3b0fc98c0",
-			"0x50bb320d8bea03db548be3a3b619159e1993ba8eea83af6f022b9cd29ae4d0ff",
-			"0x53deeb64ee923912f76a233532f474d76d8f6b8cc42eedcce81bda8ad608294c",
-			"0x1af301b0eaf36d16a74b2d1f76e9e26659f047cd3466a765049260047c25bbee",
-			"0x05c1d40227ece15c55f06dc922f5a9be01cc147a96e070e7a81b696f0f40b6ee",
-			"0xa63ee877c70d8e51e795d153a34ce3bcc212f8fb8e77df52ff83084b9133a280",
-			"0x07ab3e2107db7ff479f5be0d7a57e3b76627cf6230cdeb61d78ebaa2c391d360",
-			"0xc893aee6d249c152f5db3d7763f34a3311345dff721ae9c71ab5fb3d2b3e2559",
-			"0x250caa98ea3e682be9c866990f19647f443d57690052229ac0ccfa0ab30a5a71",
-			"0xc32fd5318214071a41cd8e98499b2b65942c5837c686a06b536146fd0bf294bf",
-			"0xac390c012eecd83fa8f4cc77a59992914b5c95af36b28747e07adea13228acbc"
+			"0x4f199a8efc8615c623902b5c279dd995ac1df4654a07aab0423e070d14bd24d0"
 		]
-	},
+	  },
 	"nodes": [
 		"enode://efd48ad0879eeb7f9cb5e50f33f7bc21e805a72e90361f145baaa22dd75d111e7cd9c93f1b7060dcb30aa1b3e620269336dbf32339fea4c18925a4c15fe642df@18.205.66.229:30303",
 		"enode://5fbfb426fbb46f8b8c1bd3dd140f5b511da558cd37d60844b525909ab82e13a25ee722293c829e52cb65c2305b1637fa9a2ea4d6634a224d5f400bfe244ac0de@162.243.55.45:30303",
@@ -3861,100 +3757,10 @@
 		"enode://5cd218959f8263bc3721d7789070806b0adff1a0ed3f95ec886fb469f9362c7507e3b32b256550b9a7964a23a938e8d42d45a0c34b332bfebc54b29081e83b93@35.187.57.94:30303"
 	],
 	"accounts": {
-		"0x0000000000000000000000000000000000000001": {
-			"builtin": {
-				"name": "ecrecover",
-				"pricing": {
-					"linear": {
-						"base": 3000,
-						"word": 0
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000002": {
-			"builtin": {
-				"name": "sha256",
-				"pricing": {
-					"linear": {
-						"base": 60,
-						"word": 12
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000003": {
-			"builtin": {
-				"name": "ripemd160",
-				"pricing": {
-					"linear": {
-						"base": 600,
-						"word": 120
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000004": {
-			"builtin": {
-				"name": "identity",
-				"pricing": {
-					"linear": {
-						"base": 15,
-						"word": 3
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000005": {
-			"builtin": {
-				"name": "modexp",
-				"activate_at": "0x85d9a0",
-				"pricing": {
-					"modexp": {
-						"divisor": 20
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0x85d9a0": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0x85d9a0": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0x85d9a0": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
+		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+		"0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"3282791d6fd713f1e94f4bfd565eaa78b3a0599d": {
 			"balance": "1337000000000000000000"
 		},
--- a/ethcore/res/ethereum/constantinople_test.json
+++ b/ethcore/res/ethereum/constantinople_test.json
@@ -58,47 +58,8 @@
 		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x00", "pricing": { "modexp": { "divisor": 20 } } } },
-		"0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		}
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "0x00", "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "0x00", "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "0x00", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } }
 	}
 }
--- a/ethcore/res/ethereum/easthub.json
+++ b/ethcore/res/ethereum/easthub.json
@@ -0,0 +1,87 @@
+{
+	"name": "Easthub",
+	"dataDir": "easthub",
+	"engine": {
+		"Ethash": {
+			"params": {
+				"minimumDifficulty": "0x020000",
+				"difficultyBoundDivisor": "0x0800",
+				"durationLimit": "0x0d",
+				"blockReward": "0x2B5E3AF16B1880000",
+				"homesteadTransition": "0x0",
+				"bombDefuseTransition": "0x0",
+				"ecip1017EraRounds": 5000000
+			}
+		}
+	},
+	"params": {
+		"gasLimitBoundDivisor": "0x0400",
+		"registrar": "0x0000000000000000000000000000000000000000",
+		"accountStartNonce": "0x00",
+		"maximumExtraDataSize": "0x20",
+		"minGasLimit": "0x1388",
+		"networkID": "0x7",
+		"chainID": "0x7",
+		"eip150Transition": "0x0",
+		"eip160Transition": "0x0",
+		"eip155Transition": "0x0",
+		"eip161abcTransition": "0x7fffffffffffffff",
+		"eip161dTransition": "0x7fffffffffffffff"
+	},
+	"genesis": {
+		"seal": {
+			"ethereum": {
+				"nonce": "0x0000000000000042",
+				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+			}
+		},
+		"difficulty": "0x0400000000",
+		"author": "0x0000000000000000000000000000000000000000",
+		"timestamp": "0x00",
+		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+		"extraData": "0x323031382045617374636f696e2050726f6a656374",
+		"gasLimit": "0x1388"
+	},
+	"nodes": [
+		"enode://ca57e40edb95a08a81b85a91e91099a0aaab777ad329ea7f3f772bc0fd511a276a5d84944725d181ff80f8c7dc1034814bff25b9723b03363d48617fed4b15f0@13.125.109.174:30303",
+		"enode://57254e23a7e5fe1e081ee5d1b236e37735a120660daeb4bf1fec6943a82c915c5b6fad23eeb1a43a27c23f236e084e8051aaa28f7d4139149f844747facb62bb@18.217.39.51:30303",
+		"enode://ef248f327c73c0318f4d51a62270b0612f3c4a4fd04b77d04854dc355980e137708d1e48811bc91387b0d7eb85cf447d8bbc095404f39bb7064e76751bda9cd4@52.221.160.236:30303",
+		"enode://bf6f0e37dd733cf04f2b079c753d2dea7cc7c59d8637eff9a8e63e17d08e2bfc91229fbb2dff08fe6ee12e51c1b6f8ed969d7042b89d77029e7ea02b05e17be3@18.197.47.177:30303"
+	],
+	"accounts": {
+		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+		"0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"20c1252a8cb33a7a9a257b2a4cfeed8daf87c847": {
+			"balance": "100000000000000000000000000"
+		},
+		"9dcd37c8e5aea3a0d37c5d0a2db683362d81febd": {
+			"balance": "100000000000000000000000000"
+		},
+		"9eff080302333f44a60bfd8c33bd63015c6d921b": {
+			"balance": "100000000000000000000000000"
+		},
+		"c1df2e5de98d5c41fec0642dc302971f5d3500bd": {
+			"balance": "100000000000000000000000000"
+		},
+		"2e0fb67cd1d029cbaea4b74c361efcc06b3105fd": {
+			"balance": "100000000000000000000000000"
+		},
+		"2b6425cc3cd90654f077889ef7262ac2f5846460": {
+			"balance": "100000000000000000000000000"
+		},
+		"28562041230c6d575e233e4ed1b35c514884d964": {
+			"balance": "100000000000000000000000000"
+		},
+		"16eb6896a5a83d39ac762d79d21f825f5f980d12": {
+			"balance": "100000000000000000000000000"
+		},
+		"f09e3f1de27dd03a1ac0a021b2d9e45bde1b360c": {
+			"balance": "100000000000000000000000000"
+		},
+		"2d87547819c6433f208ee3096161cdb2835a2333": {
+			"balance": "100000000000000000000000000"
+		}
+	}
+}
--- a/ethcore/res/ethereum/eip210_test.json
+++ b/ethcore/res/ethereum/eip210_test.json
@@ -46,47 +46,8 @@
 		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x00", "pricing": { "modexp": { "divisor": 100 } } } },
-		"0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		}
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "0x00", "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "0x00", "pricing": { "linear": { "base": 2000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "0x00", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } }
 	}
 }
--- a/ethcore/res/ethereum/ellaism.json
+++ b/ethcore/res/ethereum/ellaism.json
@@ -66,47 +66,8 @@
 		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": 2000000, "pricing": { "modexp": { "divisor": 20 } } } },
-		"0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"2000000": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"2000000": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"2000000": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		}
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": 2000000, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": 2000000, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": 2000000, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } }
 	}
 }
--- a/ethcore/res/ethereum/ewc.json
+++ b/ethcore/res/ethereum/ewc.json
--- a/ethcore/res/ethereum/expanse.json
+++ b/ethcore/res/ethereum/expanse.json
@@ -76,48 +76,9 @@
 		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0xC3500", "pricing": { "modexp": { "divisor": 20 } } } },
-		"0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0xC3500": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0xC3500": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0xC3500": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "0xC3500", "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "0xC3500", "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "0xC3500", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"bb94f0ceb32257275b2a7a9c094c13e469b4563e": {
 			"balance": "10000000000000000000000000"
 		},
--- a/ethcore/res/ethereum/foundation.json
+++ b/ethcore/res/ethereum/foundation.json
@@ -136,8 +136,7 @@
 				"eip100bTransition": "0x42ae50",
 				"difficultyBombDelays": {
 					"0x42ae50": "0x2dc6c0",
-					"0x6f1580": "0x1e8480",
-					"0x8c6180": "0x3d0900"
+					"0x6f1580": "0x1e8480"
 				}
 			}
 		}
@@ -164,12 +163,7 @@
 		"eip658Transition": "0x42ae50",
 		"eip145Transition": "0x6f1580",
 		"eip1014Transition": "0x6f1580",
-		"eip1052Transition": "0x6f1580",
-		"eip1283Transition": "0x8a61c8",
-		"eip1706Transition": "0x8a61c8",
-		"eip1884Transition": "0x8a61c8",
-		"eip2028Transition": "0x8a61c8",
-		"eip1344Transition": "0x8a61c8"
+		"eip1052Transition": "0x6f1580"
 	},
 	"genesis": {
 		"seal": {
@@ -187,9 +181,9 @@
 		"stateRoot": "0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544"
 	},
 	"hardcodedSync": {
-		  "header": "f90215a0ec6330e9082f796d1d40cd146f1c504efc5823b486633f81a9f8ee31e799d41aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794ea674fdde714fd979de3edf0f56aa9716b898ec8a0d815854242c0f817a92beff41d66fc19dbfb2e4769762da7a2d4e49a9cf831c2a0e7e0ffc7d9a8ab82a7713cbf850628bf9a5227d80b0fe75d10b682be74bd90b9a0933423cb40b87bbcc53383c7d0a24d2ce5e8de99f2ba9213e51b4bb86b2fbb27b901008a0200250d21200aa00806e32495058b8880962440b0005dc4900000fc63451012c084c8c6224a0234ded20e96099533b08856aa0288a3bd00666137612c5680400000c4ec3ec5118ca2fa5c40804026c782e0188e4602502500c34460101adb47400d1b52c6884995204ac402d0bc10df7c1929827a9880b4a4051190406049368a1387c24c840a90b6c2b4e48e003e28459dc479c00042184824b2b8780308f3a660d05438a115a68804a16b209101020c0d9046812b61bc8004871b04402b1d904406114120beb0ea108a1cafe6983d9010c984882d2424301200000a78e0b03074ead02004044702412122423cbd2c5a4020ca9ca041998158050838033d8708cce2eaf2fd8b838640018397cc4d83979c13845db0992894505059452d65746865726d696e652d6575312d32a033a7c1a79360234b45773d79bb2d017ccf33414e59502691c87fea0a3ec26163880e5c7838013df6da",
-		  "totalDifficulty": "12517645144159165893352",
-		  "CHTs": [
+		"header": "f90215a0ea51746efaaede944c3397e41ae72b7908c8ce25967c1edcd02618b068486feba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794829bd824b016326a401d083b33d092293333a830a0aee38c1032f191c3d42cc581f53d31adb1f0d91f463e6a8c12fc35fd1db58d5aa0568149713d45e959d5d07624917617d0d7865124c25c28eb9b798013096ddeafa0847bb20a0b62d1d8e2b467c33b28ded6796c556cd2b2a169b640b40e58fd2340b9010048c03883204a1ef0204300012248c8841814900c04362858000450c8927a22a88d5b471c4869c00001d8641080695910c20801022c2910408829a8002620115dc8200ec2851300611284301c3243e091030706068c8160505403250d03f44437410080072a69048082b43070805d08424a021328221500101418463040904ca094a189c801e50000c41402603426c4701a6302e1023040080d8380e21d600a2083003a2604082001b183068d1470840a49008a514148800a08030a8002c821b24010f20ea31c55060582801c14483ec29d4081c7152d2244840016c123da6f42249b6002c8401618a0000a8c8df892954d8080800c160244453086480d8264b6870ae8321581e6cb836ed001837a30a08379e5a2845c72b9c0947070796520e4b883e5bda9e7a59ee4bb99e9b1bca06883c088b374f7c667ed0fda0f1ec7c18890c892b88f14b41f03e7d927bcca82880db92c004f0313a8",
+		"totalDifficulty": "9242028122621986440675",
+		"CHTs": [
 			"0x0eb474b7721727204978e92e27d31cddff56471911e424a4c8271c35f9c982cc",
 			"0xe10e94515fb5ffb7ffa9bf50db4a959b3f50c2ff75e0b8bd5f5e038749e52a11",
 			"0x816e7463af7b5d2fcb804ba55f09e8452182b0ba6c995a34e144245d76333d55",
@@ -3735,757 +3729,7 @@
 			"0x8ed199e2fd654bfc9dfd5e7ea7dc82bea9f4535eb480c95984a5a6bc1533bf8e",
 			"0x4e5475dae57c548460d4ddd15583223bf2a4a2046c2ee56ca670892794a37d90",
 			"0x80409971b3e59ec71deb1a158a92ab6fe8318cb9adebcf583586e23e42d370c4",
-			"0xeb35d7c78965874110f67b77307deae4bb29dc98c01fbac3737409ede61df7c6",
-			"0xd358b672db99b007ac54ef3ea7c77c0eb0b4e9cc1437ca4eb70d71aaaf84b6f2",
-			"0x0ca4c79c1709b947794ae73dd3b73b357273c4e5cfc83ec85c4c2b649e10740f",
-			"0x704635b2335b5ad2be0e586e60770dc1e0548794ee2c1670cbfbc2ed0c1f64ae",
-			"0x6a6f2425c865216b49e7e73026fd2e9cc02f131c0050ce849f274c37828909f0",
-			"0xce31e62ac098db0fef0823941009b826d4e5b8e11f2e01208ee6abccb160c0cc",
-			"0x5669c0e6ccaa8abff08e944fe8bdcf0001dce9c10ef8b90d7f821819e028dcb6",
-			"0x37b59281d4eec501ed45d68c2bfac450d336ee5a18ecb7d2d812763d2cfd4321",
-			"0xfb52f084a5ffd63001f47acdb2ea62e91714af63f896c151100350d83bd2c7e4",
-			"0x67bfc4a94fde6e81b54ebe52914c0d73a053bbac22d6d64862e987e53c78ed61",
-			"0x49c141a8ac1124f40d06c569f49363a8af092d0028b02d8f4c895af2f86d0f28",
-			"0x5c81c85021692d5dd1bdbd3a4543ec86d49e674380a0e5f59d4400902d7e753b",
-			"0x9b46d19b0cee63461453a487bbf855fb4a7d70933ce2b7445d1dce8dbbc11cf9",
-			"0x50fe5cb0ddf34ed2ee8341848bc00df89fda05fbf0ebb1b34d12afe9e5ae4d1a",
-			"0xd56b4c4880798175c2db50c5c5d6845b5c1e7b6b33172ba107f5de075ed09def",
-			"0xe0928a4092e5ab5b9a34a8748c3ddf86a6a9ab50e85777c4e1e8088ac7b44ae7",
-			"0xfcde6d53ff8286afecafa27d608e94c07a4d78813edeccb73a1076772d1f7e83",
-			"0x1bff0dc76b0d8877a9ea133a023a5dc0f88559f16f0adffbf7b4d58b6be487a1",
-			"0x5252a71f6c9784b538ecd810bded0520f349f5aa748657a9b4422474eee08388",
-			"0xc4cccd5ae51babfe8e9f76af2c64227b0fd63bc2f4336b7820a32846516d9835",
-			"0xd07bc360f06a492a13047247448ba37fc9a167bd81ee63607976be269d245e14",
-			"0x9499022a6b509dd05eae2a7c799c332382b810843065e82ec72891b771cc3a8a",
-			"0x0ba258fb2666908035e53ec37a96ee13719779de43f14a57223b704961ef667a",
-			"0x4dec79cac5e3b414aa835c69bb2c580ccc03eaed675b61070f37b606ff4715bd",
-			"0xac640ffa67870bd91b1ff36450256fb1e5f59e65f4ef844875185c38f7f986b5",
-			"0x0af93eccdfbb75dc353ff31949329b3c96ffa93f63e9ae4a515f6e177e201d35",
-			"0x5a2d5ba9defce6db1bff0bbbe4eee170fe3b9c0ecb4a1ec6e16f904b55c07beb",
-			"0xd92f1c26de95255b1e0926341c35b5bfd106820dbdcb381400516d247062f3fd",
-			"0x447ec0cf1a32e8201cb92d0ad13adc6e664a07612bf38ce9c598c799cd947fb1",
-			"0x28460192df35aec41fe3992efc94da904d69e4b65e518fd2c530b38c1ec88819",
-			"0x6b0557132b0efe568a96f77fad4f1e18cf05670c007488052f347cf3461ee98c",
-			"0xb82f3f400a0edc100ddd6e82c2ea587eb5d56ea0f8faa379f8fa259f31ea0838",
-			"0x370b650e0bd14d9e5d749f628fca91ff47184473b6cba948e9ad3492a68bed5e",
-			"0x794e423feca451babc044923a79ceab62ff3a9a7e8947dcadd0d91f78a11cff6",
-			"0x7fe410432bfc7048e6685eb6bf0b4ae9808864a2e09ed1d373dc211f40c59da7",
-			"0x9f53d260f145de7b48c04829abd97989bc11d748af7d119ebf56948ca438913a",
-			"0xad5ad5cd5ff452e16c07bba12f0b34bb1c3c8c33d54db45b515cf6761d6a1cc8",
-			"0xcc6e322ea2c52af09d720524c85629019eac5ca01dcec5da887ad4b32157b9e4",
-			"0x5d3ddb9fa275898453e8430b26270e2812709717898683f0a3291291b29d688a",
-			"0xeff621bef47694a862a320a661b691b491e4a5c44e1d2026c9756f84903a6375",
-			"0x110e7059d20e4531323dcf981ad6cb9d67d56815c54394ab1b0b7af4235aa218",
-			"0xe44d27931b9429204cd2e9cba838f0ed707d5668ab55ecf2c906b2748fa1f16d",
-			"0x9d7166683764cde8445c58697df637cd48e35b3ad00f6e6d4bbf12844ba217c5",
-			"0xf5f6625754100a91cd7283d47e72cca73c39e5fa2e0405d427430bccd49cc2bb",
-			"0xd6b27ee81a557ff5d8947225c19f3ba023af18415a413acdf438548b24902427",
-			"0xccc665895dbabf0d8775c5fddf167b41579b0e6bff8fe99c8da00622334c8861",
-			"0x1986e5fd526af0a0e74ab83cb82c18dbd5a73fe72b94c8ca10318f8f6bd2d98a",
-			"0xd3f245d6f37b0c47506fc4a2b12d85ff87eb35c2f45f82c3e5bebdc7362d8cd6",
-			"0x53b97494c77ef9a843ce61b2a58231bc145b492b710fc3dcf79c297187993bbf",
-			"0x00d4cd1f9460a8625ed0a539257e58a9ab8051ff239172f0a9437cb9f0d1a11f",
-			"0x1c3d92f1e67b04c24db2eb04184ca7ccd5533540aca4dcbe084a70648c347ee5",
-			"0x200e39cb704bcda42f547c0cae54c0dd4c0b1aaf17469d69deaa67d3ef0d95c5",
-			"0x5aa208366dc50c2e9f0075b0e8aad396851f54a42c9ec1114c2994da0c2fcace",
-			"0xbea70811c324fb1553c4fc492521ce062756da0a469d8f98cd6c0f7a3a7b5e3a",
-			"0x79aa191ef9975049a5f2b8b7e2921a3f78d045b99b7a569a93680c5ee2600a18",
-			"0x233fd477509141aed423948a0c5c5b8f0ab8cc3c4836c0f44c8cd6c0811b419c",
-			"0x1737e144530678804416cd7c3c8200f54f395bf7712c9ade8340988e1e123af5",
-			"0xbdad2ae32cbfc13446adfe9e4101f32fb52b1e336c165a1125c917d6c1a1fceb",
-			"0xc20dedeedd63be4c10d92d9d0e7b47e20d503f331cb31d47ec9e99b915305ba0",
-			"0x262281f50e2892d8cfca3b8f8a6645b5931fb4601755f02fb863d719cd690381",
-			"0xb0a717f11ff1e3f1a4bd775792c7e5a75af6e56967ab1615be6b4941ca9315e3",
-			"0xe8f45b1aee0fb0e87148b316ee0ce662ae3bb2abd05e9666429fcf30893641b1",
-			"0xe7a439e2577c4f892921f798efa19353d236146b849c20253b07f03194b36286",
-			"0xf4eda704d4864d8fccefecc246fb683dbdeee5468a53dd11d71d71477d170422",
-			"0x308d977f739b7a8cb4810242fb447a8f6cad45389a127f5822ca2df48fa9df86",
-			"0x3115d6d0f174e00bf3e5704f57e44b62f7e279894ce62f39568ffe4367fc5a44",
-			"0x6b6e6354b8d1e1ab0430fe2a5068b2b2263ff453676dbfdce5da60a6d625f20f",
-			"0x9b8a7b122572f459d946e67a1c78973040bcf67a64327f689d4016c53afcc4cf",
-			"0xa367c0bc2e6029afec518db94fa79288801f5ebf2cba50980fc9754a40784d19",
-			"0xc1a017142eac944b5fda4cd66a9b6b6dc64551c3ce958e8811797433b96ec5d8",
-			"0xc9e3999a3f162d42ae52644ce4f765b5ccc7fe2a4c91cc59048eeb8c8086718e",
-			"0x67c135523c9703aa1f1b653d9279804af4cd81cd3de99e10a853b42d78143914",
-			"0x9af2390bb01b245c65f76454f1c80102871131417cc8fbff4b1ada056d04dd47",
-			"0xf4cec7d4f4a76c769021ab0dab848d668fd36e910259e45094d88defabd13448",
-			"0xe2a224fd4510ac5f8a6782d2eed14ee164e6bb92d3f0a7e5e71497046fe9f30c",
-			"0x9884ca2b5533c36e03fecf28470fd3c45292dc623fb220c5eb0a580781fbe724",
-			"0x078b1365c5dc77fdea6bb010fab6c4dede06e27386d4d5f205bf7e7857b03865",
-			"0x8f930fa645409fc1d7fb28637360489a5e5eaa6554857441c3fd8990243d9972",
-			"0x2e21ac485ed90007e8b69cf247c28b25361729bcc7501a3296f9c06dd0742888",
-			"0x46c3ea9e86ad55d87b6f5d50fd9c145bcb6ca90a4d570c1f86b5532b0762d8c0",
-			"0x87edc87f5ac353d64b0f157ce3e3180ce73fdd1f0ae9db1406e49581f1780de7",
-			"0xc940108991c82f871c3eea33ec93951c9bc33cd0aba1c77262cb6fc6ea16f4eb",
-			"0xba2f1d37cebd9bcde635bee4c0f260af8fddb43a84508f244b562dd1f7bdbe92",
-			"0x738e8d02870cf37ba27db2eb621d5f7b32a225010de41e3983ed389ebaa0e364",
-			"0x84af8e6e7ceb53e068bdf16091bfe966458bb5d3e4a925360411a213aaf46a5c",
-			"0x548302ac8a0af1ef5bb91d469f66f8669cdb2a07c432e7504a806e00487adb63",
-			"0x35bc3a284170d090e6fe053d3bd2a8fc3aa299d113b69b90340ca4c7e019016d",
-			"0xfe7b61c4388f2615642f9ffb44279f31a98c0f0d2f3f37b5f77ba09a67c12737",
-			"0x864581a4e526055847c252f6169bc54b5a1615de8e1cb7e80c649315b04a9aab",
-			"0xb8b4c67301cf9d3e91ae59a0394c8085737358bde297c58688b48a9d33c04205",
-			"0xa1ee0d1c7d50d37f96505ed06b166722f47fdd784b71bb3d47539ae40be96262",
-			"0x63b2658609397ec6a9e9d9d0a5b318b79b1e39348606ca53e0f84f6466d3aad4",
-			"0x2211abc4f8bbd6784aa191805465b10520a6c505d6257063aa9b911d5781fb89",
-			"0xefed35d1327328deece22922f08d3c3931c80c1ea9a8bc719b8226f38823bb6d",
-			"0x64b862e2d5a6c24d569f3352b8524ebfecfd5a3205a3200ec78df72d79a66838",
-			"0x6da8edf169a9c78307258a723c1ac1d96db20a7131018efad16f0606683c0f07",
-			"0xbae1427beab8c3e71cea57e5f9cdd55bc278c6d6073ae2628f0d3efbf9894a42",
-			"0x389bbd1b3fa390e8d3339cf5b018ec64d9cfc02bbcb801acad0857fe377ed83b",
-			"0x819c3a7f682db122c56c004c1128a9e219f13052c9b78e59e838ca850e7ff191",
-			"0xaa860c92d60059cc76b9c07d9b942e132b72940f09952a6ea84e03e0d481a409",
-			"0x3a1ed0df289c45f80aca59d16f9a8fc2363faa591ff2259767965138155057f7",
-			"0xebd67ae495f5d5f4b2d36676bd9e4619043dc83e00766b92eb0ac9ecc46cb9ba",
-			"0x2ff9b30bfee54deed34ac25e2c7e1d7825ce27d270b27ac8350f33e0021a894b",
-			"0x5344883f5098af546dfeed7e76dae5597b6a2eade7eba066c1f3fd2ca37b5a9c",
-			"0xd8220eed4c1e6c3fc9edf342c7691e0b7a09b1bc93ca8ee101f549d1c416dd13",
-			"0x89122f929f806e2f345539d74a3b67a59976a996427a301f608f67e9067d337a",
-			"0xbb288743f3da50ba5ba8c3493e267c30b83c67b77a22df96fb194fbe3d6fbdcf",
-			"0x1f4d12a9c756fd7a8e6a35df39a35888a47fea0f4191ffb303503c1c007f0959",
-			"0xf4a47acf8c2ecdf67bfbb0fa49b02a372e16ea554d7911eba4527647564b773a",
-			"0xc4ea1bb4b007889b8a81b306367ef03d2213a17e44ca13dd0d30f98e0327644a",
-			"0x1da665d430e25a551e5a2cc6b09942c906559337df136af4b81934a14b44f2fb",
-			"0x429c1fac7e8ae535baf1024b797708ab758420bdf6dc73331f2c48bb27edc2e2",
-			"0x3cb6d3d2836e4132b090dc084df9347f6cea34d23b3252301b65d2ae125c057a",
-			"0x82aa375fa96569741873b0fbe883f5901dfc2bb80dc9cf8c77622fe57ae7922c",
-			"0x44ecf8444c6f4cf718a9d785b74ee71d483c02b8a4499065d4822d4c4b7dd098",
-			"0x35879d2288d42165f3329be77fc7125ef63947d99647022cf85d9d78bf5c3376",
-			"0x5119fb54e3eec69ddb94091f3f446e3dccb7bb91d11345f4895734765ce74740",
-			"0xcac39a05efa882556d8f2afc987563d61e1728dc00365c2b19182bfea7e9e1f4",
-			"0x3a5bac1d3d0751d1101245c4fc5594ddf6b2b87e1ca2afe97e3b94659f2d6a6c",
-			"0x433bfa0e7110d38ac86b893e892f3ba7f5acedccc5482a34b6045fcabeb27a75",
-			"0x4f25ccd53e8bd308c7aac31f47ca3b0efc803ec7787904d41e4f40ff1a7c9936",
-			"0xe290ba09a6f6b5a975f2a0b87717d83c64128af3d84ee5a8e3e6b73dc963bfdc",
-			"0x7a4d734fe57c4ae23fc10f17863eaf0fd35b71f7bd1f03196c4466028b143d0d",
-			"0x191c097cb3f00ed9f5f8b8e6cee02f8e8a11c4500f92ec2f99fa2140173f6e07",
-			"0x7f21cd1e87804e63c0973dd9f66e792181aedc5d8cd931eaa1d80d14880f8dce",
-			"0x4ae1193f849d7833b9efb7c615dc7e88026a3f3d01a72aecaa040b4754eb6c5d",
-			"0x84e7bd0b8f59390667f6e211ea89a17a13279190de24a33b744f71149eff9165",
-			"0x5765adf9a49a7594f0e9ed443858f3a822b293cf8bfdae93f36739e1989b1961",
-			"0x80abd196d81322281597ed14ed996987e15bafcb372c5b386a28e5df8cee57fa",
-			"0x24e9ac57c579c3edb8b3d40231436c8a5a4316fa73810855f5cf4a89b858c563",
-			"0x3378c60cb4879b9d4205db9b4cafdba13e9923993dc5e8b155d909ba2bd0b270",
-			"0x0e4e9289f83c3a8bcc6d6a6d7645ca919bee8c278e3776e2085b4fc347627934",
-			"0x2879e00c5e77faef512162ec3b28c132cda5377f72fdec476d0f09be9d002e42",
-			"0x8e0de62a93882ddab17038a7250734c354340e976dd643f609fd497381a3562b",
-			"0x8730ceb5206279126dbebf0676f922f12b5ecd13be08bf301d7d652473f79001",
-			"0x0df58042003ef56cd28013d9794180ad11cfb28485970bfd79f62e1893f39dfd",
-			"0xbf555dc1708cbeb96069194d2d2cb75208ef2cc73fcac3b4f35abae97dfc26ad",
-			"0xa38a19e71f0b7176b3428cd3e635405fb1df56ce3ab60f711521b1c6dd5921ef",
-			"0x7748a206bb39f27841e3fd6caec4c00a68ed50ca1e474cf8a943e99a21013742",
-			"0xb1e82160b63784d3e9b434033c8b79c2f9f8bd713e392581fa7db2290512a437",
-			"0x0569198adc593a471ea4fba27d0aa659361395b18185de08442aba1128b321b3",
-			"0x4821034a9f0e2d3badf586be65a04fdbd035c960265d0f2bd07cc5403e1ec002",
-			"0xfc3b5dfbb770fba26e68a2cf15ab6d9fd0cbc841c8b7e4cb67f975f0d1e9a456",
-			"0xa85944d5b68b690c8eae612b09e71e422f96234bfc55860159e99371b17db96a",
-			"0x704ddeb5089de9f58c7677150ca4dc64b9f8eaeb8d1e24dcafaad48ec910dc7e",
-			"0x223938a7097dddac139a909c0c33880b8da9dc45c86e1493d21909f809531132",
-			"0xa07403c373e4edbdc13e207241577de01d2cc9baec6529ca28afcdef27ac04d4",
-			"0x385fcf679306dad9d1d2323caca5d17aa3197316bc4ae3dbe126a7f687280e13",
-			"0x81c27cce7a06b71cfe276b0440865cf2c0f444bbd6904bc30f2e2380074d1020",
-			"0x2fbae35e1c82c0d8afda61f1a0e95dd5ca47fd603450a7f2fa4fa5bcd73ac5db",
-			"0xea14be904f027e364092837e583dc19500addf6e5ecb59af1dab4cd0a132a04b",
-			"0x409f1a6a99ff08ac262addb8ffaf3fb3d08db086716c92bbccbc2b8c738b8866",
-			"0xfcd3cf7e04c6eabe6c648368cff1ef62ffff8fd5f3279176781d2238db715f04",
-			"0x5f38c3238f5b52cfa9f45249651e468a53a2b62f1b62a5c543bd663dbae07204",
-			"0x265a6954be72496fec70afabb4224f7ce4258caeeebfc4c6d27550e17cce58b9",
-			"0x58b2fae8d925846b08310b557ca5b7262a9ee1f3b729863e699fbfa91ccb9ef0",
-			"0xbbb46cd133cbbeea781699fe620831b93db03bc3f7d77da64c0367fe5d8170a2",
-			"0x9b57cf784efd6d4d484486ed7ac6a7093fe0fe087931eca10e9f7a0084c4fbbb",
-			"0x1ef9d5604fbb21e365d259c10b0b24070a5d5ba4dda6ab44f37337d62c4a84e4",
-			"0x2502589834ad081fd22d5df57be4047001ac7df36ebc5733bca560ac5e463b02",
-			"0x425cac90caa07eed1eaa6c020bd2d7141601b5d007fbd5905d455fa6e00cf804",
-			"0x65d3376222597121fbf6fa541998a61605f8c344bb68b646c32a5d10a215f955",
-			"0x087c94ab1aebbf52e158c0caf0ffb1ccdc179b3d3b9ce136653d6e72a918e96a",
-			"0x5524392fb09e03a0bd8440d8e9f038a82954f95332bf4beb8f8e4d5be6deb904",
-			"0x134ac78af0626fa56dd62f27ea658570652e5fc3c627c57d737d178a31688f7d",
-			"0xf2e565457b1d938a18a8fe1c3732d70386f9344be91380d8cae740ffccdac58a",
-			"0xc203bc327d1085ba09cafbe5645657d73e64450ed314dac5c84e7f356cae01de",
-			"0x9c847099e82e8b2c1be8a7cf440ecb85c8cc20111931c0bedbb7ce778c7404e0",
-			"0xc22206c94e653a7439faf69cba997d9feb1c5b34829bf00a4c85d0adfe79d911",
-			"0xce0d9b43dce7b340e847e7340aa7d58c03b778a57e493a8f8dc9d63ccb06b6a9",
-			"0x20f416746af1522273b7119f31000c4848ee66597d5945492053cbcce359c6ff",
-			"0x9f789bec24566fc2ee6179b336be2b08e67fa39a367787063f07b7424f8f77f5",
-			"0xdaff9cecfb864d02ea03a7fc76d24760303c1d28a93613bfd659dea6997d8cdc",
-			"0x522c6b0c2334ddeb39a0fa8092851535e6980e3bfb1ceaccf86247ca4209c392",
-			"0x35e1440e9e6851ec26dd112b07761023637bdeb54c9a4045475b8616eac8f2c7",
-			"0x160df7b24ed8a0d4e2d6556add5318aed08656dc2f218b75badfa7dcd2d6085d",
-			"0x1219ccc41d673e6e1d8eb1e2a1edf6360318a611bf5917f40394216c3398af30",
-			"0x5237d29b94e6427a41e552dfa0db1281381a6f7f5eca72134e1638a8a7acb790",
-			"0x596d64fb8478cf32fd3d72d70c4ddc8a348b4d2aaefabeffc906a8ce656884a5",
-			"0x6cd01fc463582e85e433263128bbcb75d8cea197d650034bdf0ca0fba50abf92",
-			"0xe879011882783b1f085cb14abe05fa2fb008f3f25d303c96532c7b63091fcd50",
-			"0xad0e0237bfc7ca75073ab1328770fe3fa2099c7aad98d659747446efc271860a",
-			"0x1ef22d01e144466d68c09600e54425756024d95f323064a7bace055678533223",
-			"0xeb4f046e6c9eafb07c8615513b096dac0c30a7a9983a9b9d282ced0502baefac",
-			"0xa5ec8188ed11607e0c166d809bf6f4a624b63a04cdde6c9b38ca991cc363f07d",
-			"0x757cbd504e40ed1fb80967cbfbf0d73d649f381e07d3d774f6fb6a958872e13c",
-			"0xa9d67e8749177c72fef84684a3ddf25f280e624fce571e202eac7f4713675f07",
-			"0x05fffd3d981ec6411342264732be62a03ced7c7fbd2ccaae53fee75c81017316",
-			"0x673bf4e2016572077879057f6d122ad7e29da0a17c62a97679dfc6913820d42b",
-			"0x3f3e2d80251eb582daf8057af384c4e4a419873e1fa8b9ec32a6ed7054de1efa",
-			"0x860291469fec3ecb7c78b2a3c291722f43aaf747fbf3bd88cc4061083516b64a",
-			"0x3c30c64ffb77b39132c64e8856024abf0736cd2603da0091f52f1e81983e67ba",
-			"0xae8e21ce50f85fc0ea64696b973f53ae1cd877d64e30f13904d15b34d4bac6c5",
-			"0xb4ca3d97e33e9526ad1c7796a7f9efa5858ebec2605d1367862c880f78c86272",
-			"0x6c20893dcf39f711700bf6be5e360ef38102a7f7129ed83e24c5fc24f42584c9",
-			"0xd520870cbe314b46c1b7edc21399986870303d38cde9cbce3f4e25807124b1fe",
-			"0x9a24dc78fdfaa16af729b4b27c324a95068b7fd09eaecfa6564c7a815b8e9084",
-			"0x9b8c6c28860af11376931e082ad7bf12b0cb75f2582c8284c6e587ef2cdb8842",
-			"0x656f2096414bd7ad74c7abc1cd8222c61697b15ad68d7a5e76c1dc41086129c4",
-			"0x95bc4027611b90d1fb1ca0eed5bd326464cd1e4de67ff8640683496785c38c04",
-			"0x20e3c8545a8c05022d3b83a1bcc94db7239a6f509f13053d19b8ff7db126d093",
-			"0x767a60be20b494d792b1d4ea6fbc35f4affa633841f7f07f6c95b8b14ddad8c9",
-			"0x521dbc01a89820776a38d4989b6ba794d7c0251ad939dd0caff9a7b99579d0ee",
-			"0x814c1693d5e763b3e91b49ab8c192dfac0848993839e2cafab76e5cab13c6f7b",
-			"0x6626910d3525d978e25f14a92e3e2795dcd2f7844dcaae556127716ecbdbf747",
-			"0x685257b9002ba7808aed5b69dced6fcf1eb9b75e1e3646541aafe90caf3ce1b5",
-			"0xaa3d255fbf57445aca9fb45babd6fb58c89a95c6625f6b80601bb656a5eab344",
-			"0x2795d9516f8f2f15da8904741d24cc0675803c9a7ddb342fc66caa7d5050bca9",
-			"0x283f89476887c625c534bd277fcf5523df8ded877479517728358b71efaacdf2",
-			"0xc2044a35800edb0b6848341004928307ed023660fd22d7eaad2422146cef294f",
-			"0x01d35757346541a85a4b86f41d1b5b21701c1efce3f287a034497942483f52db",
-			"0x43d7f8c173717cfdbb3cbf38cc8cdda9c6ea8f05bfd435efe1f74144c9c84f24",
-			"0x6463d12f4bd83d544a14948fdce6c7e9e0da0e9812bedfb314b6e91157c0c682",
-			"0xa7cc32d879feab7508b84fa364fadc0af5a7cb1164b61d7d6cc5d7d1a76c32eb",
-			"0x37cd4953d262b095fa8a5a0708224d006ed9ef93d1ee5edeb285d410c5d86a8a",
-			"0xe896567b6be24f3ff1d962e05015f574443ac86c58b07bb943d12255cd94ed11",
-			"0x51d07ecc06ee4be7bc9700631ae07818756aca34d1eb2ac6eae7112ea9e9df41",
-			"0x72ba4e79031a1f2616b8e788fa578b9ea830e08823467fc875dd603badf6b79b",
-			"0xe06f71635f9df9bcecbd6553ab32f1af94275d8ccd59d1969c248822e3b6feb2",
-			"0x0484a049e43ac9f424ee9b2dfbd4c5932cafca539c1bec00d32d90561746e12e",
-			"0xe03a17de161d63503962f3d5cfaf28cba22ed622cb88547c8224509e77e2bfea",
-			"0x203acc2c14b68b80292f381fd440da199c9f8f0e043c42e0b0adc67be71bb807",
-			"0xba3d7f8a15b76afa8a834b44a922332713014a5d5ec3e52f729007c6717d5324",
-			"0x01e4a4e25bbfad7dbb0a23adf6fc873c40561319ba7bfbffa3c7a379606433cc",
-			"0x6252660ed44dc18d448fc1cf49bbae98c4c31817b6e372c71d45832556261a1c",
-			"0x1442a2a2eb665994c951d8134726c91989f7fd13145ca146de4e87a203ed1c31",
-			"0x017e10ab064887aaf7354bf1108d6946d31b435838a56d5c43bd70d3b5fe7c6e",
-			"0xc9f0213c74e6f3ee3bf7505c66620b61b147597ae8a4c3f0324463cb57d07f78",
-			"0x321a1e72fb858b8df990639bb7b05e10b7c094772af92fea9a8882b84a91d33e",
-			"0xcd57ed7635c2c59e8d2fa2ff04afc2c851d1a792fcf2e0192769404dd96b3be5",
-			"0xaf89e85dabaa1fd91efc15f0a60e2fb10be92c6ab2d726d6f7afc8ab94d5639f",
-			"0xf8425ba5813b811a587ad8b9fffa64adc22ad5660ff77a94ecaf479dadc7deff",
-			"0x9d602387122f2c064924d32fa3a62ed2e39dbdeb570b55af7a6b138534ace4d1",
-			"0x2569b3f2c09c18ec14468c4615355afd9fcadf2bb6c9d527e4a3457a068bb808",
-			"0x96a695ce507be20ae2636449116850e8cf86485eb756bca499aca80790c3dd3a",
-			"0xbb91a27d4a244d199c1b9dd22d0a6e687fdd340731c13c7016b7009ac49771fb",
-			"0x468a1b2fd3c8835f1f1b7e16f35a5a401cd4e7e0e50920198cfd3f27b5971f7e",
-			"0xce2aea8f42295d49480f6ccdb2f0c2d33af2b44f1f3b0b4eb45e3975397ee264",
-			"0x786c6d63ef22e083b0aa3c1cd2de64c238efa8963532e84471ca40a1fb210f4c",
-			"0x86f90dae63767ef7819d0c779ac362b2a23e8c457bb7f5c901e89dcab8a5ea14",
-			"0xf689fdf55a5d1e1474b9dcb1b591f14448cd017d2d708bc522157688a728cc8b",
-			"0xc4be4c521cc105651c4a2a0449d206c2d7052123d06bb02ba3afc1b22d802177",
-			"0x64debdb7293aaac3e610bececfcd7b53e103c27b03173f0cfa401db4d385023f",
-			"0x3d4b4017e6ffe74f2a96cf8cba7b21edd627ba5105bb87e79cb1ea88b3657366",
-			"0x74161c9fd283d80490b55731ddec4ebf2a1e328e518ac17b2526bb93d069ecdd",
-			"0x89f522f48230fcbe9fe87ffff8201ce5fd853bf7ff6536d3299368151b833871",
-			"0x090d72bee8471c51275662ac2fbe285e5a52552348af1eca33e657fac448db8c",
-			"0x2d76427152f13ec917a6e28430ad5f0f0e69b5abba49ef432a90c4fc2a875894",
-			"0xd490618c0aa63e1e963e457c6be096bb5242b10765b4797df232def9d0269aba",
-			"0x980445545153a80c8aa343a8874a80fe7fbb7beac68e58d5d90c4c5fa73d7e9d",
-			"0x0eeb2df77b486bf20203c9e80981787ae439fc38f39c583ffef93ea0aad82358",
-			"0xd0897e799d1152432c2d9cbfdbf72d2e522af23766e7ff93d51acd52ed869683",
-			"0xe740acfe918c168daf28f9e491cf94b3b168de4e807a80b5f1b097beff45f206",
-			"0x125580c9d014b8cb50a56f8a14f10ba4360fe448f18aa86829bc7f7e1cccbb77",
-			"0x7c9af1244e12d298778b3320718f096faabed0006acabdb0289bcb7b5c2bf8c1",
-			"0x76ac2ad7e52c2a1e7b23f03f21d607bb634a4290b800fe479c6c134c87d41703",
-			"0xdfb4b41974d53773300949ee46ce3edd2b5ea0f8be55d87bf9b2d1ba21dc30e7",
-			"0xde87fe285a4fb2dfe40dd79462488808c6efc4ca3cf26de46f3ac56c4fcfc0ec",
-			"0x72ddcbe95df0949ae31eb4ee5d532587ec1d30a358a3fa9588dc6749f3b0b673",
-			"0x4da323bf0509116d1dedd6ef0c486838a9c8fc7bf0d6f2899fa1c43c89791a5c",
-			"0x6ab3c6c40001407ecc8b5926692e6bda176b5d9685cbebf72a69a8bd01c8764c",
-			"0x85e1cd7421da9343f156f573c89d477f166cea452287d9cb8f19e71feb570cdf",
-			"0xa8f06a7f39e85e9e3c1abf454940c9d4a658f1d5df827935376f556b90670c53",
-			"0xa6ef83d45fe75050512a767f8d69b74a59a43b2d12a03204bea075839e9401c0",
-			"0x92d440c5683f941accc4b575e884bc402fedf6499b1a9f74e0500885eaf211e3",
-			"0xac5536524cc38b40c8f0b421af9eeaf9ed78be65bd1b180a469008d5b807cc1c",
-			"0x00bf19f0ca582188040b38756dc88388d1aca7cba42aa89e513628a433156b0c",
-			"0x220b5f691ad4fecf71e471a845862097fd754bd0ffaebc204c048aa48acb2bea",
-			"0xba7174d367fd0f9487aa9d1f2444a4fdf38f39d3686d7d41d18b0671653cfe6a",
-			"0x04e281d09ab1ff8fadd252a22c4682beafc436916ac90f81ef85d3c92fefe628",
-			"0x4aeb3ab7be3dd495dcdc78631a3cfece68ae9797bfbc4b5ac6ab13002d9fe6e0",
-			"0x0fd273deb137dcc98c8bc54f13098e355568bf56077a58f656e4c22e51ab0360",
-			"0x55438d435628bef382426565cad284695ebffa4ff7485e10c91c0988ba20ec25",
-			"0x049e4a80ef77096719ed90d324174d50a0f84cdc3da0c45d0b122a813028d2d5",
-			"0x200e2da004718c48d4850a0c5ea3fc9821f820af0cc24b733d80dab98d756ec0",
-			"0x9da660709c2b4ab2807df73bc4d11cd75a102ff5d47ded6781ad5a293ce22415",
-			"0xf29ee2bc658cac2d28a1e5809becab789b329938c3ce314bec172c6ae3861f4f",
-			"0xeca0f045b3777c894d3cc2be518cbb06b2f54c4c9d02374e6d27de0721c471f4",
-			"0x804b27ccfd7440ae1dd05edc6acc4194a288918958541de596530ca2b89b3b54",
-			"0xe0805890aed8a60e2e60d2bbf29a2d130c64ff69a82e3a78f63c9e483fee94d9",
-			"0xcdfde2f6274594a0a67a6d7b02dfa0fc735842c28b144a6859ef6eda842d6669",
-			"0x5e80068e6aa44fe7d9c810607d90e13bc364bdbf91255fa4675a7264bdc38998",
-			"0x622e0765bef88f51dd013b616f40fb80c6bbf6623fb226d3d811af52e4de7740",
-			"0x0ee735a5e83a5191c4e531c603179e90381eb43de0abb03e12e5f8d7b821031f",
-			"0x55eacedd69481b311baac1d17343a78a1587454e6acba2edbc560fc1c95ebc6d",
-			"0x2eda26ac17139e750560a6b705f60a4408487668df17fdfa29fd1f3d3fd76aac",
-			"0x18a465896c7cda9912dc2c7ba459224a924d0feca1d49825423277902b7a0094",
-			"0xf764b9bbab0bde6ce1cfbf84a8c280f1524f396aed6fb4569f59e2791afcf27f",
-			"0x7d7fbe746c72958cf2dc3d5b6a7f2b680c0e47247e9697a1135384486640a736",
-			"0xcc595d1e98d13809ed5a22277ec10f25f36f05ff7ef1aa91de45bdd471ce76ca",
-			"0xd9579a9c16117e08e441401696fe4b3687b40179cda267be384d044d27fea705",
-			"0x39c73747189563c6ee22de333270178803b17b5d1e300732143a3e553ddac6e0",
-			"0x52049d4f26ff9bcb9b4444e0a3d4551d2e68ba31787f1c69722754004e6c10c7",
-			"0xe15d9b70b804cac3efaf1eee6f980b146f2753cca6f60a338800fe67cbf47db6",
-			"0x150feb1be780bb1e166b4f7b54bd01434820fcb8e63244d259a56bed67eb1fb4",
-			"0x48441f61086ff68e3d7ea203193df77565ff8c846a5ef3aea5cdf52ead82c6b5",
-			"0x8fd3355dbe04679233da0c0aebf896128245349e8e3925e2f4b4e044ece35654",
-			"0x22395d1a8af82cc86af2697b45b86df13d5af07eb790a96624383d2d2cf35fbf",
-			"0x32c13c2498ca202482c0b2e7e5ed096bde4c36cdf15dbc0076042caea180d6ba",
-			"0xfb3fa42d8cca9e62d1226bce9a8a3d8e75cc461d2b34979751107ac656130a4f",
-			"0x2860141a7eb70cb951b3f45f13dd81c95ac8d86c97ee354e65c2ff31ad24f149",
-			"0x7c02d5bb3b990ac7d5c6a7f183fb4c4e3d2249605f6d963e12b6587e665bbad0",
-			"0x22a79a905b70c40eebf4aff3f9a595458e9e5a585ae7a18a32d99cb369cdda90",
-			"0x8e10f60b08c81d0ae43a1932f798e85bf0bac6d22ab3d399c22d1e3744134de7",
-			"0x03d6dda99b12d94960eeae1f67dd6ff8f41102ab00aa7b48055515262bcbcf01",
-			"0x2864090dfb4a667388f3c51dea1daac94245f2de71e804bd7e9f8c4a6206a827",
-			"0xf64e0a38264b190f611d8afe030e948064af722c1d85a16e3e20a5c4d6c9153a",
-			"0xb7706df2d787d33c13f2f100cdbbeab68dae726cd5a08a046d7fa8b34b029a23",
-			"0xf91f33d36525beb213fe0761808dc89921ed0d52c5214d704acbca639098622b",
-			"0xe1825f2cc40a1fefb24edbb3ee31c5118448abdd237a6e27f364623689a70a92",
-			"0x051450e257cd9e5d03081ab11de949a52b4391f7f7179fabe0e7f43e0cceded4",
-			"0xd09a4642c0fbbb0f29af7bf0ac06c080e468e2e287d1ef74e388163d5c0057dd",
-			"0xd7ff8cf1b7744f7c2d79255e5288e8a2c6b58ea7aac62894716149f42f3e020c",
-			"0xb108bbd52148c62ad106a9cd35aec9d8b111e094bbfcbb4d447745f8a54ae8fc",
-			"0xa4794deee36a670394a5ec4d908728a1796cea8c8564f61e41201a7ae985b0ab",
-			"0x4fa697253bab92379a876446a3af734dacb965722d568203a1194e078777c364",
-			"0x4222754bd0a480cd4e1bf0c9faa267d17a941496e557c0856d2ef9818f96bcfa",
-			"0x8ee7c73f3d4ba9c2764cc6e980f3b9a53fe7a1306c415c8fd8264a33dd5622f1",
-			"0x17f40c4b7109e2aec6c8c4eea793e196bc96c73f20c963a923fd311b23814590",
-			"0xc32018615cf1253161ea102dce96379f6fb9791e8008d75d86642f21bc555b3d",
-			"0xd38fa39699ea67d3c4892094309335ec3bfd0185790ad117d197866331a294cf",
-			"0xa770de6526cd0a07d0337cb18e371fa33a6ec0803203e54f1c93b276d1bd24ee",
-			"0x7377908db9acdbc040fd248b8ab85eefdf7edac2efa6ca90535d4241c2286d46",
-			"0xcb74aabcd157c732935f0d8b926ecedb3b643ca97ead5077301d2b4768324908",
-			"0x3885f8b2a341c91cf42d459a0f9e81bc11bea8da8e0080c884e357d79f0143a5",
-			"0x1c56ed46627a1c6b2495cd4d94473920b8a249c951b227e24b9bafaa00a3575c",
-			"0xc2e5a1d6afe982eaef9f35cfe30b4f80e224950c094d9ae39430476988199c98",
-			"0xd5c27345331cde1052278637de22a243e9c5022d4edc254cffb7c574615e661d",
-			"0xe89ad382c17daf957f02a2472fd509eefeed4a10317ca97085539839a80bc5f3",
-			"0x2bef80881328dbe76f8f87a6f7285209a1355e9400c31fe1e915d5a0323efec9",
-			"0x0a79f2fc887da96d5ea26722726d83506c1d5fcbcb50044ba6f74336d9ae8609",
-			"0x2d79e9b35b5bd7beb0bb392a4db71331c4bf41210c26e2a0f5e64c4de8d659f8",
-			"0x3a82b6fea11f99de12f1e39202c2fd69a21ea2fe5f4d1d62500ceee7de29c88f",
-			"0xeb1139baf2c45e867787be6df45acc8d21686cb21adb1f10866ebb1605741ade",
-			"0x691505332d0a4c6af51e0c49f11d578f834e961898279a21b680438b3dffd917",
-			"0x8cb46c9273d3ccecf1ddcd4cc86b9ae5f1e1bec57c15cd624853c2333aa7184a",
-			"0x06f1cb0b68758ada524d604ce8b6d5c273eaba7304d8650687869eb575799362",
-			"0xce7464c87dda228032c88dd3ed29b41524e847e31ebaa76b2248eee64ca41e70",
-			"0x64b6e5039609367f5c524c0d5266150515cad29a8a262c76614c5086c83f1bb8",
-			"0x76cbd65dfe8dd8eb21996529bfa0663bbcd851b675314ed4855689ed9f120939",
-			"0xea80a1c269e36cc9ef3aa3daa051a08e03deb23add31dd32cff7bbb86f53c8f3",
-			"0x575ed304982a8b6c44b3f6dbfad271ef13c13986776abfca33a9da2727f587c2",
-			"0x5a969beca5363e60be1c6ba433f6cc037806e1c617c78b9a3115d47d2e87865e",
-			"0x2b010bbdd97fbf30ff7b48263c8ef58690a2de5b4cf170829fd458d2309c7c09",
-			"0x7bbc16e0933d41a60d2fa96563ffe099fcbcb4427cfe884150f645f25af752b3",
-			"0xba7fabd6d879f55a747a3427b3b2c5e04917b0734d693f759c2ee5fe235c8e6b",
-			"0xa890505d5778b78e3dc6c9749e8c9c80e490aa84bf91a76f4fde2d39a8e68ad3",
-			"0x36e27f687d02db5cf074ec89896e557ccf240d6c0271b5858a6af8b2661104e6",
-			"0x6a18097d71c66f0564a0fd27b05346d2dc74ccbb1ae123ba575a2bde54f1e810",
-			"0xdf4b61a51fa7f576c212aa0ec1a93118668f8c5fae5e7a55a27d2d0033634734",
-			"0xb572f4dde7b9282f92de5efa836b9d8ba82476c229bc669eb1956e05a1a02923",
-			"0x616b7d8a8c29a6dea339ceb8241b86fead820cdbcee279f87680b9973c1ccf85",
-			"0x3c59231ae02993318e8244435bf7f51ad352ce971a2f174725f2c2456bf62812",
-			"0x66e778c1de1503722d7a610003596c092360261e4eff24c54f218baf5106a8b6",
-			"0x5b372b99a39105ab048a83fa36f2ee79de9c920addaaae0cfb5b569ed92d0fc7",
-			"0x1389b29e130b37d8aae7dd19b46f216c2ca8d8562c7e04be9113ace816b772eb",
-			"0xe947c173f63c2a4b5bc1d14617dff02d6221915debca30ce90af9c63123dccd7",
-			"0x18926071dedc42086bc9c90e9f3e80ea1ac09981677b7c8d75159a8b11043501",
-			"0xd196e45da07cd27ef03abb235166e4937b6027c0fd6de42ed71b5d9ec748767c",
-			"0x81440dee93f1b7ca2d634549e1f21b834e417df97338c7de56e2d630f15e662c",
-			"0x228a10cf2a02f134998dab3ac59a71a05681640f115cfea4dccc67baedf4f746",
-			"0x5ab8b611cb2eef244571059e61540fd338bdb1ee90e7ed7e5769e67f5eb2c793",
-			"0x3f044afb403947868f4d2deb1dce168dc9332451c1dd1bab4e94e4ff6de5bba7",
-			"0x6212ebee274a505464940ca808dc61d1f1a2df76820ce3a8cb9c26bfd49b67e2",
-			"0x6a89fdde963cc5b696beb902d174b99c0cf8ee2e2208cd8f1f25965fc2d7368c",
-			"0xbc5d4f775e4925e2201214b1e64c7f5080899125a01961b1e5a3d29aa6158d26",
-			"0x844b1f9e0da0aa6dea81cada5255248b14cc4655d739377feab11d99b77f48ca",
-			"0x8a972d2e563d3baa95cac6c73b23bb04e57e7db2eb27b2c6bd78f0f2b2285a17",
-			"0xd25370dc166a5a4ec801c652b9eb3b7f17c9c76f898c6da338dc686ea65fc108",
-			"0xb1d6e05e234624e144fd8db5189ed47da5befc84581fcee92176951aa7a6adc7",
-			"0xbae505f675148669eb640bb1183d5235260780e57f62398b244a289f6e920593",
-			"0xfb0cdb77ad3ad6dc5feab63979743a18d72aa7715f9e3518618be5de6c724d5c",
-			"0x78964f3f2e28bdc1d9f6bdd9c424cc8b211820f23bc59d61a00a4f5089eb8553",
-			"0x81985ebb740817d81784174ae06e160d3d37c1a1fd4b79b665fba428e6adf199",
-			"0xdfe038aa48f96bd190c570b92bb9771b49556a8e618bd17a3183d594cb303297",
-			"0x4c2866dccd714ca6e233da2349b91e7fea7dfd0055675235788e1bcc012fd297",
-			"0x4d9e866bf6bf2545608734b914a55f247b9acd17455d1262f6a352cc46499ef7",
-			"0x53be82bf17d1dc0d3d5e50be3a04fcf2f5191cd3547ca432a7814c038f709a82",
-			"0x1d5cda51a57e81d33e3caae568b083bb26f71fdb23fb68e1f7ceb4444514c13c",
-			"0x35633bad7488a5c222d4fcc3111768fb7c126065ad9b32c49dac3a44353539ae",
-			"0x857564f5cc2b7385db6cfb22e41a30047dfbbb333f5e2984bc5826805653e364",
-			"0x3346a3292d6d1f716a13fad02af61b18f6993d277cd891a162fb6df932333906",
-			"0x267114f270cb5c8d7be4016d4ac1e6950cfef777e36e746829963c9c08fa604d",
-			"0x9b133dba17f550b709ec7891bec8ddaa99a909482ff50dd1ab0f473a64ccbec0",
-			"0xbb9d1242e6dca8ac62b9cf77f5fea02bf6ca33cd8fc60b75370eca5050e7e3a8",
-			"0x4b03fff35d5eb647982f79cc8c6fdd3514a8b2d95d45af83a06352a9f857b770",
-			"0x1251e1e7d8ba37f5ed242c045d14bcee63d044bcbeb300d2036cb746675777c4",
-			"0x3ea4f140b4dc19071603745962ab84c2751c9fa7add74f165cc4955bd0a23384",
-			"0xdce6b80eb188a9e240c73c86c13554c89176a0a3a322538480683a9f1187e518",
-			"0xf67d61c218998a24048c4dd68f903190a0072c80066b53e34df7e3a837e18339",
-			"0x9f886a4835f3f8fc010ad96e3e2a3004647c0f3c744d98d527980383975dc6f3",
-			"0x8a7920678b5f2687620340ac774f00239e48bfe1cf443c795d6cf25fd885c98e",
-			"0x16dfb4a0448f4b05c18115f6e2c128be6d6596b338723c912f22cd80448de1d8",
-			"0x497588ed59d0e9b9733bb7caa08fc36deeaae3396bd3922272d69f4861f06420",
-			"0xd96c89c40ba3daeb23f18a83471be008dbf8cc75668a72bcf8d02cefa1efee7e",
-			"0xee4e9ee2ea8a057649b9105c68792f2479b7eca57276211d70da3097a9fe4904",
-			"0xfd789aa5a980fee8a509079acc5ad340c98faeaeb31a1774683b93b1753289fb",
-			"0xf9e19259a14a532c93e935d252145d41988c16faffa4a185df11ed5f23715d20",
-			"0xbb0b8e1c03cac49cf3b45bc031a229334f9f25aeb59d410a12fc17c7e78f759a",
-			"0x5993b045dcbc40baf27d780c48b881c864f9aa21a9d59b0d4ff0377aa64e7c7a",
-			"0x726dd11a76be09acae4dbe103f0ba092d654206dee07511d6ac97c673437d26f",
-			"0xb43c5f0bbd52398157dd6233a5d8a03c931166150df21e8643f02b6c767239c4",
-			"0xcad3878512998b146cb2c6eb61efe07206c09677687df4198d9174c66e3ef3c7",
-			"0xf8a7872ede6770b0f48c924888c3b4d1b410639ddf98944561f837acee7c21fa",
-			"0xb31f007ab3deec8e37f7b70d4c5102a06eb9b37abf384ba3da0d7f32d29d320e",
-			"0xde77b2e81f239a80caeb44731b1f272a10528909f7ef6e342e36dc29edf7373e",
-			"0xa9818a101b730940a6b7698f76d6c08ef7720b12fd267825202355c3edeccc72",
-			"0x962cdb425d23201004d3f39a045e10aa39994fb8425aca3a2298b4ef1c9cd6ae",
-			"0x3c2a14b29d91c93978fd5a178adf3cb1aa5d60c8eb0b60d4c05f3f32b79ea42d",
-			"0x86d861026e8918c570c3190e57244aa89be34d57aa0c0d4f65f98abbb547b255",
-			"0x91e3b5fdda9b9087f6d267741a383c6c9a566851e03501d9090228046d793a32",
-			"0xb8e4f9fa0c7ddaec74a87492af4679aec824a08fc3fb267dc6f41b764145040e",
-			"0x7da2db73f48b0ec869db149bdb9ee85f50587720cb0fd6a765a23586f47e61d0",
-			"0x04b81ae4616337f5a09700eafec29ec84af8b0babd528913c8155ae3a47545e2",
-			"0xd2ca213e6a01e43f2eaab755003f25512fde5c1fc9d809c0b6ec437b194d5899",
-			"0xaced62e93320daedde74a5aa1f72739698c286f9ef4848b7be0682d99fcdd385",
-			"0x4e2f1707f429a5be0f52b39936d90bd3faa1693a4c18f0926cc300e2c2fdf8f4",
-			"0xc840e1e29894fb3ff6fe5572075b0a1e98e33b251fd8dd5996cbccf041a48b4e",
-			"0xe3d69480c26d810001a144e37f251e3ac4bbbc7558a0550a4ed8f8d5a06f09f7",
-			"0x7bf69d3d3bc804cc504ef7d37fde00fd3649dcc2853541507585e40b67bead0b",
-			"0xafe6cfb04d00956f24e4ebc3e9e0a23e55b044bde113654a5787a8c05add0a4b",
-			"0x3d050577e4169f4205e19f28f309142665acfd296c2ab5c234b6b5acabab07be",
-			"0x2c74c7ab90ae5058daed0c9551f0c9a52a9a5b10871fb0f71733fa6c39969882",
-			"0xf3d37db16c16218aa47b1ece8b7d178c42f1d06ec0141cfa0e5ffca27b21969c",
-			"0x5894c5aea4a461941788104ba38e9d8d39718ec8e4948c2675d83195584d1df5",
-			"0x564b9061ef80ed588a658fb138240e5c6356a5e1bd557ea06f85b4507dc4b73a",
-			"0x6a802d7836b1db57aa5b6c68b43fc072941e2c8090e73e26de86a0956eda3876",
-			"0x05fd4b6d5633a83e48fc91638d3f39cc6df164dc4187c78c19f4bbe78dcd12ee",
-			"0x481d0df4eef16c19e38d8a08889da1c2279d56ad2b6c6961737585686ff42280",
-			"0x0faa8363d77063a3ec76a6ec5786e9d64e0d028912c3ba5272c06cbf7c1d7c52",
-			"0x2177ca5c3420989d7493b28534489f2269f28e97ba167772bf5d17e9f9efd274",
-			"0x0694512d03ba47a5f36d024abed8ce1d15741f56c32baf7deb5b9a5e3afe66c5",
-			"0x38364d47d110cc930dd32fdc5cb7aa4e96b88e783b7060d2302c8235da7b4e8b",
-			"0x7f63e39e98887db4dfdda2cdb29ef716425f30480371beea60f2f70a8df7263b",
-			"0x4069d32514b8216a07b21c23b75cb63f12967dabec053304c990ebc8de9cdb99",
-			"0x954da7bca7ec16e62189cc6ae2878dc347d1677895cd978f2dfaf31593cd6bce",
-			"0xe9eeb5d86aec47d3f43f2b899fdad816b0c30e3040cfad14fd3e821cc6962ecd",
-			"0xae81c8ca19bf6b92752fcfdce9441f7c5b540d911a5e4315e561e9eb22746a4a",
-			"0xc84bf9c8ea619e0658ff70101fe588dc385e1e997349dbe112d66968ed672113",
-			"0xb113ba865fbc89fd495934f9139731222940ef72804eaea010f12ee167406fa6",
-			"0xf70a9e70e90a08c8fd629ab4fe0d1497896ab2d5e00852d18fe672346e337155",
-			"0xc1e671394b86e70459a39449e8ae9cd0b3e05602639e256a9da4cc3c047f6cf7",
-			"0x577bbcb4066d1aad7cbb75b5ce0f8f1bd7885511b1a7652b8f8600492656d673",
-			"0xa836b6615e1a4b6e306399e9da4d2c661985446822c8c05939da1a35414cd328",
-			"0x7042af635abf9efb3d9f5d6a2d25e638b6e9b8c6ad61591a7f88cedd4b0667aa",
-			"0xffa0e1f57683d082733344e57ef4aa267dac50dc6d72e8f36125e7ba892d19bb",
-			"0x2ac6846383bb7ca0ec56883b797c379336d64d9753a16ce48ad14d4086da2388",
-			"0x21499ae4629bccd17845c58f7fd13a8a72ece3557f4c11cc68af46426d3c3057",
-			"0x7bbb60b32ca0ec25a830e77790f73d11ac92929d2c9dc8eb70b8be026c7a7489",
-			"0xbfbd58d0c7f635ecbef3eb27d114068f953c2ef4ba9407a33c5516156d622e77",
-			"0x08643068ca01cdad8fc46e5190a9c90423e1f95cb4960684977c6c7980e6c0ea",
-			"0xea194e1527fb2202da5fbac43239179f2cfca95206c34c56042f69ba76ef3cca",
-			"0xe7e1206b62032646bb310e8b11338d0c94fef89151731fa701767d22105570c4",
-			"0x222084eaaff69aa8c1addb139d566e71d95dabe7fbf1cfcfb7d604eb3ab133a9",
-			"0x615c903ae923f5f8769befa3d9850d53b36ee3b47f2f136545efdace34e72de8",
-			"0x20f73e2ac4f18b1664a1028184367aa3d7b4b6d16492e199991cb0cc334908ff",
-			"0xe6fba0dd6fca5aca6cdc8b64f1509e6bb2b7819906cae07649bc311cec2829b4",
-			"0x4d73a9c7d379fd300f03be9e842ceec41a4c00ff35610756e5754f33929e8719",
-			"0x875ce56746e3303d28b7b6345d21dcc26412625d5972944a9a6039cde722260c",
-			"0x8fbf9148420b9c2eebc075d757ffbcaf0ee18373f1827b6b7c1051abe1b47bc7",
-			"0x44f7288451825d7b7bd4e4c8f82d9e017844ab9c08b77b4cbcd01fa39a755420",
-			"0xc150ccccd85a88fbe1795603c84193173c6de5814952763be4915061bf9490ea",
-			"0x936a08521d40e87784ccfe3bd50bf5f0ce28e8ddba7e29b4ed4139ae5030ace1",
-			"0x023d64dab9457ad253e42455b83a48217bf31b6779365694ced4640b640327e6",
-			"0x89a921ab2c309f0b86689c3d8f1eb6e9daa745c83b0d1a04cbc5331f9f96238a",
-			"0xb6f2020f682f34cd41dd273f19e6449c6b2b0b35d3bd7bee96363f97f028c27f",
-			"0xe61f2638f6cdc94607c9e978d6cfdc936a126cbbec0a97e27ed6733683b0794d",
-			"0xb136303b946b359cdd76c1a588046757221bcbdef6b7c4c070d9603bbe575b29",
-			"0xabe07f82dab2b17a4990f425a0daa1b78fd22ad33e68c499a7fd418c5f09d6f0",
-			"0xaeacb7ce46ffc86a5e08d6a71b7304f8f7f5fd794ceb0710888bf1825e7b0620",
-			"0x5879c7fe56421aa2a41731a4c6aeffdfe690b27c1468f5467ca03f69e7c74149",
-			"0x8a962ce351c06748908f8565ce0aca5b874c2ff18e99611cf12843a1bf93dbc0",
-			"0xa7557ac54d37f207d069407ebc80c1bb84a85744763e585c15199ea0ca906b47",
-			"0x26b637ab94949a1e7243736fff67435d28513b978a9e2173d184a64659f3b225",
-			"0xb80d141f221fe90d9aa80875c1c7d4f82d16a8b170073c08248878aee057c78d",
-			"0x1e4e58da25f9c1feddecbb771f6089dabe79079c9c8c98d78f8854b004f0b5c6",
-			"0xdffa5016e82a215af34cb2d7b54535e32c8e0797dafd1ad0b829ca434ddb7596",
-			"0xb74197a700d2ac5ac4105291ffe1567d146b3eec5447af86701b1599e42637af",
-			"0x4104494199a7fae34759bca78e8490f41dfc1eec726f33555a2bf87b3f923a12",
-			"0x0100ddc8b90291faf2af0a2b36975b7c7e247dc65414ad429f4b1d68a2f2ab75",
-			"0xe4740fc1ca3cbd20871da439f3af9e7a0aa94ab9e1eed2fb04931272f5546c3b",
-			"0x69eb680f378798e9dd194e3b985078b71d18ed637199cf854cb8116c5d2ebf56",
-			"0x8828999c917e550baaa229b3157a7914d4eca4903d96f2778702a7ac578bf897",
-			"0x3db2bba067a16d29a3ee7c68c9b5ac825f2814fb9b8490a5db3c1bedaafa33a4",
-			"0x079ebcfdae5f5457bc5cd686d65af96d8c15806ef4152eea5f4681ee472cc303",
-			"0xd2609a6ffbadd712bca9ea357311b30f79334667973c024e03670e26d2420862",
-			"0x3168229643f898f3297d3af867e03e1360d99d265c1e83d1440f045b0739767b",
-			"0xd62aee5a8f14ad052619317a81852cf563bd716a0ec621bfb25a15f9736deb53",
-			"0x144bb80a52cca2b9813f7f1ac547e96a57485c345f7eb4fbef7a0c6772292848",
-			"0xd8f21d1aae77e7a8610aef8ebc35f28c9f8dcc07463f4852a5a17db1eccbe795",
-			"0x8d08043b6144cd3d22c23675390363dd517fe2e8b71e29a7d1107f18d98f7607",
-			"0xc5f997af5b8c39a7992a3d64ae05d10791c18507c93977477954c4e89b28da42",
-			"0xcdb5b0e653ff308a24fc98b6cc28f1bdb4739673f2d96ea567edf9ffddf50c05",
-			"0xecba2883399e952a885fa626663de0c922e98ea1eb57b8b286121f5bc0a6b147",
-			"0xf32c9760a0ca7966dbd017d7326f50f15daf020daf31a5258819d2d55fb224ee",
-			"0x8e5cae1773d0aa309991d024ee02ab1ffcd0ffe895503e2f94ae30551de3d7a1",
-			"0x49d378c0158bfeb25b7ac2914bc1b45ddee970e58001ece549f60033781a39cd",
-			"0xd19e11ff8d23a64ffae4c886669d7e52d48ac281ad1283885ebafaab53e8ff70",
-			"0x6c91b89d95efff6ce209d96bf5c1dbeb5d6c01710ba03379be0f0a845d3ac936",
-			"0x4e514d655f12589e3c57a6f9ca2879658ea9c6ab0a523f5f107ac1a543e2ce67",
-			"0x44e9876929bdbf0e6ca42c42ae2222812f6bfe6fd957ccbc5f70a9eac80f0892",
-			"0x545859fe34e436e0d4183b630cd69b103816d883a0648e67ad955328022d5aeb",
-			"0x121b2a96f0bbb59565fadcbf50a02de161d57a8dd5871ebf72e039832104ab20",
-			"0xa96f4ab77346235358b680a23cae7f1cacbe21cd0e1fe775c4b0721bbee46bf3",
-			"0x80b235a11a3114ef45cc9c563b4646c338eda7e7ba2b077b0acf640197fe48eb",
-			"0x1a11074a30d0cdd88a26e648e673d0c3b6376dd8e5c8bf23012684102a3af830",
-			"0x51b806c229bc0755a73f256da981ba450d32a008306e6bf59ba4c893e1cc5795",
-			"0xaa74491a1e7d0edb6bf4e979ebafa5af05dae7d5d0f067303627f00e8fa56afd",
-			"0xcbf802903c9d29e00b22fef9f2875944f3d0e36a87ce6e49beb230979fb4e838",
-			"0xb92c3755d629be2c446a19a4a0bba3212f60c1fa5b342d60930379a74d41169b",
-			"0x07ec15dd0bd56f2acb56a5db6a530a23cdc33b7a7a1c4a8464572e6fd9b8626e",
-			"0x7f9c7a9b5abe417243e3c74adcd571aa45783a9dece0187a1466760270ba3b6b",
-			"0xaf9740a3960868f6e759d8f18221f3c5f6a6138afd40672e9c8e37e437be9bbb",
-			"0x7ec7bbcb17bc86e276a13dcd41513d7effaf08b67e71aa618528087f34efc208",
-			"0xf2903fcde2aef9045af6f83a3677ab98bb23adc5bda60de7d46509bba777d5ff",
-			"0xcf83625f4d891af2a93114908f3be5319b89372c31bd23960ad20f8031b20ce6",
-			"0x18aa4145b728ef0427165710bd0437dd5551a69c5056dfb171b546e35753860a",
-			"0xe139097ab29aa83f4aac8765e9125b109ddf2984ea325e7a1b4d881495f29dd8",
-			"0xceaf62b97e71d8326d5f66e81b26ea2b0519fe38c6a4b1b38d693d90d3ebf1dc",
-			"0xd23c423fe5fa5ca547a84e7e34f401ddc846af42956c6b052eea15950a0fe79b",
-			"0x947bb7c1e8c90826f78c4139def8e188af907cdb04feddb80360b4d712e51103",
-			"0xb8c65dbc12478ee24def67d15e845c4a52d9c4ce4467674faa81df72120061e5",
-			"0x85a642a8743d2d4aba389ae7a7ffa9b0687d28d4702cf45130e2d66eb43a31d1",
-			"0xe913e63914798d9b3518f204a989328f97520460d0e5925e73c0596d62cfd9c7",
-			"0x7c7065599f3f5cdf0314cb9ff575feaf604507859c20ff3a63e86c3dfdd2a5b5",
-			"0xaa2d5c80b189f37cfa00285362abeaaf430b9dc198a042024f1e148b0e888585",
-			"0xd5c0cb01fcee8af87b0842ad630ea13ea0892c97acd8b1443f6a6c7bcf7bd5b4",
-			"0x7c41cef1c4af5d15900fb535f0b1f3ae78de50cab2046dd65785feb768ea9437",
-			"0xf125c0cf53777bf2c49f9b99b804b0df68155c1c3dc554db66bf0327ecd62a70",
-			"0x18441cdcbc196bc6a4e4a5d9216132d3e075e60d2efbafecfd352621e6b2175b",
-			"0x0c4b7a2df6e6f1c4a724a8f4cfac0297f3c1f4248ec298a98d4c871820219e40",
-			"0x43bb93b6bc4c61df7ce7547405fc95a0bcb3ad7874562413dedb1744826fc4cb",
-			"0xf5f736e014cc04ab828edabde6a104caffe3ec3b286f84d4f6ecc2f7e699974f",
-			"0x8a912ec8dfa51053430d2e1fcfb67e7961fb7c9eb34006d08848d2d3b21c742d",
-			"0xd2567779967cfde9018c42f059490cc0c3518b9a32ee5fb1306cd54ca0ced771",
-			"0x3098a48f2fdf02ac43531168734d661673f82ac0d2e120f10ef0a00460db134e",
-			"0x9777d31e299aa8fe591612462b85ebb3c1fa27d60248cae8e90e4ec8ff00a811",
-			"0x880ea730ca93d9639ef1c2ab33136b16eb447b52b89cfe5b74b7327e4d12e4eb",
-			"0x1ea9f641d8a740ed394d34d7d1648f837667ed622867dd05fcd5f1387efb32f3",
-			"0xda9f20e5b4a61f72291e1a0438095af7fba8a55196a448c88cf3d1e1ea9bfcd3",
-			"0x949bd03ef394076512b6cb8f41c09a8d41304e045642c4670585a4e4b54c539b",
-			"0xafc89365b92724884bce8e10ec1c5c9c9f3f4a7a38effe56392642a73df487c8",
-			"0x447f42123c8ee209e4940605aa753cba0590bb4cecf366d07ee7e15e11ba7447",
-			"0x9a99f57a47d31a95f015347d38a3e39f66aa942747dcd65fdfc5355f61ea31cf",
-			"0xc131af20ca03905d63e74dde7d44d9138d59ec6e95b8a283fea9de870b79ad84",
-			"0xebfd03f29b2251499f04227ddcff308d5367bf534cd59f42a090a5a6c64458af",
-			"0x071ee5f0da2f97fca59606b25edfc0642371251d9c07aaf0e8010e5afaad7bf9",
-			"0x5040af11773c0c1b13fdcf6f2a92dff924d7733ee7d1caa83cfaa84dd204ce3b",
-			"0xc25afdcda4dff3a3b6a15e6fa90dc54a05a5cf33dea503b9e152a7fde6ceb9d5",
-			"0x9604f964d6de2c263139cf011baaf97aed1ed08dfbca158ecb495986d461261b",
-			"0x177e263de95e9c29f3ad31f286117d30ef069e981d825e767bce8031e634d84c",
-			"0x72f10f3393dea1a41bbe4834d728e8429aa5651c043fdf5b881650328eb62118",
-			"0x3969a0524ce2ed0d59f839f4abefae7ad9b2750b698716aac552e92079fae19c",
-			"0x99876fc077b178d584e9c29160ed320fe62c908ed406a2fca7ddf47de487f3d1",
-			"0xbd211392c93f76c541ddcbd83702db71a90a2ded78d530ae61c00c7ba72d9509",
-			"0x5e75d857ede2f1af61f846b5f7072225bdec659543c33b24fdd1bddf04de2f93",
-			"0xdb4c0c2519e081e1a6ed40a3a397b9f093f8dd4b24613d3f18a1e4f7ef94af9d",
-			"0xb2dfec129fe8cd0f7ed568b0a984fc37dae704c497770110b944d003e53b3807",
-			"0x6ba3b9ecafc2a469338c398c7588806d499b98720d3bd9c9bb2aa07a0fbf63bf",
-			"0x69a711d99e3e061cffbc1f6b10f4036de181a9bdb3824ee1a7c83fe15fb2ad41",
-			"0x2340c3402304d06a71998d35a2431774cd2198a170a3cf62989205545c6f0dd0",
-			"0xf7b9a019517ef3f4fd6bc5c4a98dc4b97e742e2f0f088d94d8b6442447118c76",
-			"0xf556a0b838ac7dc6dcd57b0e52f53df4a9f171221d620bbe7958ca3d71671787",
-			"0x68ebf1d4a6009f64a8a2f1b53611d43404a539e8d51c46dae9873ac1fd9548a3",
-			"0xb37c2344e14dd698bf0988608ee56a8f6b31fd2d18629c9a7dc1f027955b39a5",
-			"0x066df722de25d7455976b6be2ec850d97a6afe7f934fc83dde99aa5d49cc912f",
-			"0xdcaa64c29d2e447d85fe9a0329b269a283e27885ac75d874793bc4989d726f3c",
-			"0x6ac4870c173b2404d30357e40bb14db4ec0b87f35437da89c07af88d7c265420",
-			"0xaff8d57640e559db7dbbacbffbe7436d2708f5c3be26370b1b54a8e771eb4141",
-			"0xec0a42a3464caf7ba5b95d185aed8ce0b9e0696a03e2638f71382a92106b3957",
-			"0x7b77e84bcd0b0602128148fc8c94dee2e4f28ff1a748ada7ca7f5d0855e1708d",
-			"0xe0a572dde38708200a814e0120522528bd0ad3be8862293a21c69151fd72659b",
-			"0x2580506cdacfa687e1dc7344aaeacf2cb2a2eb8a4830c7ad83ec8cc0ef70a1f5",
-			"0xf5379cfc470fd6989c140d3d3bc51f9ca7a18761928783424c1947ad33e07e4c",
-			"0x582097b699a9ce614e823fd7e95235e8e6f002d2eea67e87f56ef86735599f24",
-			"0xab1a683bb247b5f0f3efb6a91f1938e0938326e81e6cdde2278827e25aed99ea",
-			"0xf21eb6fa7877e3275690765bdc7f0186e5ba0a94b0bbf9ebf1b4b1bf7aad3add",
-			"0x3168d818b07b7cc71912d7d92f2ec15d10ecf22c9ec20da610068c972c933c4a",
-			"0xd3d49fa35320e95473a7197c2a9c98bcd13b4b491ee96ac0199f3fde94123706",
-			"0x193d71d673a1e1de8267df397c41b8e3d9fb5b189b96da91c31be63456afaada",
-			"0x6579fe55af7c0d58f00f241e257db748566b750a59b7c05372b0b14fb03282ca",
-			"0xf6195d1b7de28d81a3f7d50f34f2a60f7ba6cf48d4ea9593404e48e6b33b8857",
-			"0x3bf3d52ff3c498761bbc2598c449d64a0cebbbb28201dec3633c73d5493b048a",
-			"0x57c4f9be1b0fc5d7c6f86a9297aa4d1375e9f5848bb2f3c1f08851f2c77a614a",
-			"0xa6ca06afd1b9fae9533d53a9188aa8497a7c92e363ade6ac094023bcb0e5f46b",
-			"0x09c669b50d1b26685f20817d0a096168b7d2a4949a20e50a2d665be4c3d4086e",
-			"0x8aa7d92376364e98c4549669e798af1c2e654a776f0561c89c7f7b2540725539",
-			"0x935240267eb3e1a1a6a34966084681ca4d8792142c4fc45574fa669c518b2e8e",
-			"0x7e339371cb38e9babe203905f4026cb90f25c8b10def4781ab5330dd0a63af63",
-			"0xfb588a940601e578fc7c3286fb4ad68f76dc1fa3dd88251193d9655fea77e056",
-			"0x90a702a71779ee4176ed8eab503deb43c63628535d78f9742ac95ffa5f699464",
-			"0x122c0341b0838cdcbf934769322e8fb8df77d8f8a666fe106cf87373bb719eeb",
-			"0x53e7ace007789e4c3513b16eef872dff5b6353bea42d8a3e3912fd62e14b8f83",
-			"0x3bdad07ec3a785d36f8c41ac9c0716a2cad6004bcf1e7e899b06c640e1aa1d9a",
-			"0x6d95da2724a3609af3466474e44455a787b9286f0bc016f13690a867f2f89756",
-			"0x98cd50a72a2fe944b00613dec757270f61e8590002d2e1b35bdb6bd4290dcb31",
-			"0x3b995783e2812c5d7fdf10f83170c8fd142caf1526698a9d094a24314ebb1a09",
-			"0x81cf7500dd9e75fd872b00378005a1bd180fe07be7e7cc3dcdb06ee006c8721c",
-			"0x8e7f5b4940da9de2b59fde73201351d01e5ebdd3ee863cc7653a919c64c35e84",
-			"0x6bd0c1bae338f0922d5c0fc951d089f9c290a42a3744f0a5b4b0b61a5248a4b1",
-			"0xca6c19228395454d07246773fe87ea86891a0fdeee12e8bd261625a62a426c05",
-			"0x83d0b617af7fe6f23019ff4e04bc71b8267a4dd9b79ae4ac29470e99cbe7466b",
-			"0x901c51cf6fa4726b8217b807f7b0d2e0b4ebb71b6a28e8168d2493016919b267",
-			"0x6d101782b820ab580dbe1cf9aacbc065279c18407e70e965ba3315bb77537c77",
-			"0x831996d9ece576f424f0c11abe5f3847229500ca651c452fd6ac234cc48cda4e",
-			"0x5d8fe79678589811621ff19ebfd3d6c4e2d0035ace9a197368b58deadc8b6fc1",
-			"0x8eda2c20216008d1c04f5bc93b5c2d9f8c3635e2ee440cee379f0470cd1a3c9a",
-			"0xef3608f4b6e9e835f3360e78b097af504df75f96796b4e30c9b4e643caf9d07e",
-			"0xee7fd312bae21e15346a412bd82265cd4231449f5a11824938de30fbc6400b19",
-			"0xd659949d718dc3522af4a4794d0c46b346109b5de4a8b87247d1f1a4c414b766",
-			"0x7567bedd64cd79119167944a7e623997ddf134c308a546724e432c36ee2a2d39",
-			"0xf0adf777a52828b31e70712776b4e56215a1038e0c14f2a5ab5bbf035623067a",
-			"0x92daf2c7cef9eee82db16820db7c60a3113950448ae4b149a7b32eb6956326fb",
-			"0x83825ec2c5c8a323cb5ced10e99fa0d7e9df73b9a158c522267ab0fb05ee7030",
-			"0xbb9e1680cb85ae48da3322345b06055fe4b668ae7b31402fc4d13faf439b199c",
-			"0xb040722e777fe01ac533eafcc93b869cfab5bc67f9e2e1044ff505c011f55f1f",
-			"0x0c488f1776428ffdd8eb03083fcc9dde010d7a3d4c08c8f8df2fa93fb206b2bd",
-			"0x54a0b71a8cba973d26bb89e5e07421b8c73dc59bf95f6190bb3b86e7962788ea",
-			"0xadf110bccb6d34276e3fe4701119b2527a86431d6f057a02e30118a6c6cfed54",
-			"0xe01ab7f11ec408b5a17ffbf6cabc3268e16f6be0cd0b15d73ee8b8e2aaaeed54",
-			"0x7280b73efa14f10d39306f2d2dc7832c0e47fadbc14f990a821c76d60be529f9",
-			"0x3cd2b491fa5228b4cae420d5c2a2da9a5e07a32f2147f45f3fa35dbde38224f8",
-			"0xdcc642f2123fc607d991e9794210770453e1befdf52582df0bbaacf85a148048",
-			"0x79a1710d32bfb57c607c5bd23fbd2b8fe3356f586172e507d2688185be8993ca",
-			"0x9ed1335deff01eda0b660081d44718b7cfa0fc69c3e9946c9733dd7ea64d6f8f",
-			"0x37f70e002a78cb3e8266d5ce7959a45649359b6b6ada51482d097b9f32e93179",
-			"0x814f9b9e4af3c84c31f40af0028086d16900f9c63f519f7bc3c18c0eb5c407dc",
-			"0x9957e067f5e79fa6f40bef2036c6d19734146ef231ffc22263bda5c36a7a12ec",
-			"0xa1a240b8ce8973e91dec89bd147a3b7af274fa1e233cc56b9dd83bcc9311a029",
-			"0xac083bbbb8455d3e145f59424d19a8fd7c6162d32a193c67405291ff64113bab",
-			"0xf2182db4682212298b31bd8bd086171a719bd68424da98dc133c83ad043ae903",
-			"0xb3015688c0e0f55c6e97034615de00173151c4334c72aabe048c47c244ea5082",
-			"0x15ebd9c48235918e2d8b2260acda2610b71fe3c4ba7f853238df940d021cd60c",
-			"0x847729223cc8abde709cd283dcc4356375ff89651f39c9adab865fea75e10708",
-			"0x39c9a1bd9e21caf13132b33a272b429c68cb7af1b8db3df08280860dcce141b0",
-			"0x31f21eb219700c01c3d910b2a922788d790acf6ad91c8de739795f1a740c220e",
-			"0x7fee191fd2c31b723a1d4a57af9366662e62eec889d886b0325f0c1e2e4f9d57",
-			"0xc682c555d050a03b8164ca927920ac6f97be4f96eeb8efe8e4fe3d7b48cc8424",
-			"0x1b887661820a95c845fa5c8e0bf10028b81073bbfa072a2f81f82b4aaf3c68e2",
-			"0x4e86af7e8a0aaea28c67e2658b97540e84ebd4cd1a9dff33c99a45cdbd0de661",
-			"0xa93100e0dcab1d0799a13d40ddb459e32f6e95d2c661094d7e8d09e008ed2486",
-			"0x2d15cbd72ffe23920d63d6916f68c5a75d2400b0417283b54ade9dab8ba3af5c",
-			"0x72f199719868bb4b4546407f7dc690180b2e8359ab6e747fe3ca4861c59bcfdb",
-			"0xc3a9a2ad727ee7623ec35671a330ff150e504bd20365a7dfec0295909e9973a7",
-			"0xe4dec421f674d4917299076c9885c49c51e7cffdc5253696b552b9c3ab307cdc",
-			"0x426f724354ff7fb3114bc2e66360c996dfdb1e8585d3967738285a2030a89b07",
-			"0xf39f6051d26d8b21aa5592dffc3be99480a768a0be6afb8b8eb5bbcd4058d4e4",
-			"0x061bbe83ae46285c935b9bfd646cc54f4da034b33dfa8b3b8c902995a77b7d1e",
-			"0x37b7086aa13372623ea527ad0dbf08bb2162b274420972c55030c4001e86a1eb",
-			"0x2de6121506702ddf0eb5ec8e2eae6110ad41b3982c73cf8382bea329e77a8cfa",
-			"0x4e941c3da784368dc838b7b8a77ee51868160a79362aef6caf0981fed3ba3d36",
-			"0xad2e32669978cdc836e32d3dae7a7a89b1d0e28e5f938247d1a6233eb055b481",
-			"0x8d0d13cfe3e40eca8c6ec865aef23fee9f5af445131bf0aeffdc87e4640a1212",
-			"0x8bf162d69c4565050dd4496e244ebfffa69bf13abaa9e7770b8173999340009e",
-			"0x21a33a33d92a99de5af52ae238a799e3307258b8b91a959a485238bad31f913a",
-			"0x21a95996aa2f4abe48a35617de16894f14292afca769679a63a03d68350cc362",
-			"0x57bfa7d2037da6aaa07f44594cef60a598ed2bc1218b9f6af48dad1b42759e95",
-			"0x7324fefadaab09a26c065bd98d3e9a56eaa7ef78df1269c1152bbbaaa6693256",
-			"0x41722de103de41c72010d1f19166ae0ccee2bb72314c719945f4162ffa165ac1",
-			"0x19b2f1f42353f935f46f8f9421bcf06e2ee573304d0efa13071d676ea174e18d",
-			"0xd7fc39efd2a392efb8de6d7d1c7807ed7daee0c8b82115acc60beaa7f6d9b86f",
-			"0x5ae63df9ecf9aee8cac4d0ce1edd37a95069d61c8d8ef886a150eda4bad4c87b",
-			"0x6e7aba83a3654cae6b12a6f87a9739735dfeb43ff67e309fe4701b8b17937915",
-			"0xd624f46d01a186da11d15eef4d79250191605e51ce19b9e02b62e65d84dd1c38",
-			"0xbc134d2f8acb6a60d424d4c8c6087fbacbb5202251c89ef720dded9947e3c4d7",
-			"0x6e8e39dca2960de07134fc043f73c9757c42c6827ef22d063c44a5573ce6c8f1",
-			"0xe53089dd7ccb7e0e78f3cd7d7ea342ce5a2316b50d6bd033ae621f6ec4329a46",
-			"0xca3eca5da2a9ded537dcd471390b7d97716deb0c5cd9e0d6a7e2addbadd97cac",
-			"0xaa5799394d99d90642d013e8359a40f2cc72e6b49c91233ed930ea1d32b360f6",
-			"0x8ae22559b0296959ef540aec5702dcc03d2b2bd9411b69af756d7d9e12e6cb90",
-			"0x5067bf825ad66e89ae1c46f1ebbbee8a77c2d285fb66c01b732b6c3f629b2ca2",
-			"0xf2f1c4304b5ec8b314fc6a4f9a9df69472cf0a132577217eff1c0a80443885ae",
-			"0x4c888be868c74ae86a9c0648429bdb207d18794e3ad6b9ff79d9291dfb0d0b46",
-			"0x3083508ec1669fa69d5fa4ab1d84501868c7a054a24b0a432b74be1f3bd0ed1c",
-			"0x443f7e4cc89e3c798c788fd40185525d8402c2160e5f3434986922c6f8179ab1",
-			"0x16d395ee5e915ea950dfc7639f90a29fe04ccbb47a2b0cd303ea719acd48ed58",
-			"0x901df34bd40035ee95569ea61c8a9874fd9151fef5701e91f02578c896704f20",
-			"0x4ce474419d801fad788b158bbf40dc7d7bc2ba43e1c2424f91b858055a7b61ea",
-			"0x10b2d6126ce1183cb227e291b184d7541b3380e100a70d876587a0aef2fe588a",
-			"0xac68a6a550c4a40c723ae37abd07d9e2d8486a30cd4f2cf7285f6d74882368f7",
-			"0xa0800069211efb656d0df4a81f1febfb48f251c712ee973afdff37a2baf83b99",
-			"0x53293ec8346c1a44e3cf78017dd033dd90be4737045e1c55d27130d7f6f36dbf",
-			"0x0a92d75455eb5c2167e2c07e1575a9580c135debe7bafc8d15d1fc2a25b984ea",
-			"0x32e6f505ec66fa987746c67a470df78a7a0fd136ef814ed24f3b5e0988cb53b0",
-			"0x20e6f99aa4b002e35f97900a34322af373397dc98ec28ee668e9921bc41d7219",
-			"0xc309a8620421c52fdae475d4a29530a2e56dc0051a28f8c4205c09cba5443666",
-			"0x0fb5bbd851d3860876e1dd038fd3f8d9e5b8e8b4e0d3b83ba0bc3d06222ac9ed",
-			"0xd71830cb6f3ad0776795865aedf50ceee94ba9ec89533190d3dfe2107a9e0e9a",
-			"0x768040f6401331b029bb0222b7494ddd21525091d936641f4ef89f00cb5b20e8",
-			"0xc52b410050774495fb2e22e0a94bc97dc72aa86cba7b20e8ce6c8a20ff03c5e1",
-			"0x026072e68a13a5ae0721d9e47ace688b75e16ba76ef67ff01d0a11f10e80ddc3",
-			"0xcfb1040048b9312c0d274a6b2576c7907176a983f0c0e02b120c10bee28f438b",
-			"0xd3036d04273279c5fa5ec4a096b8fd8a68a46c0536c24519b0ee5368c5103d84",
-			"0xdb9bdc3edecf7280dabcc104885942eced615311e93c2fa06dea812adc626baf",
-			"0xa25ca25f83c418bbfcba8a16cf661902499d3651b497e75161aa0d0bc4c3717c",
-			"0x96221feae35068b02e1540f06be277c27e938459af8718a2c883406b2582ba31",
-			"0x5584e36296dc2cc61e21c1e6539f66d918b800025fd6460da31f869cbc357289",
-			"0x7a0de103b391af8b2a9af3e6e5c2c6bf309d61cebe805db82d3addfde5395b4d",
-			"0xc5b000944c368f67c77e6c6564c5be5bb1fb84eaac76ca2bb3c7ddfde64e5635",
-			"0x544ea39b4d37a698bcb0c2dbd689ef90590e160db52deefe446d65aa7b60b20b",
-			"0x32160ce8e604c62c09814f8e13e795b654cfda57fdfef4b01c38ae3d078aaab6",
-			"0x5def86fc59562b477277bd6a2c1f1bd5a9192cd969c4ac578b16ea73031d5aa5",
-			"0xc0fc111d2c0eea81e7d6e0221c0465cf950772fe8dad94476c0e33d528928f9a",
-			"0x1b803a048d3ab8e5b4a49b3550c6586d71dd6f5409da6df0bc6df76de94e64bd",
-			"0x549d98175538c94e098c93f77ccca9ca0cbd11ab7c270ffcf1d3a908adb4d8e4",
-			"0x17d331df92fe4d8b57acde9bff8eced101f461e3470691ba7b46df9ceeb8129f",
-			"0x7a496054ef706cf89c0c55d848cac64779091799d2d64d6cb43907d2222c000b",
-			"0xe86b6819e9a482600ce2c9b42d248dfa3262547eb7ed42a6c1ebdb138e62206e",
-			"0xfd49fc9e5f4eeabb74a7d9ab4ae8a0e583ca153ef4c09e697f5c0207e6505ff7",
-			"0x9a297101369d0cba7b6f7edfe1a4a432d91f74f88ed3473ce14dc91cf616e903",
-			"0xd66a19a2834cbd910f2278b2bd5cae2ab9b58fe1a9e583cce4e2d22903d767db",
-			"0xd9cf8987c12672ec0e2bb97b25567f3f914fa8fb89b1186c6b665967834025a2",
-			"0x54e18efcf10895d51cf8f8dd6541ca097899fbb1880abd3b68aefd6e657a0af2",
-			"0x759486342c0162d26a8d2a0881affeca579a7cad80c32c6885d910f9e966ed94",
-			"0x02b2d8cbcb7244efb913aac80895e6cfbc81b60cf831b0a19b2354e0c7e00b72",
-			"0x414736aea69a7be69bed90c56eea05e5df9db9667f3b0b07ee6622442628fd88",
-			"0x75db93f08ee2236e4cc9222f8167c15c5bb31b4b9cfa1fe62f5175bac9c4c6de",
-			"0x07c460d27a5df943f09d114d99cc39c05135953c416591a7dc9bad3e2c064796",
-			"0x42c32a832d8a9911eeafbf0ed6550cce1be3832304f22a63d6edf1b72d92053d",
-			"0x2f8226acee0e5cb949592c1e77ac3da86f43f3834df940349cd6a55626ec7d3c",
-			"0x3f3e88302fffecb9751ee31a36de3abc6fb7963e264988904daf8fe6aec18fc8",
-			"0x0ea47b2cb04403773d9420ccfde549fe763bcdfe350c7546e3293b4612e096bc",
-			"0xf03a38c16a3ee05197b7c77985c2640af18479ebfb7db342416bd0baf2645eab",
-			"0x32c9844dcd2794e987ab14af8aab52d9925d77279377185697bfa362907f4bf3",
-			"0x72985d640d5ee8da6a1e0aa3ab71a19168802c29e3ab915d61910523d2d8a550",
-			"0x4453f4c055057ac3fb2780fa8fe131b6e08ef90a5b30930a83d4cfa5120ff6ce",
-			"0xb13ff4f56efd0f41bdcbc06c8a917f81614ca363f8c06bb3bd748467e146f959",
-			"0x172419af274d54de1a3ec6b10e5e8f98d0941d07571f9a5eae977597f0ea6e2e",
-			"0xa70469fc4070b5a675838352457cb6b4566a7a95ef843b0cf49fc0e02a342b0a",
-			"0x15072136cb1235007413c137115f4246ff22dd33bce99dec813042d6638ee502",
-			"0xa883cb9646a12a6f13eb4e1fde9422767be38279eef669068db6572d449da45f",
-			"0xe752e1e6ddc10633853a0c997727644b92aff7e46710c2c3850f6994edf83072",
-			"0x880e73586a7d6d79b4a7bd30f551d04e928747962ec263867f53dc33709353c4",
-			"0xcca01d7edd840727db14e657c9edb63a5518b41115abbcd848a60c9800e8b244",
-			"0xdf231e025e5c85b82fac8c836df78f5ee23509bb7b363b018ab27cf83680ea52",
-			"0xb42b4d31d1838886a6cb91123748078b5d07384afb1e574146a0174b6e3609fb",
-			"0x243c0ef11b9cedb39146fc35149291ea31906f60f56642ec3af28753936c7b08",
-			"0xac496eba34056ac76fd2c20c300bbcb66bc9d5257859aa8b8480fb1ea44cc60f",
-			"0x1631a82a3927c93bcb93d055ef94963bd00c264816768d7a12b1e6844b65a226",
-			"0xee630ea7011dc95ef7c9dab11e2c89a8065a85b7ee3ffe35bacf38efc61706e6",
-			"0x8bcb73df8715723d55d5635d5b1d5332af85b2945871172d22e10a2f19cbc9f9",
-			"0xa498dea3b8eb89b40f963d9266a2d4e71e3492c614e597e08dcf565e54d2d8cb",
-			"0xe798586f9f5bd8def445e5b66e1cd1037df1fc1e043b7c4a804d1cf368aaff70",
-			"0xc7e9da2ee64ed53fa9306e35e019c7fd74030f3065b5514189c50931d70372dc",
-			"0x557acd95f593728a732f1ef04b94acfd5475da37a18dafda2cac957db46b24a2",
-			"0x303f4929efdd5f54365d8927aae229df99e222e76e42b494e216d5365a4330c2",
-			"0x6252147a7a16f988726467394919d25e24a28756726bdefbdec768cc84d125b5",
-			"0xd9bd80354f25a846ccf3a47dc928b1d47958598474749795d4f1885f172fc996",
-			"0x356cc71f2169917a76e87355c358eca62bb5c79fc4f38c4992ad57cb35ce493c",
-			"0xadf1135a2511fd2cdbd33006738725459f33edcc593b1aa936b55889fe9e9687",
-			"0x8359e90f401234e4a85695c7e369ef5c107b246088baf3355046934197705c89"
+			"0xeb35d7c78965874110f67b77307deae4bb29dc98c01fbac3737409ede61df7c6"
 		]
 	},
 	"nodes": [
@@ -4579,13 +3823,11 @@
 		"0x0000000000000000000000000000000000000006": {
 			"builtin": {
 				"name": "alt_bn128_add",
+				"activate_at": "0x42ae50",
 				"pricing": {
-					"0x42ae50": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x8a61c8": {
-						"info": "EIP 1108 transition at block 9_069_000 (0x8a61c8)",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
+					"linear": {
+						"base": 500,
+						"word": 0
 					}
 				}
 			}
@@ -4593,13 +3835,11 @@
 		"0x0000000000000000000000000000000000000007": {
 			"builtin": {
 				"name": "alt_bn128_mul",
+				"activate_at": "0x42ae50",
 				"pricing": {
-					"0x42ae50": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x8a61c8": {
-						"info": "EIP 1108 transition at block 9_069_000 (0x8a61c8)",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
+					"linear": {
+						"base": 40000,
+						"word": 0
 					}
 				}
 			}
@@ -4607,24 +3847,11 @@
 		"0x0000000000000000000000000000000000000008": {
 			"builtin": {
 				"name": "alt_bn128_pairing",
+				"activate_at": "0x42ae50",
 				"pricing": {
-					"0x42ae50": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x8a61c8": {
-						"info": "EIP 1108 transition at block 9_069_000 (0x8a61c8)",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000009": {
-			"builtin": {
-				"name": "blake2_f",
-				"activate_at": "0x8a61c8",
-				"pricing": {
-					"blake2_f": {
-						"gas_per_round": 1
+					"alt_bn128_pairing": {
+						"base": 100000,
+						"pair": 80000
 					}
 				}
 			}
@@ -31310,4 +30537,3 @@
 		}
 	}
 }
-
--- a/ethcore/res/ethereum/goerli.json
+++ b/ethcore/res/ethereum/goerli.json
@@ -1,937 +0,0 @@
-{
-	"name": "Görli Testnet",
-	"dataDir": "goerli",
-	"engine": {
-		"clique": {
-			"params": {
-				"period": 15,
-				"epoch": 30000
-			}
-		}
-	},
-	"params": {
-		"accountStartNonce": "0x0",
-		"chainID": "0x5",
-		"eip140Transition": "0x0",
-		"eip145Transition": "0x0",
-		"eip150Transition": "0x0",
-		"eip155Transition": "0x0",
-		"eip160Transition": "0x0",
-		"eip161abcTransition": "0x0",
-		"eip161dTransition": "0x0",
-		"eip211Transition": "0x0",
-		"eip214Transition": "0x0",
-		"eip658Transition": "0x0",
-		"eip1014Transition": "0x0",
-		"eip1052Transition": "0x0",
-		"eip1283Transition": "0x0",
-		"eip1283DisableTransition": "0x0",
-		"eip1283ReenableTransition": "0x17d433",
-		"eip1344Transition": "0x17d433",
-		"eip1706Transition": "0x17d433",
-		"eip1884Transition": "0x17d433",
-		"eip2028Transition": "0x17d433",
-		"gasLimitBoundDivisor": "0x400",
-		"maxCodeSize": "0x6000",
-		"maxCodeSizeTransition": "0x0",
-		"maximumExtraDataSize": "0xffff",
-		"minGasLimit": "0x1388",
-		"networkID": "0x5"
-	},
-	"genesis": {
-		"author": "0x0000000000000000000000000000000000000000",
-		"difficulty": "0x1",
-		"extraData": "0x22466c6578692069732061207468696e6722202d204166726900000000000000e0a2bd4258d2768837baa26a28fe71dc079f84c70000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-		"gasLimit": "0xa00000",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"seal": {
-			"ethereum": {
-				"nonce": "0x0000000000000000",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
-		"timestamp": "0x5c51a607"
-	},
-	"nodes": [
-		"enode://06333009fc9ef3c9e174768e495722a7f98fe7afd4660542e983005f85e556028410fd03278944f44cfe5437b1750b5e6bd1738f700fe7da3626d52010d2954c@51.141.15.254:30303",
-		"enode://176b9417f511d05b6b2cf3e34b756cf0a7096b3094572a8f6ef4cdcb9d1f9d00683bf0f83347eebdf3b81c3521c2332086d9592802230bf528eaf606a1d9677b@13.93.54.137:30303",
-		"enode://573b6607cd59f241e30e4c4943fd50e99e2b6f42f9bd5ca111659d309c06741247f4f1e93843ad3e8c8c18b6e2d94c161b7ef67479b3938780a97134b618b5ce@52.56.136.200:30303",
-		"enode://67913271d14f445689e8310270c304d42f268428f2de7a4ac0275bea97690e021df6f549f462503ff4c7a81d9dd27288867bbfa2271477d0911378b8944fae55@157.230.239.163:30303",
-		"enode://a87685902a0622e9cf18c68e73a0ea45156ec53e857ef049b185a9db2296ca04d776417bf1901c0b4eacb5b26271d8694e88e3f17c20d49eb77e1a41ab26b5b3@51.141.78.53:30303",
-		"enode://ae8658da8d255d1992c3ec6e62e11d6e1c5899aa1566504bc1ff96a0c9c8bd44838372be643342553817f5cc7d78f1c83a8093dee13d77b3b0a583c050c81940@18.232.185.151:30303",
-		"enode://ae8658da8d255d1992c3ec6e62e11d6e1c5899aa1566504bc1ff96a0c9c8bd44838372be643342553817f5cc7d78f1c83a8093dee13d77b3b0a583c050c81940@18.232.185.151:30303",
-		"enode://b477ca6d507a3f57070783eb62ba838847635f8b1a0cbffb8b7f8173f5894cf550f0225a5c279341e2d862a606e778b57180a4f1db3db78c51eadcfa4fdc6963@40.68.240.160:30303"
-	],
-	"accounts": {
-		"0x0000000000000000000000000000000000000000": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000001": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "ecrecover",
-				"pricing": {
-					"linear": {
-						"base": 3000,
-						"word": 0
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000002": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "sha256",
-				"pricing": {
-					"linear": {
-						"base": 60,
-						"word": 12
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000003": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "ripemd160",
-				"pricing": {
-					"linear": {
-						"base": 600,
-						"word": 120
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000004": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "identity",
-				"pricing": {
-					"linear": {
-						"base": 15,
-						"word": 3
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000005": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "modexp",
-				"activate_at": "0x0",
-				"pricing": {
-					"modexp": {
-						"divisor": 20
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000006": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x17d433": {
-						"info": "EIP 1108 transition at block 1_561_651 (0x17d433)",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000007": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x17d433": {
-						"info": "EIP 1108 transition at block 1_561_651 (0x17d433)",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000008": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x17d433": {
-						"info": "EIP 1108 transition at block 1_561_651 (0x17d433)",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000009": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "blake2_f",
-				"activate_at": "0x17d433",
-				"pricing": {
-					"blake2_f": {
-						"gas_per_round": 1
-					}
-				}
-			}
-		},
-		"0x000000000000000000000000000000000000000a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000010": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000011": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000012": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000013": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000014": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000015": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000016": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000017": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000018": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000019": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000020": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000021": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000022": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000023": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000024": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000025": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000026": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000027": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000028": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000029": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000030": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000031": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000032": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000033": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000034": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000035": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000036": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000037": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000038": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000039": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000040": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000041": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000042": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000043": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000044": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000045": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000046": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000047": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000048": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000049": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000050": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000051": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000052": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000053": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000054": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000055": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000056": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000057": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000058": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000059": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000060": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000061": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000062": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000063": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000064": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000065": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000066": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000067": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000068": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000069": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000070": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000071": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000072": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000073": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000074": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000075": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000076": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000077": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000078": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000079": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000080": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000081": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000082": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000083": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000084": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000085": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000086": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000087": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000088": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000089": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000090": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000091": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000092": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000093": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000094": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000095": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000096": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000097": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000098": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000099": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009f": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000aa": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ab": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ac": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ad": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ae": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000af": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ba": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000be": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bf": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ca": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ce": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cf": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000da": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000db": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000dc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000dd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000de": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000df": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ea": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000eb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ec": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ed": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ee": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ef": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fa": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fe": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ff": {
-			"balance": "0x1"
-		},
-		"0x4c2ae482593505f0163cdefc073e81c63cda4107": {
-			"balance": "0x152d02c7e14af6800000"
-		},
-		"0xa8e8f14732658e4b51e8711931053a8a69baf2b1": {
-			"balance": "0x152d02c7e14af6800000"
-		},
-		"0xd9a5179f091d85051d3c982785efd1455cec8699": {
-			"balance": "0x84595161401484a000000"
-		},
-		"0xe0a2bd4258d2768837baa26a28fe71dc079f84c7": {
-			"balance": "0x4a47e3c12448f4ad000000"
-		}
-	}
-}
--- a/ethcore/res/ethereum/istanbul_test.json
+++ b/ethcore/res/ethereum/istanbul_test.json
@@ -1,121 +0,0 @@
-{
-	"name": "Istanbul (test)",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"blockReward": "0x1BC16D674EC80000",
-				"homesteadTransition": "0x0",
-				"eip100bTransition": "0x0",
-				"difficultyBombDelays": {
-					"0": 5000000
-				}
-			}
-		}
-	},
-	"params": {
-		"gasLimitBoundDivisor": "0x0400",
-		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-		"accountStartNonce": "0x00",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID" : "0x1",
-		"maxCodeSize": 24576,
-		"maxCodeSizeTransition": "0x0",
-		"eip150Transition": "0x0",
-		"eip160Transition": "0x0",
-		"eip161abcTransition": "0x0",
-		"eip161dTransition": "0x0",
-		"eip140Transition": "0x0",
-		"eip211Transition": "0x0",
-		"eip214Transition": "0x0",
-		"eip155Transition": "0x0",
-		"eip658Transition": "0x0",
-		"eip145Transition": "0x0",
-		"eip1014Transition": "0x0",
-		"eip1052Transition": "0x0",
-		"eip1283Transition": "0x0",
-		"eip1283DisableTransition": "0x0",
-		"eip1283ReenableTransition": "0x0",
-		"eip1344Transition": "0x0",
-		"eip1706Transition": "0x0",
-		"eip1884Transition": "0x0",
-		"eip2028Transition": "0x0"
-	},
-	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x0000000000000042",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
-		"difficulty": "0x400000000",
-		"author": "0x0000000000000000000000000000000000000000",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
-		"gasLimit": "0x1388"
-	},
-	"accounts": {
-		"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x00", "pricing": { "modexp": { "divisor": 20 } } } },
-		"0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000009": {
-			"builtin": {
-				"name": "blake2_f",
-				"activate_at": "0x00",
-				"pricing": {
-					"blake2_f": {
-						"gas_per_round": 1
-					}
-				}
-			}
-		}
-	}
-}
--- a/ethcore/res/ethereum/kotti.json
+++ b/ethcore/res/ethereum/kotti.json
@@ -1,924 +0,0 @@
-{
-	"name": "Kotti Testnet",
-	"dataDir": "kotti",
-	"engine": {
-		"clique": {
-			"params": {
-				"period": 15,
-				"epoch": 30000
-			}
-		}
-	},
-	"params": {
-		"accountStartNonce": "0x0",
-		"chainID": "0x6",
-		"eip140Transition": "0xaef49",
-		"eip145Transition": "0x1a064d",
-		"eip150Transition": "0x0",
-		"eip155Transition": "0x0",
-		"eip160Transition": "0x0",
-		"eip161abcTransition": "0xaef49",
-		"eip161dTransition": "0xaef49",
-		"eip211Transition": "0xaef49",
-		"eip214Transition": "0xaef49",
-		"eip658Transition": "0xaef49",
-		"eip1014Transition": "0x1a064d",
-		"eip1052Transition": "0x1a064d",
-		"eip1283Transition": "0x1f67cf",
-		"eip1344Transition": "0x1f67cf",
-		"eip1706Transition": "0x1f67cf",
-		"eip2028Transition": "0x1f67cf",
-		"gasLimitBoundDivisor": "0x400",
-		"maxCodeSize": "0x6000",
-		"maxCodeSizeTransition": "0xaef49",
-		"maximumExtraDataSize": "0xffff",
-		"minGasLimit": "0x1388",
-		"networkID": "0x6"
-	},
-	"genesis": {
-		"author": "0x0000000000000000000000000000000000000000",
-		"difficulty": "0x1",
-		"extraData": "0x000000000000000000000000000000000000000000000000000000000000000025b7955e43adf9c2a01a9475908702cce67f302a6aaf8cba3c9255a2b863415d4db7bae4f4bbca020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-		"gasLimit": "0xa00000",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"seal": {
-			"ethereum": {
-				"nonce": "0x0000000000000000",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
-		"timestamp": "0x5c2d2287"
-	},
-	"nodes": [
-		"enode://06333009fc9ef3c9e174768e495722a7f98fe7afd4660542e983005f85e556028410fd03278944f44cfe5437b1750b5e6bd1738f700fe7da3626d52010d2954c@51.141.15.254:30303",
-		"enode://93c94e999be5dd854c5d82a7cf5c14822973b5d9badb56ad4974586ec4d4f1995c815af795c20bb6e0a6226d3ee55808435c4dc89baf94ee581141b064d19dfc@80.187.116.161:25720",
-		"enode://ae8658da8d255d1992c3ec6e62e11d6e1c5899aa1566504bc1ff96a0c9c8bd44838372be643342553817f5cc7d78f1c83a8093dee13d77b3b0a583c050c81940@18.232.185.151:30303",
-		"enode://b477ca6d507a3f57070783eb62ba838847635f8b1a0cbffb8b7f8173f5894cf550f0225a5c279341e2d862a606e778b57180a4f1db3db78c51eadcfa4fdc6963@40.68.240.160:30303"
-	],
-	"accounts": {
-		"0x0000000000000000000000000000000000000000": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000001": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "ecrecover",
-				"pricing": {
-					"linear": {
-						"base": 3000,
-						"word": 0
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000002": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "sha256",
-				"pricing": {
-					"linear": {
-						"base": 60,
-						"word": 12
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000003": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "ripemd160",
-				"pricing": {
-					"linear": {
-						"base": 600,
-						"word": 120
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000004": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "identity",
-				"pricing": {
-					"linear": {
-						"base": 15,
-						"word": 3
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000005": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "modexp",
-				"activate_at": "0xaef49",
-				"pricing": {
-					"modexp": {
-						"divisor": 20
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000006": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0xaef49": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x1f67cf": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000007": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0xaef49": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x1f67cf": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000008": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0xaef49": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x1f67cf": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000009": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "blake2_f",
-				"activate_at": "0x1f67cf",
-				"pricing": {
-					"blake2_f": {
-						"gas_per_round": 1
-					}
-				}
-			}
-		},
-		"0x000000000000000000000000000000000000000a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000010": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000011": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000012": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000013": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000014": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000015": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000016": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000017": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000018": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000019": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000020": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000021": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000022": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000023": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000024": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000025": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000026": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000027": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000028": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000029": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000030": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000031": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000032": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000033": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000034": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000035": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000036": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000037": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000038": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000039": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000040": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000041": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000042": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000043": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000044": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000045": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000046": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000047": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000048": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000049": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000050": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000051": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000052": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000053": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000054": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000055": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000056": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000057": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000058": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000059": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000060": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000061": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000062": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000063": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000064": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000065": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000066": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000067": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000068": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000069": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000070": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000071": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000072": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000073": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000074": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000075": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000076": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000077": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000078": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000079": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000080": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000081": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000082": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000083": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000084": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000085": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000086": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000087": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000088": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000089": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000090": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000091": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000092": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000093": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000094": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000095": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000096": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000097": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000098": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000099": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009f": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000aa": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ab": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ac": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ad": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ae": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000af": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ba": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000be": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bf": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ca": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ce": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cf": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000da": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000db": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000dc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000dd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000de": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000df": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ea": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000eb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ec": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ed": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ee": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ef": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fa": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fe": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ff": {
-			"balance": "0x1"
-		},
-		"0x25b7955e43adf9c2a01a9475908702cce67f302a": {
-			"balance": "0x84595161401484a000000"
-		},
-		"0x6aaf8cba3c9255a2b863415d4db7bae4f4bbca02": {
-			"balance": "0x4a723dc6b40b8a9a000000"
-		}
-	}
-}
--- a/ethcore/res/ethereum/kovan.json
+++ b/ethcore/res/ethereum/kovan.json
@@ -7,31 +7,17 @@
 				"stepDuration": "0x4",
 				"blockReward": "0x4563918244F40000",
 				"validators": {
-					"multi": {
-						"0": {
-							"list": [
-								"0x00D6Cc1BA9cf89BD2e58009741f4F7325BAdc0ED",
-								"0x00427feae2419c15b89d1c21af10d1b6650a4d3d",
-								"0x4Ed9B08e6354C70fE6F8CB0411b0d3246b424d6c",
-								"0x0020ee4Be0e2027d76603cB751eE069519bA81A1",
-								"0x0010f94b296a852aaac52ea6c5ac72e03afd032d",
-								"0x007733a1FE69CF3f2CF989F81C7b4cAc1693387A",
-								"0x00E6d2b931F55a3f1701c7389d592a7778897879",
-								"0x00e4a10650e5a6D6001C38ff8E64F97016a1645c",
-								"0x00a0a24b9f0e5ec7aa4c7389b8302fd0123194de"
-							]
-						},
-						"10960440": {
-							"list": [
-								"0x00D6Cc1BA9cf89BD2e58009741f4F7325BAdc0ED",
-								"0x0010f94b296a852aaac52ea6c5ac72e03afd032d",
-								"0x00a0a24b9f0e5ec7aa4c7389b8302fd0123194de"
-							]
-						},
-						"10960500": {
-							"safeContract": "0xaE71807C1B0a093cB1547b682DC78316D945c9B8"
-						}
-					}
+					"list": [
+						"0x00D6Cc1BA9cf89BD2e58009741f4F7325BAdc0ED",
+						"0x00427feae2419c15b89d1c21af10d1b6650a4d3d",
+						"0x4Ed9B08e6354C70fE6F8CB0411b0d3246b424d6c",
+						"0x0020ee4Be0e2027d76603cB751eE069519bA81A1",
+						"0x0010f94b296a852aaac52ea6c5ac72e03afd032d",
+						"0x007733a1FE69CF3f2CF989F81C7b4cAc1693387A",
+						"0x00E6d2b931F55a3f1701c7389d592a7778897879",
+						"0x00e4a10650e5a6D6001C38ff8E64F97016a1645c",
+						"0x00a0a24b9f0e5ec7aa4c7389b8302fd0123194de"
+					]
 				},
 				"validateScoreTransition": "0x41a3c4",
 				"validateStepTransition": "0x16e360",
@@ -64,11 +50,6 @@
 		"eip1052Transition": "0x8c6180",
 		"eip1283Transition": "0x8c6180",
 		"eip1283DisableTransition": "0x9c7b61",
-		"eip1283ReenableTransition": "0xd751a5",
-		"eip1344Transition": "0xd751a5",
-		"eip1706Transition": "0xd751a5",
-		"eip1884Transition": "0xd751a5",
-		"eip2028Transition": "0xd751a5",
 		"kip4Transition": "0x8c6180",
 		"kip6Transition": "0x8c6180"
 	},
@@ -83,8 +64,8 @@
 		"gasLimit": "0x5B8D80"
 	},
 	"hardcodedSync": {
-		"header": "f90247a0d0c0f490e8e5045fa96fd77ce45ed983900feaab964b2b0ba3a2d3a6b5e0f842a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479400d6cc1ba9cf89bd2e58009741f4f7325badc0eda0c91e59c81193c4fead4f64ecaa349e97056409dfbb787772ea3c1e55e7582b2ea08be1332f5e7eac286c7e5e5ccf3760e47f4a919548c15e748ad4351bb8405f9aa054e0533aa3433f4d07afa226230c867fc1e2844b5f49b25aba8df17630d9f8c8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000090fffffffffffffffffffffffffffffffe83a26801837a12008306f78d845c9da0b09fde830203088f5061726974792d457468657265756d86312e33332e30827769841727682cb841d6db93a25c84287603ee26e48db0dd301753840cc7283d411d3febd0485e02b2520086bebfb3aec1ab69403f45f0d59249bf0d458f33aa268dc4badefc73c8d300",
-		"totalDifficulty": "3571337622391237938633151520660827524104528124",
+		"header": "f90247a03dc1f4ed47c057717131ce81535d06194d990be6969334e9b8034e0c875f9dffa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940010f94b296a852aaac52ea6c5ac72e03afd032da0fd1833e970c207ca16e1e74d937c9d8e01a1f719643fb25963028427295fc2cca00d9d5e376ebe3558b412402702d34a93256bb03a61df9f17ae234f0a70f95b20a0129c38f28acd251820f96305d217511a725a1fae1a434d77034bd7efef1f9f5ab901000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000080000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000090fffffffffffffffffffffffffffffffa839f3801837a1200834bb5f3845c7361249fde8302020a8f5061726974792d457468657265756d86312e33322e30826c6984171cd849b841d077cf579661ac8634ee865b5cc67918223aed686d6ba189624a6f6c0dfc5249418b25423e30e072a79d5377e01845d5234ff5e0b9b0207b1bf2515f805b47e300",
+		"totalDifficulty": "3500253997070921577369506418666760871805116639",
 		"CHTs": [
 			"0xdb9557458495268ddd69409fc1f66631ed5ff9bf6c479be6eabe5d83a460acac",
 			"0xd413800c22172be6e0b7a36348c90098955991f119ddad32c5b928e8db4deb02",
@@ -5180,109 +5161,7 @@
 			"0x7ba1756f8fa6637d8cb6cc588a679f6366827bc2044865744837c63e8a5aadcc",
 			"0xfc1a94a88f1e52bb78a0862eea4b996444f0264a3b301c1a31e59744d0216de8",
 			"0x79472bc4de84a0c430f15bcf8569486cddd2de985409ceb8e48abec8aa3e3fe7",
-			"0x02bc578dcc715304c651a43d8dcb4a761d2073a93cca2c39da3ee513f0c6d415",
-			"0xcf6175cfa60c20178241c18111d64f8837ec008751c5c333bee96c616d3cb6d1",
-			"0xd8281202c7b6da2a2541cd7f8d4270066f6546bec601e83647896ebdf0f2eb66",
-			"0xc4975ca8b2b71f61d2ba2825833df91096bd733301d54a3c7b6eca016ac14153",
-			"0xd01d6f14e93c8ba17a602378bce1c9bdb51373675109d6233c497b6c638a03a0",
-			"0x805057e19b7dd857ec014b4e6333bb60f48c02d29b128fe37a69f952df8ef16b",
-			"0x69c55bdbaf74bfa3d53ed32b79dd35ac2c24dd723a1c0bfd70871cefa4dbb8a8",
-			"0x523efe8059e6e8e2abd85d77d22123f97cbbd9864b4a3ac1fe0c0e4b8a7131eb",
-			"0xe5a4f129016bcfbd71913d1eff01cec924f9d130b8762c921d43fe5bbbbdbbd0",
-			"0x07f68773d16907348ac6e7c5be293ee1163ef41b91a2a8abb17a004c4796fb42",
-			"0x90742f88c71f9e689b6d2ca0236c48bba0e8ddeace5fa4d53a5af082055cfd73",
-			"0xaf7af6e9f695c4ca9e9a3c0229d94cbf02fcafbc4ed978a6b662862182308a72",
-			"0x0208eac99df5025cab13d9767a2ba3e42ba1eccb72cfa01d87e834d15eea3751",
-			"0xee9ff9384cef76b51a9d5b8eb12fd7e00ee7f8142f81bd68393e7fcf0eaef90a",
-			"0x4770986e657683d901d73df444836f11f169f94ac55ec81e4e19f2212052788c",
-			"0x9f9c16d009da6e8ee20d9d5f3bd7f1a77b853dfd19beef68d980fca6bce2b707",
-			"0x468efd7c8dad29cfff0e278fd950f89e2d5a57d6824c6c1a7a7659bd7e7c0ffe",
-			"0xd0391bd0a2c1fb2260d89bd5e519d4ef26b4945a7ad0c1b695687fe1b24698dd",
-			"0xdef9ee668e09f8769b2c706a8de426e06f0bd9c264e67bf0c0bb177b851cef23",
-			"0x10c5b79048e611c6e65f92dd54754753e595cd8f8f0f1005d7a647fa59deeb78",
-			"0x4ce6d5812d2565237a9b018ed6ec386cf3e9fe1f2f429605288f2ef744c5a940",
-			"0xbbacf6662d816d5eb14fc1271c1a3404de94e12c175545bc8273c231c280b789",
-			"0xb216fd154d3726f16907ae571728d92ae2199872f180e4cd6be3b53a8dd43ae0",
-			"0x2b76e6685604c69f29399451c66ce053ae033ab011eb52c97c112df968e37232",
-			"0xf93b8076ce0dc6742196d2c9af501fad39f570cd927e8fe3b8dac4127a20a6a4",
-			"0x35027cc654f998af75b8379fac0a9d51703f058b518880e25e658151619f1611",
-			"0x3e7f59319228d40e5e07c06b696ad6478237ed0c8a71cff418ac259c6b5579e4",
-			"0x7295e21fccabab1545c1e64a57f0401e62689057ab4fef26f70c8d02b63867ab",
-			"0xb06bcf07fe1345c41ba16df213d699e2e185ef2fd3b5e19b194459d0b7baffc1",
-			"0x1b13d005a29e35fff33373e2d8abc81805a85e7970b48dca8fd605069c8a0d85",
-			"0x90a5a61ce554bb73253d7f62c78b1764f03fb0fd8f65b6aae4f9e529acb1d991",
-			"0x1b1eccf7565339748947358caf473ba0cea743da2ed4790763d3ac8c402f261c",
-			"0xef9b05ae7ce93febce342336e40922e0884891da43aac06f3e9bbfc0aec688f9",
-			"0x11e1075b50de92e960d0d65e9b37b3cec81095f5afc2afccc6a9a8a325264049",
-			"0x128e6dba4205701f673dda9e980dc0c02f3c0c8cbc570f9a240257a261f81b39",
-			"0x6fd9d3eaffaeebd52ce93ac8fcd0f69b146e2c0b05218850de1c9218db8ecd8f",
-			"0xc47e3487ad63b7db773f413cd5302818061f168409c27ff2daba4579c0a4263f",
-			"0x0a55695d4a132063735f7319d3a90a2e0b83fd6ec6b6f9994068f928f68afe12",
-			"0x39403d84aa319edbb18e0313a61ae075ba9c5dae40b9850eccbfc3e09e6b27a7",
-			"0x79ba98eede4cd0b7031472baacab20df85c704a26e4cfaa6e01e3d4a9d26ca39",
-			"0x219240759d36a317f269e4301256164cb3709628e0ba07e90a6bedd664cea059",
-			"0xec793562f8498937f270c6ae5490ab8f2ad21a20510699dc4d7d4d0139efeb3b",
-			"0x0a3e9c209903b906013c8876cb4292e6ccc8b76dbf4af2ca25d8260f9f8e7c22",
-			"0x0eb347bb16d897b4909dcaf31a0009e198cd197f722075c112fe29bc9f017f20",
-			"0xac1e6a97c51f5051dc8f3a1fa33c1071e29aff3d7040972dbb5481ba215010b3",
-			"0x7e1be83ac51c7e68110c6984da43885af18bc9fe988a57ada7b2379d0a122563",
-			"0xdb01b1cb4084a43c9a57bf8a65a58245edee5bbbdcf0573a3626e9290b4a2e6a",
-			"0x6c97523c89da4c9325fe17d2e879bbd6b4693f3e6d807564de83ccf801e66737",
-			"0x7511c0b30bd4dfa6f9a4f38793ee11e2a616de5d9d2212024c0875052ef2559e",
-			"0x6faa338fd78b41f2ecb623d578520b373e0c74caafce95938161dbd95edb0e24",
-			"0x0622bf3e00fae0e244d138f73d16035cd05aa9e0c4c16d20b36adad77951c2d4",
-			"0x72e1ed876e0bcdbdd200dbd55a9d7e8248a4c7ca75588681b61f6f76eb980060",
-			"0x981a052ee33c36c52fc33598c2563ff3698e1efd130090658cb457bb814ecff8",
-			"0x2b732d67211042b340c1bc49682518bb00dfcaebd0cfe861b5d38df9c127ed64",
-			"0xfcba6702d24950030403f872be646d058039d735cf297fcedb5daa255d47ce72",
-			"0xba3bdc1bd47ab43c2d39ee67a512f306e987b577166d7037705a1fda772bbeec",
-			"0xa39705f9efc0c0b9051742b705dab9fed7a08b3a00ff15583e15de95a9933356",
-			"0x551658242a3237fda7b61eae6dc40f368ffbbe3e7f292bf1b3d291d1f21a631d",
-			"0x631783a116fb5af727d2617276bf310e9f018e1f072d9f3d5432773ec29a193a",
-			"0x7d2bee7cbf5aa7a5247f047b1147f55380e035a5ff1ce958037d96a539fada37",
-			"0xfbe38f5210d9fc7c3474be4ff932d1ca393a565426f5d1443537e962beabbbca",
-			"0xfc9b71f941a0a9dafd6356c4a42c369f22144b43f32f5d50fe3d4c1cf3ee3cda",
-			"0xa4eb11bb0a0e210af085dc446766f4bb0d19dfec04e9d5d0d2c0ee390597906d",
-			"0x42e8e9e3d4d6de275146369fa7c010a10979793276a4406bbfd77a543809e762",
-			"0xb2fef38ac3b58b498cdad7d195bdb3604ca0cfc0ca3c7282163636d3022def43",
-			"0x923269e9a526ddaa446a2e7acaea5189726ff77e664c20a341f6ad2f6b810d5f",
-			"0x02e876ba6df7c9ddd7a9ad9bbc15f5918b096e299260fc85a8c7ebaa71d7dde5",
-			"0x660442f393884c6c4b879168ab3c80c57318c6c62a67ba8df3788edf9ad7303f",
-			"0x37f7ab248fded056ae5ecde87bf51c1f4baea786fc7c9f5b6760ad13c90659ac",
-			"0x36fda244e2896e45d3a8a9ed67d7c09a2974c75944a7233f571928a497b55f8c",
-			"0x4914478536196c3c813fe151cdf37097c6dc9e8d5c0cf9b370fe7567905fc4be",
-			"0xcedb88613a1d6fbc24909963911efbc5ff56ba09377350b5e824123b50d1a910",
-			"0x236fe31e63e426111507b2f972547255bd12c6f5df9079953a8b8346179bba57",
-			"0x2f08e1b0ad4024814428237b4f0e7ca5a83257d25a1cb97f42db14307113916f",
-			"0x41e45a3a2239551e8cb9598fb855f3d8922386c2e004426e294d111a94856b92",
-			"0xd5d385b54446abfa8c78950aacae52edede3a7a65d9c7515043431a4498e4f85",
-			"0xf2d2eb5169760d81d16067b9453979783a2feea91dfa253baa3183f2419478b0",
-			"0xa5aac8d064c4f4cdfdd2c7f7326c1e0260aeb44be48b391616eb01fc6d30c95e",
-			"0xb2a298085b0a082fc1781aad1abd263e9cc2c5eeeaa70acd88e8bdfbc0be7d15",
-			"0xe2d19c438ddb9b96e77a9bc70566f49021bb6444569eea3cd039ecab4d61f73a",
-			"0xa8549fc117d3faba2ca53efb94bbb37e9cb82bed8273e408da5ed47f5df7aab4",
-			"0x161c898240dd6e0a0a1f1f5948c652a796bb6586995783a35e7ed6c3c02fb82b",
-			"0x57214b17853934f1a548a7e9942849a04b9220f5b783a9d2be7395108bdc12e7",
-			"0x7902ef6c69f5d0a3de1e45d8b46aebcf35aa87cc5f4644186f1c34614a429175",
-			"0xc290a119f495ff04f406c28461e2de50abf92743b7fdd680048e491044fc59b7",
-			"0x09bf0fa4aa8b65dcc8f937e46287eb2585c85c587b425f8a0af69d02948f35d9",
-			"0xff20130699483dee0caacca392c2ad58738f61ea2443869616a3bf006e0cd1ad",
-			"0x937c629f7307f7411a4b1cc5b92f6a1f1f42f716463f15c449c681d16525996f",
-			"0x7cd028f48f117d8da3d537f0bb0fb0c832d3111d16fc116bd06454ddd513a095",
-			"0x4bf15bb783cf917375b5494e00ce003d8da01c65fcbac40d44e62a6172f2cca8",
-			"0xaff5ceacf024e9146631c772e4e87f223a241e789c88ae083da716c9aa47b860",
-			"0x68c1db9a727678d2018ec98d0bbc369faec2fb1283b479abd5d6f2b1b04036aa",
-			"0xe70962a032b4cb81910cea9911eef50ede2eeaa6f487f1e9f8fbf88f133249b1",
-			"0x1bc2bd4440a1412fbf582d167e0d08629ad2bfe0bc0dfaeb5eb7730a4baf007c",
-			"0x2d4cbafea30b01e466b41f6911deae979f4f5c82dcbdd76f711f7bf9300c23f4",
-			"0x252e39a51862ebaf28d9b38f9fb842c70b5bf0669ca008b4c83c542e5236a1af",
-			"0xba04c89c7ec2867d778f8632e7f51e11f06e56004520444ca922eabdab623473",
-			"0x74b8dc3bf589a6d9051fbed9af3021e8fb775eab0f457cfd5d38b2ec8f88a24c",
-			"0x8c0a98cd1665f50b702b44e10dfbfaa70f08b65ede72e39306b1d31b75c07afb",
-			"0xa38c3526f5f6bce7e64a195cf8659160bc7318b8862ba206535626c338485c64",
-			"0x4ad34e3c6be8cac9be3fba22eb7e99d951baf5827df5ef921f2b01d63862e116",
-			"0x596670c729beb030c8756bf2ec6c884f9b4edc433a94f5dc5d4d337dbb712d76",
-			"0x39611d27f11938df810165987ee7edbe87cfb7e4068216cbb45848b4029f8419"
+			"0x02bc578dcc715304c651a43d8dcb4a761d2073a93cca2c39da3ee513f0c6d415"
 		]
 	},
 	"accounts": {
@@ -5348,13 +5227,11 @@
 		"0x0000000000000000000000000000000000000006": {
 			"builtin": {
 				"name": "alt_bn128_add",
+				"activate_at": "0x4d50f8",
 				"pricing": {
-					"0x4d50f8": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0xd751a5": {
-						"info": "EIP 1108 transition at block 14_111_141 (0xd751a5)",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
+					"linear": {
+						"base": 500,
+						"word": 0
 					}
 				}
 			}
@@ -5362,13 +5239,11 @@
 		"0x0000000000000000000000000000000000000007": {
 			"builtin": {
 				"name": "alt_bn128_mul",
+				"activate_at": "0x4d50f8",
 				"pricing": {
-					"0x4d50f8": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0xd751a5": {
-						"info": "EIP 1108 transition at block 14_111_141 (0xd751a5)",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
+					"linear": {
+						"base": 40000,
+						"word": 0
 					}
 				}
 			}
@@ -5376,24 +5251,11 @@
 		"0x0000000000000000000000000000000000000008": {
 			"builtin": {
 				"name": "alt_bn128_pairing",
+				"activate_at": "0x4d50f8",
 				"pricing": {
-					"0x4d50f8": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0xd751a5": {
-						"info": "EIP 1108 transition at block 14_111_141 (0xd751a5)",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000009": {
-			"builtin": {
-				"name": "blake2_f",
-				"activate_at": "0xd751a5",
-				"pricing": {
-					"blake2_f": {
-						"gas_per_round": 1
+					"alt_bn128_pairing": {
+						"base": 100000,
+						"pair": 80000
 					}
 				}
 			}
@@ -5403,9 +5265,6 @@
 		}
 	},
 	"nodes": [
-		"enode://f6e37b943bad3a78cb8589b1798d30d210ffd39cfcd2c8f2de4f098467fd49c667980100d919da7ca46cd50505d30989abda87f0b9339377de13d6592c22caf8@34.198.49.72:30303",
-		"enode://16898006ba2cd4fa8bf9a3dfe32684c178fa861df144bfc21fe800dc4838a03e342056951fa9fd533dcb0be1219e306106442ff2cf1f7e9f8faa5f2fc1a3aa45@116.203.116.241:30303",
-		"enode://2909846f78c37510cc0e306f185323b83bb2209e5ff4fdd279d93c60e3f365e3c6e62ad1d2133ff11f9fd6d23ad9c3dad73bb974d53a22f7d1ac5b7dea79d0b0@3.217.96.11:30303",
 		"enode://56abaf065581a5985b8c5f4f88bd202526482761ba10be9bfdcd14846dd01f652ec33fde0f8c0fd1db19b59a4c04465681fcef50e11380ca88d25996191c52de@40.71.221.215:30303",
 		"enode://d07827483dc47b368eaf88454fb04b41b7452cf454e194e2bd4c14f98a3278fed5d819dbecd0d010407fc7688d941ee1e58d4f9c6354d3da3be92f55c17d7ce3@52.166.117.77:30303",
 		"enode://38e6e7fd416293ed120d567a2675fe078c0205ab0671abf16982ce969823bd1f3443d590c18b321dfae7dcbe1f6ba98ef8702f255c3c9822a188abb82c53adca@51.77.66.187:30303",
--- a/ethcore/res/ethereum/kovan_wasm_test.json
+++ b/ethcore/res/ethereum/kovan_wasm_test.json
@@ -60,48 +60,9 @@
 		"0x0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0x0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"0x0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": 5067000, "pricing": { "modexp": { "divisor": 20 } } } },
-		"0x0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"5067000": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"5067000": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"5067000": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
+		"0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": 5067000, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": 5067000, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": 5067000, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"0x00521965e7bd230323c423d96c657db5b79d099f": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }
 	},
 	"nodes": [
--- a/ethcore/res/ethereum/mcip3_test.json
+++ b/ethcore/res/ethereum/mcip3_test.json
@@ -120,44 +120,38 @@
 				}
 			}
 		},
-		"0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0x7fffffffffffff": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
+		"0000000000000000000000000000000000000006":{
+			"builtin":{
+				"name":"alt_bn128_add",
+				"activate_at":"0x7fffffffffffff",
+				"pricing":{
+					"linear":{
+						"base":500,
+						"word":0
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0x7fffffffffffff": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
+		"0000000000000000000000000000000000000007":{
+			"builtin":{
+				"name":"alt_bn128_mul",
+				"activate_at":"0x7fffffffffffff",
+				"pricing":{
+					"linear":{
+						"base":40000,
+						"word":0
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0x7fffffffffffff": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
+		"0000000000000000000000000000000000000008":{
+			"builtin":{
+				"name":"alt_bn128_pairing",
+				"activate_at":"0x7fffffffffffff",
+				"pricing":{
+					"alt_bn128_pairing":{
+						"base":100000,
+						"pair":80000
 					}
 				}
 			}
--- a/ethcore/res/ethereum/mix.json
+++ b/ethcore/res/ethereum/mix.json
@@ -48,23 +48,13 @@
 	},
 	"nodes": [
 		"enode://aeb6070deb50efeb41c5e4283a6a3b08ff701fef90e3522161c145f30df2852af3dfc51ba74591f7c9d96b11ca4c3c2b354bf58dd243f2d877f6eecc2373fd1d@139.162.15.124:30313",
-		"enode://cb4b0568607c97a3af4857700152fad9c79908a89319310268c7f49184e3f7e0c88c8d3504696f521c8aafcd00644f9325f76cba9427181b1493ff7ce230df00@139.162.15.124:30303",
 		"enode://e0c926dcdc5c1cf58b2ecba371c577c28c28c91f9b210093178a812389b65e5b53f0e478753b94fceb0b36645b779a915ca57c0c48507fe4d7f786508653656c@74.207.240.177:30313",
-		"enode://37fe8c0f8d667f110316de3109dcc2e9c9247219998e9ac395db39511bef697f9646f73d86a43da491efce35458f53ac3ac0994b85f7086bbf244809d4e7eb7f@74.207.240.177:30303",
 		"enode://a2a2adb8c12b9b189306050013a44f28db30f92fb3670db9675a049b98b96eb18901d6ff7b961b6e96cfa3923ac29e8f647ef452f0a23ddfef3903ac1cf826af@173.255.195.214:30313",
-		"enode://ed6fea8e7389bb75ff34846e4aaefa9157c9c79828c6404f4a0ab6b997a613f777aecaed5092c3f51abdf918926c925f7ee4f4cffdb0ac37775d03070a3d6b55@173.255.195.214:30303",
 		"enode://5460fd1ad217941befd0f8d060e6729a0535a0738770aba56827d1313c09aeb68e3098d458aace59faba2c6780b8c9c30cb140b80cd8e30ca3a074ce6d3344d3@50.116.38.52:30313",
-		"enode://9109e01dec60b67afa5aea77da17e0cb9a716a547469be378eb122c545a3fda9082e553624ff9e673195a715d5628ebf046a6c4ff315e566420e3bdde003bd9a@50.116.38.52:30303",
 		"enode://99fff4ed887d6a6a7b6e03a657c35c06d0eede1909ec289a362bad9d37dd4085886461bbce83aa484ce1327badb3c5958365caa851d71de49dc4530e075b64bc@45.79.128.151:30313",
-		"enode://4b4c06445175b77ac07eba03ac624f72e4e86065ee8bbdbca5f882a2a333e2608e6ef2ae5b5779816abd8d07ae6ec08f75888edeab3bc06f2b75871feb14afef@45.79.128.151:30303",
 		"enode://fd80e04c75559cfdd9ed8c08ef2c39c5bc95021f7cbaf31acb601914bc7dac7c34b470b90a05e519bc8a8435a46e1ce51053ae07fac31a83567285c34a79c6bf@139.162.224.203:30313",
-		"enode://d2e678247450c0a7aefdcf03787d4905deda2a6889f02071b241a1309a6bec6ea1c8b1160f69635dee0b4e00cc83656a601b4528cccbd85744b811654ab24b13@139.162.224.203:30303",
 		"enode://4742134a153c108855eb16563424887ed3aa5b6b74e4b713c8e93a10c376d954ff3041442716bdf9ee28fab2ea09f04d07e3366f834ea472c19820b7337eb27a@172.104.130.233:30313",
-		"enode://9aaeae0129af1bbb2e3590a71cd1ad0c320aa1c03e15c9eb3563cee2d8a7ca43473f43197b6dc0befe5bcef6185196360fa8b4b0d82d8ef11e2ff65553a1efa5@172.104.130.233:30303",
-		"enode://799d0a8836e17ef7fcc58b3d5ced5bb1fe474b31a09851f938d381f4556fa8954ca308f6a178d22ed56769a8b878ac8f9cc62c889f9cafab45a3bd4f6024bb29@172.104.68.7:30313",
-		"enode://ab7b1aab2439aafadcb52f8353e60fc1eea55ee5a01b4ddf46ecdeaa2e869c4bf305249757dc74baa78cf05c5d98ffe5c2a008851f08cab6096c78a08dee7c17@172.104.68.7:30303",
-		"enode://ab4a7fb0963e4951bebbefd2ec09ddac018bb27600a6063d755dfc10be118cbfe3954ada561afbce4cbda6f62364c12902b9e6bdef258aff36b8a73db3c0f161@172.105.16.240:30313",
-		"enode://30ff1bd89f58a1adae1f2b2ed1e36fa95caf5c2c7e085cf3a49f14705427ca7d7b2508060d058ceda57c708e8aa4661304f3c17eaae4da2e9cea6b64b3893c2f@172.105.16.240:30303"
+		"enode://799d0a8836e17ef7fcc58b3d5ced5bb1fe474b31a09851f938d381f4556fa8954ca308f6a178d22ed56769a8b878ac8f9cc62c889f9cafab45a3bd4f6024bb29@172.104.68.7:30313"
 	],
 	"accounts": {
 		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
@@ -72,48 +62,9 @@
 		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": 3000000, "pricing": { "modexp": { "divisor": 20 } } } },
-		"0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"3000000": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"3000000": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"3000000": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": 3000000, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": 3000000, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": 3000000, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"97c7f4f8f0bbf384578a9f5754ae73f37ff49ec2": { "balance": "55000000000000000000000000" }
 	}
 }
--- a/ethcore/res/ethereum/morden.json
+++ b/ethcore/res/ethereum/morden.json
--- a/ethcore/res/ethereum/mordor.json
+++ b/ethcore/res/ethereum/mordor.json
@@ -1,206 +0,0 @@
-{
-	"name":"Mordor Classic Testnet",
-	"dataDir":"mordor",
-	"engine":{
-		"Ethash":{
-			"params":{
-				"minimumDifficulty":"0x20000",
-				"difficultyBoundDivisor":"0x800",
-				"durationLimit":"0xd",
-				"blockReward":"0x4563918244F40000",
-				"homesteadTransition":"0x0",
-				"ecip1010PauseTransition":"0x0",
-				"ecip1010ContinueTransition":"0x0",
-				"ecip1017EraRounds":"0x1e8480",
-				"bombDefuseTransition":"0x0",
-				"eip100bTransition":"0x0"
-			}
-		}
-	},
-	"params":{
-		"gasLimitBoundDivisor":"0x400",
-		"accountStartNonce":"0x0",
-		"maximumExtraDataSize":"0x20",
-		"minGasLimit":"0x1388",
-		"networkID":"0x7",
-		"chainID":"0x3f",
-		"eip150Transition":"0x0",
-		"eip160Transition":"0x0",
-		"eip161abcTransition":"0x0",
-		"eip161dTransition":"0x0",
-		"eip155Transition":"0x0",
-		"maxCodeSize":"0x6000",
-		"maxCodeSizeTransition":"0x0",
-		"eip140Transition":"0x0",
-		"eip211Transition":"0x0",
-		"eip214Transition":"0x0",
-		"eip658Transition":"0x0",
-		"eip145Transition":"0x498bb",
-		"eip1014Transition":"0x498bb",
-		"eip1052Transition":"0x498bb",
-		"eip1283Transition":"0xbe10b",
-		"eip1344Transition":"0xbe10b",
-		"eip1706Transition":"0xbe10b",
-		"eip2028Transition":"0xbe10b"
-	},
-	"genesis":{
-		"seal":{
-			"ethereum":{
-				"nonce":"0x0000000000000000",
-				"mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
-		"difficulty":"0x20000",
-		"author":"0x0000000000000000000000000000000000000000",
-		"timestamp":"0x5d9676db",
-		"parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData":"0x70686f656e697820636869636b656e206162737572642062616e616e61",
-		"gasLimit":"0x2fefd8"
-	},
-	"nodes":[
-		"enode://03b133f731049e3f7be827339c3759be92778c05e54a1847d178c0fdb56fa168aa1e7e61fc77791a7afdd0328a00318f73c01212eb3f3bbe919f5ce8f5b4a314@192.227.105.4:32000",
-		"enode://06fdbeb591d26f53b2e7250025fe955ca013431ded930920cf1e3cd1f0c920e9a5e727949d209bc25a07288327b525279b11c5551315c50ff0db483e69fc159b@34.218.225.178:32000",
-		"enode://1813e90a0afdd7c1e4892c5376960e3577a9e6c5a4f86fa405a405c7421a4a1608248d77cc90333842f13d8954d82113dec480cfb76b4fef8cb475157cf4d5f2@10.28.224.3:30000",
-		"enode://2b69a3926f36a7748c9021c34050be5e0b64346225e477fe7377070f6289bd363b2be73a06010fd516e6ea3ee90778dd0399bc007bb1281923a79374f842675a@51.15.116.226:30303",
-		"enode://621e28e529146fd501709194885f50540c494f1a2985d1fb4ec8769226b5cb0b0d1a11545926077821474c2767cdd87888ead8a2509a2c9069dd5584e4b1c3b8@10.28.223.8:30000",
-		"enode://a59e33ccd2b3e52d578f1fbd70c6f9babda2650f0760d6ff3b37742fdcdfdb3defba5d56d315b40c46b70198c7621e63ffa3f987389c7118634b0fefbbdfa7fd@51.15.116.226:30303",
-		"enode://f840b007500f50c98ea6f9c9e56dabf4690bbbbb7036d43682c531204341aff8315013547e5bee54117eb22bd3603585ae6bf713d9fa710659533fcab65d5b84@35.238.101.58:30000",
-		"enode://19eda672030ad5debb98c9069b3e99d12438b96506325d9f3f82d76c5f8ce4942d345f41700a5223900e75ad48e76713b74c1b694d67a10c2112540035922256@35.238.101.58:30000"
-	],
-	"accounts":{
-		"0x0000000000000000000000000000000000000001":{
-			"builtin":{
-				"name":"ecrecover",
-				"pricing":{
-					"linear":{
-						"base":3000,
-						"word":0
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000002":{
-			"builtin":{
-				"name":"sha256",
-				"pricing":{
-					"linear":{
-						"base":60,
-						"word":12
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000003":{
-			"builtin":{
-				"name":"ripemd160",
-				"pricing":{
-					"linear":{
-						"base":600,
-						"word":120
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000004":{
-			"builtin":{
-				"name":"identity",
-				"pricing":{
-					"linear":{
-						"base":15,
-						"word":3
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000005":{
-			"builtin":{
-				"activate_at":"0x0",
-				"name":"modexp",
-				"pricing":{
-					"modexp":{
-						"divisor":20
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000006":{
-			"builtin":{
-				"name":"alt_bn128_add",
-				"pricing":{
-					"0x0":{
-						"price":{
-							"alt_bn128_const_operations":{
-								"price":500
-							}
-						}
-					},
-					"0xbe10b":{
-						"info":"EIP 1108 transition",
-						"price":{
-							"alt_bn128_const_operations":{
-								"price":150
-							}
-						}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000007":{
-			"builtin":{
-				"name":"alt_bn128_mul",
-				"pricing":{
-					"0x0":{
-						"price":{
-							"alt_bn128_const_operations":{
-								"price":40000
-							}
-						}
-					},
-					"0xbe10b":{
-						"info":"EIP 1108 transition",
-						"price":{
-							"alt_bn128_const_operations":{
-								"price":6000
-							}
-						}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000008":{
-			"builtin":{
-				"name":"alt_bn128_pairing",
-				"pricing":{
-					"0x0":{
-						"price":{
-							"alt_bn128_pairing":{
-								"base":100000,
-								"pair":80000
-							}
-						}
-					},
-					"0xbe10b":{
-						"info":"EIP 1108 transition",
-						"price":{
-							"alt_bn128_pairing":{
-								"base":45000,
-								"pair":34000
-							}
-						}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000009": {
-			"builtin": {
-				"name": "blake2_f",
-				"activate_at": "0xbe10b",
-				"pricing": {
-					"blake2_f": {
-						"gas_per_round": 1
-					}
-				}
-			}
-		}
-	}
-}
--- a/ethcore/res/ethereum/musicoin.json
+++ b/ethcore/res/ethereum/musicoin.json
@@ -128,44 +128,38 @@
 				}
 			}
 		},
-		"0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0x21e88e": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
+		"0000000000000000000000000000000000000006":{
+			"builtin":{
+				"name":"alt_bn128_add",
+				"activate_at":"0x21e88e",
+				"pricing":{
+					"linear":{
+						"base":500,
+						"word":0
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0x21e88e": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
+		"0000000000000000000000000000000000000007":{
+			"builtin":{
+				"name":"alt_bn128_mul",
+				"activate_at":"0x21e88e",
+				"pricing":{
+					"linear":{
+						"base":40000,
+						"word":0
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0x21e88e": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
+		"0000000000000000000000000000000000000008":{
+			"builtin":{
+				"name":"alt_bn128_pairing",
+				"activate_at":"0x21e88e",
+				"pricing":{
+					"alt_bn128_pairing":{
+						"base":100000,
+						"pair":80000
 					}
 				}
 			}
--- a/ethcore/res/ethereum/poacore.json
+++ b/ethcore/res/ethereum/poacore.json
@@ -34,15 +34,7 @@
 		"eip140Transition": "0x0",
 		"eip211Transition": "0x0",
 		"eip214Transition": "0x0",
-		"eip658Transition": "0x0",
-		"eip145Transition": 8582254,
-		"eip1014Transition": 8582254,
-		"eip1052Transition": 8582254,
-		"eip1283Transition": 12598600,
-		"eip1344Transition": 12598600,
-		"eip1706Transition": 12598600,
-		"eip1884Transition": 12598600,
-		"eip2028Transition": 12598600
+		"eip658Transition": "0x0"
 	},
 	"genesis": {
 		"seal": {
@@ -56,6 +48,7 @@
 	},
 	"nodes": [
 		"enode://6e3d1b39cbd2a9c4f053a27e68fd90d0bac83691dfdc4a13c59f2555078a71e63c5daaee5a82aa6db500512760a5456f86076bf8bbe8011c27c82ed7d6f5fb26@45.77.140.210:30303",
+		"enode://f4698ad485a027497e1cc992bb5f7cecee2b32a44c47202738d8d0eecfab719541988d0cbcbc5ea94c6c959e5cddeb85fc6ae75fb63dc3bf87cdbe9e6f615e9d@206.156.242.64:30303",
 		"enode://31dffed97f8fed1f34fe66453280a89cbeeda60cf28f6fbb212ebbefd7c7566a02c1c7d5c00bbbb49b9fa8a49f157e0f786f379ca9bcbf2fea24de70d70a22b6@206.156.242.61:30303",
 		"enode://6bdc7553ab2e4914cb47774c1e6d8c8f47ac7c3981891f85f65d06f208ea1bc4d3bf982b330950e0a0cd127efd7145c4df7113159a1d4a06ed722e6c16d0ac6c@45.32.215.190:30303",
 		"enode://872d82a24144bc007658fb6fac0dcdfb9b63aeb05ef563a06d0186f2d1e5ffbfc5c4f1244891a8a86ef70682b9d24382e654b305224883698862e2df647a4d23@45.76.236.247:30303",
@@ -63,89 +56,19 @@
 		"enode://96678da10ac83769ab3f63114a41b57b700476c5ac02719b878fa89909a936551bb7609aa09b068bf89903206fa03f23e1b5b9117ca278de304c2570b87dcb27@35.175.15.164:30303"
 	],
 	"accounts": {
-		"0x0000000000000000000000000000000000000005": {
-			"builtin": {
-				"name": "modexp",
-				"pricing": {
-					"0": {
-						"price": {
-							"modexp": {
-								"divisor": 20
-							}
-						}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"12598600": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"12598600": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"12598600": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000009": {
-			"builtin": {
-				"name": "blake2_f",
-				"pricing": {
-					"12598600": {
-						"info": "EIP 1108 transition",
-						"price": {
-							"blake2_f": {
-								"gas_per_round": 1
-							}
-						}
-					}
-				}
-			}
-		},
+		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x0", "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "0x0", "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "0x0", "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "0x0", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
+
 		"0x0000000000000000000000000000000000000001": {
 			"balance": "1",
 			"builtin": {
 				"name": "ecrecover",
 				"pricing": {
-					"0": {
-						"price": {
-							"linear": {
-								"base": 3000,
-								"word": 0
-							}
-						}
+					"linear": {
+						"base": 3000,
+						"word": 0
 					}
 				}
 			}
@@ -155,13 +78,9 @@
 			"builtin": {
 				"name": "sha256",
 				"pricing": {
-					"0": {
-						"price": {
-							"linear": {
-								"base": 60,
-								"word": 12
-							}
-						}
+					"linear": {
+						"base": 60,
+						"word": 12
 					}
 				}
 			}
@@ -171,13 +90,9 @@
 			"builtin": {
 				"name": "ripemd160",
 				"pricing": {
-					"0": {
-						"price": {
-							"linear": {
-								"base": 600,
-								"word": 120
-							}
-						}
+					"linear": {
+						"base": 600,
+						"word": 120
 					}
 				}
 			}
@@ -187,13 +102,9 @@
 			"builtin": {
 				"name": "identity",
 				"pricing": {
-					"0": {
-						"price": {
-							"linear": {
-								"base": 15,
-								"word": 3
-							}
-						}
+					"linear": {
+						"base": 15,
+						"word": 3
 					}
 				}
 			}
--- a/ethcore/res/ethereum/poasokol.json
+++ b/ethcore/res/ethereum/poasokol.json
@@ -42,12 +42,7 @@
 		"eip1014Transition": 6464300,
 		"eip1052Transition": 6464300,
 		"eip1283Transition": 6464300,
-		"eip1283DisableTransition": 7026400,
-		"eip1283ReenableTransition": 12095200,
-		"eip1344Transition": 12095200,
-		"eip1706Transition": 12095200,
-		"eip1884Transition": 12095200,
-		"eip2028Transition": 12095200
+		"eip1283DisableTransition": 7026400
 	},
 	"genesis": {
 		"seal": {
@@ -60,99 +55,28 @@
 		"gasLimit": "0x663BE0"
 	},
 	"nodes": [
-		"enode://bdcd6f875583df2bd8094f08ae58c7c2db6ed67795ca8c0e6415a30721d3657291aec9b933d15e17e0b36ad7a76424a1447ddbfc75809a04f7a0ffef5617dd56@3.91.206.172:30303",
 		"enode://8e0af07c86ec36590bb6368e7ad0c45b6dc658f5fb66ec68889a614affddda5e021bd513bcf4fb2fae4a3bbe08cf0de84f037cd58478a89665dfce1ded2595c7@34.236.37.74:30303",
 		"enode://f1a5100a81cb73163ae450c584d06b1f644aa4fad4486c6aeb4c384b343c54bb66c744aa5f133af66ea1b25f0f4a454f04878f3e96ee4cd2390c047396d6357b@209.97.158.4:30303",
 		"enode://0d1e0372f63a3f0b82d66635ea101ecc0f6797788a078805cc933dd93e6a22f7c9fa51ab4e2d21da02d04480ef19f3bbb9a2b41dd1c262085d295a354bb8b0f9@18.217.47.209:30303",
-		"enode://875e1bd1b98019a5d6d588c23f68534b75462dd6ecbb3dd058221dbf7aa923f0ab782ab93bb82d42edc9996f7f0816a318bdc761e55c02b95e1169cef66f7edc@159.203.24.35:30303",
+		"enode://ab083db73da15b3995ac9c68035cdb32901835a823cb848fccb672e43dd21f14428706118d6fe5b921d8e741f122f35aad0255bc86807b1d17bcfa1e86e40a14@165.227.37.104:30303",
 		"enode://8e0af07c86ec36590bb6368e7ad0c45b6dc658f5fb66ec68889a614affddda5e021bd513bcf4fb2fae4a3bbe08cf0de84f037cd58478a89665dfce1ded2595c7@34.236.37.74:30303",
 		"enode://182ee200ca134dc4d6390f3d5aadbcd80df0f7f24335830335d142573eacce4eeb919d30e82c5df588034e167e6ba6dd11187502ac9264a71005127f6b146a99@159.203.95.241:30303",
 		"enode://b022ff70b5fcaf9596ae5efed99a8198b4ae0578ee9d17b733609d803a75cef95d3a2a18e50dca9a7c3b26139f158c59eaf8b5fb8d1d331c9a46934a78acabe8@206.189.76.128:30303"
 	],
 	"accounts": {
-		"0000000000000000000000000000000000000005": {
-			"builtin": {
-				"name": "modexp",
-				"pricing": {
-					"0": {
-						"price": {
-							"modexp": {
-								"divisor": 20
-							}
-						}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"12095200": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"12095200": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"12095200": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000009": {
-			"builtin": {
-				"name": "blake2_f",
-				"pricing": {
-					"12095200": {
-						"info": "EIP 1108 transition",
-						"price": {
-							"blake2_f": {
-								"gas_per_round": 1
-							}
-						}
-					}
-				}
-			}
-		},
+		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x0", "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "0x0", "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "0x0", "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "0x0", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
+
 		"0x0000000000000000000000000000000000000001": {
 			"balance": "1",
 			"builtin": {
 				"name": "ecrecover",
 				"pricing": {
-					"0": {
-						"price": {
-							"linear": {
-								"base": 3000,
-								"word": 0
-							}
-						}
+					"linear": {
+						"base": 3000,
+						"word": 0
 					}
 				}
 			}
@@ -162,13 +86,9 @@
 			"builtin": {
 				"name": "sha256",
 				"pricing": {
-					"0": {
-						"price": {
-							"linear": {
-								"base": 60,
-								"word": 12
-							}
-						}
+					"linear": {
+						"base": 60,
+						"word": 12
 					}
 				}
 			}
@@ -178,13 +98,9 @@
 			"builtin": {
 				"name": "ripemd160",
 				"pricing": {
-					"0": {
-						"price": {
-							"linear": {
-								"base": 600,
-								"word": 120
-							}
-						}
+					"linear": {
+						"base": 600,
+						"word": 120
 					}
 				}
 			}
@@ -194,13 +110,9 @@
 			"builtin": {
 				"name": "identity",
 				"pricing": {
-					"0": {
-						"price": {
-							"linear": {
-								"base": 15,
-								"word": 3
-							}
-						}
+					"linear": {
+						"base": 15,
+						"word": 3
 					}
 				}
 			}
--- a/ethcore/res/ethereum/rinkeby.json
+++ b/ethcore/res/ethereum/rinkeby.json
@@ -1,923 +0,0 @@
-{
-	"name": "Rinkeby",
-	"dataDir": "rinkeby",
-	"engine": {
-		"clique": {
-			"params": {
-				"period": 15,
-				"epoch": 30000
-			}
-		}
-	},
-	"params": {
-		"accountStartNonce": "0x0",
-		"chainID": "0x4",
-		"eip140Transition": "0xfcc25",
-		"eip145Transition": "0x37db77",
-		"eip150Transition": "0x2",
-		"eip155Transition": "0x3",
-		"eip160Transition": "0x0",
-		"eip161abcTransition": "0x0",
-		"eip161dTransition": "0x0",
-		"eip211Transition": "0xfcc25",
-		"eip214Transition": "0xfcc25",
-		"eip658Transition": "0xfcc25",
-		"eip1014Transition": "0x37db77",
-		"eip1052Transition": "0x37db77",
-		"eip1283Transition": "0x37db77",
-		"eip1283DisableTransition": "0x41efd2",
-		"eip1283ReenableTransition": "0x52efd1",
-		"eip1344Transition": "0x52efd1",
-		"eip1706Transition": "0x52efd1",
-		"eip1884Transition": "0x52efd1",
-		"eip2028Transition": "0x52efd1",
-		"gasLimitBoundDivisor": "0x400",
-		"maxCodeSize": "0x6000",
-		"maxCodeSizeTransition": "0x0",
-		"maximumExtraDataSize": "0xffff",
-		"minGasLimit": "0x1388",
-		"networkID": "0x4"
-	},
-	"genesis": {
-		"author": "0x0000000000000000000000000000000000000000",
-		"difficulty": "0x1",
-		"extraData": "0x52657370656374206d7920617574686f7269746168207e452e436172746d616e42eb768f2244c8811c63729a21a3569731535f067ffc57839b00206d1ad20c69a1981b489f772031b279182d99e65703f0076e4812653aab85fca0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-		"gasLimit": "0x47b760",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"seal": {
-			"ethereum": {
-				"nonce": "0x0000000000000000",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
-		"timestamp": "0x58ee40ba"
-	},
-	"nodes": [
-		"enode://a24ac7c5484ef4ed0c5eb2d36620ba4e4aa13b8c84684e1b4aab0cebea2ae45cb4d375b77eab56516d34bfbd3c1a833fc51296ff084b770b94fb9028c4d25ccf@52.169.42.101:30303",
-		"enode://343149e4feefa15d882d9fe4ac7d88f885bd05ebb735e547f12e12080a9fa07c8014ca6fd7f373123488102fe5e34111f8509cf0b7de3f5b44339c9f25e87cb8@52.3.158.184:30303",
-		"enode://b6b28890b006743680c52e64e0d16db57f28124885595fa03a562be1d2bf0f3a1da297d56b13da25fb992888fd556d4c1a27b1f39d531bde7de1921c90061cc6@159.89.28.211:30303"
-	],
-	"accounts": {
-		"0x0000000000000000000000000000000000000000": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000001": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "ecrecover",
-				"pricing": {
-					"linear": {
-						"base": 3000,
-						"word": 0
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000002": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "sha256",
-				"pricing": {
-					"linear": {
-						"base": 60,
-						"word": 12
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000003": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "ripemd160",
-				"pricing": {
-					"linear": {
-						"base": 600,
-						"word": 120
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000004": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "identity",
-				"pricing": {
-					"linear": {
-						"base": 15,
-						"word": 3
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000005": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "modexp",
-				"activate_at": "0xfcc25",
-				"pricing": {
-					"modexp": {
-						"divisor": 20
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000006": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0xfcc25": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x52efd1": {
-						"info": "EIP 1108 transition at block 5_435_345 (0x52efd1)",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000007": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0xfcc25": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x52efd1": {
-						"info": "EIP 1108 transition at block 5_435_345 (0x52efd1)",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000008": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0xfcc25": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x52efd1": {
-						"info": "EIP 1108 transition at block 5_435_345 (0x52efd1)",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
-		"0x0000000000000000000000000000000000000009": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "blake2_f",
-				"activate_at": "0x52efd1",
-				"pricing": {
-					"blake2_f": {
-						"gas_per_round": 1
-					}
-				}
-			}
-		},
-		"0x000000000000000000000000000000000000000a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000000f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000010": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000011": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000012": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000013": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000014": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000015": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000016": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000017": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000018": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000019": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000001f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000020": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000021": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000022": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000023": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000024": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000025": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000026": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000027": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000028": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000029": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000002f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000030": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000031": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000032": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000033": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000034": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000035": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000036": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000037": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000038": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000039": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000003f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000040": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000041": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000042": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000043": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000044": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000045": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000046": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000047": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000048": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000049": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000004f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000050": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000051": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000052": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000053": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000054": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000055": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000056": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000057": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000058": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000059": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000005f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000060": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000061": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000062": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000063": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000064": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000065": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000066": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000067": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000068": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000069": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000006f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000070": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000071": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000072": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000073": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000074": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000075": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000076": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000077": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000078": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000079": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000007f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000080": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000081": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000082": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000083": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000084": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000085": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000086": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000087": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000088": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000089": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000008f": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000090": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000091": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000092": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000093": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000094": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000095": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000096": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000097": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000098": {
-			"balance": "0x1"
-		},
-		"0x0000000000000000000000000000000000000099": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009a": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009b": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009c": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009d": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009e": {
-			"balance": "0x1"
-		},
-		"0x000000000000000000000000000000000000009f": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000a9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000aa": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ab": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ac": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ad": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ae": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000af": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000b9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ba": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000be": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000bf": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000c9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ca": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ce": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000cf": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000d9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000da": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000db": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000dc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000dd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000de": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000df": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000e9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ea": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000eb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ec": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ed": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ee": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ef": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f0": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f1": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f2": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f3": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f4": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f5": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f6": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f7": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f8": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000f9": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fa": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fb": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fc": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fd": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000fe": {
-			"balance": "0x1"
-		},
-		"0x00000000000000000000000000000000000000ff": {
-			"balance": "0x1"
-		},
-		"0x31b98d14007bdee637298086988a0bbd31184523": {
-			"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
-		}
-	}
-}
--- a/ethcore/res/ethereum/ropsten.json
+++ b/ethcore/res/ethereum/ropsten.json
@@ -16,8 +16,7 @@
 				"eip100bTransition": "0x19f0a0",
 				"difficultyBombDelays": {
 					"0x19f0a0": "0x2dc6c0",
-					"0x408b70": "0x1e8480",
-					"0x6c993d": "0x3d0900"
+					"0x408b70": "0x1e8480"
 				}
 			}
 		}
@@ -29,8 +28,8 @@
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID": "0x3",
-		"forkBlock": "0x62f757",
-		"forkCanonHash": "0x3a024a13310ec9b4805f681b17c3ae6c94167d1c6494e83d70a887ebc27df5ea",
+		"forkBlock": "0x40E80F",
+		"forkCanonHash": "0x3e12d5c0f8d63fbc5831cc7f7273bd824fa4d0a9a4102d65d99a7ea5604abc00",
 		"maxCodeSize": "0x6000",
 		"maxCodeSizeTransition": "0xa",
 		"eip150Transition": "0x0",
@@ -46,12 +45,7 @@
 		"eip1014Transition": "0x408b70",
 		"eip1052Transition": "0x408b70",
 		"eip1283Transition": "0x408b70",
-		"eip1283DisableTransition": "0x4b5e82",
-		"eip1283ReenableTransition": "0x62f756",
-		"eip1344Transition": "0x62f756",
-		"eip1706Transition": "0x62f756",
-		"eip1884Transition": "0x62f756",
-		"eip2028Transition": "0x62f756"
+		"eip1283DisableTransition": "0x4b5e82"
 	},
 	"genesis": {
 		"seal": {
@@ -68,8 +62,8 @@
 		"gasLimit": "0x1000000"
 	},
 	"hardcodedSync": {
-		"header": "f90219a081352ab3cd380f66493aa270deeb239af085e68a83579dd8871a0b0a7c7fd4e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794295856bcf02b2017607e4f61cfc1573fd05d511fa0a886a42f9a2733e392a5f9459f70bb133e5012f059d6cb6aeb360a7bb766571ea01ffc81fa17e357d368e82f1a658c8b129877818e34fdad26e32fa60ac4b12fc7a0946e845a5b468d8c679890632ab9fdff3349b307ce864c7b13195e4f80af4777b90100000000000000008c00021100000000000000000000010000400000000280000000000000000000000000008201000000010000010408010002010000000000002000010102080000008000080000000400000020100010000000200000200000000000000000000010080000000000008000000000080800000080100210000000080201006008210002000002004000000004a0000010800000000820c00010100000000000880000000800080000000020000000000000000100020000002000008002000200100000000000880840000000000242000000020100408800000202000000200000000000000000000200000008000001000000520080000000850340be271083653001837a12008344ded9845db0acc49ad983010906846765746889676f312e31312e3133856c696e7578a0a23e3a33f308378c4cb1eb9b34b40c224844aae072c0eba928a840f6d6ca69a28892892d000574e452",
-		"totalDifficulty": "26251713144679901",
+		"header": "f90217a058893ba2a7f3d1625239b0ffab5b58219412b5fb51a608fc6ae7ff012496db9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942b126e450158f14add6770739a2e6b4037526817a0a46d5b8474c625b4efd3d1d2864d7790770737587aa926fb223945d55a1d0da8a04ff0c821428157d6a4ace26e17d775eac4f42cc7d777898ded413780207fda11a0777f1c1c378807634128348e4f0eeca6a0e7f516ea411690ca04266323f671a4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000844737e14e834dd801837a1200830186a0845c76311499d883010816846765746888676f312e31312e35856c696e7578a0676e77abeb493056c28a2d8fcd1238da73a29c9d915441fd8b5e36f6e910fa5d8803afeb22c339444f",
+		"totalDifficulty": "18334236703652990",
 		"CHTs": [
 			"0x614648fc0a459451850bdfe353a932b5ff824e1b568478394f78b3ed5427e37a",
 			"0x1eae561c582dbb7f4e041998e084e165d0332c915d3a6da367638a8d24f3fafc",
@@ -2561,758 +2555,11 @@
 			"0x563d7efb4175fc12dab431175b5097186c2379a5aca1901e39d641d02865d426",
 			"0x1a55cf9842f9008e0730ae9fc6af9f288edba323803d0ae787fc0fdda99be8c9",
 			"0xccdf47cee7142cad27bbf224f0afd1a6e5178345cab510f2f8ee27115ab27ff7",
-			"0xc5b3582937ad993c5c234d059e6cd3b98f2fa4e3fe4ad591ecb6ae710b51fee9",
-			"0xd651ab199355d61c49e63259e6a20d17bf72b27891271e5175a24c23fb2dc29c",
-			"0x800e1e33b0cd48afc6f8f7c69b85902ad93e94bb290b35a862cbad67706a2f3d",
-			"0x57c7349a6b630cb52c3c1205165df428ed51e25cc167c08739f86bfa46c69e48",
-			"0xb393d362daff182dafcce65eda9038fc0c8908b3cb1ec1a1218570211c34e142",
-			"0xb2f49f7a836cd0db9e4743158ff80dd97d23de7a39a0438d19c79c355339c43c",
-			"0x3f46776ec25b5c67468c32c1b2ca02910a7f46b4b62b5dc5d0cc6b9d3381b958",
-			"0x754c4ea722e501668aa48d6151ff423263b8a4e2f33b9e44e189ee4e78462741",
-			"0x12e79ee2724763a8a7f9196bf4d0e855e0ae3f75f5a697d90a263bf562acc5a3",
-			"0x407b168fea70128a8090ca86274b0b8e7965f16d54ea2b3bbabb378485b22a02",
-			"0x0d1557ad0cb1466965e6ee86c5ce887eedf462dbec2e719c5f396f8ed95edf08",
-			"0x29c3a0db9f83698e6ae703174dbeec06f3d2055eb933799e4ae3bf73f4570dde",
-			"0x8ade20e56fcacb40f54259696bea1aa04d839b88c503d6775d7b4491e0f9e7fa",
-			"0x327ef0f173632c5049988b312b1f49e9948b02125f70e117ea127088191c32d5",
-			"0x2989c11c234b7fc5901e168d7adfa655ff6165098eb94d244b623ba43c6abbd6",
-			"0x10b56dc8f023de6a8f97696dfe2993b56156a9b35f671438fee5830f52b633b5",
-			"0x46cd37fffe94a01297f2dcef322ae72f58bbf9f58bc9f930cbf56e73f8d5ce13",
-			"0x2240214683eafc37396f3078446b43ae96bc576e45db650b953ff87a895ee7d7",
-			"0x0db4d500e5755cba5b962f6b83942e72fd1504cf52531916084852179669a08d",
-			"0xafc686a8325a30966db0f54b64a4e7235ea54e300d280a4d2a502651a53424b5",
-			"0x59d46f6fb8eadcf18e31c9fd0da6844d63a2dc19eeeaf9ad5b80113aca5bc42a",
-			"0x153ae496364bf7c34c8c967e044cef69e401f0e4aff27b04808e2c299dcf15a8",
-			"0xc85b8d3156729c7f8ff1989f320464144f4918140d608cf03e7dfd5b51ec2acf",
-			"0x78fd0613f6f5291d4131152225fbded5464841a119d854a7550a1f178a8cdfc7",
-			"0x763dc1a000b949a45f792515fed6af70047641fa3d7beeb50b141c27b4f8cd33",
-			"0x42567a1e6caadaa10a13feff343ae1e2a903564affacc48aebc14f257db58ee1",
-			"0x62c208337234d101cc95cb6be54c17631e26c956758493f5bb7978faf0ace984",
-			"0x7977aec997a3029025ef789d3492755c80c2d028046aae8c4b926f247e1981d9",
-			"0xf927505a0c29231ed187a884af15a82dbc48a1cb002f6d91496f6569c673682d",
-			"0xefd2c54f6d2483a3dd7b994d8afa5441cfffa956d7da6e81bbd1691e07ac7519",
-			"0x7bcf94d8927a39dd00558763cdd2edaf40d55728d720dccfa0f5e1e827079cc0",
-			"0x19c7e5115ec25b14bd85e3d368e15d2bbe60451ed9a02f03770a3e845521b77c",
-			"0x60e32d48de6979c70dcb3e3f068fc3632aba5844703d50851a34975338b3a837",
-			"0x6722f01dc1d6dd1f0678e5b527155beb0616e33887697a56ef4cc1bac642f394",
-			"0x59bf17368d69e0379f0f20ec1b1b856298b8d6b4c36354ee765c8a894e58ab9b",
-			"0xe2559e7b67a15a3ddfbf1ddc597a1309d1fd780fe26da28aace16ad31754883c",
-			"0xbf687ac704bf02a3877e72f738691bf5027c21f64c68a50235876a8d015ae682",
-			"0xde01838df621b7368adf4fda268c827dfaa6753a39d51956c0445a2244585ec1",
-			"0x4ba14d3860d1dee44904719e45a5bfe54dd1e4c9bdafd0a41279e432a021f2e6",
-			"0xa2380cb32538cc80e07fda5575ecd7b35e0c12932687bd8002da652ad8c16dc2",
-			"0x82d0f5c8421d6803e52e3d6a37eea0cd978686792a2f6d175d77e9c75fb4ad86",
-			"0x23701b29d07c64c998ee4bf8199d5ac0f3d9724af2544cc29665a1d92a6dadce",
-			"0x8bbd490220c823506e111c668f923d18addf5a23d9b5244103cc135c4335f23d",
-			"0x190506f2d9decb8f9423662f406e61c99606abdcb369e25a1a89c2bdc44c6158",
-			"0xb9504b090b276cbbf86349bc4dbb66b46a42ce6ae8d44d5cd7f39773fdf6112a",
-			"0x38fc273344dc7230790963dfb3dedfabe142c18886d6542d77ace8ed6d117c4f",
-			"0xc76929e9a3a984f6ab6395c4811f007eb6d73a86fe62f8a1c02e860769f2bcde",
-			"0xc4fc2465f71d06102d232858cfd9737e6e82311a45b1cb2ac203de80c881a2f4",
-			"0x34427ee5534de01e7f0510b87e6f45aac6210897472978aee3c051c39776c561",
-			"0xec4f3c6349dac1e7e43b0541b1132b3d0cc8bd422436f31832184d1aa6f9c822",
-			"0x024a848067a1156852c78495581392774b00f22e32021ca531afeab1aafb683e",
-			"0x9bdf793e30326a181d3d8fb3f27818475b755e3d1fea200d8c514cf17024979a",
-			"0x55a1d92354a31354b4b1d9366e98b27c0467b01a108d67dab7feeeda23f981d9",
-			"0x74614ac3de92173d07434dd80d83aad5c1d551127896298808ad7fba96051e06",
-			"0x7bdb77183ca1e7f50d292e50ef701ad3bfff3e6e28d36629c5325da03cb8d013",
-			"0x3a35dc3d12de1053d204410a577b9e5c36d32fbda761f797aee248c27f7dbb02",
-			"0x430aaeb1dc02bb792375d1702999cda7c384dde1c6f46ef26f1e26e5a55dfd87",
-			"0xe12805d1713ba730fec6aae824bdcd0a896c6d5e12b9bfa5b6e0a2c2be251c17",
-			"0x5a297bd3be2352e56136db83a76c7041ef825128152366b2d8f032abb1d6656f",
-			"0x111782d82f50ea25d684af38689cea53319f1a88557d82c57e46ee5e75f99c05",
-			"0xe12520cda10064d74fdefba22b5ff4c5eb95508f77fd7c8c3fe82fb89e165bf6",
-			"0x6af12e8f4db19aee3865c3d681073e7433d902832bc651b8fc3f5fd038c8bca6",
-			"0x82a4a2ce19ca3fd99007279d62dadba547b6818607800e963b3bc53c5541298a",
-			"0xbf3a444d1b15d01a29ea22d05e71021ee3581338ecc9e770ee23ab6549a19d55",
-			"0x745ff92172b5c83cdd69265b919028b350ef95a01c84810366d630162fd9b07f",
-			"0x6128cd2ff1be9e56396a676362a2049f3e670c70ad2a77be724c090fd4085f0b",
-			"0x8ffc6bf8165e52ecf30ec955d4be1bb093e6074c92a527382a8892ffa3d3e7f7",
-			"0xd65bc11ef24c0fa476640d9effdc57030a86f547b7aa79b209954a6abf4072c4",
-			"0xcd5b5e184a5c0d1c5bdd12f80736ed1a4530210b4ef5f35dacd3feba722a334a",
-			"0xa80657ecf79ef03fb919bf312e02d94ab528c1b5c3858332d9bf82f807b1c232",
-			"0xc67dfe4aca5001e97ba6f401f15b72be85ae45972ba98b965a6dd4954d5c2386",
-			"0x59201e892aeab9e40aef69945585b81b47a7444ed61ba6c6e23e006103ed7edd",
-			"0xf535c920c5316f12f0bfedc298fbad028dd84161927414b14243c4c5ddd4f4f1",
-			"0x66c6e42c8137c043eb49528c718b10e5dbad9164bd3ffcc6b55b4b0501dc507b",
-			"0xa60b9485cb54818e0b0bfe4faeca923915f85bbac0525d09d96f375d0b2b9f81",
-			"0x8f9377dddacb6ed605c8ed8ed2bc6e2323a4e5d0c9b29bccdfbd27f57a9ec315",
-			"0xc48a1940c424c2df4803ba8d5573066ce4bbf0e0fbdaa87abcb2d2f51b0a4602",
-			"0xc7bce918e9f897aeb1351d2c9cbc2fbc8fd674017cb25c49846b05d609f00ed9",
-			"0xcdaa86e0c026c91954c6305cb7ce6010560f691a2667baf0e95bc18cd3e067df",
-			"0xf131e0910a8088fc5b0b1d2e93e31632eec67fa88f75bc4f9c3c1b0a317e1d54",
-			"0xb4f8d72a85c4c2261c7b00f43b96d7d749d0e53359993f52517da36de4c9559b",
-			"0x73f84bb4774a81b39b3a10d18c7a2404d21f3efd26301dbb7c8136e96304281e",
-			"0x5559435a987f1444e4ec78b8530009e49c52431b37c7e9f80ce2e056d44e876a",
-			"0x070664d11ee10c4e0475a7ece219eb0e606e055ee0fa1266b669e593b5ba1d87",
-			"0xfdfafeba7b5551d1e2d6f179be5ddfdbd0350bd2e9dfea40e272fb608549e8c2",
-			"0x50a1356bab9b56d8ed46a3e8f55b8a16af42df6b15fcc68aa548216de484c7eb",
-			"0x681161a307552ff12175074601005bae0c6f7b38cfa6dcb87975a1df205e28d5",
-			"0x2b39456efc2e8863197c95a4d6eef5069612cc2aa6414f0991393ffa672a1a15",
-			"0x571b916a82371fafcb456524655758bd42b4f7b768e13807a1a995e642ec205c",
-			"0xb2821504201eea0e6040a131a709547fc9afb44ba7bfa6a188201735753ba3b7",
-			"0xb16a8af1bfdde1fae0e28f29c6db0b361840df4b55e73bddffbc1cc11bcc5584",
-			"0x1df38b594f536cee38acad293a818bf83fc67830fc71bc19790d7733a2caab60",
-			"0xebb3e8f76f3b6a95285154dc11d4bd94ac4c3a150383ed69f5373499b1983dc3",
-			"0xb0919ed300acac5f912f01611a428861db27ffb8129a80495f735f0ac608ab35",
-			"0x2ee321d9d805b78a97210df2977ab62b352705e308773b90e0f4e923adec377c",
-			"0xee00cb02e9b86978ae10b119924bbe6c38f730c1d1b621d32c9d697e11105871",
-			"0x3138c1f196e8b3de9369c3c8ee1d556de1bae00896cac87b4083bdd7a691e738",
-			"0x0a777c53b3be3f3b136b24585dca1b7c85f7b0edd72f2173ddc70b0a1bc8bd93",
-			"0xbcb300ee517ac8356c36c002da6f2ad562c31c81a3353d63925e044b10d0412a",
-			"0x503c3b1da233bf2f9f9fa13b0488aa5384a3cc95dc21e6f2e73577dd3ddc1974",
-			"0x0d07a00e18f3db6896d0879fe87cf7aec13f30a957806f74cdb0c47ccac035db",
-			"0xb6e92e6a32c5434a79448503a269e6e5ccbf70bc59dc58957915621eb5951e26",
-			"0xc2381981c2a38689e6ca1121fd33eac2881b1aac64a850b7f5751d587a5a79f4",
-			"0x83c0f655616e7565d63333d8a5f99baf2f4e0a7dc1520d6c4142b1be6931cdf4",
-			"0xb17c34ad30548ca1889d7aa11aa12748f7c02431d64d7f53013a10b979ec7aa1",
-			"0x34ab63d2aea17cf800fc2aa3c8589fcded1a732bbfa2102315adfa03596a4221",
-			"0x6a7bae77e28fe9ea18b59e4bd4b81780daf520309808560d533604c0bdf76f84",
-			"0x64df132fc5319adc69249961df9830e5d63945564d912fe901d80e7859a87057",
-			"0x2323352a8e2f13d442fcebc760ece470dfe5542188f6fc2d38f4db6af48bc959",
-			"0xe9944f4b2d9e3fd7aad0446281d4971463c2e53029d7e7f40f8b0daad1a29d67",
-			"0xe012a3af1ddc10881cbc1c62c1e0e7205db5edebe74bd0c8d1c12bb9a3f47e2f",
-			"0x26672ff6f0f02089b7a67837aedea5e54acc3120ad4f2b936948d7053d74ccfe",
-			"0x70b1eb24d9c2544e26af43212c0cf70e3e2ba58316f5372db5daed02c45907bf",
-			"0x7156e65df46bc1d62e8f8ab4c6c2115a5129d28ae9e96ba779b4615fde08f267",
-			"0x15212b5fcc31d204cee80a4ba392e731a2fbe40e1a23d8fdcbc6ecdd665ac9ff",
-			"0x1508823c086bb5269f60b452fcaf3d58b6dece236704ad479205e1b6b870b7a2",
-			"0x73a9ba93b3a5444294b466acb8c560c0a62a16dcdb5c90eddeb19f9eb75dfd31",
-			"0x9658cab50473a5fdc06f3bf07b34981212f215bdd773439cda3a5a37dd96b7ed",
-			"0x1b76828d177851a98f2a4e4a5a28e2e50dc876878b4a44b7654c409ad6a58a4c",
-			"0x7345477276953426e16dc819818ba09988d1e2b552adfa47c5f7cf6c1bfdb3da",
-			"0x2419a94e778ed5aeff0552a884b87b12e3b4f9b87c2e5df66ebe9260f38f19fa",
-			"0x4c14ee271bcb543d5395324a6fae046e133bd3e34f6a3d1328c9d3c77593756f",
-			"0xcbd9935f32d758ec070e06c393f5bfb925515058237471ccc89a6c7126df2fbc",
-			"0xf945621e7c926f2739488d96c4e5fd42fa91a5be31e9a45876fe982166bd4cfd",
-			"0x427ae8d29c63525078a803c1e40554f77685866a46f2ad9d0f772ad0c10b43ea",
-			"0xe4a6753800fc0d20c0ddedd6c716f8fafbbe636256548170a871d2913c885c9a",
-			"0x4da6c6246e60c496e059dd80bcae5ff30dc285e2a2db142eb4da3f15b00c0df3",
-			"0x4d1ff252edc762f25066a466e26154162942ef71ad13c159c102d94e427cc926",
-			"0x663a98199d967f55acdb313e901cfa23768ae21e7b5efa6b6de88b93e96b08b2",
-			"0xf025c69018317e95880e27a96910c6a4fac0b5d7a52abaab7c616af08eab1090",
-			"0xa5dc8339e0b823dc3821867cc84bebff11fb0bb8fe2f54ca5748cd2d8066f68b",
-			"0x9b3835afa0d0f1aac1a603d1f322940f4b84da6c6352654fb10aea202b3b84b1",
-			"0x41cea6f1e1de2697e58cefefbd4ea1118acb43aaf9ec7a9c116d14a5310e925f",
-			"0x5f1e42931b16c26642f351b24bb063f6ae7dbceca760961fe4d07dee0286082a",
-			"0x9ab19e309d5a4fd3596f0979b268473eeccd04af6674968e1e340a47c6652d9f",
-			"0xd6dfe22679bc3590594bfa1ead582bd4639f1b3869915e802e8973666d29588d",
-			"0x92f5589f356fbf8e4c5b12bf11d5f148d94f0e9f9297bbb32a73ed8fc409ad8d",
-			"0xecdeb77e2b35647c59aeb935e6fa4404ddecf9287ffd84d02c090d6772f1a68b",
-			"0x18abbe4adfb8d2365a14201ceb3966e561817ae497754b65cb5441f64bfec184",
-			"0x4d57180d082ec586a97573b383a12a59664d9877d86140281af0eef88f8dc8fc",
-			"0xfd52e379ec75f3645ccd83653370e107970c5c61573ec688986895d5e825303d",
-			"0x9327212a8ca5d0139e6728f8b39caa571a7821782b49a2edb96371daf6320571",
-			"0x9d9b1cbc011a31b99943d9dc7a2a8ff2da0992a5e3d22bf24685723b85545452",
-			"0x8661975f8565dd506ee26d265ed78a06d0c60dc150df594b6a1cd09c5c383e5c",
-			"0x98574ee8064f0b276433b8d98f7db55b7387775c03d543f2a8d1f77cc9d9bd20",
-			"0x6fd37be595359e52e5482f53ab66c9e76ef393085485a4bcb344272607cf2c0d",
-			"0x1d2a15c07ac3b45c024b4c14c976ed18d0f2e4ddfc84fa153414e301115b70fb",
-			"0x1ebb4adc19ea75acf90cd66ded504674367b70506f4813e22cc856f10c36973a",
-			"0xcb0198d5b6883b582c6b389e6f98ed77494f3f6ed232056dff48a368bbc2b9c2",
-			"0x2bb53b3a72fd65a4a090b49301c448fe44fbe0c7773e938af9c511070b442957",
-			"0xbf8289e45461485d9ae0df36052adcc1c43089e173a54663330a4f1ccd6ff7ea",
-			"0x059c82830dd4ffb040cc75a4b354483d81bc6f16ffd0545029112845f8db7cbd",
-			"0x68fa73438a9093f1e2e5a88a244287cd1d068bc28ac0c7c88cecc70f2b7cfe74",
-			"0xf935992c7eea357445e47fceb2894d4c04c618fb238f6a84251c919cd2e5b97c",
-			"0xc2b6a5bf4ab7f6f43fa9f59269116929116e5f136faf8acc7a565eaf4f6f5a0e",
-			"0x0f06da2edc35f959f8f3c9f9b16b13df3d1ebc5de146d7467f342116648bcbb7",
-			"0x4cccb59e57aedae4c1aa83a19126e846b14701be2971f95868c9055b77461db0",
-			"0xb2a64c59c4a3878472f5fdc4365e61f6cb5a67a1b453dba34c2d257f97ac44cd",
-			"0x21d74f1e667bce1163c8da46d522bb39a6ce777b618c6d2551c01427a68a2316",
-			"0xe1d84da4146c25e3d89bece4bcfd19ebaf684086604c53e702c07b938057d88d",
-			"0x6ff86b85371f732a285b19e9372a2567529bae071a439e80be782c5e3c462c4b",
-			"0x86fce707891c52a94cb30d50c4bd08fdd5567b88f6676f35228523847c966032",
-			"0x59aeb5682b2a3443e6c8bcc4d425e3a59872090bc71dfbc6cacda9f02d9fb7c8",
-			"0x7bf9a30fae3402b8d0aa4f7b18842bbe082c1e11469f635792225c8e8e536f9a",
-			"0x3f13e2ce31229a9079f04f77131a170212bc64c1701c2ddd54713c0e59f03991",
-			"0x2daaafebbc63db1ea0a8fa6e5037c4da16a92fceda2dbcb9576fc2fa28b0ee74",
-			"0xb14610c614c0c0c59e295fde6c4ab0e4b4c174385fa734cc8a2095dd6a95358c",
-			"0x14ab25c7f34bb626f581d38faef3beee599300a51bb62d3e1e1dded92ddc95d3",
-			"0x409ca4196a8db10326ca032cd14b7295981f0a779a42c7f0233d71ebfec3b19f",
-			"0xa283859dca46f41b5ca2f403aaa9e2356bf41e06697b5722b245c68ea3f81b2c",
-			"0x1c917355509fab582d5556e340b71c6962577da9e189b703456dbb7fb55784c7",
-			"0xb928315f7ce4508f4014962fc95a5942a5c0ee66af2e125101ab02d04b6cccab",
-			"0x00c6a46b1b4eaf7f62e2133d454f850ef1dae798d5aff512f607dd8037e53bbc",
-			"0xc042c1ce9cc355d4e054e5880f7c09fa3bcd58047159fe6b08a02c80059acaea",
-			"0xbf7b1e204a760ae2782e926e202428312955404786b85ab00688da616682b085",
-			"0x36d29378eacf4d587bc5a569e8ed572cbcb71be0a016d69909a05457915962b0",
-			"0x27674967b0e43a5f70ec168cb00df61a1227da4ac61660769ac2a7a2cdcb2598",
-			"0x9bea8f7596f72268a51be1b993cde5adbbe175ad48334276295687a76f801fc1",
-			"0xd9e17222c824c8293b05702e3170a059543bfa3e4bdd19828203c7072f013eb4",
-			"0x170685db98bae956224b3a57e4cf50ae4a8874ddc988f70d5ea31357c2a83ed8",
-			"0xb8e7344df221731d25fc88dfd31f938005328202dffd0be8d28e9d0392a75c81",
-			"0x47abee9a0802d59dec86fbe5d9a13a7332d326b900cae4e3841c69e9b25ac788",
-			"0xc09452238c2890433e14e0fcf826051c752580f147750ca745d1b779f303ef9b",
-			"0x05bbb06eb270618437a1300c02964c8f854d4a6daaab2d59ff6cc69f46c7234b",
-			"0x89d752b94f59ad98d59ee317c3ebcd840dcc997efa7fb88797c35477831c695a",
-			"0x2dc622984dd44a2cbb4313c7efccba85b497e33214eb314dfd7f2be40fee6cd3",
-			"0xe23e51675985c6a4f887c843048487721da6ae6a6676adc87a805fdd46149f9c",
-			"0xa452ef2f6e358a534dfc4914a2c7ad3ff9faf2d16fc0b7cab96659cef5e4eea0",
-			"0xec9f04f090f443596129248d8675aab78e5275c56691444604751a0bb5da443e",
-			"0x52d8fe33aab98f680b3b7d56f501621a5516d3999bf4b1804b4ec0e845f87ee4",
-			"0x22dce4da35077c2efdb94c41c6ec7e17c1a3604c3c7b70041728a96c3d533851",
-			"0x706284df96499696a8c20c7a685493663b149af04afb5635fb831bdb20de256c",
-			"0xcfd7fa6c9a27e3b9c1f124522c87841a22105c561224de3c1d7a5e441f980c94",
-			"0x562458d2c5b55b9fe6116ef5cf165aebcc40d86863efb5036d42f1f86a804e73",
-			"0x05fffdd643f1eefb8083d7c2acdbbd13e076134e05c0ca6bed8049bc747403ec",
-			"0x1f1d7cb9e496d998ea6f8bdeb31e977dffc942987157f571cfb38037b8585bba",
-			"0xaac332309b32eb92fd347871dc513987c06b984ac00feecbc686029cd548ed56",
-			"0x64c449079ba124feb488948f3b17f6e68207992d71cc4a383563510503414932",
-			"0x0aa5215822bdc1f3151756079fb5435df2abbeeecaae1050d33af6fa1ab37a87",
-			"0xceddb86f1882bd3e196856e9a43d95a37ef115a4a2d2a86166ae827c7b0e8f0e",
-			"0x3f368b92f5217f872d9a38c14e5791b72b3b25730962514677e2c069bc04de94",
-			"0x9ef75df3e9b2e97208b2c4d0917ba6de03b437ccba8e580b9f4023a1c753a354",
-			"0xaa662f12ed9e399bdfa0e81b7f52c217029166b483a1ee492328d596d95e55c8",
-			"0xbaee3ebcc9a9de22b3d4067d905beb6c75ec7715d06a426dfba366da9d9b12dc",
-			"0x4fd3b9baa9f53e6edaa14c9d69f0cf2f0010d9ead83963d96b87b7505b97e83b",
-			"0x808d62434ef0cbd193a3ec3cdc60f79ffb797ea07d53b98ba1afaa8497cdf7e6",
-			"0x1da441a4ef8e75eab531c5fadee15bd1a60e93043e6f5b5264912d760ccfd79f",
-			"0xea233791cf501a1b6d172ecea7ed1e2fcc39555b597fa3ef86f8b63ceffef6cc",
-			"0x57e04235e51c579d0a7fbf74d469c6a74403cbd09ee56f168a74a3c1fc5940f5",
-			"0x46d051393b825130670a2d56872467b02033a8eb479d466c6522fc466020e76b",
-			"0xd9c313e7ac54bf497a315c8af6dc1f3751e10a97dab570b04f80811208f0c2d0",
-			"0x7219321803c2a129ef429886035bfbc27dd64fd50515c38a7c43bcd184a68380",
-			"0x140c4deb5543c31c49296e68bbca9d7c10799ff293e05ee130982a6d9f3d4638",
-			"0x2cb5aac917f6c1519a7cb3094953d9851d5498b954b62b05045ef0fb93924419",
-			"0x1aaaf2699d5ac7bd2124f3509fb2148dc1c93b940c517eb9d4417b6a6a911a21",
-			"0xb454286ea98d62faba2a2e531f6e2a42a61e23ea3274605f8e2c776697085dea",
-			"0x100a6c25a0221361db912b4a491a001032a3cac6909f8d805ef82251f635aaf3",
-			"0x08a834de8f3ca2dc5f7075f0ef5246f6d824ea4577a3d238b2458676896a846c",
-			"0x6c0878c40a466520a5b86a06670ff0e1ce97512205ae8c22995d0bc48d9ad222",
-			"0x6835b4bb12bae675af54580a1fc57f266c050748a583f8b6145306fd3bf86cb9",
-			"0xa66940592c705e99bccb61c82e6112cc75aad73b605aa09280edeb065718a043",
-			"0xc565e42a728c1a0211ebce7b5ce9b8088e74ba9b254ff339611806c239dc72f6",
-			"0xc691d8ad39fab8e168266f1d502f02f269c7f44ddd055dcee529136cce2b835e",
-			"0x34bd34e5e476acfdef9f3c260a8d6f9d4236e58a9fe60aae99c38f8fbd465b38",
-			"0x9bf9269591e17668d01181d6a0d71ac17b494340e47034ec5f40f91f0bde9f58",
-			"0x3f3b051eea4259b90aa1063772ebf6e05563c7de791707bc8e35cc5ae561d110",
-			"0x7021c2db5c4df7a546d99750bc905b1a9f846afc688b7a033653feb8a9afc12c",
-			"0xfc7b212e599b58ff35eaa80b49ead63215ea826dcb3edc4df7500334cb929935",
-			"0x6cf11be5e7c9b94e24ab241b7552fb5bb089ef9b3dcd62bdba020b0332d4cc05",
-			"0x9353b5f84c414f0274732975cd3449a7ba55aba6665b5cdca14650e6387ffb3c",
-			"0xa4717f0fecb6a35c60e9669c8a754c1c2d41f6144cefac52531f9870fe0351ef",
-			"0xae685fc22226cfb05373350506f1f2072406b3d391a4b57ea5c467a9286ddc3c",
-			"0xd91482bd0e080649387aa580e255d77c197c1734a692296b27470d8f20d971cc",
-			"0xbe97061686e83466182be54cfdc721637ef26e99b247ea68b814aeef0123f076",
-			"0x8bc0768fa4670eb28beaea6ebe20a7acc0f23832154b61515bdebc9e6e5aae61",
-			"0x9570703dace2ff11a3e8d61552baaf3e5e812eca124f42210f1300ccb2116158",
-			"0x21a68948d1014f8e541adead6c9d0e73f003dbb3cdc145cbfcdaadb1ab0449c9",
-			"0xad51740caef4a8c01223fe11d7346852ed0873b38a65fe3ab1948e5946e6a8c4",
-			"0xf5b3e50890db272ac29b8fed050b89a3c1260563466cbde8aa6d50ab66c28a54",
-			"0x635e873d51779460b6b4dc2683ca229826e5a40ba0f5963a0a27d02eb0370cb9",
-			"0x13302c3e93380ebbf6b54be15f792f0878396dfd9e8da75689e4dec5f30ca85c",
-			"0xffb0746ad72d53240895bbdb07d1cc5a94bcf4e6422c0dbe7b2b3fff57587271",
-			"0x1cef16d47f2975e4517a9bead7df47d7e0db677c68d80e50edca3a81f493cdb9",
-			"0x50824f81d7ccbdadfdf5fc4b082d920d1416d6f3e6dae3a347e71993a2565ecd",
-			"0x10707c02efc13e50e5b1a9217ba2602ec77dee3817385d145674eceaa21d2892",
-			"0xa281eb9159884095b5d3584b67bb7db899464fa176cc90800ed8ccf23eccb4c7",
-			"0x2f63567e75786960025334d3772571f6fe1ff411b6bf867c84c1455f3954ef13",
-			"0xe1d9eb8d78fb1365f28d4112b14f3d5575a68f1160813f0d0a2a1faae3266d1c",
-			"0x7a7dd4036031fe92e19c41af52f5c039fa3c12430d5b79111c568681b640a2a0",
-			"0x509e93ce350453b61b502de0f87fed794b0d77bb6878225122eee67a1414320f",
-			"0x679778b1f6732382d834000d24a94223b69a0a88b56d0c070b659fb2daed668c",
-			"0x49963e1807e7f45e132a7e3d2cf7c10fa0e1c36aae866a9641cc801ee8d261aa",
-			"0xa1124f9bf0d2b0ef671ddcfca3a66a86545cac8ca9ecc82631480ca091ccea94",
-			"0x9ec43a9de16fc83ddf5022891c6f5593796122b9f9c72803373c62888c5f9198",
-			"0x5af071f137c5584bc1766ef4ef092fdd8f4a3a3a64ebaca50b169a22e32d2542",
-			"0x5b3ada30dc686e15bac396821debd08d8a96fe1450e5180170241cd6527b4bbd",
-			"0xe56f8e15e3f74d77427424811c6d03b2bc98f010750c6bc83c34b8eb94bee0d1",
-			"0x5dbe293dc9f09c20091e29ec20249a9b1e52e28ec863afce106f03a75b88b111",
-			"0xd61adfaf9d822c3d8e981725a42113a13abeb8f887f16e0ae021cb23d7255a2f",
-			"0x1efdd0a60ad05c11faecde65b02f3ba3fb85bce685a9b89ee4e6a94ddde4b7d5",
-			"0x60613e04232a203fe161398acf4346652a9b6b9a07837fcc06f53a950136d911",
-			"0x1b9f0c43d87ba4efaf7781da46f52a6eff60b8c9ca6d81dbe02bf6774fa80047",
-			"0x41aab71c01968d0cb73fad35b9839f6ba2e8d807852ac9c6f1220d5aef866f74",
-			"0x67ca5da2f269bfea45e0ec5037bcb1e467d5938eff17760f6b3c5ef74448af69",
-			"0xc16c2d3a36275d3123d5d95b6ace3bf131af1e6e07de185a8f4e335c5a3cfc1d",
-			"0xa70dd20159272a4d8e5efe456500a1f710a271b690334e98862a24d31d4427f4",
-			"0xeb932d05a4e57bd9cbe363a96cc616d0aed481298cb38183bafbaed9384ed27e",
-			"0xad772cc01c6537fddff8eacd182680e1e8b0d203bbbbc317a4ad9c1e7c1e4b71",
-			"0x81d7acf3f3760b06a68257654e4b0c466883e3198c61ad71decae53963435817",
-			"0x33cbfe14923923214b2047d445696b34251f70d53005e84f43e383fa1dd791fe",
-			"0x8a74d3f3c775f619f9225388fb5172b187141a8ed35ad794c40b2d278e6a388c",
-			"0x9db16af2961834b804e6330a9f587512c92a137b8656bc5baffb227686fea9db",
-			"0xa23c0d4f859ad30a4b7d3863ad16926faf41b4623e6adf9c7f2a59815890f4ee",
-			"0x97da87b047a43970a8e537ed5cb15c0f28885812262e8119c659a3d1a92f8aab",
-			"0xe0a2d92c83b8ab1bfaad4bd1e717fb5dda967c001ec7662815042a3544bef441",
-			"0xc70983fb6257a34bd43862c405023db2112f0b1c4a11aebc23ba17eee3ecd1e5",
-			"0x05798069ba546f61fec26ddc4b260fcadad3a84d612900ee2afc84e10dd13358",
-			"0x1d12ca65d3a55ecdc19fa4135e47bf470bc6ca85fa6639eeeabe951d9d0ddfa2",
-			"0xd47f4b22fc0326df733607783934b1be3818fe057afe802216178a450f507c17",
-			"0x4d71d9619222c0c4ebd0fb25da7e53358ddf4ab2cbd962ad88b37fbb331442ce",
-			"0x2be4b69114e307d117df01cb568d35f79588ea70e9016f865f641614691cf7c8",
-			"0xa87d1304e2462cabcf90207b81a058ae766273007821ac98b718467792eff05c",
-			"0xd94b7d41761d34a27c5cf565f0e92fbb65ccc3e8aeb5b1c1d9d233b032f071ba",
-			"0x6079df72e53c3f1793bcf5a4d22ed2035e31662d45bfd210c4bdee475335039f",
-			"0x85506dcffd6342df61e673ac01219c58198558bcaf7759eb2e4b19925ddae8e6",
-			"0x6a19a7212075395bba890eeaf4709c7025af6ef3087ca86671da478c7e49ed83",
-			"0x62c52d8ad2b6c000462358d31c652b280bce3676f103d7182fd3646a7f007604",
-			"0xa600ffa0e6d161287d9b9bfb13ee9dba74699e542aede1278d5344e6688f0382",
-			"0x7404c9ba05ab64a8e88847dc725b132b627686f4531248ebdd76dc76d42a8b36",
-			"0xff0198b39d39660cb3c74d455b4019ae0f23fb181378c207bbcb3b79587b8558",
-			"0xf47db7ef987a8cc32dd3f61b44e6812c940592337c056570d265e1604ef49f4b",
-			"0xfbf7eeb0951ed5c4704fff2e5d121b831637a86472e32c24a7b85e9daed5e1e5",
-			"0xdc560bf4b2d849ecb777a4d2d8a3b3bfd12c1a4a295531573fd1d493af34042c",
-			"0xce32751e3958436d8aa727ab6f89d1354cd0373f288b40395e9105aa905a1713",
-			"0xdfb4595b9c8bce6108ed0b550f920fd098f6757a3e64734fa97fd5a640c962d8",
-			"0xfc557009bbfc0b2a47eb486002568e963a32eb664f7a55d81335ef6efa79c804",
-			"0x9dd310e9b00e69b7d0b0d91db5095065c78bc91f2321df8b5622a490ef940626",
-			"0xd4ca936ec7acd0d54c6efd71cc6c808573482f2510175ac6251f1cffd7a12ade",
-			"0x465a05fb5c4c66d0bfa64097c705eccb50bafe9d2ba223ee69111b16c2014c02",
-			"0x634d4372ed9478b3afaaeb35e316f71cc5d371548260eefe273c236501d5616e",
-			"0x16ebd07c2e0032fb1c3722df3647e74650b7c1c81f4e7084149a30524846ccf3",
-			"0x32ee5ef340cf87e26642d11d619eff9ab9e5a1518815b9897b6a95007e2b7572",
-			"0x47ed528e27c42d8a4100a84957ef81a4784c0272f5e3cb6a68212af492a844fd",
-			"0xcc376aa2c1b0b49f96bde6390d5ec296fe7d5671d6bb5b5df31cdff2eb5f08f6",
-			"0xdde8938b019a5e587a28eaf579b5e21892bfc3475ce75112c4f1d9a5ef65dad7",
-			"0xd0b4c6d8ca3d95851c34e729d9228cfb0f4c4efa7fdcac3d96ea4e4d3e0c0189",
-			"0xb441266ed512646050c73207c3d88869ccceb7584f3325125a5511d5b05bf5e2",
-			"0xf05a1a620f1179a6ebe9281fac034638620155bf9260bba7df47d59b54789bd6",
-			"0xdba9596e7229cee4c339fbd182b0ebd076309e3c8d3653060a94dff252ceca19",
-			"0x30142242a511348d48171bd65aa191fea095446cefc49967fc7ac88964efb4c9",
-			"0xed1b743e8baa487193935a6d974a7c417cd42fb761007e5ef168f35486cdc2d2",
-			"0xfe54e8161aa159b9873dfd4f2d3b7bfd5cc70c4625855b70348684c7a19acdb6",
-			"0x7993784b62dec4dbdc595450f114290152676cb6938fca76e956968367e34519",
-			"0x2efca2f1900c2ae1f572342a077afd97fccde2b2305ee0b60fbce8240d6779eb",
-			"0x99ec617f5f447a4608d5bd96ca375a33a15894270ce22091b60f308298ac51e3",
-			"0xa38427232204d3f8e58dacb6495799a6c21e60746d26a438d8504dadab3a9bbc",
-			"0x8c39c623cd06d598ef78e2c46f7506523ab9ae5fba5a7273366ce9a3d9bb977f",
-			"0x9e15df3655d1a3acc064309382a41e0f7db24925ebf1df51e23e0693d9b119b1",
-			"0x69b4a6a1cdae2b0f84a18b712286ee304995f6073b6c81fe7ee544ab1d17539f",
-			"0xe395574bbbc54fbc2e3dc7f363abb34dc760bc2f6fa92c980d26d5c9df5681f5",
-			"0x1f863b9112535a87fa2e28cecbe0af5c22dbeb41558b93cac0dead527affb06c",
-			"0x78229983620efa77087391d04057e1971b2ecde2c9f9d959f769e18c1e07a8c5",
-			"0xcb72a2403046e54d6babc6cb9e2db5f79f09a9c45f983dcf595dae3fece77570",
-			"0x5267de76947667220d218ec4d1c3db31213d991e59cd0f8e4e547197e4f99205",
-			"0x55b03de02f92b3210a614f8d0eed98e056a348dce7dc03dc46dec5f7ffa942df",
-			"0xc2e6b807b1baf078a962a9bf2d92f91c0b326cce0ba6ff59c834b812e55278cb",
-			"0x94073fbeb062a2fc6f1a0450776b598b1a26aaabb1c1b07e79ba0a816f63ea26",
-			"0x2521e9b0d16b0129ae594dbea0a2fdc115c379c6c754933ae4dbd20091e8d148",
-			"0xd2e288fcb68b22fb80e5591bca2524d7a21eef199c3c333a80218a4eb698550c",
-			"0xc92539e422408c2bbf932556b096d90cea0caeb81e29c2c92552d156c2bf8399",
-			"0x5ffcc95004131253c4b32e34f7e1db552938b092f7343f501e15554cebe914e4",
-			"0xea70a44b30ed6d5a7e8e9f85eb8b70aaa05320489054faa40e15989e01ba789e",
-			"0xcccead6845a28d610af1674a474bd77a5042ce93f682f0c4e879cb0c3e836320",
-			"0x3ee01f8d3f6948da18f0212ee7c990bdc2ba2eedd020d29461d9d558ac9155c8",
-			"0xc5aec3935dcbf93026bcd8e24632e405b56ba1ab003cddc169b41372ea6d3a59",
-			"0x1a9e0622cb0658017749353e3167f38bb1961c4088442f124c1ceee2dab52945",
-			"0x2628f184beb5baff725a1918ad222900d41a1c3911eca1f272b484fe103ed4d8",
-			"0x2a03c227d307eb99185eab66ad4fe4b77ac1a0245ec28bf4d87702092461c275",
-			"0x4664e5b9b20927813f129a23414f319628243cf2ec6d93b0779f0bab5c602803",
-			"0xdb8978d3303d1c40d51e1608a24102af93c15ef7a82bb3fa8f9a1ffcccf87bf9",
-			"0xbe63631e76bae0c7eb4ab34abae21f9c827638954578ab93e823d9db8212c08a",
-			"0xfcb959859a8eed19f6cfabce408e5207206e8e0f96924328355a279f9fe9779a",
-			"0xc1f2e02c014167d9456a985c669121d543e39a8957aaf328ec1779de2803ee99",
-			"0x3261a5631dc254f335cfe69cb835f61e11caaf9b0299f0701ebbfd0470755313",
-			"0x02d30a73d3a7fec6c2567e1f2861113428fae47abcf76167ec432da20515134b",
-			"0x312e3cc2897aa8eb766bb4d0a91e160884153c90c266d03bb6efed08c4f48cc1",
-			"0x00f196dae3153faa0b4ce1bb9b3122f76cf1c1398fb43f8aba95037b8a6d797d",
-			"0x8e4bb4443854630bf0835c3644270462d9b7e8f3fa409e2c8c420010c8dcf0f6",
-			"0x3ad0e8f5abb1238702bbd95556ac9a9018f4a4ce107bb2d87b7ebc76b0b723ea",
-			"0x5c78e87df5d32db813c9e89d4934a18490f9ec5e4f2e5e66941db9e6c8dd1129",
-			"0xac6749f8a149d465b9d98dda8283425ae7e27eacd803baf2babd9254d2da0e97",
-			"0xf68f70077a1f7d69e5afbc259adbd51fd97cb78e45a38bcd698922ca0f2c17bc",
-			"0xc6b1279ce5d96648642dfff31d3bf3d989de50143a69dced098f883f2d58ad36",
-			"0xc4655ffd7482e52531cef2edc1f259f384d69a3920f699f6443e92386a0b63f0",
-			"0x28ea7302f04d4ff4b2c40fc150908ffc34403d7e5d756be4e980983e08a72db4",
-			"0x87d6de7a3cfb49ba01d006bfc051c5d22c2671eb67bf3af87291d34bf84dd328",
-			"0xd156e6fefece7a5613122c24733683863b9a20f7fae1cd022b093c9dfb53b366",
-			"0x5501015e22d6086647d60e44df262d70d4d8921648bcf366e8442cfd8421e83c",
-			"0xfe520098dd0cb9422d83d4a562c099bf8445c25e93b3b9a410319f0300b710dd",
-			"0xbac6ee3d851c6d574004c6645647b2ffa6a3519f13f3ff9529e5924288815a5e",
-			"0x3fbbb9d0516549cb952f1be5ab6e69d60ef1a8369cfa4d22152d006d886eb604",
-			"0xbc1843d922c2e0ccd1403a0da02b4f758fad4f02bb09ab823560308826149cf9",
-			"0x9ec0d3d14623babe08dbba627c2d478ab34a0a0f46984e528499b86755bab02e",
-			"0x98715273786d911f75085819b301792d241d005934e2d93e8e689c8a5cebc5f0",
-			"0x0c25dafe9a23ad5d17e97f23782e11152f548c73a0ff58fba9b3a64aa26cfacb",
-			"0x7a8fc37c03b6ce7d275c2a4160e883787df5010892fd6ffad54dfdd70a97168f",
-			"0x342816670945437b66e0a12d5eae2d284176a54cee727a5cff6f5fac83845864",
-			"0x40f472f8737a813a879eb762f085ea5966934e1a4562b212b11612b5fac059f4",
-			"0x865b00c472ef94d6d9b038f328aeb2eab1e81cbd2da3c4720257c8b4b8b41e76",
-			"0xe94ee97f38d8989ab6bbd137ed9bad8529c543910e5a328b01fd5571ed63199f",
-			"0x57ac21373529bdcb22c053797736b9b600737d91ccaf296ea761bdb9d425ed74",
-			"0x4c56a968ab57aa36196bca9841e308e4ecf366b21891cfeeeb4a7741caf00bdd",
-			"0x79e087e68abf35a76d839a0792932730441d2f57506fe7db72b9b91b3fbb50d9",
-			"0xad2df80333074a637b0afdf1dca51759ebb10d7d443adf507f41a99863b2c7ef",
-			"0xbdc6c77a8ee0b979cfa93d42e4b87c9aee8b0c19e6f19206008a5d1083909478",
-			"0x369810909434600983003d17fd321e7e73dc4b8ad0e73d925caf499f2b836690",
-			"0x4d3749a7865675e8a3ecf2b1af4b7c3250a311ca8d20449e71d6d8ffa33a7536",
-			"0x7286924c10b2db63e61041976ca7c6bd3d6b1ddc69eac4dac03427e0460333fc",
-			"0x33edb799e39ee239790c7d3a6349218284a61847a235f9b6978accddbb57467c",
-			"0x0f131efecd5a1deeb5267f4f99e64ad2dc84532f7698802fe500daa8c306c1e6",
-			"0x96f48183924cca8948eeb08c3c5320aeceaba747c7f7ccc321cf17ec0704ffd6",
-			"0x87a8c9e79f17968814cc145bdb1325a2b5740cff68f1ef7fc7ae42f20729287a",
-			"0x3c9d17093214572bfe4e6438528163d7b6e24228dd15ec1986924f07e8b9e197",
-			"0xe9c033c63af4230d352ee370bcddbcf79a284e113ff5b8f559d5d958a6648f2a",
-			"0x331c86081b46499c6c0b23304f562afdfa467ae8b390e22718f2abd96dbb6c2f",
-			"0xf783b03698791d07c2ce40bcd9f69e6f04a4041cecdc85e17b96e6673f57d9d2",
-			"0xb886c566152b6f0fb43d8eaae97d8f6698caaca12845f63e6b98872d7be91429",
-			"0x70abce391cbeb52597c5cd3b3668e33aded768c797a1c27d22ef827c3c82e516",
-			"0x37b6b2d24a95cf8837b6345b7646e48942b1dfc26bbe8a0026715501e56d1d71",
-			"0x95d0f6f51d5efafcd395e79b83facd5886c4cd68fd725d68305a8bd3e73fa818",
-			"0x839db36c5e8d539cd87c2fad2221a95728d201e27aa0f21e48c61a4d50088e6e",
-			"0x85370ab2418ca50bd86694bebf26c9fd59f7b737282375f1a53c06d1aecdacdf",
-			"0x42270a3434074b79bf19b043bd5cb7a819d5639461edd5eddc24b336fdb39428",
-			"0x105f93a4dbaef09de92dcb0fde88051d7cc267ed11ee0433c2840ccea459fc81",
-			"0x2b97bb02b8447cab790dd30d312471385d233b89dd135c0fa59ed763f7f1a5dd",
-			"0x39d6aebdd41ddb3937963660a188b9e840166fb249c2859cb442588ddaeaa2f8",
-			"0x635d327dcea329de7bae55e025d4fee8470ffac2ecc8a87cb2a796b822cfbfdc",
-			"0x53b87772eb46bcb5dc54ee6f2fe0c8ec1384bf13e02057cf2fc551c657a961c9",
-			"0x9cf06b583c647f8c5e875c6d0cba5ffff00052620c39d49a04095cec4d4c8c51",
-			"0x917634c039976e153be529547de0799bfb23b733c5edc42e1e54b3e6ebe55d11",
-			"0x108e5ff2b56ae17fe3dc92203f454fda904dd4e15f4732397fba95f38b632f98",
-			"0x4bd32df511cab41fdcd3a502704c74f3c7b0eccd352b82b4c3c28b0a844fdff0",
-			"0xd8e04779971d970f01a77212d1ee2b8926d12194ecfb756f9f83b524c072abfd",
-			"0x1f0226a32fd46224ee3d9b7424df992847a711660fa1777ee8ec699a255a3046",
-			"0x9dbdd6b26f1fa61ae7fa8c31bcb259c754e2827d6c6f6e7a604ea84f54770255",
-			"0xaa59f69dc2ac48f6e2b06cbf95e68ab1d0971ef6ea4274ac4e24263d01a2d0de",
-			"0x217ab35702c7c959e994c09f9a8bbd939b9711c3a6c4a57d03b02d615561cd13",
-			"0x8016f4e0ab60e64c8ece505bc77fd8ae9a73e663200615679692057588706ae7",
-			"0x1ab438e4d7e7ac9e9157c2a43fcd730f7b3bc70676a302784d22dc6e9d7cc1e8",
-			"0x902a3b829ef54cd702094667296ff452eff0aabd04f76046cc799331da7296b1",
-			"0x80d14802bae3c50cda30a6830db5122e72f7dcc67544d33857e1153a49bdd710",
-			"0xaa73faa4c36e080065a0640acfa4cdf16de65fe6aa1b0ed74d20ab01ef675b32",
-			"0xf129f354afb67cda78b4f05e531e0553b512f8238278a7388a8ea2a26d4fd5fb",
-			"0x8ac7e8a496a2c3465ce049ed69c0f1a671714369856d705c1037cbd193106dab",
-			"0x0167c76291a52cd70b1302ef3bca9e8449d071761c1e5520219d70344e0b39c5",
-			"0x0796256c466d0f1a706462c642813620e7acb3ba0e17b606bd464edd52e0b491",
-			"0xf9e68a276fb7585b978ccd0a5d4cb07851fab909fe223e1534897574745ac585",
-			"0x215b53c58f116b3d45669d5257644b866639eede3eebdef04e171d9415247eb7",
-			"0x69425708be100d1e7402bea70be42a2dc981ff3a4d7c8c5c859283c06d1283c9",
-			"0xfb0b4c899f6081eb3e2b4bd4d32554c0c34199731d3f80976ac3885cd62ca5d5",
-			"0xe07304905487800ca8bc3357236b5b4971ccc884612d4c3a0fa903ca4ea399ae",
-			"0xfc0e4e84ccf10d44f338d76dfd0562cd47db6758dc7f3eb08006dbcd577c5dbd",
-			"0xd198d19f531de16e174f85a4cf6d3d2d0f326de398f027223f34534c9a6e8634",
-			"0xf5f6dd24e48fe4b37a5098700dea861fea66c835e81269ec20b911fa821abc8d",
-			"0x6930e75f5170de31a5cb2f899db422feb51f080f83f49be83951eecb5f913793",
-			"0x5a8d5ffc0944ebfa1273e0162e766fdb34fada198583876f0931e331ac7164c8",
-			"0xc6a5ae3002cccdc6bc302c68ce171dd83c385444ab5c04c66b19bf67255e298c",
-			"0x05c8c483696d2aaf79f985706ff9e84c9ad08defe8399531aa0fb3d32fea316b",
-			"0xc226d5d5d4df247a1e5cec4fa6fe43605e9ecd27bb07b9c220c4b6ad5a4e70ad",
-			"0x312cca0e8c4b55bb84176a54926d1366dd5928d9859f1d2ad2991e0fd9624b79",
-			"0xd0aac977184cfbdf53ee96ffb2e0bbcb85a202b5c6ea02f9989972c70120468c",
-			"0xdb3b8102d9a9a363174e138b292ca67020f31fc819cb15c5cb9ee34ccf2d2f8f",
-			"0x1a50ef2cef7ee171832dd9e9162125e51e6ae7c27d08753c30c4a03cc68cd473",
-			"0x292ef1d673e8441c3850d68ce27faeb572083864ec22f09220cb9f4fe32d560d",
-			"0x0cd5290d348d7462f747030cbd8a38636f1549023f8f6379c244b91420312ab5",
-			"0x2a35347668b072eb67d478dfe9146822e77ac78abb4b69cf57478a87c4f5b794",
-			"0x70d10e3336ea822d3385352737397cdc660ee71e07158fc1ffd711d249daa841",
-			"0x1f9d182b5e755e9c0ab2f77a9f302b01241c4d235b5b717237b96247a9157141",
-			"0x93ef750e15a936c2fd6f047e65affabcc2c0b5bdf3cfb160402dd0696329a654",
-			"0x17c7f10a273615b0f8df2044396e3f0aa33b46ad053bf6ec6dbc32273e66c4b7",
-			"0xc249c69c4c2d40dd9d0a7fde388824ff734f3b8c2868d1e824a52b32dc05e58c",
-			"0xc1c1f0f9ff1c472a7e84ae89f8da22575df60fa7f9479fc3638f2f0d02509010",
-			"0xb563144ab0b85113b0e30109cfbde500c28faafaf922c81939dcf9f1ea469752",
-			"0x80f88663065d058d2db7e55df1af8035c810e36a6589f4b1989794bb32e337c6",
-			"0x25905f6b1188bb66393a10ee044c6bc197627d83301f766f4900d36cbdbdf8e3",
-			"0xb73cbb759230184289722513df452814de312c90f8726e77b129b6e37e5e803f",
-			"0xff19c1a15bf598da49fc91d04c7401c88b4aab08fa926e467779fb14d8f8002b",
-			"0x71d46f2c6a4d7291a9906df0beb183d495248599e40c41da6ad30ca3fe37f43c",
-			"0x5a00726405d2db913571b141053892aa41faf26644c6788c16c8f417df49ede2",
-			"0xbb046094f514ccd722d224a2bc4b6b473c760224a7b36ba09a21f149cc244e1d",
-			"0x8b0d483f156f390376c526acc219070a9c393df731b7115753e934af20940621",
-			"0xead2c2100390e48bf720d19378964dfc1d0071e28c1d799b2d5d529b118290e8",
-			"0xa4169df4e2f8662b43845598c58a591e6fd17574c0d567d7b702d3f12d4b74e7",
-			"0xe14c4be058238b81d8025fa71abb580aeaf52d4cc3aa4f05bd5b24be77479fe8",
-			"0x81e58c707025a640a9b014046559ee7f827142474606ac24ccbd61557b0a7745",
-			"0xc1717626f785ffd170697d0bd148226d1916f16461796dee609f59ee5eed3423",
-			"0xdbe52fc3e71b136881136693f3a318d9e3257e6a0384d17768cba6c84b1e3ec3",
-			"0x7596e35148892b5831e2111a168ea56a59ede2f2222a08f8d82fd235f09cb267",
-			"0x130fdf1383873279e44ba21c7d1d6f962ab3d71031270a0e5f57f12f90eedcde",
-			"0x0d52be29476a3b4ec79a432554198255be617f50ddfa6d614ff5b73302c44067",
-			"0x3f1edff4b943e5fa15bddad5ab9e3248db0335359af255fd6efb66c8b63bce69",
-			"0xad9909d1fdd9e1de3e6cbca641e42a87e3fa254a0498085790b3e44e6ee42045",
-			"0xaa166286f4e1799f9ed1033861eb8b2117810d08dcb29cc3f7a3fdcb05989780",
-			"0x11401b423d204a1df2e918882c3f795e9cd1695ad0badd77532bd2512eb7d1a8",
-			"0xa738bfb7ad265db50854afc6d8988d5342ba77d7021ad5d5a45efd582b6b6bec",
-			"0x25051016399b94cef771f16cef661de81bca5f3803c96c602dac42d395679c15",
-			"0xeec18e2c9d76a98455ea4e50f744926a13b9ac8c6d0f575128787cd134ade901",
-			"0xaa4a38ed3e461643c1acc765ed8f27262eae8ed1dfd6659c4e4e1ea080f42363",
-			"0x42760a8066850088424917edca117faf1df6a05221216479aaead8ba11286400",
-			"0xb3503c3841ccf8bc2853eaa618435036b976c9e77d1e1081a5fceb036091f9d4",
-			"0xcf5979cabf525d5b6cc1199358688fe0bde640f6ed95dd7c30a6f42a38337cc2",
-			"0x713df6a565efbb13da4161b545908ac4255af1ce8ab229146ed00954b3c58e4b",
-			"0x9ff3a78a18a59687eb99e54ac79df1ac920a3361b3b5416dbe95126f8de3074b",
-			"0xbaa888556f1a519b1b1acd01b4ebcd9132dd55bfec1bef0ffae9408152333fce",
-			"0x5ced4fedd95a4742ee250948c233f59587eb1624e3adcfb6662f9d81b5517bad",
-			"0xac1d2706dd82b142b8a629b42ea5c4f13286af59d24f21b3bc36ebdb4eaaeeb6",
-			"0x1d99ca18dd1d872a4be8ed45385d0898215041f54e7c8e7f3252ca212b4eba3a",
-			"0x1dc60cc7789fb6b25c3d27868ac49136e09f6bfeb09a20061781ef14cb7c670e",
-			"0xaec01b8047a0693e78b6ed445396dfe6dea247997ad32747896ba0e30a20d2ea",
-			"0x977779b6e2da8fde03c1151537d2e03facfd217650e862c3fef07af71f34b507",
-			"0xa1634dc9c2bdb48762a7bf7b41b74a2e8d4d731b15792044cff1ac3b416fb28b",
-			"0xc36b6333c28344a360214708798c125adb5e2cf8a2145a216e303186b85a8f91",
-			"0x1196ee872385c8fea747eba6f5b4fc6f30817714e86c28b657c24593ded2e0ef",
-			"0x8dc3ccff642a29b46266eee8782b9a9ebcb171ba154c5dca0ca5f73fe24969b0",
-			"0xa9dbea651bb7a362e526744229b3e1807705ceb492a8e4bc54a9a1f36102a9c3",
-			"0x0bc82693277412688a6577a6bc95ce99504a1a50904f49b4b4588538f506fbf9",
-			"0x8df943b0847f1de48f76d6dcaec5cc7b0d7d839ec5e6c8c887f6e5cd785f53cd",
-			"0x92f4a5577743eb6c34134fa7867cc7d8836fdfd4000abec8cbf1460d136054cc",
-			"0x047f5f8332e788d1b6be8a3ecbebffa80ad6df670cf4eb4e76a6f22c5781ac14",
-			"0x392652a55a85300848f43879d9a45d8b7fe5897467743d51a9208b2ac0dc029d",
-			"0xfa2e6a2cdf4949028be0772f9513169815fa9af20c53ce188680f09f57efa671",
-			"0x0b86c1c1e683a9e6debddb8ef516b16fb15709b87dcd780ad6cd7f9b9080f4d8",
-			"0xc8e942935b64b294ff66d4fddc51fc83b0097772bca50140e738d4c034b09cb4",
-			"0x0b783f8b64650bad1753e4f86fd66b99d7ad03d2da0460bf44965a1f443b70d9",
-			"0x8a9aa339e78f09ad3d2ffe3999c22684d519219b787ac3cc64c772d1e6508392",
-			"0xb8a2303cb9d927badda947a962311c699a290545b597f0d242f669392076facf",
-			"0x34a1bd076dd55dc6eb2e675c5231b3cc8f2a197194c86242c9c5c052a6859d28",
-			"0x0623254a886ba8bb191d3340e9705ae52e71df2717c6e84bd07a759d1f415d91",
-			"0x37d451749a48d1cf4780f28360c5445d3b749d8b24f065db07b8df89facab6b9",
-			"0xd73f2404b935580681cd7f6060b17ff569f7419196e67596f101b6b1d1d913e3",
-			"0x45029ea3cd0d90900c46df72e6b182bba69ecac1a9289a4719b2f6008f11ffd0",
-			"0x23315337a4609580ca1835f370575bbe025d2ba5447b61e583119757debfe35a",
-			"0x581bb3ed8dac28e597d89e9a211bce6b011a4b6dabf001597b68e5e8c6ab7c8f",
-			"0xb71f91dc1a2eae9ff7e0aacbdcd3d8a77302437ba0e9d327790c5b92c7603ac2",
-			"0xde661510c4713c64961a0ce9db1eaaecfa509e66446998450178c0afb4f5a670",
-			"0x9070334bbe9fbda52e42939155c43daa239833ed2d952eaa5eb4d5fa8d56b708",
-			"0x7dc07b309fa5e188f2e417525e9228b80f84c6c36ac00cd3e49defa0e0146e15",
-			"0x2e9ecefa3e28f4b31b876e5d9214877ac00be6e7eb65a26990fdd5a2799dec54",
-			"0x6c4b8dc62fdb63d5da2e1387a50759e82f00f7b3cb9c4306d98fa1a4630e0136",
-			"0x1244fa807ba8ff8a27b88ea1146c3386e96995ab1d7b0f491efedb89a2400028",
-			"0x7b18bd023a26e920b03e517b3399304c2d277045d2bc62ea7ca0ff8dff1e453c",
-			"0xa71afca6a9475974486a698a897c34cd6b5a7dec8023c62bf252f60b3d63c306",
-			"0x4162c46dcf1961704d020fb0bbee7f9c0ea85f4dfc58d6db2c09f5ef0df543ec",
-			"0x651d2fdf296254f97528a2f7b2d2395438b1f58ed11f4d1cc076f1fd04912824",
-			"0xc2705774d530011afebc9430c39aaa28e27962427e46164822bfd6da9948887e",
-			"0x9c88eb61fae9cc442bb10503b32a439b771f8ed67d626c4980ccb3d53cd24fde",
-			"0x8f86c85d3df630b1f292217035ede6ab978d9388fb6bfff402419c3de0a8406e",
-			"0xf8946728a1deb862861627606bbfb887e66d743d47fe03048b9b1799e083c5b3",
-			"0x023cc1ee86a5dc550b934e28e668e3de2c0a925c9c0dc9fcabec34d33da07a75",
-			"0xa40e3c2eb6531a40239499165490be2d6a986f356c3e50c4449a81a9ee037df2",
-			"0xe85b21c59987f25bad5ae1ee09dadf22ab33530cd907ed72819ebade1e2b84f7",
-			"0x9acd8cc33e4e79adffd4fd50fab9ba6025822f2510b165d547c3bdc037cb7629",
-			"0xb07c7c23039d83efb37b63873d4c7dabcb4e9265bad35f9a1667114159cbefe9",
-			"0x3b470afc97f674222850a489a3c845a1c68384c88c03ee3946ceb90924c7554e",
-			"0x669492bc00a496fcfa5920c9617f74170242d2382c4cd231d22e48e991b12687",
-			"0x0e4a605fed37c87fe9bb0de8ee63f571785aa3da8767093cda45da51414a38ea",
-			"0x5a25cabd5470cf246164f60ca6c963a3960550e684ca051958c2f768af92e227",
-			"0xf6dc542a83245efdddccc4527ce125c5e4409045afb2e57e11941d4d5c21015d",
-			"0xca22cafbdd6ce48b7cd3700090a5b9ce0dcc267a16e5a6e55df4bcbf681f7e88",
-			"0x9d89784fcd3cd9a0fe85b82d2329a1561d46026abf132289126d001cd6507bdb",
-			"0x7fe02ef1e87c7b1294501dcf0fb97fcf5b8f2b131ea00b3559dba67feb7431e1",
-			"0x0c5870d20c5e086520c1a4fe39d09933da794f49b5e4db186b7fba5f55751334",
-			"0xa6664e2bafcc0b548a41c272568d2a3ffc0328f64c3f4ac80e3c0dca18253ebe",
-			"0x539fc6955f7ceb8b9b662534e98512be388ed59e3e3b2fc21226569c3a85f272",
-			"0x1f4a0c45d47e378f8c0cbe4603e6e8ef3131ca7cbd4a732a4c5a081bab3cb381",
-			"0x1be1bc472e060fbaeedee56fe03a42cd74afef7321904c64ca7d384ecdf39be2",
-			"0x3a74f2b96cd47864ee7b113651a176c328c23059e9b8f8bc2111a071895d2bb8",
-			"0xdc05d7314a2fe10122a1a4f037b96e960ce344202328932e8f069d3801881606",
-			"0xf5b2462912f2a53b8261d4f63e788289213ca566ca915f59969c79b6698aac80",
-			"0x8febf165b4673b4762bfc7d1c4f8a82cdc5649065f080bf00e843a0ae3f3dd53",
-			"0x1ed2f84e593f6356522b0bd4606209b1291518a7ff708d21ad8765572292f3ad",
-			"0xb7af3b32db199c91881f8b7d23f53376c310cc1cee191cd62a1878a229dbef3b",
-			"0xd5711bb07409bb27c5fb8164cb2860c0d6583e5f5f5882c6e6e74b0cfca540a0",
-			"0xa8d7cc512c42b6028121f6114b974163f687ac19a5c71b1c25789a7ba8f38236",
-			"0x72f3aa7c612ff18149497e90fdc03e766686e37209573a3e5bf144a9a010192e",
-			"0x6950075793f3170d754bc05fdb31856d6d15fa389281c7e4f73d8c597b1aa4da",
-			"0x34f1a8805f65b0a09f1e5523a53d35cfc12dfdecc22e47efc80ce209d40dd514",
-			"0xc348d949ce4bd0299853e6d616dc292a8d33485ad93924f7b9ce64666594a44a",
-			"0x0f828822e7a2250d0b8f2b819ff27631f5d50a3168874ba1c1922babce345fe5",
-			"0x92c5275a7bb840f9ea612340bca5275dee489cc7e2b13e6037ed49b3606ec01e",
-			"0x29e227f64c8446f49611f9d2dbe04b8328b8165193b5a0a2ad8c337e60d7ae74",
-			"0x4032647c4576c6e4f23dcf87377e7a403ccccb4785e276d404bc8e6fd66aebf4",
-			"0x971070530b371733bf83599364270fde641d64155807d36c8ec79e73e3c990ac",
-			"0x52d8cb01d3999e01141667df6f11143754e7cdc1b12f5b5bbe5e16f51af1acce",
-			"0xdd821e13bef48af8e79041e7a5e28db421502e98aa41382d2a89480dadd0e7e5",
-			"0xa785dea19433b90dac8703f0b075df9d3c91394826e6b8b89abd806f5cec6ce0",
-			"0xe82804babcdbf1af8f6fac1dd0076550928c372d0a9dda8c0560a6f378e2c970",
-			"0x1dd41ff3d620b1ae3725debcb26edec36cc219292bf651fe9305a0fd08523042",
-			"0x9e2d84e8a10b32fae0b29b150f747041b8eed743d2e3026991c31c607839ba09",
-			"0x79ca039f12ab21e7ecb6d6629a501515d94a56a3c24d669474624603a0ed0c90",
-			"0x7cd387f75eadccb5aea925124377d09be0e7b4a9af6463dd649213c5af521236",
-			"0x31fa2bb5eb784c0dcbdeedc7d439704bd44294ec2bb1b4f49e6bf508381ed521",
-			"0xd0772b6dccbe61b5b2cbec0a95a9542fb9b89e9a75b8324e05855039c2914dcc",
-			"0xddcb84f63b7469935bd4f6ec405ecd619a5539c89c2cd28250065ba9b4984838",
-			"0xd866486a928c2a69b054339b5e57bde41149c63e6e16c066046e3fe8018cba2b",
-			"0x7246af9a036f7b773bff1b2f9b388618402738e6bcd03c354816c507aa7fdebe",
-			"0xd16bd03e80088d51f007a7068697e19cc91a0daa96816ab336135b0e1bda7e1a",
-			"0x3571d1fe22f56864df7584f73958b5cf9336b6afe6702cc4ec9d1f097c4fc58d",
-			"0x74e19b61d2a511e2b067662bb61bf93241bf538d74face662561a5d170c8c2ad",
-			"0x01720ba8bf55fe1caac98a1cc5843f24a1376bbd08cf630c9a39fe219ec31b68",
-			"0xe2d0a0e01f6557e5ea96808c0cdb7618d36bb5bdbbd1d9e2fbffc07672a120cd",
-			"0x0ff2e856f17849a4349c70aa6fe2c04d7fffcc6e41860774210c2c2a0208f2c0",
-			"0xfbe09f759660388a823894be477df3491bb6c51ef7df038dbf12ab9c122b358f",
-			"0x9e610db00a109f0b4a4cbb094b88680f62dfe5d3526bc83377645cfcf6c03b18",
-			"0xe7460e14d9b5365c3b1306eaca86ffe4f996f07909c16bfbd731443d91df1931",
-			"0xe7c05451729b5eb5b61a3f159d522424fefa1b30f3929366289a89b714f59609",
-			"0x28055b2961079028d017758cd43b12e4046fca9a1ef53e09c3a4e0da3f8ff197",
-			"0xac65523c531d9ca6551cb6b9336d1e78671c7aeee7208f30548b3c010d79b15a",
-			"0x3c6939d2ef02c1c6e9aaf6aa1119fd4fa2682b71d5b010708a59144641b794ae",
-			"0x40cc42a031994649aa861a544d6fb7c02aabd574a5b14d26e7802d5cf2574e36",
-			"0x054cfeb8044d5dffd1577bf0e45dcdc53d15c308cadcc4d022d3c0dbc292efc2",
-			"0x337dd5519a0f33011f3d27da8e1d2cf43dc249597f199d5388cefa6200e9e3b6",
-			"0x3263b6e7d5c31f7873fe32542124bf2b11ce9520c629bc8b277e1dc9152717cf",
-			"0xce5e58922cf860beff17177cea7aa6c0e789233ba1b15cfaab6896c45dab7e3e",
-			"0x7b5bd2a6e19812524fc1c1c9c6ee8b970ddc3684b4a5bc3fe865dc28726032f3",
-			"0xbb76c2c12be46fb4a8d18e15817f9e77547acea67f71cd3bf0f13ebcf674080c",
-			"0x300838c866e4c8ec4e7d130a3191f3122795c26757ebeac2d51eb69f19319624",
-			"0x53b73eb4f155c5f126802db8f2a64ba08d93972743f3308454be1c0c68c7f4e5",
-			"0x4e0de18b8bb30adcd9770ee1cab2e0fb45225737e382b4376b08d4e64fab577e",
-			"0x3a6ca6bdeee957b6ed7297760bbcf53bc5b9945ef1fecfe8c9dbc077926d519a",
-			"0x014dea0c5dfe7db3b67349ebed21bae42f40f02857456827c72ace435b6b8632",
-			"0xa0b1b3f7f3883d34cb1ee9789c36b607ada517c526eea23193a786d72196ee1d",
-			"0x2bc8ee35c612ac2a9c9e5b97d6d3b9c458f7d8825c89c2d593faba38ca116357",
-			"0x6d61cf0212c61b9c608d7b0a5b2395e9ff41a815f429ed05abecfe350fa5c22b",
-			"0xcd284b589d6f3ea56a8eac1f7e17d4932c809ebe955300c3b1da554f7d0998cc",
-			"0x56b3afb245b853cb2cd2a9e6b938819db181b7541003fc298347b646cd0bd894",
-			"0xe24a047cf216f0837c52bfaccbcf4810026bc374618465d94480d5d222c37ec4",
-			"0x5e80313f3a14f41e63ae80192b79456d742e0a43d89e505d938e5d0b164a2b6c",
-			"0xcacdae3d23fd91db005624bd007f1f0c9bc48ee212e6ca2aab8b189b687b9f0d",
-			"0x2a0f603aeadf258feaf46805767fd42a61ccc3f031f42f131c4548875a887ba5",
-			"0xf90ac12554e9929db35620b33a5b61cef0cea7209a83f9ab44937dddb4c96bb3",
-			"0x1a4eb8628a48f763284900ffbd01107879f41c9479bc76c139db520d34295fc4",
-			"0xe0b600503c7f112ccc29a447ccd1c85285a304b403aaf0d227b3a7c7ffa4d9b8",
-			"0x1ecc791b207e1d79e10a9252fcb35591b0cabf71910eb50bde734ff7a364945c",
-			"0x7dc509f4b620ccc2de77ee7064b910a831a577008b8f099b76c2c9382c4ab31a",
-			"0xe94bf1b965b4a10ea548653cfccc63720c9945b3f02785b650c9ed26047855c6",
-			"0x19001b2e4a67c28e925ee2656aa6b8918c3b6d785101f4810ac9ba46cbd80d0a",
-			"0x717a34a0113fba177f11307a4b06f467fe4bff06f1bb38fea0c272ccd9256db6",
-			"0x1f8815eb7335b0a2b0b4d0cabc9f9fd97ec2fca78a69fe7c048ca540cdd303e3",
-			"0x56897445682734394c0e6923826b78222719c51dc288529d2ad2ffede4649f34",
-			"0x3c059f0c0e1809877da2fc06b1384e1ab651dee6b373980b0c5c64da57dc137e",
-			"0x7a0a2968b2b0458e653fda06a611c892ea1983ca852e31d916415244f06142a7",
-			"0x4711f167a6332b0dcd27e4530a498d2d5585dbad9b6a5d5e71d4dd07ad57adce",
-			"0xbdc064506c9f16e3a9607e7864ad1b4471c1fc9e0be5f98aefc5a330a33ba805",
-			"0x16d54ff57301af6239313e4b98e163d1a23ce6a0aa82d08e989edd31b24ba999",
-			"0x225a99bdb550da94a9a4717ae178f7def59f799ef36fe9d392a31a344ef6fe4a",
-			"0x3e502698ef85c6246dd7040f311f277f705bc028644a873df537b80b98d1fea1",
-			"0xe6969b55177b17b69d45c8e569fa83d00a75723ce5ba8a4b5ca67202ac5c353c",
-			"0x4358581c44a2caf58f64b86802c3729cf77f2b14df54c18ceac805b219440b0e",
-			"0xab33a0104b936b5e1be1e9d197619872eda67745ecd61f864149ff6932acfc3c",
-			"0x9da92be95e0f0d0e284bd8d2d3ee01b53b60482878b1434726df51e270fdf603",
-			"0x9543a4c4fcbe9d86084fc4b9431cfb8124919413c03f83e8666f2ec6376f0982",
-			"0x7ede3504ac4981e29634f703ac85e69ab389df3ee6f6ae62f6721b500fdddd20",
-			"0xe2ccb0b4c4114f266c9cbb387d255ee86971496aecfb57bd98f7ff1808384e06",
-			"0x971d50027dcde0cc2443d898438b181c772699bc7d4ed5d501258c4a8ba32de7",
-			"0x449ebd55963c7777e5d5523521810f69a5d4bcd6b20f558a2a5f904646dea0a0",
-			"0x5379acbafaa3c16ee514482e0497d4f3938399788f207adc9a77312c11d4aeb9",
-			"0x704ed53672d490277a0fe111fcd7790cd2fb53d94ef9d65196e315d788e38f60",
-			"0xfb0ff7818c21bd9883af9e04f5a2b9e5bb43173c8f791972d410d302b5dbf674",
-			"0x80a5bdb23c110c6acf90e6efc194eabf88d054cf1f27588ca77fbec650878544",
-			"0xdecf2911a31b325760b1df7fc9d9df80f28a6bca798f5503b2f73f93a4404a38",
-			"0x5bf29b9b96265b010a33a4bc05967edfac53c6fb3e8a8000d8c60fa869a8e8f0",
-			"0x24e0a4762cac65712ea029233970aded11c859dc4a5abf9c673664c35078ac1f",
-			"0x68327c02f690d8edd22330efefdb6233e2c8bbcb0c0ec4905694b1833adec387",
-			"0xbef7609a716a8d2623ead6eb31daebfbd9421816c467a4f80d027ba7dc1902cd",
-			"0xed29b3bc58c2dac4b2874e34dcbb83e32fff33b28437260d17edefa4ea1cbdbd",
-			"0x1c11469afb27568d93adc3d9af95075530067a6411b06431016efc05b021e6c3",
-			"0x1c1b432281eaea836c78fc78edc7ba02b3a5d6451a13c556fb46b682b02504c6",
-			"0xeebaab0904bfa1331f72dbc02e73b05303b4a71f2bea6b8e1b9855dd9b2d67d0",
-			"0xad36e72940ba9dfab81721c33d05bad5b412c774026a76ca0caaa8c6819e2f4d",
-			"0x5101be8446b66c40c7c375a663001070c6aaac7ccb559bc088e773f3370e8d97",
-			"0x3be827089ad34a73b9f6f8bbe1c7c414cdbcafc6573f6d987c3fe3e39f8fc043",
-			"0x16d5eca9c07ad9a133cf54c455d27030121482a1db142988d71770d083090dd5",
-			"0x4c2f8374663d94c4677d199b463f16916d307430ca39d36650be11e8dfe39c91",
-			"0xc26e2080ec735af4b67f9058e2289477ad970625d2e8cd7c4724d3844ee68936",
-			"0x49b9428a3cfb02fab5ecd3b603a68df495e36219f5c5a7335237137c9855c70f",
-			"0x55a4f76f8dc95a2a84666954727057845eb0ecf6ee456295739255c8fef23b81",
-			"0xe2efe0ae812195d68c6f8f846ad0fb90240984a444a2b2b5ba1096e8d299c96c",
-			"0x585d1f644a9802cb9a742d373a711616ff5ab0f3ba0a5f685d3dea11b041d289",
-			"0xaf87cda7cde3ff36e1a4a0a3a90e42052a72983f21331d78aba1e4c681eeb591",
-			"0x4f2cc01d0e07e9634505030847ed039ddbe4138ea4b2425e7b24188043b6fdfe",
-			"0x13a10286bc58803a4dbbd59c59dbf3c9ebb605d4ed0417a525fe30575331f4cd",
-			"0x9b54f33798b2d69512c527b1e92017351ea98f7edd956a1744d7ae00acdd096e",
-			"0xd5d636fd588c85c54d6f797ffa674e526caf5dab6e4e87f26c70c4462eef6c8c",
-			"0x47a182d7f196f6cd6f8b8818a9be457ce06fe8b93ef53c5669c756b23a07c5f1",
-			"0x2cebac7f3796b470e9c75693b1a8596bdbd2a89de862ab60ece1957d7b5383f3",
-			"0x7ce7e3078c683ec1573b2cd41b0b5fc62c28af48a23454b177699fec9ab322de",
-			"0x7d4f2be3a45bad9abc61edcbba9d86234f0460145e358dc6566ef623c50b91f2",
-			"0xfdaba3ce59b5e7ccd1f4a9e84bdd5feeb2b135603ffa49b86a7ce89eac635ce6",
-			"0x8c72f673640ed0564c3de1280414dabeb89cfe0ce6f49ebb81c3d7f0b1e6d55a",
-			"0xacacfcbe5ae3d3a9d1b3886bf8ec26bff6f84a23ae5dae8820ea138edb974c3b",
-			"0x3f2339582dc6834395622db187e6798edbcbe2f2e8458c2216779c1bb14d45dc",
-			"0x73a444fa697c736d392cd6d2b347d98734f5329d5910520419f391a443fdbd44",
-			"0xe03bb06673dd6d6e82f2d21c71053e62d3b1dd649d5e7a38150b83b0f085a473",
-			"0xc68461b94228db05a62a234ad0569aefbf31fa59fdba3d144c3a619d05fea871",
-			"0xb44575ebdc05026549326e837692dd60253155f001c7fa6f789568b7a136e8db",
-			"0xad0159409b99c1dead470cd92b3a9d4bfe25266d7400595c93f9276d8d580312",
-			"0x545c4abba819ad9a1d719991a5a0ca289932466fbc62471250e6c9148727a02e",
-			"0x5fa8b86faf4cec2e9de78f071822dc0af0198fcec23e1693e35ebb765d97d12c",
-			"0x2159886570715c7aa819fafea2166c045832707f76958fe456cf7af5ce8d73b6",
-			"0xff22db024b0e036d81383646db787cb0b1aeb713dc3387b788fd43a283a4a27c",
-			"0x7f229da8a815b51cdeb7b3662b7c902238b540ded6f224ce5568514032832ec3",
-			"0xa5e57b07a872a68d2cf2ee6fe73baeffdd4b5c3a423d2a819e67dd73dd36fb83",
-			"0xf0ad72ee27fb47af398972ea5ee5d07ff21091a0ee610a015da1f677ac04beeb",
-			"0xdbca73f967cd079e0c863e9be4194acfd63857fa71ab93c3d4c44dec0f88f9f8",
-			"0x29f4dafd87f712ebbe677193aa86ac807dc933cf0ab895c95feb8c19a46a78c8",
-			"0xef79cedefe4aab625ea24882c8e5493ac4540ddfa7ec8ac72d06d6c264a2a43f",
-			"0x377ad1711a2818e94eff19e349d34a5a7c0eaf3ad514b918efa58d48980f8dc7",
-			"0xca40524371fd62f82dfc73b74acd6f103bad8e81c22dcfe2c3b56d0941a2bf03",
-			"0x14f6e3daa8495585abf5030e856f742b63e2c3b8fab950fbcf61438d203b3481",
-			"0xfab710e7caecd295113ae04e2da94fd089d0cf2ed1bb804fc961bbda414fc78a",
-			"0x6a4ea10fee2a5029011fe25fc6788d1ffd6cdaeca4105b146745883ca457f7f2",
-			"0x3d16f801b58a8a0362178a2de3667967ac8e8e5600dec667098c56534e95c51e",
-			"0xe6b91400dbbe1279d8001c9ebbb951b85ae815e0812b3d706a257fd7cafc72a9",
-			"0x833f7223f1f9c216001b67fc3c5869c012ac7bdadf07a750bf5d504b8da9dac8",
-			"0x1dadfa642e018d46c90e4c9b45e7d22f964c713c829f28e7dd94456efb5ba769",
-			"0x9b0b0f0f9255c2ff2b0c0d9b70baea541997a2981b3e1cec904420c02c8e68f9",
-			"0x0ab920eab62b4a0fa9751d42b4656be510a8724337fe0adf54224cfea0b0e3b9",
-			"0x1669cc89308825fbcf62478c1d6d4a979d730bde70c1512afc0926e0d4e23929",
-			"0x66b011d44e8e971ad3063722cf5d6238c519d57c0a94c760e5c307a3158e4161",
-			"0x0a4ac475f2b54e24784b10b18df0086a92c407e2474479357baccd46086ea81c",
-			"0x988a166c64baeb21ff5ade5d2c563ef93ad0452c67015a1c472b2fc14944fcb7",
-			"0xac583c02f23326514085d3b816973c5907541f1efdb31373b399a67807ad1322",
-			"0x51d7e2b08d025386fb4b335b0d0e2d07f55b9208fff10d3a362832dc6a7547e0",
-			"0x6c4e553f3ce7b7c80cbce8d3c107cdcb8a7b4c89ebca8f1057e526552f1c979c",
-			"0x870d63c54b37873abfc8b0c8cc7bfa2b41261f77550251ab59a8f304417dbcd5",
-			"0x6db3c454f0583e94ba43aeca2c4ef413f80555eaef5829b1c4c1708d63d3b4e6",
-			"0x6cc1ddaf69d050d9b492d559de84c69232e43b7607cb6807933b1801cb4beea4",
-			"0xc7c0aa117b17ceef132579c731956b015ebaf3e802b85ee0a6c825f124a4451e",
-			"0x8bf5ba7ba1184ca6aa5f6915e418e455bb096403d43746ade9b5895fa8d0e69a",
-			"0x13bb12782984d634332842ce7b72a981a17bdd34ee6acd9adbf65844b96d7b48",
-			"0x88a59590e8e1366ec65ddf718dedbb5540a06317613a7dbe130c4a570f7f2963",
-			"0x8a89daffb49834fc7f2341d00151f952ef7d1a7299ab92b3fc926e442d9dad74",
-			"0x78afc35edc10009ad9fa1b51bb7774a48d7e53a960ebdd8818e51899fd8f5cc5",
-			"0x0e25764281bb700a43644ed3455c279969b80f5c537f4096934413a7904863a0",
-			"0xdad129d76c4fe2fc61c1af14ed7556321989efaef6824aee0436216504a36e1a",
-			"0x9e4fc1c9dea1e18cc4147cfc52cab7eaa90930a2b393a442238a8c5378cd4274",
-			"0x08c8c7dc91c967fdb900953d543b4975ec90b8def04eadcf7885c555c782ba5f",
-			"0x07d599a0c521f72463b80cbb534bf4dc605bf345dc1c5de1db13b55486d382d7",
-			"0x420c5f035c465ba9127bc832eb0f757814a6769dd9fce22b28f4a3a3e9cdfd33",
-			"0x2dc76172b77b50b249a5a5b9d5e23595b3310aff6199d7335eb94881d8d24906",
-			"0xd2fbcd5e757bd9eec8698e53088491d63b36854d315d278d1a2bd81988485077",
-			"0x3544b07abaf58fa8c4aa0dd1f0060c11e0de7cc1ed04b18f5f90cc196d3c99b3",
-			"0xe238c7374ba22d723699269c9c943eba814aa1afdb95d5e00707b3cac06a5f2a",
-			"0x1cfadf02760942304c47e07d07a7acbdfe7417c62d330b5802f598a7f550863f",
-			"0x65ad9de6d69c6e80c1cabd34f49c4c9d74b5986ecdf2e3bac30833a599cb792c",
-			"0x27f8b2a3a019abec3e4487fb353bd9ec0ac11a160c6c3a83df6ca959d404aa6d",
-			"0x6c814f0081795e7cdcf730b0807a3c91c7c656132d0d9ec2d9e39f1bb8f57526",
-			"0xec686e5d76bb74cc369ce26db62b742235bcf6ad7e7c5ef6872d62c45bdfd5d7",
-			"0x09941fefe99a62e910b1a0ab5751c36eef7d21b1740f2b9e25d814af27169649",
-			"0xc0cf4f22b4e05e192421baa0af9c888bd976239e70046a62cfb5b018d9205378",
-			"0x6c45ab7adedfa0a6a133d288a7b8ba2d213fce73124d78b0fa12e1360d930714",
-			"0x85872e50c368df9ce35b61d5363ce8db27f123661ae528334c6424a953197d00",
-			"0x6869696612636971deda05c67f663242977351aaaea43d9cdb718be5948f080b",
-			"0x291097a53461b3ec1740b0b61c129d827f0cf731e16defcfede2d7a544bf52f2",
-			"0x438259d8150e73fc0d2ec553a2143e1fa5d3e53e27b0533ca20ab37991050b4b",
-			"0xb1889369c5a7f3385258a7d63dcbe5b05ae2e2ff4ff1e5cf82e5b582a02e895b",
-			"0x3b03ee5f95e9588caaf54878d8b6c746dbeea3e695bf768651fd3c8e3255cade",
-			"0x60443bf8bbbec8f21d35a3d16c5cdafec1dd3bdf4b9c447bbeda74fd92655efd",
-			"0x61bbd3649fd7f9bdab23d6693135ec6dcf07adf1560d9bda68cbc97ae4917b42",
-			"0xc019e34634d76e06d2984f7201c445cf6fa3f72f3164c148de2b1827eed0b6b9",
-			"0x3031e3e27af9bcca0902254143e3a440d40dfed6bd69ee5095387347559fd231",
-			"0x6600ccda7d374610e0c8d0b7fb012bf5cb59966aa0d93f65850db3c6e4544bab",
-			"0x8e692bc730330a2f4bacebaae77983a1831372e64fb9578d42701a305f972ddf",
-			"0xb504ec0ea7de6f102f2b59f698d9f7a63893fa352fbe7d17bf05f9c0e0c7c0ea",
-			"0x8e8d3763f75dfb8c07fc5f609bd6becf34b6a19cadcf52a593cca1098bb2e56e",
-			"0xa30d9cca760ef7f64b647573f17adefe0da9694567c0948c677024388ff51617",
-			"0x61a0157d34d3474a167146c9dee2870b409cd9f96c9d2e530764a296b3b33d0d",
-			"0x625183a74036771889d7177b16cb7bc6982b1a68814c5140b4a31157ff953a2b",
-			"0x9c1fe65834f3733fef1fc14c47fbcbb270c01384975490ec7a483b5a29ab6a7d",
-			"0xf334351dae09bcd536fcf96d031457d0c1158d422adb8980b194da88670ffcbb",
-			"0xa9a92557684b04bfda34805c6588e1cb9fa44d7c73803c28a12a4cce0e46d222",
-			"0x9e5c9a5df1dfb47ea6cf46f0421492ed1613039789ab91d237ce65a1ef6826ec",
-			"0xc3fe546f606cee75b2c28ad343ae67da95b99b507742aa1814fcf472a8874bed",
-			"0x73a429e5ad90697799123575999fa28922436600934689457b0b5ae787e3aa20",
-			"0xbd8ce8cb98c7f263a6b8cb909b671782cb57ee111180f565c988bd97c9369ce1",
-			"0x45a0254dd0944f5419fa6a658a124de3a8fdf53dd799d2ff71fb1256b6648273",
-			"0x598cba26ab789de29b9043f53d02872d6fa2fc86df238d54786b14e4ad8bcbe9"
+			"0xc5b3582937ad993c5c234d059e6cd3b98f2fa4e3fe4ad591ecb6ae710b51fee9"
 		]
 	},
 	"nodes": [
-		"enode://d6cb8cba18828397e22e8852324af7e970b57cadbbd94aba6124790d1895728311b1f274e45d44a7a22b4276726903130a11ac2de19af5bc9294998f948eaad4@144.217.72.209:30303",
+		"enode://6332792c4a00e3e4ee0926ed89e0d27ef985424d97b6a45bf0f23e51f0dcb5e66b875777506458aea7af6f9e4ffb69f43f3778ee73c81ed9d34c51c4b16b0b0f@52.232.243.152:30303",
 		"enode://94c15d1b9e2fe7ce56e458b9a3b672ef11894ddedd0c6f247e0f1d3487f52b66208fb4aeb8179fce6e3a749ea93ed147c37976d67af557508d199d9594c35f09@192.81.208.223:30303",
 		"enode://30b7ab30a01c124a6cceca36863ece12c4f5fa68e3ba9b0b51407ccc002eeed3b3102d20a88f1c1d3c3154e2449317b8ef95090e77b312d5cc39354f86d5d606@52.176.7.10:30303",
 		"enode://865a63255b3bb68023b6bffd5095118fcc13e79dcf014fe4e47e065c350c7cc72af2e53eff895f11ba1bbb6a2b33271c1116ee870f266618eadfc2e78aa7349c@52.176.100.77:30303",
@@ -3392,13 +2639,11 @@
 			"nonce": "0x0",
 			"builtin": {
 				"name": "alt_bn128_add",
+				"activate_at": "0x19f0a0",
 				"pricing": {
-					"0x19f0a0": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x62f756": {
-						"info": "EIP 1108 transition at block 6_485_846 (0x62f756)",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
+					"linear": {
+						"base": 500,
+						"word": 0
 					}
 				}
 			}
@@ -3408,13 +2653,11 @@
 			"nonce": "0x0",
 			"builtin": {
 				"name": "alt_bn128_mul",
+				"activate_at": "0x19f0a0",
 				"pricing": {
-					"0x19f0a0": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x62f756": {
-						"info": "EIP 1108 transition at block 6_485_846 (0x62f756)",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
+					"linear": {
+						"base": 40000,
+						"word": 0
 					}
 				}
 			}
@@ -3424,28 +2667,17 @@
 			"nonce": "0x0",
 			"builtin": {
 				"name": "alt_bn128_pairing",
+				"activate_at": "0x19f0a0",
 				"pricing": {
-					"0x19f0a0": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x62f756": {
-						"info": "EIP 1108 transition at block 6_485_846 (0x62f756)",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
+					"alt_bn128_pairing": {
+						"base": 100000,
+						"pair": 80000
 					}
 				}
 			}
 		},
 		"0x0000000000000000000000000000000000000009": {
-			"balance": "0x1",
-			"builtin": {
-				"name": "blake2_f",
-				"activate_at": "0x62f756",
-				"pricing": {
-					"blake2_f": {
-						"gas_per_round": 1
-					}
-				}
-			}
+			"balance": "0x1"
 		},
 		"0x000000000000000000000000000000000000000a": {
 			"balance": "0x0"
--- a/ethcore/res/ethereum/social.json
+++ b/ethcore/res/ethereum/social.json
--- a/ethcore/res/ethereum/st_peters_test.json
+++ b/ethcore/res/ethereum/st_peters_test.json
@@ -36,7 +36,6 @@
 		"eip145Transition": "0x0",
 		"eip1014Transition": "0x0",
 		"eip1052Transition": "0x0",
-		"eip1283Transition": "0x0",
 		"eip1283DisableTransition": "0x0"
 	},
 	"genesis": {
@@ -59,47 +58,8 @@
 		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x00", "pricing": { "modexp": { "divisor": 20 } } } },
-		"0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		}
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "0x00", "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "0x00", "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "0x00", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } }
 	}
 }
--- a/ethcore/res/ethereum/tobalaba.json
+++ b/ethcore/res/ethereum/tobalaba.json
--- a/ethcore/res/ethereum/transition_test.json
+++ b/ethcore/res/ethereum/transition_test.json
@@ -57,47 +57,9 @@
 		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
 		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"5": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"5": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"5": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		}
+		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "5", "pricing": { "modexp": { "divisor": 100 } } } },
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "5", "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "5", "pricing": { "linear": { "base": 2000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "5", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } }
 	}
 }
--- a/ethcore/res/ethereum/volta.json
+++ b/ethcore/res/ethereum/volta.json
--- a/ethcore/res/ethereum/xdai.json
+++ b/ethcore/res/ethereum/xdai.json
--- a/ethcore/res/instant_seal.json
+++ b/ethcore/res/instant_seal.json
--- a/ethcore/res/null.json
+++ b/ethcore/res/null.json
@@ -36,51 +36,9 @@
 		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "0", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "0", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
 		"0000000000000000000000000000000000000005": { "balance": "1", "builtin": { "name": "modexp", "activate_at": 0, "pricing": { "modexp": { "divisor": 20 } } } },
-		"0000000000000000000000000000000000000006": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_add",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 500 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 150 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000007": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_const_operations": { "price": 40000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_const_operations": { "price": 6000 }}
-					}
-				}
-			}
-		},
-		"0000000000000000000000000000000000000008": {
-			"balance": "1",
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"pricing": {
-					"0": {
-						"price": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 }}
-					},
-					"0x7fffffffffffff": {
-						"info": "EIP 1108 transition",
-						"price": { "alt_bn128_pairing": { "base": 45000, "pair": 34000 }}
-					}
-				}
-			}
-		},
+		"0000000000000000000000000000000000000006": { "balance": "1", "builtin": { "name": "alt_bn128_add", "activate_at": 0, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "balance": "1", "builtin": { "name": "alt_bn128_mul", "activate_at": 0, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "balance": "1", "builtin": { "name": "alt_bn128_pairing", "activate_at": 0, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "0" }
 	}
 }
--- a/ethcore/res/null_morden_with_finality.json
+++ b/ethcore/res/null_morden_with_finality.json
@@ -1,38 +0,0 @@
-{
-	"name": "Morden",
-	"engine": {
-		"null": {
-			"params": {
-				"immediateFinalization": true
-			}
-		}
-	},
-	"params": {
-		"gasLimitBoundDivisor": "0x0400",
-		"accountStartNonce": "0x0",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID" : "0x2"
-	},
-	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x00006d6f7264656e",
-				"mixHash": "0x00000000000000000000000000000000000000647572616c65787365646c6578"
-			}
-		},
-		"difficulty": "0x20000",
-		"author": "0x0000000000000000000000000000000000000000",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "0x",
-		"gasLimit": "0x2fefd8"
-	},
-	"accounts": {
-		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "1048576", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"102e61f5d8f9bc71d0ad4a084df4e65e05ce0e1c": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "1048576" }
-	}
-}
--- a/ethcore/res/spec_backward_compability.json
+++ b/ethcore/res/spec_backward_compability.json
@@ -1,155 +0,0 @@
-{
-    "name": "Volta",
-    "engine": {
-        "authorityRound": {
-            "params": {
-                "stepDuration": "5",
-                "validators": {
-                    "contract": "0x1204700000000000000000000000000000000000"
-                },
-                "maximumUncleCountTransition": "0",
-                "maximumUncleCount": "0",
-                "blockRewardContractAddress": "0x1204700000000000000000000000000000000002",
-                "blockRewardContractTransition": "0"
-            }
-        }
-    },
-    "params": {
-        "networkID": "0x12047",
-        "maximumExtraDataSize": "0x20",
-        "gasLimitBoundDivisor": "0x400",
-        "minGasLimit": "0x1388",
-        "maxCodeSize": "0x6000",
-        "eip140Transition": "0x0",
-        "eip211Transition": "0x0",
-        "eip214Transition": "0x0",
-        "eip658Transition": "0x0",
-        "eip145Transition": "0x0",
-        "eip1014Transition": "0x0",
-        "eip1052Transition": "0x0",
-        "registrar": "0x1204700000000000000000000000000000000006"
-    },
-    "genesis": {
-        "seal": {
-            "authorityRound": {
-                "step": "0x0",
-                "signature": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-            }
-        },
-        "difficulty": "0x20000",
-        "gasLimit": "0x5B8D80"
-    },
-    "accounts": {
-        "0x0000000000000000000000000000000000000001": {
-            "balance": "1",
-            "builtin": {
-                "name": "ecrecover",
-                "activate_at": "0",
-                "pricing": {
-                    "linear": {
-                        "base": 3000,
-                        "word": 0
-                    }
-                }
-            }
-        },
-        "0x0000000000000000000000000000000000000002": {
-            "balance": "1",
-            "builtin": {
-                "name": "sha256",
-                "activate_at": "0",
-                "pricing": {
-                    "linear": {
-                        "base": 60,
-                        "word": 12
-                    }
-                }
-            }
-        },
-        "0x0000000000000000000000000000000000000003": {
-            "balance": "1",
-            "builtin": {
-                "name": "ripemd160",
-                "activate_at": "0",
-                "pricing": {
-                    "linear": {
-                        "base": 600,
-                        "word": 120
-                    }
-                }
-            }
-        },
-        "0x0000000000000000000000000000000000000004": {
-            "balance": "1",
-            "builtin": {
-                "name": "identity",
-                "activate_at": "0",
-                "pricing": {
-                    "linear": {
-                        "base": 15,
-                        "word": 3
-                    }
-                }
-            }
-        },
-        "0x0000000000000000000000000000000000000005": {
-            "balance": "1",
-            "builtin": {
-                "name": "modexp",
-                "activate_at": "0",
-                "pricing": {
-                    "modexp": {
-                        "divisor": 20
-                    }
-                }
-            }
-        },
-        "0x0000000000000000000000000000000000000006": {
-            "balance": "1",
-            "builtin": {
-                "name": "alt_bn128_add",
-                "activate_at": "0",
-                "pricing": {
-                    "linear": {
-                        "base": 500,
-                        "word": 0
-                    }
-                }
-            }
-        },
-        "0x0000000000000000000000000000000000000007": {
-            "balance": "1",
-            "builtin": {
-                "name": "alt_bn128_mul",
-                "activate_at": "0",
-                "pricing": {
-                    "linear": {
-                        "base": 40000,
-                        "word": 0
-                    }
-                }
-            }
-        },
-        "0x0000000000000000000000000000000000000008": {
-            "balance": "1",
-            "builtin": {
-                "name": "alt_bn128_pairing",
-                "activate_at": "0",
-                "pricing": {
-                    "alt_bn128_pairing": {
-                        "base": 100000,
-                        "pair": 80000
-                    }
-                }
-            }
-        }
-	},
-    "nodes": [
-        "enode://59c9250cb805409e84c9cd0038e97d8e5e4605b928663675869ebdfd4c251d80ccad76267a5eb2f4362ddceb5ec671f7595463adfc0a12e9f68dbf233072db41@54.70.158.106:30303",
-        "enode://e487ebacbdad3418905d2ed7f009fa5dbd17d73880854884acc604c0afc1a60a396aa90cb2741278c555a4e30ffc6ffc1c29e83840aa22009ec92fe53f81ec04@99.81.92.124:30303",
-        "enode://563f12602a117201b39ebeea108185abb15d9286830c074640c9fccbaaaabcc7fe2c95682cc43f95b95059f6d0dc4c9becbc1b2bd78e0c5ef5fddff07d85ba0e@54.201.62.74:30303",
-        "enode://5903b3acebdc4a34800f6923e5f3aec3ca7e5d1285bec4adb9f20ebb0f87a3bebdd748b1849ca1108a9f1e37ff9ced0b475292b8effc29e95d49ec438f244b02@3.121.165.10:30303",
-        "enode://8f8e35a6dcacfee946f46447b4703c84f4e485e478143997f86b1834e1b0bb78dab363d700dff3147442b9d3e2a1c521f79340c436eb7245a97c7fe385b89a5d@54.93.159.98:30303",
-        "enode://bd228aa03cf4a88491c81c5f3ab4a1437df3b463081cc93943c4d3ab37f1e4f8081c6995eca076f717d4fdf9a277c750bd0289477ac151f1e2b024747dcd1747@52.31.129.130:30303"
-    ]
-}
--- a/ethcore/service/Cargo.toml
+++ b/ethcore/service/Cargo.toml
@@ -1,5 +1,4 @@
 [package]
-description = "Parity Ethereum (EthCore) Client & Network Service Creation & Registration with the I/O Subsystem"
 name = "ethcore-service"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
--- a/ethcore/service/src/error.rs
+++ b/ethcore/service/src/error.rs
@@ -14,18 +14,17 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.

-// Silence: `use of deprecated item 'std::error::Error::cause': replaced by Error::source, which can support downcasting`
-// https://github.com/paritytech/parity-ethereum/issues/10302
-#![allow(deprecated)]
-
 use ethcore;
 use io;
 use ethcore_private_tx;

 error_chain! {
+	links {
+		PrivateTransactions(ethcore_private_tx::Error, ethcore_private_tx::ErrorKind);
+	}
+
 	foreign_links {
 		Ethcore(ethcore::error::Error);
 		IoError(io::IoError);
-		PrivateTransactions(ethcore_private_tx::Error);
 	}
 }
--- a/ethcore/service/src/service.rs
+++ b/ethcore/service/src/service.rs
@@ -30,10 +30,8 @@ use blockchain::{BlockChainDB, BlockChainDBHandler};
 use ethcore::client::{Client, ClientConfig, ChainNotify, ClientIoMessage};
 use ethcore::miner::Miner;
 use ethcore::snapshot::service::{Service as SnapshotService, ServiceParams as SnapServiceParams};
-use ethcore::snapshot::{SnapshotService as _SnapshotService, RestorationStatus, Error as SnapshotError};
+use ethcore::snapshot::{SnapshotService as _SnapshotService, RestorationStatus};
 use ethcore::spec::Spec;
-use ethcore::error::{Error as EthcoreError, ErrorKind};
-

 use ethcore_private_tx::{self, Importer, Signer};
 use Error;
@@ -199,7 +197,6 @@ impl ClientService {

 	/// Shutdown the Client Service
 	pub fn shutdown(&self) {
-		trace!(target: "shutdown", "Shutting down Client Service");
 		self.snapshot.shutdown();
 	}
 }
@@ -260,11 +257,7 @@ impl IoHandler<ClientIoMessage> for ClientIoHandler {

 				let res = thread::Builder::new().name("Periodic Snapshot".into()).spawn(move || {
 					if let Err(e) = snapshot.take_snapshot(&*client, num) {
-						match e {
-							EthcoreError(ErrorKind::Snapshot(SnapshotError::SnapshotAborted), _) => info!("Snapshot aborted"),
-							_ => warn!("Failed to take snapshot at block #{}: {}", num, e),
-						}
-
+						warn!("Failed to take snapshot at block #{}: {}", num, e);
 					}
 				});

--- a/ethcore/src/block.rs
+++ b/ethcore/src/block.rs
@@ -31,7 +31,7 @@
 //! `ExecutedBlock` is an underlaying data structure used by all structs above to store block
 //! related info.

-use std::{cmp, ops};
+use std::cmp;
 use std::collections::HashSet;
 use std::sync::Arc;

@@ -52,6 +52,7 @@ use vm::{EnvInfo, LastHashes};
 use hash::keccak;
 use rlp::{RlpStream, Encodable, encode_list};
 use types::transaction::{SignedTransaction, Error as TransactionError};
+use types::block::Block;
 use types::header::{Header, ExtendedHeader};
 use types::receipt::{Receipt, TransactionOutcome};

@@ -154,15 +155,69 @@ impl ExecutedBlock {
 	}
 }

+/// Trait for a object that is a `ExecutedBlock`.
+pub trait IsBlock {
+	/// Get the `ExecutedBlock` associated with this object.
+	fn block(&self) -> &ExecutedBlock;
+
+	/// Get the base `Block` object associated with this.
+	fn to_base(&self) -> Block {
+		Block {
+			header: self.header().clone(),
+			transactions: self.transactions().iter().cloned().map(Into::into).collect(),
+			uncles: self.uncles().to_vec(),
+		}
+	}
+
+	/// Get the header associated with this object's block.
+	fn header(&self) -> &Header { &self.block().header }
+
+	/// Get the final state associated with this object's block.
+	fn state(&self) -> &State<StateDB> { &self.block().state }
+
+	/// Get all information on transactions in this block.
+	fn transactions(&self) -> &[SignedTransaction] { &self.block().transactions }
+
+	/// Get all information on receipts in this block.
+	fn receipts(&self) -> &[Receipt] { &self.block().receipts }
+
+	/// Get all uncles in this block.
+	fn uncles(&self) -> &[Header] { &self.block().uncles }
+}
+
 /// Trait for an object that owns an `ExecutedBlock`
 pub trait Drain {
 	/// Returns `ExecutedBlock`
 	fn drain(self) -> ExecutedBlock;
 }

+impl IsBlock for ExecutedBlock {
+	fn block(&self) -> &ExecutedBlock { self }
+}
+
+impl ::parity_machine::LiveBlock for ExecutedBlock {
+	type Header = Header;
+
+	fn header(&self) -> &Header {
+		&self.header
+	}
+
+	fn uncles(&self) -> &[Header] {
+		&self.uncles
+	}
+}
+
+impl ::parity_machine::Transactions for ExecutedBlock {
+	type Transaction = SignedTransaction;
+
+	fn transactions(&self) -> &[SignedTransaction] {
+		&self.transactions
+	}
+}
+
 impl<'x> OpenBlock<'x> {
 	/// Create a new `OpenBlock` ready for transaction pushing.
-	pub fn new<'a, I: IntoIterator<Item = ExtendedHeader>>(
+	pub fn new<'a>(
 		engine: &'x EthEngine,
 		factories: Factories,
 		tracing: bool,
@@ -173,7 +228,7 @@ impl<'x> OpenBlock<'x> {
 		gas_range_target: (U256, U256),
 		extra_data: Bytes,
 		is_epoch_begin: bool,
-		ancestry: I,
+		ancestry: &mut Iterator<Item=ExtendedHeader>,
 	) -> Result<Self, Error> {
 		let number = parent.number() + 1;
 		let state = State::from_existing(db, parent.state_root().clone(), engine.account_start_nonce(number), factories)?;
@@ -195,7 +250,7 @@ impl<'x> OpenBlock<'x> {
 		engine.populate_from_parent(&mut r.block.header, parent);

 		engine.machine().on_new_block(&mut r.block)?;
-		engine.on_new_block(&mut r.block, is_epoch_begin, &mut ancestry.into_iter())?;
+		engine.on_new_block(&mut r.block, is_epoch_begin, ancestry)?;

 		Ok(r)
 	}
@@ -215,7 +270,7 @@ impl<'x> OpenBlock<'x> {
 	/// NOTE Will check chain constraints and the uncle number but will NOT check
 	/// that the header itself is actually valid.
 	pub fn push_uncle(&mut self, valid_uncle_header: Header) -> Result<(), BlockError> {
-		let max_uncles = self.engine.maximum_uncle_count(self.block.header.number());
+		let max_uncles = self.engine.maximum_uncle_count(self.block.header().number());
 		if self.block.uncles.len() + 1 > max_uncles {
 			return Err(BlockError::TooManyUncles(OutOfBounds{
 				min: None,
@@ -229,6 +284,11 @@ impl<'x> OpenBlock<'x> {
 		Ok(())
 	}

+	/// Get the environment info concerning this block.
+	pub fn env_info(&self) -> EnvInfo {
+		self.block.env_info()
+	}
+
 	/// Push a transaction into the block.
 	///
 	/// If valid, it will be executed, and archived together with the receipt.
@@ -237,7 +297,7 @@ impl<'x> OpenBlock<'x> {
 			return Err(TransactionError::AlreadyImported.into());
 		}

-		let env_info = self.block.env_info();
+		let env_info = self.env_info();
 		let outcome = self.block.state.apply(&env_info, self.engine.machine(), &t, self.block.traces.is_enabled())?;

 		self.block.transactions_set.insert(h.unwrap_or_else(||t.hash()));
@@ -284,6 +344,7 @@ impl<'x> OpenBlock<'x> {
 		self.block.header.set_difficulty(*header.difficulty());
 		self.block.header.set_gas_limit(*header.gas_limit());
 		self.block.header.set_timestamp(header.timestamp());
+		self.block.header.set_author(*header.author());
 		self.block.header.set_uncles_hash(*header.uncles_hash());
 		self.block.header.set_transactions_root(*header.transactions_root());
 		// TODO: that's horrible. set only for backwards compatibility
@@ -333,39 +394,22 @@ impl<'x> OpenBlock<'x> {
 	pub fn block_mut(&mut self) -> &mut ExecutedBlock { &mut self.block }
 }

-impl<'a> ops::Deref for OpenBlock<'a> {
-	type Target = ExecutedBlock;
-
-	fn deref(&self) -> &Self::Target {
-		&self.block
-	}
+impl<'x> IsBlock for OpenBlock<'x> {
+	fn block(&self) -> &ExecutedBlock { &self.block }
 }

-impl ops::Deref for ClosedBlock {
-	type Target = ExecutedBlock;
-
-	fn deref(&self) -> &Self::Target {
-		&self.block
-	}
+impl IsBlock for ClosedBlock {
+	fn block(&self) -> &ExecutedBlock { &self.block }
 }

-impl ops::Deref for LockedBlock {
-	type Target = ExecutedBlock;
-
-	fn deref(&self) -> &Self::Target {
-		&self.block
-	}
-}
-
-impl ops::Deref for SealedBlock {
-	type Target = ExecutedBlock;
-
-	fn deref(&self) -> &Self::Target {
-		&self.block
-	}
+impl IsBlock for LockedBlock {
+	fn block(&self) -> &ExecutedBlock { &self.block }
 }

 impl ClosedBlock {
+	/// Get the hash of the header without seal arguments.
+	pub fn hash(&self) -> H256 { self.header().bare_hash() }
+
 	/// Turn this into a `LockedBlock`, unable to be reopened again.
 	pub fn lock(self) -> LockedBlock {
 		LockedBlock {
@@ -399,25 +443,25 @@ impl LockedBlock {
 		self.block.header.set_receipts_root(
 			ordered_trie_root(self.block.receipts.iter().map(|r| r.rlp_bytes()))
 		);
+		// compute hash and cache it.
+		self.block.header.compute_hash();
 	}

+	/// Get the hash of the header without seal arguments.
+	pub fn hash(&self) -> H256 { self.header().bare_hash() }
+
 	/// Provide a valid seal in order to turn this into a `SealedBlock`.
 	///
 	/// NOTE: This does not check the validity of `seal` with the engine.
-	pub fn seal(self, engine: &EthEngine, seal: Vec<Bytes>) -> Result<SealedBlock, Error> {
-		let expected_seal_fields = engine.seal_fields(&self.header);
+	pub fn seal(self, engine: &EthEngine, seal: Vec<Bytes>) -> Result<SealedBlock, BlockError> {
+		let expected_seal_fields = engine.seal_fields(self.header());
 		let mut s = self;
 		if seal.len() != expected_seal_fields {
-			Err(BlockError::InvalidSealArity(Mismatch {
-				expected: expected_seal_fields,
-				found: seal.len()
-			}))?;
+			return Err(BlockError::InvalidSealArity(
+				Mismatch { expected: expected_seal_fields, found: seal.len() }));
 		}
-
 		s.block.header.set_seal(seal);
-		engine.on_seal_block(&mut s.block)?;
 		s.block.header.compute_hash();
-
 		Ok(SealedBlock {
 			block: s.block
 		})
@@ -426,7 +470,6 @@ impl LockedBlock {
 	/// Provide a valid seal in order to turn this into a `SealedBlock`.
 	/// This does check the validity of `seal` with the engine.
 	/// Returns the `ClosedBlock` back again if the seal is no good.
-	/// TODO(https://github.com/paritytech/parity-ethereum/issues/10407): This is currently only used in POW chain call paths, we should really merge it with seal() above.
 	pub fn try_seal(
 		self,
 		engine: &EthEngine,
@@ -467,8 +510,12 @@ impl Drain for SealedBlock {
 	}
 }

+impl IsBlock for SealedBlock {
+	fn block(&self) -> &ExecutedBlock { &self.block }
+}
+
 /// Enact the block given by block header, transactions and uncles
-pub(crate) fn enact(
+fn enact(
 	header: Header,
 	transactions: Vec<SignedTransaction>,
 	uncles: Vec<Header>,
@@ -481,12 +528,13 @@ pub(crate) fn enact(
 	is_epoch_begin: bool,
 	ancestry: &mut Iterator<Item=ExtendedHeader>,
 ) -> Result<LockedBlock, Error> {
-	// For trace log
-	let trace_state = if log_enabled!(target: "enact", ::log::Level::Trace) {
-		Some(State::from_existing(db.boxed_clone(), parent.state_root().clone(), engine.account_start_nonce(parent.number() + 1), factories.clone())?)
-	} else {
-		None
-	};
+	{
+		if ::log::max_level() >= ::log::Level::Trace {
+			let s = State::from_existing(db.boxed_clone(), parent.state_root().clone(), engine.account_start_nonce(parent.number() + 1), factories.clone())?;
+			trace!(target: "enact", "num={}, root={}, author={}, author_balance={}\n",
+				header.number(), s.root(), header.author(), s.balance(&header.author())?);
+		}
+	}

 	let mut b = OpenBlock::new(
 		engine,
@@ -495,23 +543,13 @@ pub(crate) fn enact(
 		db,
 		parent,
 		last_hashes,
-		// Engine such as Clique will calculate author from extra_data.
-		// this is only important for executing contracts as the 'executive_author'.
-		engine.executive_author(&header)?,
+		Address::new(),
 		(3141562.into(), 31415620.into()),
 		vec![],
 		is_epoch_begin,
 		ancestry,
 	)?;

-	if let Some(ref s) = trace_state {
-		let env = b.env_info();
-		let root = s.root();
-		let author_balance = s.balance(&env.author)?;
-		trace!(target: "enact", "num={}, root={}, author={}, author_balance={}\n",
-				b.block.header.number(), root, env.author, author_balance);
-	}
-
 	b.populate_from(&header);
 	b.push_transactions(transactions)?;

@@ -577,7 +615,6 @@ mod tests {
 		last_hashes: Arc<LastHashes>,
 		factories: Factories,
 	) -> Result<LockedBlock, Error> {
-
 		let block = Unverified::from_rlp(block_bytes)?;
 		let header = block.header;
 		let transactions: Result<Vec<_>, Error> = block
@@ -607,7 +644,7 @@ mod tests {
 			(3141562.into(), 31415620.into()),
 			vec![],
 			false,
-			None,
+			&mut Vec::new().into_iter(),
 		)?;

 		b.populate_from(&header);
@@ -632,7 +669,7 @@ mod tests {
 	) -> Result<SealedBlock, Error> {
 		let header = Unverified::from_rlp(block_bytes.clone())?.header;
 		Ok(enact_bytes(block_bytes, engine, tracing, db, parent, last_hashes, factories)?
-			.seal(engine, header.seal().to_vec())?)
+		   .seal(engine, header.seal().to_vec())?)
 	}

 	#[test]
@@ -642,7 +679,7 @@ mod tests {
 		let genesis_header = spec.genesis_header();
 		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
-		let b = OpenBlock::new(&*spec.engine, Default::default(), false, db, &genesis_header, last_hashes, Address::zero(), (3141562.into(), 31415620.into()), vec![], false, None).unwrap();
+		let b = OpenBlock::new(&*spec.engine, Default::default(), false, db, &genesis_header, last_hashes, Address::zero(), (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
 		let b = b.close_and_lock().unwrap();
 		let _ = b.seal(&*spec.engine, vec![]);
 	}
@@ -656,7 +693,7 @@ mod tests {

 		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
-		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes.clone(), Address::zero(), (3141562.into(), 31415620.into()), vec![], false, None).unwrap()
+		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes.clone(), Address::zero(), (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap()
 			.close_and_lock().unwrap().seal(engine, vec![]).unwrap();
 		let orig_bytes = b.rlp_bytes();
 		let orig_db = b.drain().state.drop().1;
@@ -680,7 +717,7 @@ mod tests {

 		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
-		let mut open_block = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes.clone(), Address::zero(), (3141562.into(), 31415620.into()), vec![], false, None).unwrap();
+		let mut open_block = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes.clone(), Address::zero(), (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
 		let mut uncle1_header = Header::new();
 		uncle1_header.set_extra_data(b"uncle1".to_vec());
 		let mut uncle2_header = Header::new();
--- a/ethcore/src/builtin.rs
+++ b/ethcore/src/builtin.rs
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sočik	e1c1ecf0a5	2.4.2 beta backports (#10488 ) * version: bump beta * Сaching through docker volume (#10477) * _old codebase_ before docker update * before docker update, testing runnr * docker update, testing the caching * distributed job cargo homes * distributed job cargo homes 2 * distributed job cargo homes 3 * dockerfile with gitlab checkout, audit uses template * dockerfile gets repo in volume * change builds_dir * trying docker cache for repo * repo cached automatically * after script is not concatenated * check sccache non-cacheable reasons nature * watch cache * log sccache * log sccache 2 * debug log sccache * fix debug log sccache * fix debug log sccache 2 * debug log cache 3 * debug log cache 3 * trace log all sccache * test wo cargo cache * test w removed cargo cache * report non-cacheable reasons, cargo cache is back and empty * report non-cacheable reasons, cargo cache is back and empty 2 * report non-cacheable reasons, cargo cache is back and empty 3 * wrap into after_script * restore CI tags `qa` -> `linux-docker` * return to main runners, this will fail until config on runners And Dockerfile won't be updated * typo fix CI lint * return to docker tag * fix win&mac build (#10486) add CARGO_HOME: "${CI_PROJECT_DIR}/.cargo" * fix(extract `timestamp_checked_add` as lib) (#10383) * fix(extract `timestamp_checked_add` as lib) * fix(whisper types): remove unused `EmptyTopics` * fix(time-lib): feature-flag to use time-lib or std This commit adds conditional compilation checks that falls back to `our time-lib` when `time_checked_add` is not available in the standard library Note, `time_checked_add` covers both `checked_add` and `checked_sub` * fix(grumble): use cfg_attr to define rustc feature	2019-03-20 09:17:30 +01:00
Sočik	72c8b79035	2.4.1 beta backports (#10471 ) * version: bump beta * Implement parity_versionInfo & parity_setChain on LC; fix parity_setChain (#10312) * Light client: implement parity_versionInfo RPC * Light client: implement set_exit_handler & parity_setChain RPC * parity_setChain RPC: return an error if failed (instead of `true`) * Implement eth_subscribe('syncing') RPC for full node & light node * Fix indentation * Revert commit: Implement eth_subscribe('syncing') * Revert change to Cr callback function * CI publish to aws (#10446) * move publish aws from gitlab.yml to gitlab scripts * gitlab.yml cleaning move publish AWS to gitlab scripts remove dependencies from android build * CI aws git checkout (#10451) * Updating the CI system with the publication of releases and binary files on github Signed-off-by: Denis S. Soldatov aka General-Beck <general.beck@gmail.com> * move publish aws from gitlab.yml to gitlab scripts Signed-off-by: Denis S. Soldatov aka General-Beck <general.beck@gmail.com> * gitlab.yml cleaning move publish AWS to gitlab scripts remove dependencies from android build Signed-off-by: Denis S. Soldatov aka General-Beck <general.beck@gmail.com> * Revert "Updating the CI system with the publication of releases and binary files on github" This reverts commit da87e06f2e4751dbca08a898b52926aef5ad0aba. * remove no-git for aws * microfix * no need in no_git then * Revert "CI aws git checkout (#10451)" (#10456) * Revert "CI aws git checkout (#10451)" This reverts commit `3e1d73126c`. * Update .gitlab-ci.yml revert aws script with small fixes * Delete publish-aws.sh * Tests parallelized (#10452) * tests splitted, phase 1 * typo * fix wrong launch commands * typos * rearrangements * use `nproc` function for threads * use nproc for threads * let theads be auto, build-andriod no more in regular run * split val chain and cargo check * renamed some files * wrong phase * check rust files before test jobs * lint error * rust files modivied var * test except changes * add rust_changes except * lint error * fixes * .gitlab-ci.yml can't be excluded * pipeline shouldn't start * pipeline must go * pipeline must go 2 * pipeline must go 3 * pipeline must go 4 * pipeline must go 5 * pipeline must go 6 * pipeline must go 7 * pipeline must not go 1 * pipeline must go 8 * avoid skippng tests yet, reintroducing them after the caching * test theory * parallelized cargo check with combusting helicopters * less uploads * alias for cargo checks * nice template * Ensure static validator set changes are recognized (#10467)	2019-03-19 09:10:36 +01:00
Hernando Castano	c7d8ee1dd7	More Backports for Beta 2.4.0 (#10431 ) * revert some changes, could be buggy (#10399) * 10000 > 5000 (#10422) addresses #10418 * fix panic when logging directory does not exist, closes #10420 (#10424) * fix underflow in pip, closes #10419 (#10423) * ci: clean up gitlab-ci.yml leftovers from previous merge (#10429) * Update hardcoded headers for Foundation, Ropsten, Kovan and Classic (#10417) * update foundation to #7262209 * update kovan to #10434561 * update ropsten to #5027841 * update classic to #7555073 * Update Ropsten headers to #5101569	2019-02-27 16:33:29 +01:00
Hernando Castano	ce9f4c65d3	Backports for Beta 2.4.0 (#10416 ) * no-git for publish jobs, empty artifacts dir (#10393) * no-git for publish jobs, empty artifacts dir * fix syntax * prettiness * fix prettiness * should get rid of git in publishing * Fix to_pod storage trie value decoding (#10368) * snap: reenable i386, arm64, armhf architecture publishing (#10386) * snap: reenable i386, arm64, armhf architecture publishing * gitlab: fix indent * gitlab: fix yml syntax * Linker for crosscomile * fix target to linker * new docker image * fix lint, add build to this PR * calc SHA3 using rhash * add new images for i386, armhf * show snap target & artifacts * set CARGO_TARGET for publish snap * move detect Version to publish snap * rm libc6 dep from snap-template up pub-snap script * clean up cargo config before add linker * move linker config to docker images	2019-02-25 15:24:51 +01:00
5chdn	ab0ad1925b	version: mark 2.4.0 beta	2019-02-21 11:25:29 +01:00