[beta] More backports for 2.1.2 (#9733)

* produce portable binaries (#9725)

* HF in POA Core (2018-10-22) (#9724)

https://github.com/poanetwork/poa-chain-spec/pull/87

* Use static call and apparent value transfer for block reward contract code (#9603)

* Verify block syncing responses against requests (#9670)

* sync: Validate received BlockHeaders packets against stored request.

* sync: Validate received BlockBodies and BlockReceipts.

* sync: Fix broken tests.

* sync: Unit tests for BlockDownloader::import_headers.

* sync: Unit tests for import_{bodies,receipts}.

* tests: Add missing method doc.

* Fix ancient blocks sync (#9531)

* Log block set in block_sync for easier debugging

* logging macros

* Match no args in sync logging macros

* Add QueueFull error

* Only allow importing headers if the first matches requested

* WIP

* Test for chain head gaps and log

* Calc distance even with 2 heads

* Revert previous commits, preparing simple fix

This reverts commit 5f38aa885b22ebb0e3a1d60120cea69f9f322628.

* Reject headers with no gaps when ChainHead

* Reset block sync download when queue full

* Simplify check for subchain heads

* Add comment to explain subchain heads filter

* Fix is_subchain_heads check and comment

* Prevent premature round completion after restart

This is a problem on mainnet where multiple stale peer requests will
force many rounds to complete quickly, forcing the retraction.

* Reset stale old blocks request after queue full

* Revert "Reject headers with no gaps when ChainHead"

This reverts commit 0eb865539e5dee37ab34f168f5fb643300de5ace.

* Add BlockSet to BlockDownloader logging

Currently it is difficult to debug this because there are two instances,
one for OldBlocks and one for NewBlocks. This adds the BlockSet to all
log messages for easy log filtering.

* Reset OldBlocks download from last enqueued

Previously when the ancient block queue was full it would restart the
download from the last imported block, so the ones still in the queue would be
redownloaded. Keeping the existing downloader instance and just
resetting it will start again from the last enqueued block.:wq

* Ignore expired Body and Receipt requests

* Log when ancient block download being restarted

* Only request old blocks from peers with >= difficulty

https://github.com/paritytech/parity-ethereum/pull/9226 might be too
permissive and causing the behaviour of the retraction soon after the
fork block. With this change the peer difficulty has to be greater than
or euqal to our syncing difficulty, so should still fix
https://github.com/paritytech/parity-ethereum/issues/9225

* Some logging and clear stalled blocks head

* Revert "Some logging and clear stalled blocks head"

This reverts commit 757641d9b817ae8b63fec684759b0815af9c4d0e.

* Reset stalled header if useless more than once

* Store useless headers in HashSet

* Add sync target to logging macro

* Don't disable useless peer and fix log macro

* Clear useless headers on reset and comments

* Use custom error for collecting blocks

Previously we resued BlockImportError, however only the Invalid case and
this made little sense with the QueueFull error.

* Remove blank line

* Test for reset sync after consecutive useless headers

* Don't reset after consecutive headers when chain head

* Delete commented out imports

* Return DownloadAction from collect_blocks instead of error

* Don't reset after round complete, was causing test hangs

* Add comment explaining reset after useless

* Replace HashSet with counter for useless headers

* Refactor sync reset on bad block/queue full

* Add missing target for log message

* Fix compiler errors and test after merge

* ethcore: revert ethereum tests submodule update

* Add hardcoded headers (#9730)

* add foundation hardcoded header #6486017

* add ropsten hardcoded headers #4202497

* add kovan hardcoded headers #9023489

* gitlab ci: releasable_branches: change variables condition to schedule (#9729)

.cargo/config

@@ -1,3 +1,3 @@
 [target.x86_64-pc-windows-msvc]
-# Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643
+# Link the C runtime statically ; https://github.com/paritytech/parity-ethereum/issues/6643
 rustflags = ["-Ctarget-feature=+crt-static"]

.github/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 ## Do you have a question?
 
-Check out our [Basic Usage](https://github.com/paritytech/parity/wiki/Basic-Usage), [Configuration](https://github.com/paritytech/parity/wiki/Configuring-Parity), and [FAQ](https://github.com/paritytech/parity/wiki/FAQ) articles on our [wiki](https://github.com/paritytech/parity/wiki)!
+Check out our [Basic Usage](https://wiki.parity.io/Basic-Usage), [Configuration](https://wiki.parity.io/Configuring-Parity-Ethereum), and [FAQ](https://wiki.parity.io/FAQ) articles on our [wiki](https://wiki.parity.io/)!
 
 See also frequently asked questions [tagged with `parity`](https://ethereum.stackexchange.com/questions/tagged/parity?sort=votes&pageSize=50) on Stack Exchange.
 
@@ -10,11 +10,11 @@ See also frequently asked questions [tagged with `parity`](https://ethereum.stac
 
 Do **not** open an issue on Github if you think your discovered bug could be a **security-relevant vulnerability**. Please, read our [security policy](../SECURITY.md) instead.
 
-Otherwise, just create a [new issue](https://github.com/paritytech/parity/issues/new) in our repository and state:
+Otherwise, just create a [new issue](https://github.com/paritytech/parity-ethereum/issues/new) in our repository and state:
 
-- What's your Parity version?
+- What's your Parity Ethereum version?
 - What's your operating system and version?
-- How did you install parity?
+- How did you install Parity Ethereum?
 - Is your node fully synchronized?
 - Did you try turning it off and on again?
 
@@ -22,12 +22,12 @@ Also, try to include **steps to reproduce** the issue and expand on the **actual
 
 ## Contribute!
 
-If you would like to contribute to Parity, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/paritytech/parity/compare).
+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).
 
-Please, refer to the [Coding Guide](https://github.com/paritytech/parity/wiki/Coding-guide) in our wiki for more details about hacking on Parity.
+Please, refer to the [Coding Guide](https://wiki.parity.io/Coding-guide) in our wiki for more details about hacking on Parity.
 
 ## License.
 
-By contributing to Parity, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).
+By contributing to Parity Ethereum, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).
 
 Each contributor has to sign our Contributor License Agreement. The purpose of the CLA is to ensure that the guardian of a project's outputs has the necessary ownership or grants of rights over all contributions to allow them to distribute under the chosen license. You can read and sign our full Contributor License Agreement at [cla.parity.io](https://cla.parity.io) before submitting a pull request.

.github/ISSUE_TEMPLATE.md

@@ -1,13 +1,11 @@
 _Before filing a new issue, please **provide the following information**._
 
-> I'm running:
->
-> - **Which Parity version?**: 0.0.0
-> - **Which operating system?**: Windows / MacOS / Linux
-> - **How installed?**: via installer / homebrew / binaries / from source
-> - **Are you fully synchronized?**: no / yes
-> - **Which network are you connected to?**: ethereum / ropsten / kovan / ...
-> - **Did you try to restart the node?**: no / yes
+- **Parity Ethereum version**: 0.0.0
+- **Operating system**: Windows / MacOS / Linux
+- **Installation**: homebrew / one-line installer / built from source
+- **Fully synchronized**: no / yes
+- **Network**: ethereum / ropsten / kovan / ...
+- **Restarted**: no / yes
 
 _Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._
 

.gitlab-ci.yml

@@ -45,7 +45,7 @@ cache:
 test-linux:
   stage:                           test
   variables:
-    RUN_TESTS:                     cargo
+    RUN_TESTS:                     all
   script:
     - scripts/gitlab/test-all.sh stable
   tags:

CHANGELOG.md

@@ -1,639 +1,371 @@
-## Parity [v1.11.6](https://github.com/paritytech/parity/releases/tag/v1.11.6) (2018-07-09)
+## Parity-Ethereum [v2.0.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.1) (2018-07-27)
 
-Parity 1.11.6 is a bug-fix release to improve performance and stability.
+Parity-Ethereum 2.0.1-beta is a bug-fix release to improve performance and stability.
+
+Note, authorities in PoA networks based on the Aura engine, should upgrade their nodes to 1.11.8-stable or 2.0.1-beta as this release includes a critical fix.
 
 The full list of included changes:
 
-- Beta: 1.11.6 backports ([#9015](https://github.com/paritytech/parity/pull/9015))
-  - Parity-version: bump beta to 1.11.6
-  - Scripts: remove md5 checksums ([#8884](https://github.com/paritytech/parity/pull/8884))
-  - Add support for --chain tobalaba
-    - Convert indents to tabs :)
-  - Fixes for misbehavior reporting in AuthorityRound ([#8998](https://github.com/paritytech/parity/pull/8998))
-    - Aura: only report after checking for repeated skipped primaries
-    - Aura: refactor duplicate code for getting epoch validator set
-    - Aura: verify_external: report on validator set contract instance
-    - Aura: use correct validator set epoch number when reporting
-    - Aura: use epoch set when verifying blocks
-    - Aura: report skipped primaries when generating seal
-    - Aura: handle immediate transitions
-    - Aura: don't report skipped steps from genesis to first block
-    - Aura: fix reporting test
-    - Aura: refactor duplicate code to handle immediate_transitions
-    - Aura: let reporting fail on verify_block_basic
-    - Aura: add comment about possible failure of reporting
-  - Only return error log for rustls ([#9025](https://github.com/paritytech/parity/pull/9025))
-  - Transaction Pool improvements ([#8470](https://github.com/paritytech/parity/pull/8470))
-    - Don't use ethereum_types in transaction pool.
-    - Hide internal insertion_id.
-    - Fix tests.
-    - Review grumbles.
-  - Improve should_replace on NonceAndGasPrice ([#8980](https://github.com/paritytech/parity/pull/8980))
-    - Additional tests for NonceAndGasPrice::should_replace.
-    - Fix should_replace in the distinct sender case.
-    - Use natural priority ordering to simplify should_replace.
-  - Minimal effective gas price in the queue ([#8934](https://github.com/paritytech/parity/pull/8934))
-    - Minimal effective gas price.
-    - Fix naming, add test
-    - Fix minimal entry score and add test.
-    - Fix worst_transaction.
-    - Remove effective gas price threshold.
-    - Don't leak gas_price decisions out of Scoring.
-  - Never drop local transactions from different senders. ([#9002](https://github.com/paritytech/parity/pull/9002))
-  - Recently rejected cache for transaction queue ([#9005](https://github.com/paritytech/parity/pull/9005))
-    - Store recently rejected transactions.
-    - Don't cache AlreadyImported rejections.
-    - Make the size of transaction verification queue dependent on pool size.
-    - Add a test for recently rejected.
-    - Fix logging for recently rejected.
-    - Make rejection cache smaller.
-    - Obsolete test removed
-    - Obsolete test removed
-    - Construct cache with_capacity.
-  - Optimize pending transactions filter ([#9026](https://github.com/paritytech/parity/pull/9026))
-    - Rpc: return unordered transactions in pending transactions filter
-    - Ethcore: use LruCache for nonce cache
-      - Only clear the nonce cache when a block is retracted
-    - Revert "ethcore: use LruCache for nonce cache"
-      - This reverts commit b382c19.
-    - Use only cached nonces when computing pending hashes.
-    - Give filters their own locks, so that they don't block one another.
-    - Fix pending transaction count if not sealing.
-    - Clear cache only when block is enacted.
-    - Fix RPC tests.
-    - Address review comments.
-  - A last bunch of txqueue performance optimizations ([#9024](https://github.com/paritytech/parity/pull/9024))
-    - Clear cache only when block is enacted.
-    - Add tracing for cull.
-    - Cull split.
-    - Cull after creating pending block.
-    - Add constant, remove sync::read tracing.
-    - Reset debug.
-    - Remove excessive tracing.
-    - Use struct for NonceCache.
-    - Fix build
-    - Remove warnings.
-    - Fix build again.
-  - Miner: add missing macro use for trace_time
-  - Ci: remove md5 merge leftovers
+- Backports to 2.0.1-beta ([#9145](https://github.com/paritytech/parity-ethereum/pull/9145))
+  - Parity-version: bump beta to 2.0.1
+  - Ci: update version strings for snaps ([#9160](https://github.com/paritytech/parity-ethereum/pull/9160))
+  - Be more graceful on Aura difficulty validation ([#9164](https://github.com/paritytech/parity-ethereum/pull/9164))
+    - Be more graceful on Aura difficulty validation
+    - Test: rejects_step_backwards
+    - Test: proposer_switching
+    - Test: rejects_future_block
+    - Test: reports_skipped
+    - Test: verify_empty_seal_steps
+  - Remove node-health ([#9119](https://github.com/paritytech/parity-ethereum/pull/9119))
+    - Remove node-health
+    - Remove ntp_servers
+    - Add --ntp-servers as legacy instead of removing it
+    - Add --ntp-servers to deprecated args
+    - Remove unused stuff
+    - Remove _legacy_ntp_servers
+  - Parity: fix UserDefaults json parser ([#9189](https://github.com/paritytech/parity-ethereum/pull/9189))
+    - Parity: fix UserDefaults json parser
+    - Parity: use serde_derive for UserDefaults
+    - Parity: support deserialization of old UserDefault json format
+    - Parity: make UserDefaults serde backwards compatible
+    - Parity: tabify indentation in UserDefaults
+  - Fix bugfix hard fork logic ([#9138](https://github.com/paritytech/parity-ethereum/pull/9138))
+    - Fix bugfix hard fork logic
+    - Remove dustProtectionTransition from bugfix category
+      - Eip-168 is not enabled by default
+    - Remove unnecessary 'static
+  - Disable per-sender limit for local transactions. ([#9148](https://github.com/paritytech/parity-ethereum/pull/9148))
+    - Disable per-sender limit for local transactions.
+    - Add a missing new line.
+  - Rpc: fix is_major_importing sync state condition ([#9112](https://github.com/paritytech/parity-ethereum/pull/9112))
+    - Rpc: fix is_major_importing sync state condition
+    - Rpc: fix informant printout when waiting for peers
+  - Fix verification in ethcore-sync collect_blocks ([#9135](https://github.com/paritytech/parity-ethereum/pull/9135))
+  - Docker: update hub dockerfile ([#9173](https://github.com/paritytech/parity-ethereum/pull/9173))
+    - Update Dockerfile for hub
+      - Update to Ubuntu Xenial 16.04
+      - Fix cmake version
+    - Docker: fix tab indentation in hub dockerfile
+  - Rpc: fix broken merge
+  - Rpc: remove node_health leftover from merge
+  - Rpc: remove dapps leftover from merge
 
-## Parity [v1.11.5](https://github.com/paritytech/parity/releases/tag/v1.11.5) (2018-06-29)
+## Parity-Ethereum [v2.0.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.0) "Ethereum" (2018-07-18)
 
-Parity 1.11.5 is a bug-fix release to improve performance and stability.
+This is the Parity-Ethereum//v2.0.0-beta release, code-named "Ethereum", **YOLO!**
+
+Please note, Parity-Ethereum//v2.0.0 comes with some breaking changes that might be interrupting your usual workflows. Please mind them before upgrading:
+
+- The Parity client is now called _Parity-Ethereum_ to distinguish it from other software we provide, such as [_Parity-Bitcoin_](https://github.com/paritytech/parity-bitcoin/) and [_Parity-Polkadot_](https://github.com/paritytech/polkadot) ([#9052](https://github.com/paritytech/parity-ethereum/pull/9052)).
+- The public node and the user interface (a.k.a. _"Parity Wallet"_) are completely removed from the Parity-Ethereum//v2.0.0 client ([#8758](https://github.com/paritytech/parity-ethereum/pull/8758), [#8783](https://github.com/paritytech/parity-ethereum/pull/8783), [#8641](https://github.com/paritytech/parity-ethereum/pull/8641)). Users interested running a Parity Wallet, check out [the stand-alone UI application](https://github.com/Parity-JS/shell/releases).
+- The DApps subsystem was completely removed from the client ([#9017](https://github.com/paritytech/parity-ethereum/pull/9017), [#9107](https://github.com/paritytech/parity-ethereum/pull/9107)). Again, use the standalone wallet if you wish to continue working with them.
+- Windows and MacOS versions are not available as installer anymore and the system trays were removed ([#8778](https://github.com/paritytech/parity-ethereum/pull/8778)). If you desire to run Parity-Ethereum on Windows or MacOS, you still can get the binaries from our mirrors. Furthermore, MacOS users are encouraged [to use our homebrew tap](https://github.com/paritytech/homebrew-paritytech/).
+- Linux versions are not available as deb-/rpm-packages anymore ([#8887](https://github.com/paritytech/parity-ethereum/pull/8887)). Communities are encouraged to provide their own packages or maintain their own repositories, such as [Arch Linux does](https://www.archlinux.org/packages/community/x86_64/parity/) for instance.
+- MD5-checksums are completely replaced by SHA256-checksums ([#8884](https://github.com/paritytech/parity-ethereum/pull/8884)). This is also reflected on our homepage by now.
+- Deprecated, removed, or replaced CLI-options are hidden from client `--help` to further discourage their usage ([#8967](https://github.com/paritytech/parity-ethereum/pull/8967)).
+
+Additional noteworthy changes to the client:
+
+- Tracing of precompiled contracts when the transfer value is not zero ([#8486](https://github.com/paritytech/parity-ethereum/pull/8486))
+- _Parity-Ethereum_ as a library now provides APIs for running full and light nodes and a C interface ([#8412](https://github.com/paritytech/parity-ethereum/pull/8412)). Shared crates are now available in [_Parity-Common_](https://github.com/paritytech/parity-common) ([#9083](https://github.com/paritytech/parity-ethereum/pull/9083)).
+- The Morden database and keys are now moved to a `./Morden` subdirectory instead of `./test` which is by default used by Ropsten ([#8621](https://github.com/paritytech/parity-ethereum/pull/8621)).
+- Adding support for having an on-chain contract calculating the block rewards ([#8419](https://github.com/paritytech/parity-ethereum/pull/8419)).
+- Enforcing warp-only synchronization with `--warp-barrier [blocknumber]` flag ([#8228](https://github.com/paritytech/parity-ethereum/pull/8228)).
+- Adding a fork-choice and meta-data framework suitable for implementing Casper ([#8401](https://github.com/paritytech/parity-ethereum/pull/8401)).
+- Returning an error if RLP-size of a transaction exceeds a 300kB limit ([#8473](https://github.com/paritytech/parity-ethereum/pull/8473)).
+- Warp-sync is now resumable by keeping the downloaded chunks between client restarts. Also, it seeds downloaded snapshots for other nodes ([#8544](https://github.com/paritytech/parity-ethereum/pull/8544)).
+- The developer chain `--chain dev` now contains Byzantium features, this breaks existing developer chains ([#8717](https://github.com/paritytech/parity-ethereum/pull/8717)).
+- The EIP150, EIP160 and EIP161 forks are now to be specified in common params section of a chain-spec file instead of the Ethash params to enable these features on non-proof-of-work chains ([#8614](https://github.com/paritytech/parity-ethereum/pull/8614)). Please update your chain specs.
+- Allowing to disable local-by-default for transactions with new configurations ([#8882](https://github.com/paritytech/parity-ethereum/pull/8882)).
+- Never drop local transactions from different senders ([#9002](https://github.com/paritytech/parity-ethereum/pull/9002)).
+- Optimize pending transactions filter and fix ethstats reporting of pending transactions ([#9026](https://github.com/paritytech/parity-ethereum/pull/9026)).
+- Add separate database directory for light client allowing to run full and light nodes at the same time ([#9064](https://github.com/paritytech/parity-ethereum/pull/9064)).
+
+If you are upgrading directly from versions 1.10.9 or earlier, please note important changes to our transaction-queue implementation, namely:
+
+- The pool now limits transactions per-sender (see `--tx-queue-per-sender`), local transactions also have to obey that limit. Consider increasing the limit via CLI-flag when running benchmarks or sending a lot of transactions at once.
+- In case the pool is full, transactions received over the network, but originating from accounts that you have private keys for might not get accepted to the pool any more with higher priority. Consider running with larger pool size or submitting the transactions directly on the node via `eth_sendRawTransaction`.
 
 The full list of included changes:
 
-- Bump beta to 1.11.5 / Backports ([#8955](https://github.com/paritytech/parity/pull/8955))
-  - Parity-version: bump beta to 1.11.5
-  - Update ropsten.json ([#8926](https://github.com/paritytech/parity/pull/8926))
-  - Update hardcoded headers ([#8925](https://github.com/paritytech/parity/pull/8925))
-    - Update kovan.json
-      - Update Kovan to block 7693549
-    - Update foundation.json
-      - Updated to block 5812225
-    - Update ropsten.json
-      - Update to 3465217
-  - Scripts: minor improvements ([#8930](https://github.com/paritytech/parity/pull/8930))
-    - CI: enable 'latest' docker tag on master pipeline
-    - CI: mark both beta and stable as stable snap.
-    - CI: sign all windows binaries
-  - Scripts: fix docker build tag on latest using master ([#8952](https://github.com/paritytech/parity/pull/8952))
-  - Rpc: cap gas limit of local calls ([#8943](https://github.com/paritytech/parity/pull/8943))
-  - Snap: downgrade rust to revision 1.26.2, ref snapcraft/+bug/1778530 ([#8984](https://github.com/paritytech/parity/pull/8984))
-    - Snap: downgrade rust to revision 1.26.2, ref snapcraft/+bug/1778530
-    - Snap: use plugin rust
-  - Fix deadlock in blockchain. ([#8977](https://github.com/paritytech/parity/pull/8977))
-  - Remove js-glue from workspace
-    - This fixes test error on Rust 1.27 but also prevents js-glue from building itself.
-    - Builtin dapp users can still use js-glue from crates.io.
-  - Fix Android build on beta ([#9003](https://github.com/paritytech/parity/pull/9003))
-
-## Parity [v1.11.4](https://github.com/paritytech/parity/releases/tag/v1.11.4) (2018-06-20)
-
-Parity 1.11.4 is a bug-fix release to improve performance and stability.
-
-The full list of included changes:
-
-- Backports ([#8916](https://github.com/paritytech/parity/pull/8916))
-  - `Duration_ns: u64 -> duration: Duration` ([#8457](https://github.com/paritytech/parity/pull/8457))
-    - Duration_ns: u64 -> duration: Duration
-    - Format on millis {:.2} -> {}
-  - Keep all enacted blocks notify in order ([#8524](https://github.com/paritytech/parity/pull/8524))
-    - Keep all enacted blocks notify in order
-    - Collect is unnecessary
-    - Update ChainNotify to use ChainRouteType
-    - Fix all ethcore fn defs
-    - Wrap the type within ChainRoute
-    - Fix private-tx and sync api
-    - Fix secret_store API
-    - Fix updater API
-    - Fix rpc api
-    - Fix informant api
-    - Eagerly cache enacted/retracted and remove contain_enacted/retracted
-    - Fix indent
-    - Tests: should use full expr form for struct constructor
-    - Use into_enacted_retracted to further avoid copy
-    - Typo: not a function
-    - Rpc/tests: ChainRoute -> ChainRoute::new
-  - Handle removed logs in filter changes and add geth compatibility field ([#8796](https://github.com/paritytech/parity/pull/8796))
-    - Add removed geth compatibility field in log
-    - Fix mocked tests
-    - Add field block hash in PollFilter
-    - Store last block hash info for log filters
-    - Implement canon route
-    - Use canon logs for fetching reorg logs
-    - Make sure removed flag is set
-    - Address grumbles
-  - Fixed AuthorityRound deadlock on shutdown, closes [#8088](https://github.com/paritytech/parity/issues/8088) ([#8803](https://github.com/paritytech/parity/pull/8803))
-  - Ci: Fix docker tags ([#8822](https://github.com/paritytech/parity/pull/8822))
-    - Scripts: enable docker builds for beta and stable
-    - Scripts: docker latest should be beta not master
-    - Scripts: docker latest is master
-  - Ethcore: fix ancient block error msg handling ([#8832](https://github.com/paritytech/parity/pull/8832))
-  - Disable parallel verification and skip verifiying already imported txs. ([#8834](https://github.com/paritytech/parity/pull/8834))
-    - Reject transactions that are already in pool without verifying them.
-    - Avoid verifying already imported transactions.
-  - Fix concurrent access to signer queue ([#8854](https://github.com/paritytech/parity/pull/8854))
-    - Fix concurrent access to signer queue
-    - Put request back to the queue if confirmation failed
-    - Typo: fix docs and rename functions to be more specific
-    - Change trace info "Transaction" -> "Request"
-  - Don't allocate in expect_valid_rlp unless necessary ([#8867](https://github.com/paritytech/parity/pull/8867))
-    - Don't allocate via format! in case there's no error
-    - Fix test?
-  - Fixed ipc leak, closes [#8774](https://github.com/paritytech/parity/issues/8774) ([#8876](https://github.com/paritytech/parity/pull/8876))
-  - Add new ovh bootnodes and fix port for foundation bootnode 3.2 ([#8886](https://github.com/paritytech/parity/pull/8886))
-    - Add new ovh bootnodes and fix port for foundation bootnode 3.2
-    - Remove old bootnodes.
-    - Remove duplicate 1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082
-  - Block 0 is valid in queries ([#8891](https://github.com/paritytech/parity/pull/8891))
-  - Add ETC Cooperative-run load balanced parity node ([#8892](https://github.com/paritytech/parity/pull/8892))
-  - Minor fix in chain supplier and light provider ([#8906](https://github.com/paritytech/parity/pull/8906))
-    - Fix chain supplier increment
-    - Fix light provider block_headers
-  - Check whether we need resealing in miner and unwrap has_account in account_provider ([#8853](https://github.com/paritytech/parity/pull/8853))
-    - Remove unused Result wrap in has_account
-    - Check whether we need to reseal for external transactions
-    - Fix reference to has_account interface
-    - Typo: missing )
-    - Refactor duplicates to prepare_and_update_sealing
-    - Fix build
-  - Allow disabling local-by-default for transactions with new config entry ([#8882](https://github.com/paritytech/parity/pull/8882))
-    - Add tx_queue_allow_unknown_local config option
-    - Refactor flag name + don't change import_own_tx behaviour
-    - Add fn to TestMinerService
-    - Avoid race condition from trusted sources
-- Parity-version: beta release 1.11.4 ([#8856](https://github.com/paritytech/parity/pull/8856))
-  - Cherry-pick network-specific release flag ([#8821](https://github.com/paritytech/parity/pull/8821))
-  - Parity-version: bump beta to 1.11.4
-  - Parity-version: remove merge leftovers
-
-## Parity [v1.11.3](https://github.com/paritytech/parity/releases/tag/v1.11.3) (2018-06-06)
-
-Parity 1.11.3 is a security-relevant release. Please upgrade your nodes as soon as possible to [v1.10.6](https://github.com/paritytech/parity/releases/tag/v1.10.6) or [v1.11.3](https://github.com/paritytech/parity/releases/tag/v1.11.3).
-
-The full list of included changes:
-
-- Parity-version: bump beta to 1.11.3 ([#8806](https://github.com/paritytech/parity/pull/8806))
-  - Parity-version: bump beta to 1.11.3
-  - Disallow unsigned transactions in case EIP-86 is disabled ([#8802](https://github.com/paritytech/parity/pull/8802))
-  - Fix ancient blocks queue deadlock ([#8751](https://github.com/paritytech/parity/pull/8751))
-- Update shell32-sys to fix windows build ([#8792](https://github.com/paritytech/parity/pull/8792))
-- Backports ([#8785](https://github.com/paritytech/parity/pull/8785))
-  - Fix light sync with initial validator-set contract ([#8528](https://github.com/paritytech/parity/pull/8528))
-    - Fix #8468
-    - Use U256::max_value() instead
-    - Also change initial transaction gas
-  - Resumable warp-sync / Seed downloaded snapshots ([#8544](https://github.com/paritytech/parity/pull/8544))
-    - Start dividing sync chain : first supplier method
-    - WIP - updated chain sync supplier
-    - Finish refactoring the Chain Sync Supplier
-    - Create Chain Sync Requester
-    - Add Propagator for Chain Sync
-    - Add the Chain Sync Handler
-    - Move tests from mod -> handler
-    - Move tests to propagator
-    - Refactor SyncRequester arguments
-    - Refactoring peer fork header handler
-    - Fix wrong highest block number in snapshot sync
-    - Small refactor...
-    - Resume warp-sync downloaded chunks
-    - Refactoring the previous chunks import
-    - Address PR grumbles
-    - Fix not seeding current snapshot
-    - Update SnapshotService readiness check
-    - Early abort importing previous chunks
-    - Update Gitlab CI config
-    - SyncState back to Waiting when Manifest peers disconnect
-    - Revert GitLab CI changes
-    - Refactor resuming snapshots
-    - Revert "Refactor resuming snapshots"
-    - Update informant log
-    - Refactor resuming snapshots
-    - Update informant message : show chunks done
-  - Don't open Browser post-install on Mac ([#8641](https://github.com/paritytech/parity/pull/8641))
-  - Fix not downloading old blocks ([#8642](https://github.com/paritytech/parity/pull/8642))
-  - Fix PoW blockchains sealing notifications in chain_new_blocks ([#8656](https://github.com/paritytech/parity/pull/8656))
-  - Shutdown the Snapshot Service early ([#8658](https://github.com/paritytech/parity/pull/8658))
-    - Shutdown the Snapshot Service when shutting down the runner
-    - Rename `service` to `client_service`
-    - Fix tests
-  - Fix cli signer ([#8682](https://github.com/paritytech/parity/pull/8682))
-    - Update ethereum-types so `{:#x}` applies 0x prefix
-  - Set the request index to that of the current request ([#8683](https://github.com/paritytech/parity/pull/8683))
-    - Set the request index to that of the current request
-  - Network-devp2p: handle UselessPeer disconnect ([#8686](https://github.com/paritytech/parity/pull/8686))
-  - Fix local transactions policy. ([#8691](https://github.com/paritytech/parity/pull/8691))
-  - CI: Fixes for Android Pipeline ([#8745](https://github.com/paritytech/parity/pull/8745))
-    - Ci: Remove check for shared libraries in gitlab script
-    - Ci: allow android arm build to fail
-  - Custom Error Messages on ENFILE and EMFILE IO Errors ([#8744](https://github.com/paritytech/parity/pull/8744))
-    - Custom Error Messages on ENFILE and EMFILE IO Errors
-    - Use assert-matches for more readable tests
-    - Fix Wording and consistency
-  - Ethcore-sync: fix connection to peers behind chain fork block ([#8710](https://github.com/paritytech/parity/pull/8710))
-- Parity-version: bump beta to 1.11.2 ([#8750](https://github.com/paritytech/parity/pull/8750))
-  - Parity-version: bump beta to 1.11.2
-  - Parity-version: unset critical flag
-
-## Parity [v1.11.1](https://github.com/paritytech/parity/releases/tag/v1.11.1) (2018-05-15)
-
-This is the Parity 1.11.1-beta release! Hurray!
-
-Notable changes in reversed alphabetical order:
-
-- TOOLING: **Whisper CLI** [#8201](https://github.com/paritytech/parity/pull/8201)
-  - `whisper-cli` is a standalone tool to communicate with the Whisper protocol.
-  - It provides functionality to specify `whisper-pool-size`, `port` and `address` to use.
-  - All whisper RPC APIs are enabled and can be directly accessed.
-- JSON-RPC API: **Return error in case eth_call returns VM errors** [#8448](https://github.com/paritytech/parity/pull/8448)
-  - This changes the behaviors of `eth_call` to respect VM errors if any.
-  - In case of `REVERT`, it will also return the reverted return data in hex format.
-- ENGINES: **Block Reward Contract** [#8419](https://github.com/paritytech/parity/pull/8419)
-  - The _AuRa_ PoA engine has now support for having a contract to calculate the block rewards.
-  - The engine passes a list of benefactors and reward types to the contract which then returns a list of addresses and respective rewards.
-- CORE: **Private Transactions** [#6422](https://github.com/paritytech/parity/pull/6422)
-  - Parity now provides a private transactions system.
-  - Please, check out our wiki to get an [overview and setup instructions](https://wiki.parity.io/Private-Transactions.html).
-- CORE: **New Transaction Queue implementation** [#8074](https://github.com/paritytech/parity/pull/8074)
-  - Verification is now done in parallel.
-  - Previous queue had `O(1)` time to get pending set, but `O(n^2)` insertion time. And obviously insertion/removal happens much more often than retrieving the pending set (only for propagation and pending block building) Currently we have `O(n * log(senders))` pending set time (with cache) and `O(tx_per_sender)` (usually within `log(tx_per_sender)`) insertion time.
-  - `Scoring` and `Readiness` are separated from the pool, so it's easier to customize them or introduce different definitions (for instance for [EIP-859](https://github.com/ethereum/EIPs/issues/859) or private transactions, etc).
-  - Banning removed, soft-penalization introduced instead: if transaction exceeds the limit other transactions from that sender get lower priority.
-  - There is no explicit distinction between current and future transactions in the pool - `Readiness` determines that. Because of this we additionally remove `future` transactions that occupy the pool for long time.
-- CONFIGURATION: **Warp-only sync with --warp-barrier [block-number] flag.** [#8228](https://github.com/paritytech/parity/pull/8228)
-  - Enables warp-only sync in case `--warp-barrier [block-number]` is provided.
-  - This avoids clients to warp to outdated snapshots that are too far away from the best block.
-  - This avoids clients to fall back to normal sync if there are no recent snapshots available currently.
-- CONFIGURATION: **Disable UI by default.** [#8105](https://github.com/paritytech/parity/pull/8105)
-  - The user interface is now disabled by default. It still can be activated with the `--force-ui` flag.
-  - To get the stand-alone Parity UI, please check the dedicated [releases page](https://github.com/parity-js/shell/releases).
-- CONFIGURATION: **Auto-updater improvements** [#8078](https://github.com/paritytech/parity/pull/8078)
-  - Added `--auto-update-delay` to randomly delay updates by `n` blocks. This takes into account the number of the block of the update release (old updates aren't delayed).
-  - Added `--auto-update-check-frequency` to define the periodicity of auto-update checks in number of blocks.
-  - This is an important improvement to ensure the network does not update all clients at the same time.
-- CHAIN SPECS: **Enable WebAssembly and Byzantium for Ellaism** [#8520](https://github.com/paritytech/parity/pull/8520)
-  - This activates the Ellaism Byzantium hardfork ([2018-0004-byzantium](https://github.com/ellaism/specs/blob/master/specs/2018-0004-byzantium.md)) at block `2_000_000`.
-  - This enables the Wasm VM on Ellaism ([2018-0003-wasm-hardfork](https://github.com/ellaism/specs/blob/master/specs/2018-0003-wasm-hardfork.md)) at block `2_000_000`.
-  - Please, upgrade your clients if you run an Ellaism configuration.
-- CHAIN SPECS: **Dev chain - increase gasLimit to 8_000_000** [#8362](https://github.com/paritytech/parity/pull/8362)
-  - This increases the default block gas limit on development chains to `8_000_000`.
-  - Please note, this makes previous dev chain configurations incompatible.
-- CHAIN SPECS: **Add MCIP-6 Byzyantium transition to Musicoin spec** [#7841](https://github.com/paritytech/parity/pull/7841)
-  - This activates the Musicoin Byzantium hardfork ([MCIP-6](https://github.com/Musicoin/MCIPs/blob/master/MCIPS/mcip-6.md)) at block `2_222_222`.
-  - Please, upgrade your clients if you run a Musicoin configuration.
-
-The full list of included changes:
-
-- Backports ([#8624](https://github.com/paritytech/parity/pull/8624))
-  - Trace precompiled contracts when the transfer value is not zero ([#8486](https://github.com/paritytech/parity/pull/8486))
-    - Trace precompiled contracts when the transfer value is not zero
-    - Add tests for precompiled CALL tracing
-    - Use byzantium test machine for the new test
-    - Add notes in comments on why we don't trace all precompiles
-    - Use is_transferred instead of transferred
-  - Return error if RLP size of transaction exceeds the limit ([#8473](https://github.com/paritytech/parity/pull/8473))
-    - Return error if RLP size of transaction exceeds the limit
-    - Review comments fixed
-    - RLP check moved to verifier, corresponding pool test added
-  - Don't block sync when importing old blocks ([#8530](https://github.com/paritytech/parity/pull/8530))
-    - Alter IO queueing.
-    - Don't require IoMessages to be Clone
-    - Ancient blocks imported via IoChannel.
-    - Get rid of private transactions io message.
-    - Get rid of deadlock and fix disconnected handler.
-    - Revert to old disconnect condition.
-    - Fix tests.
-    - Fix deadlock.
-  - Refactoring `ethcore-sync` - Fixing warp-sync barrier ([#8543](https://github.com/paritytech/parity/pull/8543))
-    - Start dividing sync chain : first supplier method
-    - WIP - updated chain sync supplier
-    - Finish refactoring the Chain Sync Supplier
-    - Create Chain Sync Requester
-    - Add Propagator for Chain Sync
-    - Add the Chain Sync Handler
-    - Move tests from mod -> handler
-    - Move tests to propagator
-    - Refactor SyncRequester arguments
-    - Refactoring peer fork header handler
-    - Fix wrong highest block number in snapshot sync
-    - Small refactor...
-    - Address PR grumbles
-    - Retry failed CI job
-    - Fix tests
-    - PR Grumbles
-  - Handle socket address parsing errors ([#8545](https://github.com/paritytech/parity/pull/8545))
-  - Fix packet count when talking with PAR2 peers ([#8555](https://github.com/paritytech/parity/pull/8555))
-    - Support diferent packet counts in different protocol versions.
-    - Fix light timeouts and eclipse protection.
-    - Fix devp2p tests.
-    - Fix whisper-cli compilation.
-    - Fix compilation.
-    - Fix ethcore-sync tests.
-    - Revert "Fix light timeouts and eclipse protection."
-    - Increase timeouts.
-  - Add whisper CLI to the pipelines ([#8578](https://github.com/paritytech/parity/pull/8578))
-    - Add whisper CLI to the pipelines
-    - Address todo, ref [#8579](https://github.com/paritytech/parity/pull/8579)
-  - Rename `whisper-cli binary` to `whisper` ([#8579](https://github.com/paritytech/parity/pull/8579))
-    - Rename whisper-cli binary to whisper
-    - Fix tests
-  - Remove manually added text to the errors ([#8595](https://github.com/paritytech/parity/pull/8595))
-  - Fix account list double 0x display ([#8596](https://github.com/paritytech/parity/pull/8596))
-    - Remove unused self import
-    - Fix account list double 0x display
-  - Fix BlockReward contract "arithmetic operation overflow" ([#8611](https://github.com/paritytech/parity/pull/8611))
-    - Fix BlockReward contract "arithmetic operation overflow"
-    - Add docs on how execute_as_system works
-    - Fix typo
-  - Rlp decode returns Result ([#8527](https://github.com/paritytech/parity/pull/8527))
-  - Remove expect ([#8536](https://github.com/paritytech/parity/pull/8536))
-    - Remove expect and propagate rlp::DecoderErrors as TrieErrors
-  - Decoding headers can fail ([#8570](https://github.com/paritytech/parity/pull/8570))
-    - Rlp::decode returns Result
-    - Fix journaldb to handle rlp::decode Result
-    - Fix ethcore to work with rlp::decode returning Result
-    - Light client handles rlp::decode returning Result
-    - Fix tests in rlp_derive
-    - Fix tests
-    - Cleanup
-    - Cleanup
-    - Allow panic rather than breaking out of iterator
-    - Let decoding failures when reading from disk blow up
-    - Syntax
-    - Fix the trivial grumbles
-    - Fix failing tests
-    - Make Account::from_rlp return Result
-    - Syntx, sigh
-    - Temp-fix for decoding failures
-    - Header::decode returns Result
-    - Do not continue reading from the DB when a value could not be read
-    - Fix tests
-    - Handle header decoding in light_sync
-    - Handling header decoding errors
-    - Let the DecodeError bubble up unchanged
-    - Remove redundant error conversion
-  - Fix compiler warning ([#8590](https://github.com/paritytech/parity/pull/8590))
-  - Attempt to fix intermittent test failures ([#8584](https://github.com/paritytech/parity/pull/8584))
-  - Block_header can fail so return Result ([#8581](https://github.com/paritytech/parity/pull/8581))
-    - Block_header can fail so return Result
-    - Restore previous return type based on feedback
-    - Fix failing doc tests running on non-code
-  - Block::decode() returns Result ([#8586](https://github.com/paritytech/parity/pull/8586))
-  - Gitlab test script fixes ([#8573](https://github.com/paritytech/parity/pull/8573))
-    - Exclude /docs from modified files.
-    - Ensure all references in the working tree are available
-    - Remove duplicated line from test script
-- Bump beta to 1.11.1 ([#8627](https://github.com/paritytech/parity/pull/8627))
-
-## Parity [v1.11.0](https://github.com/paritytech/parity/releases/tag/v1.11.0) (2018-05-09)
-
-This is the Parity 1.11.0-beta release! ~~Hurray!~~ This release has been pulled due to peering issues, please use 1.11.1-beta.
-
-The full list of included changes:
-
-- Backports ([#8558](https://github.com/paritytech/parity/pull/8558))
-  - Fetching logs by hash in blockchain database ([#8463](https://github.com/paritytech/parity/pull/8463))
-    - Fetch logs by hash in blockchain database
-    - Fix tests
-    - Add unit test for branch block logs fetching
-    - Add docs that blocks must already be sorted
-    - Handle branch block cases properly
-    - typo: empty -> is_empty
-    - Remove return_empty_if_none by using a closure
-    - Use BTreeSet to avoid sorting again
-    - Move is_canon to BlockChain
-    - typo: pass value by reference
-    - Use loop and wrap inside blocks to simplify the code
-    - typo: missed a comment
-  - Pass on storage keys tracing to handle the case when it is not modified ([#8491](https://github.com/paritytech/parity/pull/8491))
-    - Pass on storage keys even if it is not modified
-    - typo: account and storage query
-    - Fix tests
-    - Use state query directly because of suicided accounts
-    - Fix a RefCell borrow issue
-    - Add tests for unmodified storage trace
-    - Address grumbles
-    - typo: remove unwanted empty line
-    - ensure_cached compiles with the original signature
-  - Update wasmi and pwasm-utils ([#8493](https://github.com/paritytech/parity/pull/8493))
-    - Update wasmi to 0.2
-    - Update pwasm-utils to 0.1.5
-  - Show imported messages for light client ([#8517](https://github.com/paritytech/parity/pull/8517))
-  - Enable WebAssembly and Byzantium for Ellaism ([#8520](https://github.com/paritytech/parity/pull/8520))
-    - Enable WebAssembly and Byzantium for Ellaism
-    - Fix indentation
-    - Remove empty lines
-  - Don't panic in import_block if invalid rlp ([#8522](https://github.com/paritytech/parity/pull/8522))
-    - Don't panic in import_block if invalid rlp
-    - Remove redundant type annotation
-    - Replace RLP header view usage with safe decoding
-  - Node table sorting according to last contact data ([#8541](https://github.com/paritytech/parity/pull/8541))
-    - network-devp2p: sort nodes in node table using last contact data
-    - network-devp2p: rename node contact types in node table json output
-    - network-devp2p: fix node table tests
-    - network-devp2p: note node failure when failed to establish connection
-    - network-devp2p: handle UselessPeer error
-    - network-devp2p: note failure when marking node as useless
-- Betalize 1.11 :) ([#8475](https://github.com/paritytech/parity/pull/8475))
-  - Betalize 1.11 :)
-  - Update Gitlab scripts
-  - Use master as gitlab latest
-  - Fix snap builds ([#8483](https://github.com/paritytech/parity/pull/8483))
-  - Update hardcodedSync for Ethereum, Kovan, and Ropsten ([#8489](https://github.com/paritytech/parity/pull/8489))
-- Fix typos in vm description comment ([#8446](https://github.com/paritytech/parity/pull/8446))
-- Add changelog for 1.9.7 and 1.10.2 ([#8460](https://github.com/paritytech/parity/pull/8460))
-- Fix docker build ([#8462](https://github.com/paritytech/parity/pull/8462))
-- Parityshell::open `Return result` ([#8377](https://github.com/paritytech/parity/pull/8377))
-- Return error in case eth_call returns VM errors ([#8448](https://github.com/paritytech/parity/pull/8448))
-- Update wasmi ([#8452](https://github.com/paritytech/parity/pull/8452))
-- Allow 32 bit pipelines to fail ([#8454](https://github.com/paritytech/parity/pull/8454))
-- Update Cargo hidapi-rs dependency ([#8447](https://github.com/paritytech/parity/pull/8447))
-- Private transactions processing error handling ([#8431](https://github.com/paritytech/parity/pull/8431))
-- Improve VM executor stack size estimation rules ([#8439](https://github.com/paritytech/parity/pull/8439))
-- Block reward contract ([#8419](https://github.com/paritytech/parity/pull/8419))
-- Permission fix ([#8441](https://github.com/paritytech/parity/pull/8441))
-- Use forked app_dirs crate for reverted Windows dir behavior ([#8438](https://github.com/paritytech/parity/pull/8438))
-- Remove From::from. ([#8390](https://github.com/paritytech/parity/pull/8390))
-- Move ethcore::Error to error_chain ([#8386](https://github.com/paritytech/parity/pull/8386))
-- Changelogs for 1.9.6 and 1.10.1 ([#8411](https://github.com/paritytech/parity/pull/8411))
-- Fix receipts stripping. ([#8414](https://github.com/paritytech/parity/pull/8414))
-- Typo, docs parity_chainId: empty string -> None ([#8434](https://github.com/paritytech/parity/pull/8434))
-- Update zip to 0.3 ([#8381](https://github.com/paritytech/parity/pull/8381))
-- Fix TODO comments ([#8413](https://github.com/paritytech/parity/pull/8413))
-- Replace legacy Rlp with UntrustedRlp and use in ethcore rlp views ([#8316](https://github.com/paritytech/parity/pull/8316))
-- Tokio-core v0.1.16 -> v0.1.17 ([#8408](https://github.com/paritytech/parity/pull/8408))
-- More code refactoring to integrate Duration ([#8322](https://github.com/paritytech/parity/pull/8322))
-- Remove Tendermint extra_info due to seal inconsistencies ([#8367](https://github.com/paritytech/parity/pull/8367))
-- Use tokio::spawn in secret_store listener and fix Uri ([#8373](https://github.com/paritytech/parity/pull/8373))
-- Unify and limit rocksdb dependency places ([#8371](https://github.com/paritytech/parity/pull/8371))
-- Clarify that windows need perl and yasm ([#8402](https://github.com/paritytech/parity/pull/8402))
-- New Transaction Queue implementation ([#8074](https://github.com/paritytech/parity/pull/8074))
-- Some tweaks to main.rs for parity as a library ([#8370](https://github.com/paritytech/parity/pull/8370))
-- Handle queue import errors a bit more gracefully ([#8385](https://github.com/paritytech/parity/pull/8385))
-- Ci: fix change detection in master builds ([#8382](https://github.com/paritytech/parity/pull/8382))
-- Fix config test by adding no-hardcodec-sync ([#8380](https://github.com/paritytech/parity/pull/8380))
-- Fixed unsafe shell call on windows ([#8372](https://github.com/paritytech/parity/pull/8372))
-- Parity uses winapi 0.3.4 ([#8366](https://github.com/paritytech/parity/pull/8366))
-- No hardcoded client name ([#8368](https://github.com/paritytech/parity/pull/8368))
-- Add `util/mem` to zero out memory on drop. ([#8356](https://github.com/paritytech/parity/pull/8356))
-- Use atty instead of isatty ([#8365](https://github.com/paritytech/parity/pull/8365))
-- Increase gasLimit to 8'000'000 ([#8362](https://github.com/paritytech/parity/pull/8362))
-- Util `fake-fetch` ([#8363](https://github.com/paritytech/parity/pull/8363))
-- Bump snappy and ring, use single rayon version, closes [#8296](https://github.com/paritytech/parity/issues/8296) ([#8364](https://github.com/paritytech/parity/pull/8364))
-- Use async hyper server in secret_store and upgrade igd ([#8359](https://github.com/paritytech/parity/pull/8359))
-- Enable UI by default, but only display deprecation notice ([#8262](https://github.com/paritytech/parity/pull/8262))
-- Ethcrypto renamed to ethcore-crypto and moved to ethcore dir ([#8340](https://github.com/paritytech/parity/pull/8340))
-- Use hyper 0.11 in ethcore-miner and improvements in parity-reactor ([#8335](https://github.com/paritytech/parity/pull/8335))
-- Ethcore-sync ([#8347](https://github.com/paritytech/parity/pull/8347))
-- Rpc, eth_filter: return error if the filter id does not exist ([#8341](https://github.com/paritytech/parity/pull/8341))
-- Ethcore-stratum crate moved to ethcore directory ([#8338](https://github.com/paritytech/parity/pull/8338))
-- Secretstore: get rid of engine.signer dependency ([#8173](https://github.com/paritytech/parity/pull/8173))
-- Whisper cli ([#8201](https://github.com/paritytech/parity/pull/8201))
-- Replace_home for password_files, reserved_peers and log_file ([#8324](https://github.com/paritytech/parity/pull/8324))
-- Add Ethereum Social support ([#8325](https://github.com/paritytech/parity/pull/8325))
-- Private transactions integration pr ([#6422](https://github.com/paritytech/parity/pull/6422))
-- Decouple rocksdb dependency from ethcore ([#8320](https://github.com/paritytech/parity/pull/8320))
-- Remove the clone operation of code_cache ([#8334](https://github.com/paritytech/parity/pull/8334))
-- Fix the JSONRPC API not running with the light client ([#8326](https://github.com/paritytech/parity/pull/8326))
-- Read registry_address from block with REQUEST_CONFIRMATIONS_REQUIRED ([#8309](https://github.com/paritytech/parity/pull/8309))
-- Tweaks and add a Dockerfile for Android ([#8036](https://github.com/paritytech/parity/pull/8036))
-- Use associated type M::Error instead of Error ([#8308](https://github.com/paritytech/parity/pull/8308))
-- Remove InvalidParentHash in favor of assert! ([#8300](https://github.com/paritytech/parity/pull/8300))
-- Bump proc macro deps ([#8310](https://github.com/paritytech/parity/pull/8310))
-- Decouple timestamp open-block-assignment/verification to Engine ([#8305](https://github.com/paritytech/parity/pull/8305))
-- Validate if gas limit is not zero ([#8307](https://github.com/paritytech/parity/pull/8307))
-- Implement Easthub chain spec ([#8295](https://github.com/paritytech/parity/pull/8295))
-- Update some dependencies ([#8285](https://github.com/paritytech/parity/pull/8285))
-- Ethcore now uses Rayon 1.0 as a dependency ([#8296](https://github.com/paritytech/parity/pull/8296)) ([#8304](https://github.com/paritytech/parity/pull/8304))
-- Upgrader `remove raw unwrap` and bump semver ([#8251](https://github.com/paritytech/parity/pull/8251))
-- Cleaner binary shutdown system ([#8284](https://github.com/paritytech/parity/pull/8284))
-- Ethcore now uses rayon to 0.9 as a dependency ([#8296](https://github.com/paritytech/parity/pull/8296)) ([#8302](https://github.com/paritytech/parity/pull/8302))
-- Include suicided accounts in state diff ([#8297](https://github.com/paritytech/parity/pull/8297))
-- Remove evmjit ([#8229](https://github.com/paritytech/parity/pull/8229))
-- Build: fix updater rand dependency in Cargo.lock ([#8298](https://github.com/paritytech/parity/pull/8298))
-- Honor --max-peers if --min-peers is not specified ([#8087](https://github.com/paritytech/parity/pull/8087))
-- Auto-updater improvements ([#8078](https://github.com/paritytech/parity/pull/8078))
-- Dapps-fetcher: calculate keccak in-flight while reading the response ([#8294](https://github.com/paritytech/parity/pull/8294))
-- Cleanup Ellaism bootnodes ([#8276](https://github.com/paritytech/parity/pull/8276))
-- Allow unsafe js eval on Parity Wallet. ([#8204](https://github.com/paritytech/parity/pull/8204))
-- Remove RefCell from Header ([#8227](https://github.com/paritytech/parity/pull/8227))
-- Typo fix: todo with no content ([#8292](https://github.com/paritytech/parity/pull/8292))
-- Revert "ci: disable link-dead-code in coverage build ([#8118](https://github.com/paritytech/parity/pull/8118))" ([#8287](https://github.com/paritytech/parity/pull/8287))
-- Bump ethabi & ethereum-types. ([#8258](https://github.com/paritytech/parity/pull/8258))
-- Allow customization of max WS connections. ([#8257](https://github.com/paritytech/parity/pull/8257))
-- Supress TemporaryInvalid verification failures. ([#8256](https://github.com/paritytech/parity/pull/8256))
-- Return null number for pending block in eth_getBlockByNumber ([#8281](https://github.com/paritytech/parity/pull/8281))
-- Use constant durations ([#8278](https://github.com/paritytech/parity/pull/8278))
-- Typo fix: Mode doc - RLP should be client ([#8283](https://github.com/paritytech/parity/pull/8283))
-- Eth_uninstallfilter should return false for non-existent filter ([#8280](https://github.com/paritytech/parity/pull/8280))
-- Update `app_dirs` to 1.2.1 ([#8268](https://github.com/paritytech/parity/pull/8268))
-- Add missing license header for runtime.rs ([#8252](https://github.com/paritytech/parity/pull/8252))
-- Warp-only sync with warp-barrier [blocknumber] flag. ([#8228](https://github.com/paritytech/parity/pull/8228))
-- Replace all Rlp usages with UntrustedRlp except for ethcore views ([#8233](https://github.com/paritytech/parity/pull/8233))
-- Add test for ethstore-cli, fixes [#8027](https://github.com/paritytech/parity/issues/8027) ([#8187](https://github.com/paritytech/parity/pull/8187))
-- Update musicoin spec in line with gmc v2.6.2 ([#8242](https://github.com/paritytech/parity/pull/8242))
-- Fixed ethcore tx_filter ([#8200](https://github.com/paritytech/parity/pull/8200))
-- Update CLI help for jsonrpc-apis, ws-apis and ipc-apis ([#8234](https://github.com/paritytech/parity/pull/8234))
-- Remove network stats ([#8225](https://github.com/paritytech/parity/pull/8225))
-- Node-filter does not use ChainNotify ([#8231](https://github.com/paritytech/parity/pull/8231))
-- Implement hardcoded sync in the light client ([#8075](https://github.com/paritytech/parity/pull/8075))
-- Update some of the dependencies for WASM ([#8223](https://github.com/paritytech/parity/pull/8223))
-- Bump wasmi version ([#8209](https://github.com/paritytech/parity/pull/8209))
-- Updated jsonrpc to point to the 1.11 branch ([#8180](https://github.com/paritytech/parity/pull/8180))
-- Change name Wallet -> UI ([#8164](https://github.com/paritytech/parity/pull/8164))
-- Introduce Parity UI ([#8202](https://github.com/paritytech/parity/pull/8202))
-- Update Changelogs ([#8175](https://github.com/paritytech/parity/pull/8175))
-- Returns number of topcis to take fr.. ([#8199](https://github.com/paritytech/parity/pull/8199))
-- Make docopt usage non-const ([#8189](https://github.com/paritytech/parity/pull/8189))
-- Avoid allocations when computing triehash. ([#8176](https://github.com/paritytech/parity/pull/8176))
-- Handle rlp decoding Result in patricia trie ([#8166](https://github.com/paritytech/parity/pull/8166))
-- Bump wasm libs ([#8171](https://github.com/paritytech/parity/pull/8171))
-- Re-enable signer, even with no UI. ([#8167](https://github.com/paritytech/parity/pull/8167))
-- Update daemonize ([#8165](https://github.com/paritytech/parity/pull/8165))
-- Some tiny modifications. ([#8163](https://github.com/paritytech/parity/pull/8163))
-- Secretstore: store key author address in db ([#7887](https://github.com/paritytech/parity/pull/7887))
-- Rename DatabaseValueView::new to from_rlp ([#8159](https://github.com/paritytech/parity/pull/8159))
-- Dapps: update parity-ui dependencies ([#8160](https://github.com/paritytech/parity/pull/8160))
-- Disable UI by default. ([#8105](https://github.com/paritytech/parity/pull/8105))
-- Fix wasmi x32 builds ([#8155](https://github.com/paritytech/parity/pull/8155))
-- Postpone Kovan hard fork ([#8137](https://github.com/paritytech/parity/pull/8137))
-- Secretstore: ability to identify requester via Public/Address ([#7886](https://github.com/paritytech/parity/pull/7886))
-- Optional dependency on secp256k1 for ethcrypto ([#8109](https://github.com/paritytech/parity/pull/8109))
-- Network: init discovery using healthy nodes ([#8061](https://github.com/paritytech/parity/pull/8061))
-- Check one step deeper if we're on release track branches ([#8134](https://github.com/paritytech/parity/pull/8134))
-- Explicitly mention pruning_history uses RAM ([#8130](https://github.com/paritytech/parity/pull/8130))
-- Remove `ethcrypto::{en,de}crypt_single_message`. ([#8126](https://github.com/paritytech/parity/pull/8126))
-- Fix typo ([#8124](https://github.com/paritytech/parity/pull/8124))
-- Secret_store: use `ecies::encrypt`/`ecies::decrypt`. ([#8125](https://github.com/paritytech/parity/pull/8125))
-- Fix comment for fn gas() in wasm/runtime ([#8122](https://github.com/paritytech/parity/pull/8122))
-- Structured rlp encoding in journaldb ([#8047](https://github.com/paritytech/parity/pull/8047))
-- Ci: disable link-dead-code in coverage build ([#8118](https://github.com/paritytech/parity/pull/8118))
-- Fix trace filter returning returning unrelated reward calls, closes [#8070](https://github.com/paritytech/parity/issues/8070) ([#8098](https://github.com/paritytech/parity/pull/8098))
-- Const time comparison ([#8113](https://github.com/paritytech/parity/pull/8113))
-- Replace reqwest with hyper ([#8099](https://github.com/paritytech/parity/pull/8099))
-- More dos protection ([#8104](https://github.com/paritytech/parity/pull/8104))
-- Remove the time dependency where possible ([#8100](https://github.com/paritytech/parity/pull/8100))
-- Fix comment for gas extern in Wasm runtime ([#8101](https://github.com/paritytech/parity/pull/8101))
-- Replace std::env::temp_dir with tempdir in tests ([#8103](https://github.com/paritytech/parity/pull/8103))
-- Fix Cargo.lock not parsable ([#8102](https://github.com/paritytech/parity/pull/8102))
-- Additional data in EVMTestClient ([#7964](https://github.com/paritytech/parity/pull/7964))
-- Update serde, serde-derive, ethabi-derive, syn, quote and rlp_derive ([#8085](https://github.com/paritytech/parity/pull/8085))
-- Ethcore-service ([#8089](https://github.com/paritytech/parity/pull/8089))
-- [contract-client] refactor ([#7978](https://github.com/paritytech/parity/pull/7978))
-- Revert removing blooms ([#8066](https://github.com/paritytech/parity/pull/8066))
-- Ethcore test::helpers cleanup ([#8086](https://github.com/paritytech/parity/pull/8086))
-- Add some dos protection ([#8084](https://github.com/paritytech/parity/pull/8084))
-- Wasm libraries bump ([#7970](https://github.com/paritytech/parity/pull/7970))
-- Echo back the message hash of a ping in the pong request ([#8042](https://github.com/paritytech/parity/pull/8042))
-- Add Kovan WASM activation blocknumber ([#8057](https://github.com/paritytech/parity/pull/8057))
-- [ethkey] Unify debug/display for Address/Public/Secret ([#8076](https://github.com/paritytech/parity/pull/8076))
-- Limit incoming connections. ([#8060](https://github.com/paritytech/parity/pull/8060))
-- Max code size on Kovan ([#8067](https://github.com/paritytech/parity/pull/8067))
-- Updater: apply exponential backoff after download failure ([#8059](https://github.com/paritytech/parity/pull/8059))
-- Make blockchain functions more idiomatic, avoid needless writes to cache_man ([#8054](https://github.com/paritytech/parity/pull/8054))
-- Make patricia-trie more idiomatic and remove redundant code ([#8056](https://github.com/paritytech/parity/pull/8056))
-- Abstract devp2p ([#8048](https://github.com/paritytech/parity/pull/8048))
-- Update refs to shell ([#8051](https://github.com/paritytech/parity/pull/8051))
-- Fix cache & snapcraft CI build ([#8052](https://github.com/paritytech/parity/pull/8052))
-- Prelude to the block module cleanup ([#8025](https://github.com/paritytech/parity/pull/8025))
-- Add MCIP-6 Byzyantium transition to Musicoin spec ([#7841](https://github.com/paritytech/parity/pull/7841))
-- Bump master to 1.11.0 ([#8021](https://github.com/paritytech/parity/pull/8021))
-- `client` refactoring ([#7038](https://github.com/paritytech/parity/pull/7038))
-- [hardware wallet] sleeping -> pollling ([#8018](https://github.com/paritytech/parity/pull/8018))
-- Fixed broken link in README ([#8012](https://github.com/paritytech/parity/pull/8012))
-- Support parity protocol. ([#8035](https://github.com/paritytech/parity/pull/8035))
-- Add changelog for 1.8.11 stable and 1.9.4 beta ([#8017](https://github.com/paritytech/parity/pull/8017))
-- Fix for verify_block_basic crashing on invalid transaction rlp ([#8032](https://github.com/paritytech/parity/pull/8032))
-- Extract the hard dependency on rocksdb from the light client ([#8034](https://github.com/paritytech/parity/pull/8034))
-- Fixed parsing ethash seals and verify_block_undordered ([#8031](https://github.com/paritytech/parity/pull/8031))
-- Fixed ethstore sign ([#8026](https://github.com/paritytech/parity/pull/8026))
-- Ci: Fix cargo cache ([#7968](https://github.com/paritytech/parity/pull/7968))
-- Update ref to new shell ([#8024](https://github.com/paritytech/parity/pull/8024))
+- Backports to 2.0.0-beta ([#9094](https://github.com/paritytech/parity-ethereum/pull/9094))
+  - Parity-version: betalize 2.0
+  - Multiple improvements to discovery ping handling ([#8771](https://github.com/paritytech/parity-ethereum/pull/8771))
+    - Discovery: Only add nodes to routing table after receiving pong.
+    - Discovery: Refactor packet creation into its own function.
+    - Discovery: Additional testing for new add_node behavior.
+    - Discovery: Track expiration of pings to non-yet-in-bucket nodes.
+    - Discovery: Verify echo hash on pong packets.
+    - Discovery: Track timeouts on FIND_NODE requests.
+    - Discovery: Retry failed pings with exponential backoff.
+    - !fixup Use slice instead of Vec for request_backoff.
+  - Add separate database directory for light client ([#9064](https://github.com/paritytech/parity-ethereum/pull/9064))
+    - Add separate default DB path for light client ([#8927](https://github.com/paritytech/parity-ethereum/pull/8927))
+    - Improve readability
+  - Revert "Replace `std::env::home_dir` with `dirs::home_dir` ([#9077](https://github.com/paritytech/parity-ethereum/pull/9077))" ([#9097](https://github.com/paritytech/parity-ethereum/pull/9097))
+    - Revert "Replace `std::env::home_dir` with `dirs::home_dir` ([#9077](https://github.com/paritytech/parity-ethereum/pull/9077))"
+      - This reverts commit 7e77932.
+    - Restore some of the changes
+    - Update parity-common
+  - Offload cull to IoWorker. ([#9099](https://github.com/paritytech/parity-ethereum/pull/9099))
+  - Fix work-notify. ([#9104](https://github.com/paritytech/parity-ethereum/pull/9104))
+  - Update hidapi, fixes [#7542](https://github.com/paritytech/parity-ethereum/issues/7542) ([#9108](https://github.com/paritytech/parity-ethereum/pull/9108))
+  - Docker: add cmake dependency ([#9111](https://github.com/paritytech/parity-ethereum/pull/9111))
+  - Update light client hardcoded headers ([#9098](https://github.com/paritytech/parity-ethereum/pull/9098))
+    - Insert Kovan hardcoded headers until 7690241
+    - Insert Kovan hardcoded headers until block 7690241
+    - Insert Ropsten hardcoded headers until 3612673
+    - Insert Mainnet hardcoded headers until block 5941249
+  - Make sure to produce full blocks. ([#9115](https://github.com/paritytech/parity-ethereum/pull/9115))
+  - Insert ETC (classic) hardcoded headers until block 6170625 ([#9121](https://github.com/paritytech/parity-ethereum/pull/9121))
+  - Fix verification in ethcore-sync collect_blocks ([#9135](https://github.com/paritytech/parity-ethereum/pull/9135))
+  - Completely remove all dapps struct from rpc ([#9107](https://github.com/paritytech/parity-ethereum/pull/9107))
+    - Completely remove all dapps struct from rpc
+    - Remove unused pub use
+  - `evm bench` fix broken dependencies ([#9134](https://github.com/paritytech/parity-ethereum/pull/9134))
+    - `evm bench` use valid dependencies
+    - Benchmarks of the `evm` used stale versions of a couple a crates that this commit fixes!
+    - Fix warnings
+  - Update snapcraft.yaml ([#9132](https://github.com/paritytech/parity-ethereum/pull/9132))
+- Parity Ethereum 2.0.0 ([#9052](https://github.com/paritytech/parity-ethereum/pull/9052))
+- Don't fetch snapshot chunks at random ([#9088](https://github.com/paritytech/parity-ethereum/pull/9088))
+- Remove the dapps system ([#9017](https://github.com/paritytech/parity-ethereum/pull/9017))
+- Fix nightly warnings ([#9080](https://github.com/paritytech/parity-ethereum/pull/9080))
+- Db: remove wal disabling / fast-and-loose option. ([#8963](https://github.com/paritytech/parity-ethereum/pull/8963))
+- Transactions hashes missing in trace_replayBlockTransactions method result [#8725](https://github.com/paritytech/parity-ethereum/issues/8725) ([#8883](https://github.com/paritytech/parity-ethereum/pull/8883))
+- Delete crates from parity-ethereum and fetch them from parity-common instead ([#9083](https://github.com/paritytech/parity-ethereum/pull/9083))
+- Updater verification ([#8787](https://github.com/paritytech/parity-ethereum/pull/8787))
+- Phrasing, precisions and typos in CLI help ([#9060](https://github.com/paritytech/parity-ethereum/pull/9060))
+- Some work towards iOS build ([#9045](https://github.com/paritytech/parity-ethereum/pull/9045))
+- Clean up deprecated options and add CHECK macro ([#9036](https://github.com/paritytech/parity-ethereum/pull/9036))
+- Replace `std::env::home_dir` with `dirs::home_dir` ([#9077](https://github.com/paritytech/parity-ethereum/pull/9077))
+- Fix warning in secret-store test ([#9074](https://github.com/paritytech/parity-ethereum/pull/9074))
+- Seedhashcompute remove needless `new` impl ([#9063](https://github.com/paritytech/parity-ethereum/pull/9063))
+- Remove trait bounds from several structs ([#9055](https://github.com/paritytech/parity-ethereum/pull/9055))
+- Docs: add changelog for 1.10.9 stable and 1.11.6 beta ([#9069](https://github.com/paritytech/parity-ethereum/pull/9069))
+- Enable test in `miner/pool/test` ([#9072](https://github.com/paritytech/parity-ethereum/pull/9072))
+- Fetch: replace futures-timer with tokio-timer ([#9066](https://github.com/paritytech/parity-ethereum/pull/9066))
+- Remove util-error ([#9054](https://github.com/paritytech/parity-ethereum/pull/9054))
+- Fixes for misbehavior reporting in AuthorityRound ([#8998](https://github.com/paritytech/parity-ethereum/pull/8998))
+- A last bunch of txqueue performance optimizations ([#9024](https://github.com/paritytech/parity-ethereum/pull/9024))
+- Reduce number of constraints for triedb types ([#9043](https://github.com/paritytech/parity-ethereum/pull/9043))
+- Bump fs-swap to 0.2.3 so it is compatible with osx 10.11 again ([#9050](https://github.com/paritytech/parity-ethereum/pull/9050))
+- Recursive test ([#9042](https://github.com/paritytech/parity-ethereum/pull/9042))
+- Introduce more optional features in ethcore ([#9020](https://github.com/paritytech/parity-ethereum/pull/9020))
+- Update ETSC bootnodes ([#9038](https://github.com/paritytech/parity-ethereum/pull/9038))
+- Optimize pending transactions filter ([#9026](https://github.com/paritytech/parity-ethereum/pull/9026))
+- Eip160/eip161 spec: u64 -> BlockNumber ([#9044](https://github.com/paritytech/parity-ethereum/pull/9044))
+- Move the C/C++ example to another directory ([#9032](https://github.com/paritytech/parity-ethereum/pull/9032))
+- Bump parking_lot to 0.6 ([#9013](https://github.com/paritytech/parity-ethereum/pull/9013))
+- Never drop local transactions from different senders. ([#9002](https://github.com/paritytech/parity-ethereum/pull/9002))
+- Precise HTTP or WebSockets for JSON-RPC options ([#9027](https://github.com/paritytech/parity-ethereum/pull/9027))
+- Recently rejected cache for transaction queue ([#9005](https://github.com/paritytech/parity-ethereum/pull/9005))
+- Make HashDB generic ([#8739](https://github.com/paritytech/parity-ethereum/pull/8739))
+- Only return error log for rustls ([#9025](https://github.com/paritytech/parity-ethereum/pull/9025))
+- Update Changelogs for 1.10.8 and 1.11.5 ([#9012](https://github.com/paritytech/parity-ethereum/pull/9012))
+- Attempt to graceful shutdown in case of panics ([#8999](https://github.com/paritytech/parity-ethereum/pull/8999))
+- Simplify kvdb error types ([#8924](https://github.com/paritytech/parity-ethereum/pull/8924))
+- Add option for user to set max size limit for RPC requests ([#9010](https://github.com/paritytech/parity-ethereum/pull/9010))
+- Bump ntp to 0.5.0 ([#9009](https://github.com/paritytech/parity-ethereum/pull/9009))
+- Removed duplicate dependency ([#9021](https://github.com/paritytech/parity-ethereum/pull/9021))
+- Minimal effective gas price in the queue ([#8934](https://github.com/paritytech/parity-ethereum/pull/8934))
+- Parity: fix db path when migrating to blooms db ([#8975](https://github.com/paritytech/parity-ethereum/pull/8975))
+- Preserve the current abort behavior ([#8995](https://github.com/paritytech/parity-ethereum/pull/8995))
+- Improve should_replace on NonceAndGasPrice ([#8980](https://github.com/paritytech/parity-ethereum/pull/8980))
+- Tentative fix for missing dependency error ([#8973](https://github.com/paritytech/parity-ethereum/pull/8973))
+- Refactor evm Instruction to be a c-like enum ([#8914](https://github.com/paritytech/parity-ethereum/pull/8914))
+- Fix deadlock in blockchain. ([#8977](https://github.com/paritytech/parity-ethereum/pull/8977))
+- Snap: downgrade rust to revision 1.26.2, ref snapcraft/+bug/1778530 ([#8984](https://github.com/paritytech/parity-ethereum/pull/8984))
+- Use local parity-dapps-glue instead of crate published at crates.io ([#8983](https://github.com/paritytech/parity-ethereum/pull/8983))
+- Parity: omit redundant last imported block number in light sync informant ([#8962](https://github.com/paritytech/parity-ethereum/pull/8962))
+- Disable hardware-wallets on platforms that don't support `libusb` ([#8464](https://github.com/paritytech/parity-ethereum/pull/8464))
+- Bump error-chain and quick_error versions ([#8972](https://github.com/paritytech/parity-ethereum/pull/8972))
+- Evm benchmark utilities ([#8944](https://github.com/paritytech/parity-ethereum/pull/8944))
+- Parity: hide legacy options from cli --help ([#8967](https://github.com/paritytech/parity-ethereum/pull/8967))
+- Scripts: fix docker build tag on latest using master ([#8952](https://github.com/paritytech/parity-ethereum/pull/8952))
+- Add type for passwords. ([#8920](https://github.com/paritytech/parity-ethereum/pull/8920))
+- Deps: bump fs-swap ([#8953](https://github.com/paritytech/parity-ethereum/pull/8953))
+- Eliminate some more `transmute()` ([#8879](https://github.com/paritytech/parity-ethereum/pull/8879))
+- Restrict vault.json permssion to owner and using random suffix for temp vault.json file ([#8932](https://github.com/paritytech/parity-ethereum/pull/8932))
+- Print SS.self_public when starting SS node ([#8949](https://github.com/paritytech/parity-ethereum/pull/8949))
+- Scripts: minor improvements ([#8930](https://github.com/paritytech/parity-ethereum/pull/8930))
+- Rpc: cap gas limit of local calls ([#8943](https://github.com/paritytech/parity-ethereum/pull/8943))
+- Docs: update changelogs ([#8931](https://github.com/paritytech/parity-ethereum/pull/8931))
+- Ethcore: fix compilation when using slow-blocks or evm-debug features ([#8936](https://github.com/paritytech/parity-ethereum/pull/8936))
+- Fixed blooms dir creation ([#8941](https://github.com/paritytech/parity-ethereum/pull/8941))
+- Update hardcoded headers ([#8925](https://github.com/paritytech/parity-ethereum/pull/8925))
+- New blooms database ([#8712](https://github.com/paritytech/parity-ethereum/pull/8712))
+- Ethstore: retry deduplication of wallet file names until success ([#8910](https://github.com/paritytech/parity-ethereum/pull/8910))
+- Update ropsten.json ([#8926](https://github.com/paritytech/parity-ethereum/pull/8926))
+- Include node identity in the P2P advertised client version. ([#8830](https://github.com/paritytech/parity-ethereum/pull/8830))
+- Allow disabling local-by-default for transactions with new config entry ([#8882](https://github.com/paritytech/parity-ethereum/pull/8882))
+- Allow Poll Lifetime to be configured via CLI ([#8885](https://github.com/paritytech/parity-ethereum/pull/8885))
+- Cleanup nibbleslice ([#8915](https://github.com/paritytech/parity-ethereum/pull/8915))
+- Hardware-wallets `Clean up things I missed in the latest PR` ([#8890](https://github.com/paritytech/parity-ethereum/pull/8890))
+- Remove debian/.deb and centos/.rpm packaging scripts ([#8887](https://github.com/paritytech/parity-ethereum/pull/8887))
+- Remove a weird emoji in new_social docs ([#8913](https://github.com/paritytech/parity-ethereum/pull/8913))
+- Minor fix in chain supplier and light provider ([#8906](https://github.com/paritytech/parity-ethereum/pull/8906))
+- Block 0 is valid in queries ([#8891](https://github.com/paritytech/parity-ethereum/pull/8891))
+- Fixed osx permissions ([#8901](https://github.com/paritytech/parity-ethereum/pull/8901))
+- Atomic create new files with permissions to owner in ethstore ([#8896](https://github.com/paritytech/parity-ethereum/pull/8896))
+- Add ETC Cooperative-run load balanced parity node ([#8892](https://github.com/paritytech/parity-ethereum/pull/8892))
+- Add support for --chain tobalaba ([#8870](https://github.com/paritytech/parity-ethereum/pull/8870))
+- Fix some warns on nightly ([#8889](https://github.com/paritytech/parity-ethereum/pull/8889))
+- Add new ovh bootnodes and fix port for foundation bootnode 3.2 ([#8886](https://github.com/paritytech/parity-ethereum/pull/8886))
+- Secretstore: service pack 1 ([#8435](https://github.com/paritytech/parity-ethereum/pull/8435))
+- Handle removed logs in filter changes and add geth compatibility field ([#8796](https://github.com/paritytech/parity-ethereum/pull/8796))
+- Fixed ipc leak, closes [#8774](https://github.com/paritytech/parity-ethereum/issues/8774) ([#8876](https://github.com/paritytech/parity-ethereum/pull/8876))
+- Scripts: remove md5 checksums ([#8884](https://github.com/paritytech/parity-ethereum/pull/8884))
+- Hardware_wallet/Ledger `Sign messages` + some refactoring ([#8868](https://github.com/paritytech/parity-ethereum/pull/8868))
+- Check whether we need resealing in miner and unwrap has_account in account_provider ([#8853](https://github.com/paritytech/parity-ethereum/pull/8853))
+- Docker: Fix alpine build ([#8878](https://github.com/paritytech/parity-ethereum/pull/8878))
+- Remove mac os installers etc ([#8875](https://github.com/paritytech/parity-ethereum/pull/8875))
+- Readme.md: update the list of dependencies ([#8864](https://github.com/paritytech/parity-ethereum/pull/8864))
+- Fix concurrent access to signer queue ([#8854](https://github.com/paritytech/parity-ethereum/pull/8854))
+- Tx permission contract improvement ([#8400](https://github.com/paritytech/parity-ethereum/pull/8400))
+- Limit the number of transactions in pending set ([#8777](https://github.com/paritytech/parity-ethereum/pull/8777))
+- Use sealing.enabled to emit eth_mining information ([#8844](https://github.com/paritytech/parity-ethereum/pull/8844))
+- Don't allocate in expect_valid_rlp unless necessary ([#8867](https://github.com/paritytech/parity-ethereum/pull/8867))
+- Fix Cli Return Code on --help for ethkey, ethstore & whisper ([#8863](https://github.com/paritytech/parity-ethereum/pull/8863))
+- Fix subcrate test compile ([#8862](https://github.com/paritytech/parity-ethereum/pull/8862))
+- Network-devp2p: downgrade logging to debug, add target ([#8784](https://github.com/paritytech/parity-ethereum/pull/8784))
+- Clearing up a comment about the prefix for signing ([#8828](https://github.com/paritytech/parity-ethereum/pull/8828))
+- Disable parallel verification and skip verifiying already imported txs. ([#8834](https://github.com/paritytech/parity-ethereum/pull/8834))
+- Devp2p: Move UDP socket handling from Discovery to Host. ([#8790](https://github.com/paritytech/parity-ethereum/pull/8790))
+- Fixed AuthorityRound deadlock on shutdown, closes [#8088](https://github.com/paritytech/parity-ethereum/issues/8088) ([#8803](https://github.com/paritytech/parity-ethereum/pull/8803))
+- Specify critical release flag per network ([#8821](https://github.com/paritytech/parity-ethereum/pull/8821))
+- Fix `deadlock_detection` feature branch compilation ([#8824](https://github.com/paritytech/parity-ethereum/pull/8824))
+- Use system allocator when profiling memory ([#8831](https://github.com/paritytech/parity-ethereum/pull/8831))
+- Added from and to to Receipt ([#8756](https://github.com/paritytech/parity-ethereum/pull/8756))
+- Ethcore: fix ancient block error msg handling ([#8832](https://github.com/paritytech/parity-ethereum/pull/8832))
+- Ci: Fix docker tags ([#8822](https://github.com/paritytech/parity-ethereum/pull/8822))
+- Parity: fix indentation in sync logging ([#8794](https://github.com/paritytech/parity-ethereum/pull/8794))
+- Removed obsolete IpcMode enum ([#8819](https://github.com/paritytech/parity-ethereum/pull/8819))
+- Remove UI related settings from CLI ([#8783](https://github.com/paritytech/parity-ethereum/pull/8783))
+- Remove windows tray and installer ([#8778](https://github.com/paritytech/parity-ethereum/pull/8778))
+- Docs: add changelogs for 1.10.6 and 1.11.3 ([#8810](https://github.com/paritytech/parity-ethereum/pull/8810))
+- Fix ancient blocks queue deadlock ([#8751](https://github.com/paritytech/parity-ethereum/pull/8751))
+- Disallow unsigned transactions in case EIP-86 is disabled ([#8802](https://github.com/paritytech/parity-ethereum/pull/8802))
+- Fix evmbin compilation ([#8795](https://github.com/paritytech/parity-ethereum/pull/8795))
+- Have space between feature cfg flag ([#8791](https://github.com/paritytech/parity-ethereum/pull/8791))
+- Rpc: fix address formatting in TransactionRequest Display ([#8786](https://github.com/paritytech/parity-ethereum/pull/8786))
+- Conditionally compile ethcore public test helpers ([#8743](https://github.com/paritytech/parity-ethereum/pull/8743))
+- Remove Result wrapper from AccountProvider in RPC impls ([#8763](https://github.com/paritytech/parity-ethereum/pull/8763))
+- Update `license header` and `scripts` ([#8666](https://github.com/paritytech/parity-ethereum/pull/8666))
+- Remove HostTrait altogether ([#8681](https://github.com/paritytech/parity-ethereum/pull/8681))
+- Ethcore-sync: fix connection to peers behind chain fork block ([#8710](https://github.com/paritytech/parity-ethereum/pull/8710))
+- Remove public node settings from cli ([#8758](https://github.com/paritytech/parity-ethereum/pull/8758))
+- Custom Error Messages on ENFILE and EMFILE IO Errors ([#8744](https://github.com/paritytech/parity-ethereum/pull/8744))
+- Ci: Fixes for Android Pipeline ([#8745](https://github.com/paritytech/parity-ethereum/pull/8745))
+- Remove NetworkService::config() ([#8653](https://github.com/paritytech/parity-ethereum/pull/8653))
+- Fix XOR distance calculation in discovery Kademlia impl ([#8589](https://github.com/paritytech/parity-ethereum/pull/8589))
+- Print warnings when fetching pending blocks ([#8711](https://github.com/paritytech/parity-ethereum/pull/8711))
+- Fix PoW blockchains sealing notifications in chain_new_blocks ([#8656](https://github.com/paritytech/parity-ethereum/pull/8656))
+- Remove -k/--insecure option from curl installer ([#8719](https://github.com/paritytech/parity-ethereum/pull/8719))
+- Ease tiny-keccak version requirements (1.4.1 -> 1.4) ([#8726](https://github.com/paritytech/parity-ethereum/pull/8726))
+- Bump tinykeccak to 1.4 ([#8728](https://github.com/paritytech/parity-ethereum/pull/8728))
+- Remove a couple of unnecessary `transmute()` ([#8736](https://github.com/paritytech/parity-ethereum/pull/8736))
+- Fix some nits using clippy ([#8731](https://github.com/paritytech/parity-ethereum/pull/8731))
+- Add 'interface' option to cli ([#8699](https://github.com/paritytech/parity-ethereum/pull/8699))
+- Remove unused function new_pow_test_spec ([#8735](https://github.com/paritytech/parity-ethereum/pull/8735))
+- Add a deadlock detection thread ([#8727](https://github.com/paritytech/parity-ethereum/pull/8727))
+- Fix local transactions policy. ([#8691](https://github.com/paritytech/parity-ethereum/pull/8691))
+- Shutdown the Snapshot Service early ([#8658](https://github.com/paritytech/parity-ethereum/pull/8658))
+- Network-devp2p: handle UselessPeer disconnect ([#8686](https://github.com/paritytech/parity-ethereum/pull/8686))
+- Fix compilation error on nightly rust ([#8707](https://github.com/paritytech/parity-ethereum/pull/8707))
+- Add a test for decoding corrupt data ([#8713](https://github.com/paritytech/parity-ethereum/pull/8713))
+- Update dev chain ([#8717](https://github.com/paritytech/parity-ethereum/pull/8717))
+- Remove unused imports ([#8722](https://github.com/paritytech/parity-ethereum/pull/8722))
+- Implement recursive Debug for Nodes in patrica_trie::TrieDB ([#8697](https://github.com/paritytech/parity-ethereum/pull/8697))
+- Parity: trim whitespace when parsing duration strings ([#8692](https://github.com/paritytech/parity-ethereum/pull/8692))
+- Set the request index to that of the current request ([#8683](https://github.com/paritytech/parity-ethereum/pull/8683))
+- Remove empty file ([#8705](https://github.com/paritytech/parity-ethereum/pull/8705))
+- Update mod.rs ([#8695](https://github.com/paritytech/parity-ethereum/pull/8695))
+- Use impl Future in the light client RPC helpers ([#8628](https://github.com/paritytech/parity-ethereum/pull/8628))
+- Fix cli signer ([#8682](https://github.com/paritytech/parity-ethereum/pull/8682))
+- Allow making direct RPC queries from the C API ([#8588](https://github.com/paritytech/parity-ethereum/pull/8588))
+- Remove the error when stopping the network ([#8671](https://github.com/paritytech/parity-ethereum/pull/8671))
+- Move connection_filter to the network crate ([#8674](https://github.com/paritytech/parity-ethereum/pull/8674))
+- Remove HostInfo::client_version() and secret() ([#8677](https://github.com/paritytech/parity-ethereum/pull/8677))
+- Refactor EIP150, EIP160 and EIP161 forks to be specified in CommonParams ([#8614](https://github.com/paritytech/parity-ethereum/pull/8614))
+- Parity: improve cli help and logging ([#8665](https://github.com/paritytech/parity-ethereum/pull/8665))
+- Updated tiny-keccak to 1.4.2 ([#8669](https://github.com/paritytech/parity-ethereum/pull/8669))
+- Remove the Keccak C library and use the pure Rust impl ([#8657](https://github.com/paritytech/parity-ethereum/pull/8657))
+- Remove HostInfo::next_nonce ([#8644](https://github.com/paritytech/parity-ethereum/pull/8644))
+- Fix not downloading old blocks ([#8642](https://github.com/paritytech/parity-ethereum/pull/8642))
+- Resumable warp-sync / Seed downloaded snapshots ([#8544](https://github.com/paritytech/parity-ethereum/pull/8544))
+- Don't open Browser post-install on Mac ([#8641](https://github.com/paritytech/parity-ethereum/pull/8641))
+- Changelog for 1.10.4-stable and 1.11.1-beta ([#8637](https://github.com/paritytech/parity-ethereum/pull/8637))
+- Typo ([#8640](https://github.com/paritytech/parity-ethereum/pull/8640))
+- Fork choice and metadata framework for Engine ([#8401](https://github.com/paritytech/parity-ethereum/pull/8401))
+- Check that the Android build doesn't dep on c++_shared ([#8538](https://github.com/paritytech/parity-ethereum/pull/8538))
+- Remove NetworkContext::io_channel() ([#8625](https://github.com/paritytech/parity-ethereum/pull/8625))
+- Fix light sync with initial validator-set contract ([#8528](https://github.com/paritytech/parity-ethereum/pull/8528))
+- Store morden db and keys in "path/to/parity/data/Morden" (ropsten uses "test", like before) ([#8621](https://github.com/paritytech/parity-ethereum/pull/8621))
+- ´main.rs´ typo ([#8629](https://github.com/paritytech/parity-ethereum/pull/8629))
+- Fix BlockReward contract "arithmetic operation overflow" ([#8611](https://github.com/paritytech/parity-ethereum/pull/8611))
+- Gitlab test script fixes ([#8573](https://github.com/paritytech/parity-ethereum/pull/8573))
+- Remove manually added text to the errors ([#8595](https://github.com/paritytech/parity-ethereum/pull/8595))
+- Fix account list double 0x display ([#8596](https://github.com/paritytech/parity-ethereum/pull/8596))
+- Typo: wrong indentation in kovan config ([#8610](https://github.com/paritytech/parity-ethereum/pull/8610))
+- Fix packet count when talking with PAR2 peers ([#8555](https://github.com/paritytech/parity-ethereum/pull/8555))
+- Use full qualified syntax for itertools::Itertools::flatten ([#8606](https://github.com/paritytech/parity-ethereum/pull/8606))
+- 2 tiny modification on snapshot ([#8601](https://github.com/paritytech/parity-ethereum/pull/8601))
+- Fix the mio test again ([#8602](https://github.com/paritytech/parity-ethereum/pull/8602))
+- Remove inject.js server-side injection for dapps ([#8539](https://github.com/paritytech/parity-ethereum/pull/8539))
+- Block_header can fail so return Result ([#8581](https://github.com/paritytech/parity-ethereum/pull/8581))
+- Block::decode() returns Result ([#8586](https://github.com/paritytech/parity-ethereum/pull/8586))
+- Fix compiler warning ([#8590](https://github.com/paritytech/parity-ethereum/pull/8590))
+- Fix Parity UI link ([#8600](https://github.com/paritytech/parity-ethereum/pull/8600))
+- Make mio optional in ethcore-io ([#8537](https://github.com/paritytech/parity-ethereum/pull/8537))
+- Attempt to fix intermittent test failures ([#8584](https://github.com/paritytech/parity-ethereum/pull/8584))
+- Changelog and Readme ([#8591](https://github.com/paritytech/parity-ethereum/pull/8591))
+- Added Dockerfile for alpine linux by @andresilva, closes [#3565](https://github.com/paritytech/parity-ethereum/issues/3565) ([#8587](https://github.com/paritytech/parity-ethereum/pull/8587))
+- Add whisper CLI to the pipelines ([#8578](https://github.com/paritytech/parity-ethereum/pull/8578))
+- Rename `whisper-cli binary` to `whisper` ([#8579](https://github.com/paritytech/parity-ethereum/pull/8579))
+- Changelog nit ([#8585](https://github.com/paritytech/parity-ethereum/pull/8585))
+- Remove unnecessary cloning in overwrite_with ([#8580](https://github.com/paritytech/parity-ethereum/pull/8580))
+- Handle socket address parsing errors ([#8545](https://github.com/paritytech/parity-ethereum/pull/8545))
+- Update CHANGELOG for 1.9, 1.10, and 1.11 ([#8556](https://github.com/paritytech/parity-ethereum/pull/8556))
+- Decoding headers can fail ([#8570](https://github.com/paritytech/parity-ethereum/pull/8570))
+- Refactoring `ethcore-sync` - Fixing warp-sync barrier ([#8543](https://github.com/paritytech/parity-ethereum/pull/8543))
+- Remove State::replace_backend ([#8569](https://github.com/paritytech/parity-ethereum/pull/8569))
+- Make trace-time publishable. ([#8568](https://github.com/paritytech/parity-ethereum/pull/8568))
+- Don't block sync when importing old blocks ([#8530](https://github.com/paritytech/parity-ethereum/pull/8530))
+- Trace precompiled contracts when the transfer value is not zero ([#8486](https://github.com/paritytech/parity-ethereum/pull/8486))
+- Parity as a library ([#8412](https://github.com/paritytech/parity-ethereum/pull/8412))
+- Rlp decode returns Result ([#8527](https://github.com/paritytech/parity-ethereum/pull/8527))
+- Node table sorting according to last contact data ([#8541](https://github.com/paritytech/parity-ethereum/pull/8541))
+- Keep all enacted blocks notify in order ([#8524](https://github.com/paritytech/parity-ethereum/pull/8524))
+- Ethcore, rpc, machine: refactor block reward application and tracing ([#8490](https://github.com/paritytech/parity-ethereum/pull/8490))
+- Consolidate crypto functionality in `ethcore-crypto`. ([#8432](https://github.com/paritytech/parity-ethereum/pull/8432))
+- Eip 145: Bitwise shifting instructions in EVM ([#8451](https://github.com/paritytech/parity-ethereum/pull/8451))
+- Remove expect ([#8536](https://github.com/paritytech/parity-ethereum/pull/8536))
+- Don't panic in import_block if invalid rlp ([#8522](https://github.com/paritytech/parity-ethereum/pull/8522))
+- Pass on storage keys tracing to handle the case when it is not modified ([#8491](https://github.com/paritytech/parity-ethereum/pull/8491))
+- Fetching logs by hash in blockchain database ([#8463](https://github.com/paritytech/parity-ethereum/pull/8463))
+- Transaction Pool improvements ([#8470](https://github.com/paritytech/parity-ethereum/pull/8470))
+- More changes for Android ([#8421](https://github.com/paritytech/parity-ethereum/pull/8421))
+- Enable WebAssembly and Byzantium for Ellaism ([#8520](https://github.com/paritytech/parity-ethereum/pull/8520))
+- Secretstore: merge two types of errors into single one + Error::is_non_fatal ([#8357](https://github.com/paritytech/parity-ethereum/pull/8357))
+- Hardware Wallet trait ([#8071](https://github.com/paritytech/parity-ethereum/pull/8071))
+- Directly return None if tracing is disabled ([#8504](https://github.com/paritytech/parity-ethereum/pull/8504))
+- Show imported messages for light client ([#8517](https://github.com/paritytech/parity-ethereum/pull/8517))
+- Remove unused dependency `bigint` ([#8505](https://github.com/paritytech/parity-ethereum/pull/8505))
+- `duration_ns: u64 -> duration: Duration` ([#8457](https://github.com/paritytech/parity-ethereum/pull/8457))
+- Return error if RLP size of transaction exceeds the limit ([#8473](https://github.com/paritytech/parity-ethereum/pull/8473))
+- Remove three old warp boot nodes. ([#8497](https://github.com/paritytech/parity-ethereum/pull/8497))
+- Update wasmi and pwasm-utils ([#8493](https://github.com/paritytech/parity-ethereum/pull/8493))
+- Update hardcodedSync for Ethereum, Kovan, and Ropsten ([#8489](https://github.com/paritytech/parity-ethereum/pull/8489))
+- Fix snap builds ([#8483](https://github.com/paritytech/parity-ethereum/pull/8483))
+- Bump master to 1.12 ([#8477](https://github.com/paritytech/parity-ethereum/pull/8477))
+- Don't require write lock when fetching status. ([#8481](https://github.com/paritytech/parity-ethereum/pull/8481))
+- Use rename_all for RichBlock and RichHeader serialization ([#8471](https://github.com/paritytech/parity-ethereum/pull/8471))
 
 ## Previous releases
 
-- [CHANGELOG-1.10](docs/CHANGELOG-1.10.md) (_stable_)
+- [CHANGELOG-1.11](docs/CHANGELOG-1.11.md) (_stable_)
+- [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)

Cargo.toml

@@ -2,14 +2,14 @@
 description = "Parity Ethereum client"
 name = "parity-ethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "2.0.9"
+version = "2.1.2"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 blooms-db = { path = "util/blooms-db" }
-log = "0.3"
-env_logger = "0.4"
+log = "0.4"
+env_logger = "0.5"
 rustc-hex = "1.0"
 docopt = "0.8"
 clap = "2"
@@ -33,7 +33,7 @@ fdlimit = "0.1"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
 jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
 ethcore = { path = "ethcore", features = ["parity"] }
-parity-bytes = { git = "https://github.com/paritytech/parity-common" }
+parity-bytes = "0.1"
 ethcore-io = { path = "util/io" }
 ethcore-light = { path = "ethcore/light" }
 ethcore-logger = { path = "logger" }
@@ -43,10 +43,10 @@ ethcore-private-tx = { path = "ethcore/private-tx" }
 ethcore-service = { path = "ethcore/service" }
 ethcore-sync = { path = "ethcore/sync" }
 ethcore-transaction = { path = "ethcore/transaction" }
-ethereum-types = "0.3"
+ethereum-types = "0.4"
 node-filter = { path = "ethcore/node_filter" }
 ethkey = { path = "ethkey" }
-rlp = { git = "https://github.com/paritytech/parity-common" }
+rlp = { version = "0.2.4", features = ["ethereum"] }
 rpc-cli = { path = "rpc_cli" }
 parity-hash-fetch = { path = "hash-fetch" }
 parity-ipfs-api = { path = "ipfs" }
@@ -57,13 +57,13 @@ parity-rpc-client = { path = "rpc_client" }
 parity-updater = { path = "updater" }
 parity-version = { path = "util/version" }
 parity-whisper = { path = "whisper" }
-path = { git = "https://github.com/paritytech/parity-common" }
+parity-path = "0.1"
 dir = { path = "util/dir" }
 panic_hook = { path = "util/panic_hook" }
-keccak-hash = { git = "https://github.com/paritytech/parity-common" }
+keccak-hash = "0.1"
 migration-rocksdb = { path = "util/migration-rocksdb" }
-kvdb = { git = "https://github.com/paritytech/parity-common" }
-kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" }
+kvdb = "0.1"
+kvdb-rocksdb = "0.1.3"
 journaldb = { path = "util/journaldb" }
 mem = { path = "util/mem" }
 
@@ -89,7 +89,6 @@ daemonize = { git = "https://github.com/paritytech/daemonize" }
 [features]
 miner-debug = ["ethcore/miner-debug"]
 json-tests = ["ethcore/json-tests"]
-ci-skip-issue = ["ethcore/ci-skip-issue"]
 test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
@@ -131,12 +130,12 @@ members = [
 	"evmbin",
 	"miner",
 	"parity-clib",
-	"transaction-pool",
 	"whisper",
 	"whisper/cli",
 	"util/triehash-ethereum",
 	"util/keccak-hasher",
 	"util/patricia-trie-ethereum",
+	"util/fastmap",
 ]
 
 [patch.crates-io]

chainspec/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "chainspec"
 version = "0.1.0"
-authors = ["debris <marek.kotewicz@gmail.com>"]
+authors = ["Marek Kotewicz <marek@parity.io>"]
 
 [dependencies]
 ethjson = { path = "../json" }

docs/CHANGELOG-1.10.md

@@ -1,3 +1,5 @@
+Note: Parity 1.10 reached End-of-Life on 2018-07-18 (EOL).
+
 ## Parity [v1.10.9](https://github.com/paritytech/parity/releases/tag/v1.10.9) (2018-07-07)
 
 Parity 1.10.9 is a bug-fix release to improve performance and stability.

docs/CHANGELOG-1.11.md

@@ -0,0 +1,724 @@
+## Parity [v1.11.8](https://github.com/paritytech/parity-ethereum/releases/tag/v1.11.8) (2018-07-27)
+
+Parity 1.11.8-stable is a bug-fix release to improve performance and stability.
+
+Note, authorities in PoA networks based on the Aura engine, should upgrade their nodes immediately as this release includes a critical fix.
+
+The full list of included changes:
+
+- Backports to 1.11.8-stable ([#9144](https://github.com/paritytech/parity-ethereum/pull/9144))
+  - Parity-version: bump stable to 1.11.8
+  - Ci: update version strings for snaps ([#9160](https://github.com/paritytech/parity-ethereum/pull/9160))
+  - Be more graceful on Aura difficulty validation ([#9164](https://github.com/paritytech/parity-ethereum/pull/9164))
+    - Be more graceful on Aura difficulty validation
+    - Test: rejects_step_backwards
+    - Test: proposer_switching
+    - Test: rejects_future_block
+    - Test: reports_skipped
+    - Test: verify_empty_seal_steps
+  - Parity: fix UserDefaults json parser ([#9189](https://github.com/paritytech/parity-ethereum/pull/9189))
+    - Parity: fix UserDefaults json parser
+    - Parity: use serde_derive for UserDefaults
+    - Parity: support deserialization of old UserDefault json format
+    - Parity: make UserDefaults serde backwards compatible
+    - Parity: tabify indentation in UserDefaults
+  - Fix bugfix hard fork logic ([#9138](https://github.com/paritytech/parity-ethereum/pull/9138))
+    - Fix bugfix hard fork logic
+    - Remove dustProtectionTransition from bugfix category
+      - EIP-168 is not enabled by default
+    - Remove unnecessary 'static
+  - Disable per-sender limit for local transactions. ([#9148](https://github.com/paritytech/parity-ethereum/pull/9148))
+    - Disable per-sender limit for local transactions.
+    - Add a missing new line.
+  - Rpc: fix is_major_importing sync state condition ([#9112](https://github.com/paritytech/parity-ethereum/pull/9112))
+    - Rpc: fix is_major_importing sync state condition
+    - Rpc: fix informant printout when waiting for peers
+  - Fix verification in ethcore-sync collect_blocks ([#9135](https://github.com/paritytech/parity-ethereum/pull/9135))
+  - Docker: update hub dockerfile ([#9173](https://github.com/paritytech/parity-ethereum/pull/9173))
+    - Update Dockerfile for hub
+      - Update to Ubuntu Xenial 16.04
+      - Fix cmake version
+    - Docker: fix tab indentation in hub dockerfile
+  - Ethcore: update to parity-wasm 0.31
+  - Rpc: fix broken merge
+
+## Parity [v1.11.7](https://github.com/paritytech/parity-ethereum/releases/tag/v1.11.7) "Prosperity" (2018-07-17)
+
+Parity 1.11.7 "Prosperity" is a bug-fix release to improve performance and stability that marks the 1.11 release track as `stable`. Among other fixes, this release significantly addresses peering and synchronization issues. If you experienced such issues before, upgrading is highly recommended. If you rely on old versions of Parity, check out the `old-stable-1.10` branch, cherry-pick fixes, and compile your binaries independently. There will be no official support for any versions prior to 1.11.7, however (EOL).
+
+If you are upgrading directly from versions 1.10.9 or earlier, please note important changes to our transaction-queue implementation, namely:
+
+- The pool now limits transactions per-sender (see `--tx-queue-per-sender`), local transactions also have to obey that limit. Consider increasing the limit via CLI-flag when running benchmarks or sending a lot of transactions at once.
+- In case the pool is full, transactions received over the network, but originating from accounts that you have private keys for might not get accepted to the pool any more with higher priority. Consider running with larger pool size or submitting the transactions directly on the node via `eth_sendRawTransaction`.
+
+The full list of included changes:
+
+- Backports to 1.11.7-stable ([#9093](https://github.com/paritytech/parity/pull/9093))
+  - Parity-version: stabilize 1.11
+  - Parity-version: bump stable to 1.11.7
+  - Don't fetch snapshot chunks at random ([#9088](https://github.com/paritytech/parity/pull/9088))
+  - Offload cull to IoWorker. ([#9099](https://github.com/paritytech/parity/pull/9099))
+  - Limit the number of transactions in pending set ([#8777](https://github.com/paritytech/parity/pull/8777))
+    - Unordered iterator.
+    - Use unordered and limited set if full not required.
+    - Split timeout work into smaller timers.
+    - Avoid collecting all pending transactions when mining
+    - Remove println.
+    - Use priority ordering in eth-filter.
+    - Fix ethcore-miner tests and tx propagation.
+    - Review grumbles addressed.
+    - Add test for unordered not populating the cache.
+    - Fix ethcore tests.
+    - Fix light tests.
+    - Fix ethcore-sync tests.
+    - Fix RPC tests.
+  - Make sure to produce full blocks. ([#9115](https://github.com/paritytech/parity/pull/9115))
+  - Update hidapi, fixes [#7542](https://github.com/paritytech/parity-ethereum/issues/7542) ([#9108](https://github.com/paritytech/parity/pull/9108))
+  - Docker: add cmake dependency ([#9111](https://github.com/paritytech/parity/pull/9111))
+  - Fix miner tests.
+  - Revert "Make sure to produce full blocks."
+    - This reverts commit b12d592.
+  - Update light client hardcoded headers ([#9098](https://github.com/paritytech/parity/pull/9098))
+    - Insert Kovan hardcoded headers until 7690241
+    - Insert Kovan hardcoded headers until block 7690241
+    - Insert Ropsten hardcoded headers until 3612673
+    - Insert Mainnet hardcoded headers until block 5941249
+  - Make sure to produce full blocks. ([#9115](https://github.com/paritytech/parity/pull/9115))
+  - Insert ETC (classic) hardcoded headers until block 6170625 ([#9121](https://github.com/paritytech/parity/pull/9121))
+  - Fix verification in ethcore-sync collect_blocks ([#9135](https://github.com/paritytech/parity/pull/9135))
+  - `evm bench` fix broken dependencies ([#9134](https://github.com/paritytech/parity/pull/9134))
+    - `evm bench` use valid dependencies
+    - Fix warnings
+
+## Parity [v1.11.6](https://github.com/paritytech/parity/releases/tag/v1.11.6) (2018-07-09)
+
+Parity 1.11.6 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Beta: 1.11.6 backports ([#9015](https://github.com/paritytech/parity/pull/9015))
+  - Parity-version: bump beta to 1.11.6
+  - Scripts: remove md5 checksums ([#8884](https://github.com/paritytech/parity/pull/8884))
+  - Add support for --chain tobalaba
+    - Convert indents to tabs :)
+  - Fixes for misbehavior reporting in AuthorityRound ([#8998](https://github.com/paritytech/parity/pull/8998))
+    - Aura: only report after checking for repeated skipped primaries
+    - Aura: refactor duplicate code for getting epoch validator set
+    - Aura: verify_external: report on validator set contract instance
+    - Aura: use correct validator set epoch number when reporting
+    - Aura: use epoch set when verifying blocks
+    - Aura: report skipped primaries when generating seal
+    - Aura: handle immediate transitions
+    - Aura: don't report skipped steps from genesis to first block
+    - Aura: fix reporting test
+    - Aura: refactor duplicate code to handle immediate_transitions
+    - Aura: let reporting fail on verify_block_basic
+    - Aura: add comment about possible failure of reporting
+  - Only return error log for rustls ([#9025](https://github.com/paritytech/parity/pull/9025))
+  - Transaction Pool improvements ([#8470](https://github.com/paritytech/parity/pull/8470))
+    - Don't use ethereum_types in transaction pool.
+    - Hide internal insertion_id.
+    - Fix tests.
+    - Review grumbles.
+  - Improve should_replace on NonceAndGasPrice ([#8980](https://github.com/paritytech/parity/pull/8980))
+    - Additional tests for NonceAndGasPrice::should_replace.
+    - Fix should_replace in the distinct sender case.
+    - Use natural priority ordering to simplify should_replace.
+  - Minimal effective gas price in the queue ([#8934](https://github.com/paritytech/parity/pull/8934))
+    - Minimal effective gas price.
+    - Fix naming, add test
+    - Fix minimal entry score and add test.
+    - Fix worst_transaction.
+    - Remove effective gas price threshold.
+    - Don't leak gas_price decisions out of Scoring.
+  - Never drop local transactions from different senders. ([#9002](https://github.com/paritytech/parity/pull/9002))
+  - Recently rejected cache for transaction queue ([#9005](https://github.com/paritytech/parity/pull/9005))
+    - Store recently rejected transactions.
+    - Don't cache AlreadyImported rejections.
+    - Make the size of transaction verification queue dependent on pool size.
+    - Add a test for recently rejected.
+    - Fix logging for recently rejected.
+    - Make rejection cache smaller.
+    - Obsolete test removed
+    - Obsolete test removed
+    - Construct cache with_capacity.
+  - Optimize pending transactions filter ([#9026](https://github.com/paritytech/parity/pull/9026))
+    - Rpc: return unordered transactions in pending transactions filter
+    - Ethcore: use LruCache for nonce cache
+      - Only clear the nonce cache when a block is retracted
+    - Revert "ethcore: use LruCache for nonce cache"
+      - This reverts commit b382c19.
+    - Use only cached nonces when computing pending hashes.
+    - Give filters their own locks, so that they don't block one another.
+    - Fix pending transaction count if not sealing.
+    - Clear cache only when block is enacted.
+    - Fix RPC tests.
+    - Address review comments.
+  - A last bunch of txqueue performance optimizations ([#9024](https://github.com/paritytech/parity/pull/9024))
+    - Clear cache only when block is enacted.
+    - Add tracing for cull.
+    - Cull split.
+    - Cull after creating pending block.
+    - Add constant, remove sync::read tracing.
+    - Reset debug.
+    - Remove excessive tracing.
+    - Use struct for NonceCache.
+    - Fix build
+    - Remove warnings.
+    - Fix build again.
+  - Miner: add missing macro use for trace_time
+  - Ci: remove md5 merge leftovers
+
+## Parity [v1.11.5](https://github.com/paritytech/parity/releases/tag/v1.11.5) (2018-06-29)
+
+Parity 1.11.5 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Bump beta to 1.11.5 / Backports ([#8955](https://github.com/paritytech/parity/pull/8955))
+  - Parity-version: bump beta to 1.11.5
+  - Update ropsten.json ([#8926](https://github.com/paritytech/parity/pull/8926))
+  - Update hardcoded headers ([#8925](https://github.com/paritytech/parity/pull/8925))
+    - Update kovan.json
+      - Update Kovan to block 7693549
+    - Update foundation.json
+      - Updated to block 5812225
+    - Update ropsten.json
+      - Update to 3465217
+  - Scripts: minor improvements ([#8930](https://github.com/paritytech/parity/pull/8930))
+    - CI: enable 'latest' docker tag on master pipeline
+    - CI: mark both beta and stable as stable snap.
+    - CI: sign all windows binaries
+  - Scripts: fix docker build tag on latest using master ([#8952](https://github.com/paritytech/parity/pull/8952))
+  - Rpc: cap gas limit of local calls ([#8943](https://github.com/paritytech/parity/pull/8943))
+  - Snap: downgrade rust to revision 1.26.2, ref snapcraft/+bug/1778530 ([#8984](https://github.com/paritytech/parity/pull/8984))
+    - Snap: downgrade rust to revision 1.26.2, ref snapcraft/+bug/1778530
+    - Snap: use plugin rust
+  - Fix deadlock in blockchain. ([#8977](https://github.com/paritytech/parity/pull/8977))
+  - Remove js-glue from workspace
+    - This fixes test error on Rust 1.27 but also prevents js-glue from building itself.
+    - Builtin dapp users can still use js-glue from crates.io.
+  - Fix Android build on beta ([#9003](https://github.com/paritytech/parity/pull/9003))
+
+## Parity [v1.11.4](https://github.com/paritytech/parity/releases/tag/v1.11.4) (2018-06-20)
+
+Parity 1.11.4 is a bug-fix release to improve performance and stability.
+
+The full list of included changes:
+
+- Backports ([#8916](https://github.com/paritytech/parity/pull/8916))
+  - `Duration_ns: u64 -> duration: Duration` ([#8457](https://github.com/paritytech/parity/pull/8457))
+    - Duration_ns: u64 -> duration: Duration
+    - Format on millis {:.2} -> {}
+  - Keep all enacted blocks notify in order ([#8524](https://github.com/paritytech/parity/pull/8524))
+    - Keep all enacted blocks notify in order
+    - Collect is unnecessary
+    - Update ChainNotify to use ChainRouteType
+    - Fix all ethcore fn defs
+    - Wrap the type within ChainRoute
+    - Fix private-tx and sync api
+    - Fix secret_store API
+    - Fix updater API
+    - Fix rpc api
+    - Fix informant api
+    - Eagerly cache enacted/retracted and remove contain_enacted/retracted
+    - Fix indent
+    - Tests: should use full expr form for struct constructor
+    - Use into_enacted_retracted to further avoid copy
+    - Typo: not a function
+    - Rpc/tests: ChainRoute -> ChainRoute::new
+  - Handle removed logs in filter changes and add geth compatibility field ([#8796](https://github.com/paritytech/parity/pull/8796))
+    - Add removed geth compatibility field in log
+    - Fix mocked tests
+    - Add field block hash in PollFilter
+    - Store last block hash info for log filters
+    - Implement canon route
+    - Use canon logs for fetching reorg logs
+    - Make sure removed flag is set
+    - Address grumbles
+  - Fixed AuthorityRound deadlock on shutdown, closes [#8088](https://github.com/paritytech/parity/issues/8088) ([#8803](https://github.com/paritytech/parity/pull/8803))
+  - Ci: Fix docker tags ([#8822](https://github.com/paritytech/parity/pull/8822))
+    - Scripts: enable docker builds for beta and stable
+    - Scripts: docker latest should be beta not master
+    - Scripts: docker latest is master
+  - Ethcore: fix ancient block error msg handling ([#8832](https://github.com/paritytech/parity/pull/8832))
+  - Disable parallel verification and skip verifiying already imported txs. ([#8834](https://github.com/paritytech/parity/pull/8834))
+    - Reject transactions that are already in pool without verifying them.
+    - Avoid verifying already imported transactions.
+  - Fix concurrent access to signer queue ([#8854](https://github.com/paritytech/parity/pull/8854))
+    - Fix concurrent access to signer queue
+    - Put request back to the queue if confirmation failed
+    - Typo: fix docs and rename functions to be more specific
+    - Change trace info "Transaction" -> "Request"
+  - Don't allocate in expect_valid_rlp unless necessary ([#8867](https://github.com/paritytech/parity/pull/8867))
+    - Don't allocate via format! in case there's no error
+    - Fix test?
+  - Fixed ipc leak, closes [#8774](https://github.com/paritytech/parity/issues/8774) ([#8876](https://github.com/paritytech/parity/pull/8876))
+  - Add new ovh bootnodes and fix port for foundation bootnode 3.2 ([#8886](https://github.com/paritytech/parity/pull/8886))
+    - Add new ovh bootnodes and fix port for foundation bootnode 3.2
+    - Remove old bootnodes.
+    - Remove duplicate 1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082
+  - Block 0 is valid in queries ([#8891](https://github.com/paritytech/parity/pull/8891))
+  - Add ETC Cooperative-run load balanced parity node ([#8892](https://github.com/paritytech/parity/pull/8892))
+  - Minor fix in chain supplier and light provider ([#8906](https://github.com/paritytech/parity/pull/8906))
+    - Fix chain supplier increment
+    - Fix light provider block_headers
+  - Check whether we need resealing in miner and unwrap has_account in account_provider ([#8853](https://github.com/paritytech/parity/pull/8853))
+    - Remove unused Result wrap in has_account
+    - Check whether we need to reseal for external transactions
+    - Fix reference to has_account interface
+    - Typo: missing )
+    - Refactor duplicates to prepare_and_update_sealing
+    - Fix build
+  - Allow disabling local-by-default for transactions with new config entry ([#8882](https://github.com/paritytech/parity/pull/8882))
+    - Add tx_queue_allow_unknown_local config option
+    - Refactor flag name + don't change import_own_tx behaviour
+    - Add fn to TestMinerService
+    - Avoid race condition from trusted sources
+- Parity-version: beta release 1.11.4 ([#8856](https://github.com/paritytech/parity/pull/8856))
+  - Cherry-pick network-specific release flag ([#8821](https://github.com/paritytech/parity/pull/8821))
+  - Parity-version: bump beta to 1.11.4
+  - Parity-version: remove merge leftovers
+
+## Parity [v1.11.3](https://github.com/paritytech/parity/releases/tag/v1.11.3) (2018-06-06)
+
+Parity 1.11.3 is a security-relevant release. Please upgrade your nodes as soon as possible to [v1.10.6](https://github.com/paritytech/parity/releases/tag/v1.10.6) or [v1.11.3](https://github.com/paritytech/parity/releases/tag/v1.11.3).
+
+The full list of included changes:
+
+- Parity-version: bump beta to 1.11.3 ([#8806](https://github.com/paritytech/parity/pull/8806))
+  - Parity-version: bump beta to 1.11.3
+  - Disallow unsigned transactions in case EIP-86 is disabled ([#8802](https://github.com/paritytech/parity/pull/8802))
+  - Fix ancient blocks queue deadlock ([#8751](https://github.com/paritytech/parity/pull/8751))
+- Update shell32-sys to fix windows build ([#8792](https://github.com/paritytech/parity/pull/8792))
+- Backports ([#8785](https://github.com/paritytech/parity/pull/8785))
+  - Fix light sync with initial validator-set contract ([#8528](https://github.com/paritytech/parity/pull/8528))
+    - Fix [#8468](https://github.com/paritytech/parity-ethereum/issues/8468)
+    - Use U256::max_value() instead
+    - Also change initial transaction gas
+  - Resumable warp-sync / Seed downloaded snapshots ([#8544](https://github.com/paritytech/parity/pull/8544))
+    - Start dividing sync chain : first supplier method
+    - WIP - updated chain sync supplier
+    - Finish refactoring the Chain Sync Supplier
+    - Create Chain Sync Requester
+    - Add Propagator for Chain Sync
+    - Add the Chain Sync Handler
+    - Move tests from mod -> handler
+    - Move tests to propagator
+    - Refactor SyncRequester arguments
+    - Refactoring peer fork header handler
+    - Fix wrong highest block number in snapshot sync
+    - Small refactor...
+    - Resume warp-sync downloaded chunks
+    - Refactoring the previous chunks import
+    - Address PR grumbles
+    - Fix not seeding current snapshot
+    - Update SnapshotService readiness check
+    - Early abort importing previous chunks
+    - Update Gitlab CI config
+    - SyncState back to Waiting when Manifest peers disconnect
+    - Revert GitLab CI changes
+    - Refactor resuming snapshots
+    - Revert "Refactor resuming snapshots"
+    - Update informant log
+    - Refactor resuming snapshots
+    - Update informant message : show chunks done
+  - Don't open Browser post-install on Mac ([#8641](https://github.com/paritytech/parity/pull/8641))
+  - Fix not downloading old blocks ([#8642](https://github.com/paritytech/parity/pull/8642))
+  - Fix PoW blockchains sealing notifications in chain_new_blocks ([#8656](https://github.com/paritytech/parity/pull/8656))
+  - Shutdown the Snapshot Service early ([#8658](https://github.com/paritytech/parity/pull/8658))
+    - Shutdown the Snapshot Service when shutting down the runner
+    - Rename `service` to `client_service`
+    - Fix tests
+  - Fix cli signer ([#8682](https://github.com/paritytech/parity/pull/8682))
+    - Update ethereum-types so `{:#x}` applies 0x prefix
+  - Set the request index to that of the current request ([#8683](https://github.com/paritytech/parity/pull/8683))
+    - Set the request index to that of the current request
+  - Network-devp2p: handle UselessPeer disconnect ([#8686](https://github.com/paritytech/parity/pull/8686))
+  - Fix local transactions policy. ([#8691](https://github.com/paritytech/parity/pull/8691))
+  - CI: Fixes for Android Pipeline ([#8745](https://github.com/paritytech/parity/pull/8745))
+    - Ci: Remove check for shared libraries in gitlab script
+    - Ci: allow android arm build to fail
+  - Custom Error Messages on ENFILE and EMFILE IO Errors ([#8744](https://github.com/paritytech/parity/pull/8744))
+    - Custom Error Messages on ENFILE and EMFILE IO Errors
+    - Use assert-matches for more readable tests
+    - Fix Wording and consistency
+  - Ethcore-sync: fix connection to peers behind chain fork block ([#8710](https://github.com/paritytech/parity/pull/8710))
+- Parity-version: bump beta to 1.11.2 ([#8750](https://github.com/paritytech/parity/pull/8750))
+  - Parity-version: bump beta to 1.11.2
+  - Parity-version: unset critical flag
+
+## Parity [v1.11.1](https://github.com/paritytech/parity/releases/tag/v1.11.1) (2018-05-15)
+
+This is the Parity 1.11.1-beta release! Hurray!
+
+Notable changes in reversed alphabetical order:
+
+- TOOLING: **Whisper CLI** [#8201](https://github.com/paritytech/parity/pull/8201)
+  - `whisper-cli` is a standalone tool to communicate with the Whisper protocol.
+  - It provides functionality to specify `whisper-pool-size`, `port` and `address` to use.
+  - All whisper RPC APIs are enabled and can be directly accessed.
+- JSON-RPC API: **Return error in case eth_call returns VM errors** [#8448](https://github.com/paritytech/parity/pull/8448)
+  - This changes the behaviors of `eth_call` to respect VM errors if any.
+  - In case of `REVERT`, it will also return the reverted return data in hex format.
+- ENGINES: **Block Reward Contract** [#8419](https://github.com/paritytech/parity/pull/8419)
+  - The _AuRa_ PoA engine has now support for having a contract to calculate the block rewards.
+  - The engine passes a list of benefactors and reward types to the contract which then returns a list of addresses and respective rewards.
+- CORE: **Private Transactions** [#6422](https://github.com/paritytech/parity/pull/6422)
+  - Parity now provides a private transactions system.
+  - Please, check out our wiki to get an [overview and setup instructions](https://wiki.parity.io/Private-Transactions.html).
+- CORE: **New Transaction Queue implementation** [#8074](https://github.com/paritytech/parity/pull/8074)
+  - Verification is now done in parallel.
+  - Previous queue had `O(1)` time to get pending set, but `O(n^2)` insertion time. And obviously insertion/removal happens much more often than retrieving the pending set (only for propagation and pending block building) Currently we have `O(n * log(senders))` pending set time (with cache) and `O(tx_per_sender)` (usually within `log(tx_per_sender)`) insertion time.
+  - `Scoring` and `Readiness` are separated from the pool, so it's easier to customize them or introduce different definitions (for instance for [EIP-859](https://github.com/ethereum/EIPs/issues/859) or private transactions, etc).
+  - Banning removed, soft-penalization introduced instead: if transaction exceeds the limit other transactions from that sender get lower priority.
+  - There is no explicit distinction between current and future transactions in the pool - `Readiness` determines that. Because of this we additionally remove `future` transactions that occupy the pool for long time.
+- CONFIGURATION: **Warp-only sync with --warp-barrier [block-number] flag.** [#8228](https://github.com/paritytech/parity/pull/8228)
+  - Enables warp-only sync in case `--warp-barrier [block-number]` is provided.
+  - This avoids clients to warp to outdated snapshots that are too far away from the best block.
+  - This avoids clients to fall back to normal sync if there are no recent snapshots available currently.
+- CONFIGURATION: **Disable UI by default.** [#8105](https://github.com/paritytech/parity/pull/8105)
+  - The user interface is now disabled by default. It still can be activated with the `--force-ui` flag.
+  - To get the stand-alone Parity UI, please check the dedicated [releases page](https://github.com/parity-js/shell/releases).
+- CONFIGURATION: **Auto-updater improvements** [#8078](https://github.com/paritytech/parity/pull/8078)
+  - Added `--auto-update-delay` to randomly delay updates by `n` blocks. This takes into account the number of the block of the update release (old updates aren't delayed).
+  - Added `--auto-update-check-frequency` to define the periodicity of auto-update checks in number of blocks.
+  - This is an important improvement to ensure the network does not update all clients at the same time.
+- CHAIN SPECS: **Enable WebAssembly and Byzantium for Ellaism** [#8520](https://github.com/paritytech/parity/pull/8520)
+  - This activates the Ellaism Byzantium hardfork ([2018-0004-byzantium](https://github.com/ellaism/specs/blob/master/specs/2018-0004-byzantium.md)) at block `2_000_000`.
+  - This enables the Wasm VM on Ellaism ([2018-0003-wasm-hardfork](https://github.com/ellaism/specs/blob/master/specs/2018-0003-wasm-hardfork.md)) at block `2_000_000`.
+  - Please, upgrade your clients if you run an Ellaism configuration.
+- CHAIN SPECS: **Dev chain - increase gasLimit to 8_000_000** [#8362](https://github.com/paritytech/parity/pull/8362)
+  - This increases the default block gas limit on development chains to `8_000_000`.
+  - Please note, this makes previous dev chain configurations incompatible.
+- CHAIN SPECS: **Add MCIP-6 Byzyantium transition to Musicoin spec** [#7841](https://github.com/paritytech/parity/pull/7841)
+  - This activates the Musicoin Byzantium hardfork ([MCIP-6](https://github.com/Musicoin/MCIPs/blob/master/MCIPS/mcip-6.md)) at block `2_222_222`.
+  - Please, upgrade your clients if you run a Musicoin configuration.
+
+The full list of included changes:
+
+- Backports ([#8624](https://github.com/paritytech/parity/pull/8624))
+  - Trace precompiled contracts when the transfer value is not zero ([#8486](https://github.com/paritytech/parity/pull/8486))
+    - Trace precompiled contracts when the transfer value is not zero
+    - Add tests for precompiled CALL tracing
+    - Use byzantium test machine for the new test
+    - Add notes in comments on why we don't trace all precompiles
+    - Use is_transferred instead of transferred
+  - Return error if RLP size of transaction exceeds the limit ([#8473](https://github.com/paritytech/parity/pull/8473))
+    - Return error if RLP size of transaction exceeds the limit
+    - Review comments fixed
+    - RLP check moved to verifier, corresponding pool test added
+  - Don't block sync when importing old blocks ([#8530](https://github.com/paritytech/parity/pull/8530))
+    - Alter IO queueing.
+    - Don't require IoMessages to be Clone
+    - Ancient blocks imported via IoChannel.
+    - Get rid of private transactions io message.
+    - Get rid of deadlock and fix disconnected handler.
+    - Revert to old disconnect condition.
+    - Fix tests.
+    - Fix deadlock.
+  - Refactoring `ethcore-sync` - Fixing warp-sync barrier ([#8543](https://github.com/paritytech/parity/pull/8543))
+    - Start dividing sync chain : first supplier method
+    - WIP - updated chain sync supplier
+    - Finish refactoring the Chain Sync Supplier
+    - Create Chain Sync Requester
+    - Add Propagator for Chain Sync
+    - Add the Chain Sync Handler
+    - Move tests from mod -> handler
+    - Move tests to propagator
+    - Refactor SyncRequester arguments
+    - Refactoring peer fork header handler
+    - Fix wrong highest block number in snapshot sync
+    - Small refactor...
+    - Address PR grumbles
+    - Retry failed CI job
+    - Fix tests
+    - PR Grumbles
+  - Handle socket address parsing errors ([#8545](https://github.com/paritytech/parity/pull/8545))
+  - Fix packet count when talking with PAR2 peers ([#8555](https://github.com/paritytech/parity/pull/8555))
+    - Support diferent packet counts in different protocol versions.
+    - Fix light timeouts and eclipse protection.
+    - Fix devp2p tests.
+    - Fix whisper-cli compilation.
+    - Fix compilation.
+    - Fix ethcore-sync tests.
+    - Revert "Fix light timeouts and eclipse protection."
+    - Increase timeouts.
+  - Add whisper CLI to the pipelines ([#8578](https://github.com/paritytech/parity/pull/8578))
+    - Add whisper CLI to the pipelines
+    - Address todo, ref [#8579](https://github.com/paritytech/parity/pull/8579)
+  - Rename `whisper-cli binary` to `whisper` ([#8579](https://github.com/paritytech/parity/pull/8579))
+    - Rename whisper-cli binary to whisper
+    - Fix tests
+  - Remove manually added text to the errors ([#8595](https://github.com/paritytech/parity/pull/8595))
+  - Fix account list double 0x display ([#8596](https://github.com/paritytech/parity/pull/8596))
+    - Remove unused self import
+    - Fix account list double 0x display
+  - Fix BlockReward contract "arithmetic operation overflow" ([#8611](https://github.com/paritytech/parity/pull/8611))
+    - Fix BlockReward contract "arithmetic operation overflow"
+    - Add docs on how execute_as_system works
+    - Fix typo
+  - Rlp decode returns Result ([#8527](https://github.com/paritytech/parity/pull/8527))
+  - Remove expect ([#8536](https://github.com/paritytech/parity/pull/8536))
+    - Remove expect and propagate rlp::DecoderErrors as TrieErrors
+  - Decoding headers can fail ([#8570](https://github.com/paritytech/parity/pull/8570))
+    - Rlp::decode returns Result
+    - Fix journaldb to handle rlp::decode Result
+    - Fix ethcore to work with rlp::decode returning Result
+    - Light client handles rlp::decode returning Result
+    - Fix tests in rlp_derive
+    - Fix tests
+    - Cleanup
+    - Cleanup
+    - Allow panic rather than breaking out of iterator
+    - Let decoding failures when reading from disk blow up
+    - Syntax
+    - Fix the trivial grumbles
+    - Fix failing tests
+    - Make Account::from_rlp return Result
+    - Syntx, sigh
+    - Temp-fix for decoding failures
+    - Header::decode returns Result
+    - Do not continue reading from the DB when a value could not be read
+    - Fix tests
+    - Handle header decoding in light_sync
+    - Handling header decoding errors
+    - Let the DecodeError bubble up unchanged
+    - Remove redundant error conversion
+  - Fix compiler warning ([#8590](https://github.com/paritytech/parity/pull/8590))
+  - Attempt to fix intermittent test failures ([#8584](https://github.com/paritytech/parity/pull/8584))
+  - Block_header can fail so return Result ([#8581](https://github.com/paritytech/parity/pull/8581))
+    - Block_header can fail so return Result
+    - Restore previous return type based on feedback
+    - Fix failing doc tests running on non-code
+  - Block::decode() returns Result ([#8586](https://github.com/paritytech/parity/pull/8586))
+  - Gitlab test script fixes ([#8573](https://github.com/paritytech/parity/pull/8573))
+    - Exclude /docs from modified files.
+    - Ensure all references in the working tree are available
+    - Remove duplicated line from test script
+- Bump beta to 1.11.1 ([#8627](https://github.com/paritytech/parity/pull/8627))
+
+## Parity [v1.11.0](https://github.com/paritytech/parity/releases/tag/v1.11.0) (2018-05-09)
+
+This is the Parity 1.11.0-beta release! ~~Hurray!~~ This release has been pulled due to peering issues, please use 1.11.1-beta.
+
+The full list of included changes:
+
+- Backports ([#8558](https://github.com/paritytech/parity/pull/8558))
+  - Fetching logs by hash in blockchain database ([#8463](https://github.com/paritytech/parity/pull/8463))
+    - Fetch logs by hash in blockchain database
+    - Fix tests
+    - Add unit test for branch block logs fetching
+    - Add docs that blocks must already be sorted
+    - Handle branch block cases properly
+    - typo: empty -> is_empty
+    - Remove return_empty_if_none by using a closure
+    - Use BTreeSet to avoid sorting again
+    - Move is_canon to BlockChain
+    - typo: pass value by reference
+    - Use loop and wrap inside blocks to simplify the code
+    - typo: missed a comment
+  - Pass on storage keys tracing to handle the case when it is not modified ([#8491](https://github.com/paritytech/parity/pull/8491))
+    - Pass on storage keys even if it is not modified
+    - typo: account and storage query
+    - Fix tests
+    - Use state query directly because of suicided accounts
+    - Fix a RefCell borrow issue
+    - Add tests for unmodified storage trace
+    - Address grumbles
+    - typo: remove unwanted empty line
+    - ensure_cached compiles with the original signature
+  - Update wasmi and pwasm-utils ([#8493](https://github.com/paritytech/parity/pull/8493))
+    - Update wasmi to 0.2
+    - Update pwasm-utils to 0.1.5
+  - Show imported messages for light client ([#8517](https://github.com/paritytech/parity/pull/8517))
+  - Enable WebAssembly and Byzantium for Ellaism ([#8520](https://github.com/paritytech/parity/pull/8520))
+    - Enable WebAssembly and Byzantium for Ellaism
+    - Fix indentation
+    - Remove empty lines
+  - Don't panic in import_block if invalid rlp ([#8522](https://github.com/paritytech/parity/pull/8522))
+    - Don't panic in import_block if invalid rlp
+    - Remove redundant type annotation
+    - Replace RLP header view usage with safe decoding
+  - Node table sorting according to last contact data ([#8541](https://github.com/paritytech/parity/pull/8541))
+    - network-devp2p: sort nodes in node table using last contact data
+    - network-devp2p: rename node contact types in node table json output
+    - network-devp2p: fix node table tests
+    - network-devp2p: note node failure when failed to establish connection
+    - network-devp2p: handle UselessPeer error
+    - network-devp2p: note failure when marking node as useless
+- Betalize 1.11 :) ([#8475](https://github.com/paritytech/parity/pull/8475))
+  - Betalize 1.11 :)
+  - Update Gitlab scripts
+  - Use master as gitlab latest
+  - Fix snap builds ([#8483](https://github.com/paritytech/parity/pull/8483))
+  - Update hardcodedSync for Ethereum, Kovan, and Ropsten ([#8489](https://github.com/paritytech/parity/pull/8489))
+- Fix typos in vm description comment ([#8446](https://github.com/paritytech/parity/pull/8446))
+- Add changelog for 1.9.7 and 1.10.2 ([#8460](https://github.com/paritytech/parity/pull/8460))
+- Fix docker build ([#8462](https://github.com/paritytech/parity/pull/8462))
+- Parityshell::open `Return result` ([#8377](https://github.com/paritytech/parity/pull/8377))
+- Return error in case eth_call returns VM errors ([#8448](https://github.com/paritytech/parity/pull/8448))
+- Update wasmi ([#8452](https://github.com/paritytech/parity/pull/8452))
+- Allow 32 bit pipelines to fail ([#8454](https://github.com/paritytech/parity/pull/8454))
+- Update Cargo hidapi-rs dependency ([#8447](https://github.com/paritytech/parity/pull/8447))
+- Private transactions processing error handling ([#8431](https://github.com/paritytech/parity/pull/8431))
+- Improve VM executor stack size estimation rules ([#8439](https://github.com/paritytech/parity/pull/8439))
+- Block reward contract ([#8419](https://github.com/paritytech/parity/pull/8419))
+- Permission fix ([#8441](https://github.com/paritytech/parity/pull/8441))
+- Use forked app_dirs crate for reverted Windows dir behavior ([#8438](https://github.com/paritytech/parity/pull/8438))
+- Remove From::from. ([#8390](https://github.com/paritytech/parity/pull/8390))
+- Move ethcore::Error to error_chain ([#8386](https://github.com/paritytech/parity/pull/8386))
+- Changelogs for 1.9.6 and 1.10.1 ([#8411](https://github.com/paritytech/parity/pull/8411))
+- Fix receipts stripping. ([#8414](https://github.com/paritytech/parity/pull/8414))
+- Typo, docs parity_chainId: empty string -> None ([#8434](https://github.com/paritytech/parity/pull/8434))
+- Update zip to 0.3 ([#8381](https://github.com/paritytech/parity/pull/8381))
+- Fix TODO comments ([#8413](https://github.com/paritytech/parity/pull/8413))
+- Replace legacy Rlp with UntrustedRlp and use in ethcore rlp views ([#8316](https://github.com/paritytech/parity/pull/8316))
+- Tokio-core v0.1.16 -> v0.1.17 ([#8408](https://github.com/paritytech/parity/pull/8408))
+- More code refactoring to integrate Duration ([#8322](https://github.com/paritytech/parity/pull/8322))
+- Remove Tendermint extra_info due to seal inconsistencies ([#8367](https://github.com/paritytech/parity/pull/8367))
+- Use tokio::spawn in secret_store listener and fix Uri ([#8373](https://github.com/paritytech/parity/pull/8373))
+- Unify and limit rocksdb dependency places ([#8371](https://github.com/paritytech/parity/pull/8371))
+- Clarify that windows need perl and yasm ([#8402](https://github.com/paritytech/parity/pull/8402))
+- New Transaction Queue implementation ([#8074](https://github.com/paritytech/parity/pull/8074))
+- Some tweaks to main.rs for parity as a library ([#8370](https://github.com/paritytech/parity/pull/8370))
+- Handle queue import errors a bit more gracefully ([#8385](https://github.com/paritytech/parity/pull/8385))
+- Ci: fix change detection in master builds ([#8382](https://github.com/paritytech/parity/pull/8382))
+- Fix config test by adding no-hardcodec-sync ([#8380](https://github.com/paritytech/parity/pull/8380))
+- Fixed unsafe shell call on windows ([#8372](https://github.com/paritytech/parity/pull/8372))
+- Parity uses winapi 0.3.4 ([#8366](https://github.com/paritytech/parity/pull/8366))
+- No hardcoded client name ([#8368](https://github.com/paritytech/parity/pull/8368))
+- Add `util/mem` to zero out memory on drop. ([#8356](https://github.com/paritytech/parity/pull/8356))
+- Use atty instead of isatty ([#8365](https://github.com/paritytech/parity/pull/8365))
+- Increase gasLimit to 8'000'000 ([#8362](https://github.com/paritytech/parity/pull/8362))
+- Util `fake-fetch` ([#8363](https://github.com/paritytech/parity/pull/8363))
+- Bump snappy and ring, use single rayon version, closes [#8296](https://github.com/paritytech/parity/issues/8296) ([#8364](https://github.com/paritytech/parity/pull/8364))
+- Use async hyper server in secret_store and upgrade igd ([#8359](https://github.com/paritytech/parity/pull/8359))
+- Enable UI by default, but only display deprecation notice ([#8262](https://github.com/paritytech/parity/pull/8262))
+- Ethcrypto renamed to ethcore-crypto and moved to ethcore dir ([#8340](https://github.com/paritytech/parity/pull/8340))
+- Use hyper 0.11 in ethcore-miner and improvements in parity-reactor ([#8335](https://github.com/paritytech/parity/pull/8335))
+- Ethcore-sync ([#8347](https://github.com/paritytech/parity/pull/8347))
+- Rpc, eth_filter: return error if the filter id does not exist ([#8341](https://github.com/paritytech/parity/pull/8341))
+- Ethcore-stratum crate moved to ethcore directory ([#8338](https://github.com/paritytech/parity/pull/8338))
+- Secretstore: get rid of engine.signer dependency ([#8173](https://github.com/paritytech/parity/pull/8173))
+- Whisper cli ([#8201](https://github.com/paritytech/parity/pull/8201))
+- Replace_home for password_files, reserved_peers and log_file ([#8324](https://github.com/paritytech/parity/pull/8324))
+- Add Ethereum Social support ([#8325](https://github.com/paritytech/parity/pull/8325))
+- Private transactions integration pr ([#6422](https://github.com/paritytech/parity/pull/6422))
+- Decouple rocksdb dependency from ethcore ([#8320](https://github.com/paritytech/parity/pull/8320))
+- Remove the clone operation of code_cache ([#8334](https://github.com/paritytech/parity/pull/8334))
+- Fix the JSONRPC API not running with the light client ([#8326](https://github.com/paritytech/parity/pull/8326))
+- Read registry_address from block with REQUEST_CONFIRMATIONS_REQUIRED ([#8309](https://github.com/paritytech/parity/pull/8309))
+- Tweaks and add a Dockerfile for Android ([#8036](https://github.com/paritytech/parity/pull/8036))
+- Use associated type M::Error instead of Error ([#8308](https://github.com/paritytech/parity/pull/8308))
+- Remove InvalidParentHash in favor of assert! ([#8300](https://github.com/paritytech/parity/pull/8300))
+- Bump proc macro deps ([#8310](https://github.com/paritytech/parity/pull/8310))
+- Decouple timestamp open-block-assignment/verification to Engine ([#8305](https://github.com/paritytech/parity/pull/8305))
+- Validate if gas limit is not zero ([#8307](https://github.com/paritytech/parity/pull/8307))
+- Implement Easthub chain spec ([#8295](https://github.com/paritytech/parity/pull/8295))
+- Update some dependencies ([#8285](https://github.com/paritytech/parity/pull/8285))
+- Ethcore now uses Rayon 1.0 as a dependency ([#8296](https://github.com/paritytech/parity/pull/8296)) ([#8304](https://github.com/paritytech/parity/pull/8304))
+- Upgrader `remove raw unwrap` and bump semver ([#8251](https://github.com/paritytech/parity/pull/8251))
+- Cleaner binary shutdown system ([#8284](https://github.com/paritytech/parity/pull/8284))
+- Ethcore now uses rayon to 0.9 as a dependency ([#8296](https://github.com/paritytech/parity/pull/8296)) ([#8302](https://github.com/paritytech/parity/pull/8302))
+- Include suicided accounts in state diff ([#8297](https://github.com/paritytech/parity/pull/8297))
+- Remove evmjit ([#8229](https://github.com/paritytech/parity/pull/8229))
+- Build: fix updater rand dependency in Cargo.lock ([#8298](https://github.com/paritytech/parity/pull/8298))
+- Honor --max-peers if --min-peers is not specified ([#8087](https://github.com/paritytech/parity/pull/8087))
+- Auto-updater improvements ([#8078](https://github.com/paritytech/parity/pull/8078))
+- Dapps-fetcher: calculate keccak in-flight while reading the response ([#8294](https://github.com/paritytech/parity/pull/8294))
+- Cleanup Ellaism bootnodes ([#8276](https://github.com/paritytech/parity/pull/8276))
+- Allow unsafe js eval on Parity Wallet. ([#8204](https://github.com/paritytech/parity/pull/8204))
+- Remove RefCell from Header ([#8227](https://github.com/paritytech/parity/pull/8227))
+- Typo fix: todo with no content ([#8292](https://github.com/paritytech/parity/pull/8292))
+- Revert "ci: disable link-dead-code in coverage build ([#8118](https://github.com/paritytech/parity/pull/8118))" ([#8287](https://github.com/paritytech/parity/pull/8287))
+- Bump ethabi & ethereum-types. ([#8258](https://github.com/paritytech/parity/pull/8258))
+- Allow customization of max WS connections. ([#8257](https://github.com/paritytech/parity/pull/8257))
+- Supress TemporaryInvalid verification failures. ([#8256](https://github.com/paritytech/parity/pull/8256))
+- Return null number for pending block in eth_getBlockByNumber ([#8281](https://github.com/paritytech/parity/pull/8281))
+- Use constant durations ([#8278](https://github.com/paritytech/parity/pull/8278))
+- Typo fix: Mode doc - RLP should be client ([#8283](https://github.com/paritytech/parity/pull/8283))
+- Eth_uninstallfilter should return false for non-existent filter ([#8280](https://github.com/paritytech/parity/pull/8280))
+- Update `app_dirs` to 1.2.1 ([#8268](https://github.com/paritytech/parity/pull/8268))
+- Add missing license header for runtime.rs ([#8252](https://github.com/paritytech/parity/pull/8252))
+- Warp-only sync with warp-barrier [blocknumber] flag. ([#8228](https://github.com/paritytech/parity/pull/8228))
+- Replace all Rlp usages with UntrustedRlp except for ethcore views ([#8233](https://github.com/paritytech/parity/pull/8233))
+- Add test for ethstore-cli, fixes [#8027](https://github.com/paritytech/parity/issues/8027) ([#8187](https://github.com/paritytech/parity/pull/8187))
+- Update musicoin spec in line with gmc v2.6.2 ([#8242](https://github.com/paritytech/parity/pull/8242))
+- Fixed ethcore tx_filter ([#8200](https://github.com/paritytech/parity/pull/8200))
+- Update CLI help for jsonrpc-apis, ws-apis and ipc-apis ([#8234](https://github.com/paritytech/parity/pull/8234))
+- Remove network stats ([#8225](https://github.com/paritytech/parity/pull/8225))
+- Node-filter does not use ChainNotify ([#8231](https://github.com/paritytech/parity/pull/8231))
+- Implement hardcoded sync in the light client ([#8075](https://github.com/paritytech/parity/pull/8075))
+- Update some of the dependencies for WASM ([#8223](https://github.com/paritytech/parity/pull/8223))
+- Bump wasmi version ([#8209](https://github.com/paritytech/parity/pull/8209))
+- Updated jsonrpc to point to the 1.11 branch ([#8180](https://github.com/paritytech/parity/pull/8180))
+- Change name Wallet -> UI ([#8164](https://github.com/paritytech/parity/pull/8164))
+- Introduce Parity UI ([#8202](https://github.com/paritytech/parity/pull/8202))
+- Update Changelogs ([#8175](https://github.com/paritytech/parity/pull/8175))
+- Returns number of topcis to take fr.. ([#8199](https://github.com/paritytech/parity/pull/8199))
+- Make docopt usage non-const ([#8189](https://github.com/paritytech/parity/pull/8189))
+- Avoid allocations when computing triehash. ([#8176](https://github.com/paritytech/parity/pull/8176))
+- Handle rlp decoding Result in patricia trie ([#8166](https://github.com/paritytech/parity/pull/8166))
+- Bump wasm libs ([#8171](https://github.com/paritytech/parity/pull/8171))
+- Re-enable signer, even with no UI. ([#8167](https://github.com/paritytech/parity/pull/8167))
+- Update daemonize ([#8165](https://github.com/paritytech/parity/pull/8165))
+- Some tiny modifications. ([#8163](https://github.com/paritytech/parity/pull/8163))
+- Secretstore: store key author address in db ([#7887](https://github.com/paritytech/parity/pull/7887))
+- Rename DatabaseValueView::new to from_rlp ([#8159](https://github.com/paritytech/parity/pull/8159))
+- Dapps: update parity-ui dependencies ([#8160](https://github.com/paritytech/parity/pull/8160))
+- Disable UI by default. ([#8105](https://github.com/paritytech/parity/pull/8105))
+- Fix wasmi x32 builds ([#8155](https://github.com/paritytech/parity/pull/8155))
+- Postpone Kovan hard fork ([#8137](https://github.com/paritytech/parity/pull/8137))
+- Secretstore: ability to identify requester via Public/Address ([#7886](https://github.com/paritytech/parity/pull/7886))
+- Optional dependency on secp256k1 for ethcrypto ([#8109](https://github.com/paritytech/parity/pull/8109))
+- Network: init discovery using healthy nodes ([#8061](https://github.com/paritytech/parity/pull/8061))
+- Check one step deeper if we're on release track branches ([#8134](https://github.com/paritytech/parity/pull/8134))
+- Explicitly mention pruning_history uses RAM ([#8130](https://github.com/paritytech/parity/pull/8130))
+- Remove `ethcrypto::{en,de}crypt_single_message`. ([#8126](https://github.com/paritytech/parity/pull/8126))
+- Fix typo ([#8124](https://github.com/paritytech/parity/pull/8124))
+- Secret_store: use `ecies::encrypt`/`ecies::decrypt`. ([#8125](https://github.com/paritytech/parity/pull/8125))
+- Fix comment for fn gas() in wasm/runtime ([#8122](https://github.com/paritytech/parity/pull/8122))
+- Structured rlp encoding in journaldb ([#8047](https://github.com/paritytech/parity/pull/8047))
+- Ci: disable link-dead-code in coverage build ([#8118](https://github.com/paritytech/parity/pull/8118))
+- Fix trace filter returning returning unrelated reward calls, closes [#8070](https://github.com/paritytech/parity/issues/8070) ([#8098](https://github.com/paritytech/parity/pull/8098))
+- Const time comparison ([#8113](https://github.com/paritytech/parity/pull/8113))
+- Replace reqwest with hyper ([#8099](https://github.com/paritytech/parity/pull/8099))
+- More dos protection ([#8104](https://github.com/paritytech/parity/pull/8104))
+- Remove the time dependency where possible ([#8100](https://github.com/paritytech/parity/pull/8100))
+- Fix comment for gas extern in Wasm runtime ([#8101](https://github.com/paritytech/parity/pull/8101))
+- Replace std::env::temp_dir with tempdir in tests ([#8103](https://github.com/paritytech/parity/pull/8103))
+- Fix Cargo.lock not parsable ([#8102](https://github.com/paritytech/parity/pull/8102))
+- Additional data in EVMTestClient ([#7964](https://github.com/paritytech/parity/pull/7964))
+- Update serde, serde-derive, ethabi-derive, syn, quote and rlp_derive ([#8085](https://github.com/paritytech/parity/pull/8085))
+- Ethcore-service ([#8089](https://github.com/paritytech/parity/pull/8089))
+- [contract-client] refactor ([#7978](https://github.com/paritytech/parity/pull/7978))
+- Revert removing blooms ([#8066](https://github.com/paritytech/parity/pull/8066))
+- Ethcore test::helpers cleanup ([#8086](https://github.com/paritytech/parity/pull/8086))
+- Add some dos protection ([#8084](https://github.com/paritytech/parity/pull/8084))
+- Wasm libraries bump ([#7970](https://github.com/paritytech/parity/pull/7970))
+- Echo back the message hash of a ping in the pong request ([#8042](https://github.com/paritytech/parity/pull/8042))
+- Add Kovan WASM activation blocknumber ([#8057](https://github.com/paritytech/parity/pull/8057))
+- [ethkey] Unify debug/display for Address/Public/Secret ([#8076](https://github.com/paritytech/parity/pull/8076))
+- Limit incoming connections. ([#8060](https://github.com/paritytech/parity/pull/8060))
+- Max code size on Kovan ([#8067](https://github.com/paritytech/parity/pull/8067))
+- Updater: apply exponential backoff after download failure ([#8059](https://github.com/paritytech/parity/pull/8059))
+- Make blockchain functions more idiomatic, avoid needless writes to cache_man ([#8054](https://github.com/paritytech/parity/pull/8054))
+- Make patricia-trie more idiomatic and remove redundant code ([#8056](https://github.com/paritytech/parity/pull/8056))
+- Abstract devp2p ([#8048](https://github.com/paritytech/parity/pull/8048))
+- Update refs to shell ([#8051](https://github.com/paritytech/parity/pull/8051))
+- Fix cache & snapcraft CI build ([#8052](https://github.com/paritytech/parity/pull/8052))
+- Prelude to the block module cleanup ([#8025](https://github.com/paritytech/parity/pull/8025))
+- Add MCIP-6 Byzyantium transition to Musicoin spec ([#7841](https://github.com/paritytech/parity/pull/7841))
+- Bump master to 1.11.0 ([#8021](https://github.com/paritytech/parity/pull/8021))
+- `client` refactoring ([#7038](https://github.com/paritytech/parity/pull/7038))
+- [hardware wallet] sleeping -> pollling ([#8018](https://github.com/paritytech/parity/pull/8018))
+- Fixed broken link in README ([#8012](https://github.com/paritytech/parity/pull/8012))
+- Support parity protocol. ([#8035](https://github.com/paritytech/parity/pull/8035))
+- Add changelog for 1.8.11 stable and 1.9.4 beta ([#8017](https://github.com/paritytech/parity/pull/8017))
+- Fix for verify_block_basic crashing on invalid transaction rlp ([#8032](https://github.com/paritytech/parity/pull/8032))
+- Extract the hard dependency on rocksdb from the light client ([#8034](https://github.com/paritytech/parity/pull/8034))
+- Fixed parsing ethash seals and verify_block_undordered ([#8031](https://github.com/paritytech/parity/pull/8031))
+- Fixed ethstore sign ([#8026](https://github.com/paritytech/parity/pull/8026))
+- Ci: Fix cargo cache ([#7968](https://github.com/paritytech/parity/pull/7968))
+- Update ref to new shell ([#8024](https://github.com/paritytech/parity/pull/8024))

ethash/Cargo.toml

@@ -3,13 +3,11 @@ name = "ethash"
 version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
-[lib]
-
 [dependencies]
 crunchy = "0.1.0"
 either = "1.0.0"
-ethereum-types = "0.3"
-keccak-hash = { git = "https://github.com/paritytech/parity-common" }
+ethereum-types = "0.4"
+keccak-hash = "0.1"
 log = "0.4"
 memmap = "0.6"
 parking_lot = "0.6"

ethcore/Cargo.toml

@@ -15,23 +15,23 @@ common-types = { path = "types" }
 crossbeam = "0.3"
 ethash = { path = "../ethash" }
 ethcore-bloom-journal = { path = "../util/bloom" }
-parity-bytes = { git = "https://github.com/paritytech/parity-common" }
-hashdb = { git = "https://github.com/paritytech/parity-common" }
-memorydb = { git = "https://github.com/paritytech/parity-common" }
-patricia-trie = { git = "https://github.com/paritytech/parity-common" }
+parity-bytes = "0.1"
+hashdb = "0.2.1"
+memorydb = "0.2.1"
+patricia-trie = "0.2"
 patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
-parity-crypto = { git = "https://github.com/paritytech/parity-common" }
+parity-crypto = "0.1"
 error-chain = { version = "0.12", default-features = false }
 ethcore-io = { path = "../util/io" }
 ethcore-logger = { path = "../logger" }
 ethcore-miner = { path = "../miner" }
 ethcore-stratum = { path = "./stratum", optional = true }
 ethcore-transaction = { path = "./transaction" }
-ethereum-types = "0.3"
+ethereum-types = "0.4"
 memory-cache = { path = "../util/memory_cache" }
-ethabi = "5.1"
-ethabi-derive = "5.0"
-ethabi-contract = "5.0"
+ethabi = "5.1.2"
+ethabi-derive = "5.1.3"
+ethabi-contract = "5.1.1"
 ethjson = { path = "../json" }
 ethkey = { path = "../ethkey" }
 ethstore = { path = "../ethstore" }
@@ -39,7 +39,7 @@ evm = { path = "evm" }
 heapsize = "0.4"
 itertools = "0.5"
 lazy_static = "1.0"
-log = "0.3"
+log = "0.4"
 lru-cache = "0.1"
 num = { version = "0.1", default-features = false, features = ["bigint"] }
 num_cpus = "1.2"
@@ -47,26 +47,26 @@ parity-machine = { path = "../machine" }
 parking_lot = "0.6"
 rayon = "1.0"
 rand = "0.4"
-rlp = { git = "https://github.com/paritytech/parity-common" }
+rlp = { version = "0.2.4", features = ["ethereum"] }
 rlp_compress = { path = "../util/rlp_compress" }
 rlp_derive = { path = "../util/rlp_derive" }
-kvdb = { git = "https://github.com/paritytech/parity-common" }
-kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" }
-snappy = { git = "https://github.com/paritytech/rust-snappy" }
+kvdb = "0.1"
+kvdb-memorydb = "0.1"
+parity-snappy = "0.1"
 stop-guard = { path = "../util/stop-guard" }
 macros = { path = "../util/macros" }
 rustc-hex = "1.0"
 stats = { path = "../util/stats" }
-trace-time = { path = "../util/trace-time" }
+trace-time = "0.1"
 using_queue = { path = "../util/using_queue" }
 vm = { path = "vm" }
 wasm = { path = "wasm" }
-keccak-hash = { git = "https://github.com/paritytech/parity-common" }
+keccak-hash = "0.1"
 triehash-ethereum = { version = "0.2",  path = "../util/triehash-ethereum" }
 unexpected = { path = "../util/unexpected" }
 journaldb = { path = "../util/journaldb" }
 keccak-hasher = { path = "../util/keccak-hasher" }
-kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" }
+kvdb-rocksdb = "0.1.3"
 tempdir = {version="0.3", optional = true}
 
 [target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android"))'.dependencies]
@@ -77,7 +77,7 @@ fake-hardware-wallet = { path = "../util/fake-hardware-wallet" }
 
 [dev-dependencies]
 tempdir = "0.3"
-trie-standardmap = { git = "https://github.com/paritytech/parity-common" }
+trie-standardmap = "0.1"
 
 [features]
 parity = ["work-notify", "price-info", "stratum"]
@@ -102,8 +102,6 @@ evm-debug-tests = ["evm-debug", "evm/evm-debug-tests"]
 slow-blocks = []
 # Run JSON consensus tests.
 json-tests = ["ethcore-transaction/json-tests", "test-helpers", "tempdir"]
-# Skip JSON consensus tests with pending issues.
-ci-skip-issue = []
 # Run memory/cpu heavy tests.
 test-heavy = []
 # Compile benches

ethcore/benches/builtin.rs

@@ -0,0 +1,658 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+#![feature(test)]
+extern crate test;
+
+#[macro_use]
+extern crate lazy_static;
+
+extern crate ethcore;
+extern crate ethereum_types;
+extern crate parity_bytes as bytes;
+extern crate rustc_hex;
+
+use std::collections::BTreeMap;
+
+use bytes::BytesRef;
+use ethcore::builtin::Builtin;
+use ethcore::machine::EthereumMachine;
+use ethereum_types::{Address, U256};
+use ethcore::ethereum::new_byzantium_test_machine;
+use rustc_hex::FromHex;
+use self::test::Bencher;
+
+lazy_static! {
+	static ref BYZANTIUM_MACHINE: EthereumMachine = new_byzantium_test_machine();
+}
+
+struct BuiltinBenchmark<'a> {
+	builtin: &'a Builtin,
+	input: Vec<u8>,
+	expected: Vec<u8>,
+}
+
+impl<'a> BuiltinBenchmark<'a> {
+	fn new(builtin_address: &'static str, input: &str, expected: &str) -> BuiltinBenchmark<'a> {
+		let builtins = BYZANTIUM_MACHINE.builtins();
+
+		let builtin = builtins.get(&builtin_address.into()).unwrap().clone();
+		let input = FromHex::from_hex(input).unwrap();
+		let expected = FromHex::from_hex(expected).unwrap();
+
+		BuiltinBenchmark {
+			builtin, input, expected
+		}
+	}
+
+	fn gas_cost(&self) -> U256 {
+		self.builtin.cost(&self.input)
+	}
+
+	fn run(&self, b: &mut Bencher) {
+		let mut output = vec![0; self.expected.len()];
+
+		b.iter(|| {
+			self.builtin.execute(&self.input, &mut BytesRef::Fixed(&mut output)).unwrap();
+		});
+
+		assert_eq!(self.expected[..], output[..]);
+	}
+}
+
+fn bench(
+	builtin_address: &'static str,
+	input: &str,
+	expected: &str,
+	b: &mut Bencher,
+) {
+	let bench = BuiltinBenchmark::new(builtin_address, input, expected);
+
+	println!("gas cost: {}", bench.gas_cost());
+	bench.run(b);
+}
+
+#[bench]
+fn ecrecover(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000001", // ecrecover
+		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
+		"000000000000000000000000ceaccac640adf55b2028469bd36ba501f28b699d",
+		b,
+	);
+}
+
+#[bench]
+fn sha256(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000002", // sha256
+		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
+		"811c7003375852fabd0d362e40e68607a12bdabae61a7d068fe5fdd1dbbf2a5d",
+		b,
+	);
+}
+
+#[bench]
+fn ripemd(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000003", // ripemd
+		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
+		"0000000000000000000000009215b8d9882ff46f0dfde6684d78e831467f65e6",
+		b,
+	);
+}
+
+#[bench]
+fn identity(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000004", // identity
+		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
+		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
+		b,
+	);
+}
+
+#[bench]
+fn modexp_eip_example1(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		b,
+	);
+}
+
+#[bench]
+fn modexp_eip_example2(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+		"0000000000000000000000000000000000000000000000000000000000000000",
+		b,
+	);
+}
+
+#[bench]
+fn modexp_nagydani_1_square(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040e09ad9675465c53a109fac66a445c91b292d2bb2c5268addb30cd82f80fcb0033ff97c80a5fc6f39193ae969c6ede6710a6b7ac27078a06d90ef1c72e5c85fb502fc9e1f6beb81516545975218075ec2af118cd8798df6e08a147c60fd6095ac2bb02c2908cf4dd7c81f11c289e4bce98f3553768f392a80ce22bf5c4f4a248c6b",
+		"60008f1614cc01dcfb6bfb09c625cf90b47d4468db81b5f8b7a39d42f332eab9b2da8f2d95311648a8f243f4bb13cfb3d8f7f2a3c014122ebb3ed41b02783adc",
+		b,
+	);
+}
+
+#[bench]
+fn modexp_nagydani_1_qube(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040e09ad9675465c53a109fac66a445c91b292d2bb2c5268addb30cd82f80fcb0033ff97c80a5fc6f39193ae969c6ede6710a6b7ac27078a06d90ef1c72e5c85fb503fc9e1f6beb81516545975218075ec2af118cd8798df6e08a147c60fd6095ac2bb02c2908cf4dd7c81f11c289e4bce98f3553768f392a80ce22bf5c4f4a248c6b",
+		"4834a46ba565db27903b1c720c9d593e84e4cbd6ad2e64b31885d944f68cd801f92225a8961c952ddf2797fa4701b330c85c4b363798100b921a1a22a46a7fec",
+		b,
+	);
+}
+
+#[bench]
+fn modexp_nagydani_1_pow0x10001(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000040e09ad9675465c53a109fac66a445c91b292d2bb2c5268addb30cd82f80fcb0033ff97c80a5fc6f39193ae969c6ede6710a6b7ac27078a06d90ef1c72e5c85fb5010001fc9e1f6beb81516545975218075ec2af118cd8798df6e08a147c60fd6095ac2bb02c2908cf4dd7c81f11c289e4bce98f3553768f392a80ce22bf5c4f4a248c6b",
+		"c36d804180c35d4426b57b50c5bfcca5c01856d104564cd513b461d3c8b8409128a5573e416d0ebe38f5f736766d9dc27143e4da981dfa4d67f7dc474cbee6d2",
+		b,
+	);
+}
+
+#[bench]
+fn modexp_nagydani_2_square(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080cad7d991a00047dd54d3399b6b0b937c718abddef7917c75b6681f40cc15e2be0003657d8d4c34167b2f0bbbca0ccaa407c2a6a07d50f1517a8f22979ce12a81dcaf707cc0cebfc0ce2ee84ee7f77c38b9281b9822a8d3de62784c089c9b18dcb9a2a5eecbede90ea788a862a9ddd9d609c2c52972d63e289e28f6a590ffbf5102e6d893b80aeed5e6e9ce9afa8a5d5675c93a32ac05554cb20e9951b2c140e3ef4e433068cf0fb73bc9f33af1853f64aa27a0028cbf570d7ac9048eae5dc7b28c87c31e5810f1e7fa2cda6adf9f1076dbc1ec1238560071e7efc4e9565c49be9e7656951985860a558a754594115830bcdb421f741408346dd5997bb01c287087",
+		"981dd99c3b113fae3e3eaa9435c0dc96779a23c12a53d1084b4f67b0b053a27560f627b873e3f16ad78f28c94f14b6392def26e4d8896c5e3c984e50fa0b3aa44f1da78b913187c6128baa9340b1e9c9a0fd02cb78885e72576da4a8f7e5a113e173a7a2889fde9d407bd9f06eb05bc8fc7b4229377a32941a02bf4edcc06d70",
+		b,
+	);
+}
+
+
+#[bench]
+fn modexp_nagydani_2_qube(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080cad7d991a00047dd54d3399b6b0b937c718abddef7917c75b6681f40cc15e2be0003657d8d4c34167b2f0bbbca0ccaa407c2a6a07d50f1517a8f22979ce12a81dcaf707cc0cebfc0ce2ee84ee7f77c38b9281b9822a8d3de62784c089c9b18dcb9a2a5eecbede90ea788a862a9ddd9d609c2c52972d63e289e28f6a590ffbf5103e6d893b80aeed5e6e9ce9afa8a5d5675c93a32ac05554cb20e9951b2c140e3ef4e433068cf0fb73bc9f33af1853f64aa27a0028cbf570d7ac9048eae5dc7b28c87c31e5810f1e7fa2cda6adf9f1076dbc1ec1238560071e7efc4e9565c49be9e7656951985860a558a754594115830bcdb421f741408346dd5997bb01c287087",
+		"d89ceb68c32da4f6364978d62aaa40d7b09b59ec61eb3c0159c87ec3a91037f7dc6967594e530a69d049b64adfa39c8fa208ea970cfe4b7bcd359d345744405afe1cbf761647e32b3184c7fbe87cee8c6c7ff3b378faba6c68b83b6889cb40f1603ee68c56b4c03d48c595c826c041112dc941878f8c5be828154afd4a16311f",
+		b,
+	);
+}
+
+#[bench]
+fn modexp_nagydani_2_pow0x10001(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000080cad7d991a00047dd54d3399b6b0b937c718abddef7917c75b6681f40cc15e2be0003657d8d4c34167b2f0bbbca0ccaa407c2a6a07d50f1517a8f22979ce12a81dcaf707cc0cebfc0ce2ee84ee7f77c38b9281b9822a8d3de62784c089c9b18dcb9a2a5eecbede90ea788a862a9ddd9d609c2c52972d63e289e28f6a590ffbf51010001e6d893b80aeed5e6e9ce9afa8a5d5675c93a32ac05554cb20e9951b2c140e3ef4e433068cf0fb73bc9f33af1853f64aa27a0028cbf570d7ac9048eae5dc7b28c87c31e5810f1e7fa2cda6adf9f1076dbc1ec1238560071e7efc4e9565c49be9e7656951985860a558a754594115830bcdb421f741408346dd5997bb01c287087",
+		"ad85e8ef13fd1dd46eae44af8b91ad1ccae5b7a1c92944f92a19f21b0b658139e0cabe9c1f679507c2de354bf2c91ebd965d1e633978a830d517d2f6f8dd5fd58065d58559de7e2334a878f8ec6992d9b9e77430d4764e863d77c0f87beede8f2f7f2ab2e7222f85cc9d98b8467f4bb72e87ef2882423ebdb6daf02dddac6db2",
+		b,
+	);
+}
+
+#[bench]
+fn modexp_nagydani_3_square(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000100c9130579f243e12451760976261416413742bd7c91d39ae087f46794062b8c239f2a74abf3918605a0e046a7890e049475ba7fbb78f5de6490bd22a710cc04d30088179a919d86c2da62cf37f59d8f258d2310d94c24891be2d7eeafaa32a8cb4b0cfe5f475ed778f45907dc8916a73f03635f233f7a77a00a3ec9ca6761a5bbd558a2318ecd0caa1c5016691523e7e1fa267dd35e70c66e84380bdcf7c0582f540174e572c41f81e93da0b757dff0b0fe23eb03aa19af0bdec3afb474216febaacb8d0381e631802683182b0fe72c28392539850650b70509f54980241dc175191a35d967288b532a7a8223ce2440d010615f70df269501944d4ec16fe4a3cb02d7a85909174757835187cb52e71934e6c07ef43b4c46fc30bbcd0bc72913068267c54a4aabebb493922492820babdeb7dc9b1558fcf7bd82c37c82d3147e455b623ab0efa752fe0b3a67ca6e4d126639e645a0bf417568adbb2a6a4eef62fa1fa29b2a5a43bebea1f82193a7dd98eb483d09bb595af1fa9c97c7f41f5649d976aee3e5e59e2329b43b13bea228d4a93f16ba139ccb511de521ffe747aa2eca664f7c9e33da59075cc335afcd2bf3ae09765f01ab5a7c3e3938ec168b74724b5074247d200d9970382f683d6059b94dbc336603d1dfee714e4b447ac2fa1d99ecb4961da2854e03795ed758220312d101e1e3d87d5313a6d052aebde75110363d",
+		"affc7507ea6d84751ec6b3f0d7b99dbcc263f33330e450d1b3ff0bc3d0874320bf4edd57debd587306988157958cb3cfd369cc0c9c198706f635c9e0f15d047df5cb44d03e2727f26b083c4ad8485080e1293f171c1ed52aef5993a5815c35108e848c951cf1e334490b4a539a139e57b68f44fee583306f5b85ffa57206b3ee5660458858534e5386b9584af3c7f67806e84c189d695e5eb96e1272d06ec2df5dc5fabc6e94b793718c60c36be0a4d031fc84cd658aa72294b2e16fc240aef70cb9e591248e38bd49c5a554d1afa01f38dab72733092f7555334bbef6c8c430119840492380aa95fa025dcf699f0a39669d812b0c6946b6091e6e235337b6f8",
+		b,
+	);
+}
+
+#[bench]
+fn modexp_nagydani_3_qube(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000100c9130579f243e12451760976261416413742bd7c91d39ae087f46794062b8c239f2a74abf3918605a0e046a7890e049475ba7fbb78f5de6490bd22a710cc04d30088179a919d86c2da62cf37f59d8f258d2310d94c24891be2d7eeafaa32a8cb4b0cfe5f475ed778f45907dc8916a73f03635f233f7a77a00a3ec9ca6761a5bbd558a2318ecd0caa1c5016691523e7e1fa267dd35e70c66e84380bdcf7c0582f540174e572c41f81e93da0b757dff0b0fe23eb03aa19af0bdec3afb474216febaacb8d0381e631802683182b0fe72c28392539850650b70509f54980241dc175191a35d967288b532a7a8223ce2440d010615f70df269501944d4ec16fe4a3cb03d7a85909174757835187cb52e71934e6c07ef43b4c46fc30bbcd0bc72913068267c54a4aabebb493922492820babdeb7dc9b1558fcf7bd82c37c82d3147e455b623ab0efa752fe0b3a67ca6e4d126639e645a0bf417568adbb2a6a4eef62fa1fa29b2a5a43bebea1f82193a7dd98eb483d09bb595af1fa9c97c7f41f5649d976aee3e5e59e2329b43b13bea228d4a93f16ba139ccb511de521ffe747aa2eca664f7c9e33da59075cc335afcd2bf3ae09765f01ab5a7c3e3938ec168b74724b5074247d200d9970382f683d6059b94dbc336603d1dfee714e4b447ac2fa1d99ecb4961da2854e03795ed758220312d101e1e3d87d5313a6d052aebde75110363d",
+		"1b280ecd6a6bf906b806d527c2a831e23b238f89da48449003a88ac3ac7150d6a5e9e6b3be4054c7da11dd1e470ec29a606f5115801b5bf53bc1900271d7c3ff3cd5ed790d1c219a9800437a689f2388ba1a11d68f6a8e5b74e9a3b1fac6ee85fc6afbac599f93c391f5dc82a759e3c6c0ab45ce3f5d25d9b0c1bf94cf701ea6466fc9a478dacc5754e593172b5111eeba88557048bceae401337cd4c1182ad9f700852bc8c99933a193f0b94cf1aedbefc48be3bc93ef5cb276d7c2d5462ac8bb0c8fe8923a1db2afe1c6b90d59c534994a6a633f0ead1d638fdc293486bb634ff2c8ec9e7297c04241a61c37e3ae95b11d53343d4ba2b4cc33d2cfa7eb705e",
+		b,
+	);
+}
+
+#[bench]
+fn modexp_nagydani_3_pow0x10001(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000100c9130579f243e12451760976261416413742bd7c91d39ae087f46794062b8c239f2a74abf3918605a0e046a7890e049475ba7fbb78f5de6490bd22a710cc04d30088179a919d86c2da62cf37f59d8f258d2310d94c24891be2d7eeafaa32a8cb4b0cfe5f475ed778f45907dc8916a73f03635f233f7a77a00a3ec9ca6761a5bbd558a2318ecd0caa1c5016691523e7e1fa267dd35e70c66e84380bdcf7c0582f540174e572c41f81e93da0b757dff0b0fe23eb03aa19af0bdec3afb474216febaacb8d0381e631802683182b0fe72c28392539850650b70509f54980241dc175191a35d967288b532a7a8223ce2440d010615f70df269501944d4ec16fe4a3cb010001d7a85909174757835187cb52e71934e6c07ef43b4c46fc30bbcd0bc72913068267c54a4aabebb493922492820babdeb7dc9b1558fcf7bd82c37c82d3147e455b623ab0efa752fe0b3a67ca6e4d126639e645a0bf417568adbb2a6a4eef62fa1fa29b2a5a43bebea1f82193a7dd98eb483d09bb595af1fa9c97c7f41f5649d976aee3e5e59e2329b43b13bea228d4a93f16ba139ccb511de521ffe747aa2eca664f7c9e33da59075cc335afcd2bf3ae09765f01ab5a7c3e3938ec168b74724b5074247d200d9970382f683d6059b94dbc336603d1dfee714e4b447ac2fa1d99ecb4961da2854e03795ed758220312d101e1e3d87d5313a6d052aebde75110363d",
+		"37843d7c67920b5f177372fa56e2a09117df585f81df8b300fba245b1175f488c99476019857198ed459ed8d9799c377330e49f4180c4bf8e8f66240c64f65ede93d601f957b95b83efdee1e1bfde74169ff77002eaf078c71815a9220c80b2e3b3ff22c2f358111d816ebf83c2999026b6de50bfc711ff68705d2f40b753424aefc9f70f08d908b5a20276ad613b4ab4309a3ea72f0c17ea9df6b3367d44fb3acab11c333909e02e81ea2ed404a712d3ea96bba87461720e2d98723e7acd0520ac1a5212dbedcd8dc0c1abf61d4719e319ff4758a774790b8d463cdfe131d1b2dcfee52d002694e98e720cb6ae7ccea353bc503269ba35f0f63bf8d7b672a76",
+		b,
+	);
+}
+
+#[bench]
+fn modexp_nagydani_4_square(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000200db34d0e438249c0ed685c949cc28776a05094e1c48691dc3f2dca5fc3356d2a0663bd376e4712839917eb9a19c670407e2c377a2de385a3ff3b52104f7f1f4e0c7bf7717fb913896693dc5edbb65b760ef1b00e42e9d8f9af17352385e1cd742c9b006c0f669995cb0bb21d28c0aced2892267637b6470d8cee0ab27fc5d42658f6e88240c31d6774aa60a7ebd25cd48b56d0da11209f1928e61005c6eb709f3e8e0aaf8d9b10f7d7e296d772264dc76897ccdddadc91efa91c1903b7232a9e4c3b941917b99a3bc0c26497dedc897c25750af60237aa67934a26a2bc491db3dcc677491944bc1f51d3e5d76b8d846a62db03dedd61ff508f91a56d71028125035c3a44cbb041497c83bf3e4ae2a9613a401cc721c547a2afa3b16a2969933d3626ed6d8a7428648f74122fd3f2a02a20758f7f693892c8fd798b39abac01d18506c45e71432639e9f9505719ee822f62ccbf47f6850f096ff77b5afaf4be7d772025791717dbe5abf9b3f40cff7d7aab6f67e38f62faf510747276e20a42127e7500c444f9ed92baf65ade9e836845e39c4316d9dce5f8e2c8083e2c0acbb95296e05e51aab13b6b8f53f06c9c4276e12b0671133218cc3ea907da3bd9a367096d9202128d14846cc2e20d56fc8473ecb07cecbfb8086919f3971926e7045b853d85a69d026195c70f9f7a823536e2a8f4b3e12e94d9b53a934353451094b8102df3143a0057457d75e8c708b6337a6f5a4fd1a06727acf9fb93e2993c62f3378b37d56c85e7b1e00f0145ebf8e4095bd723166293c60b6ac1252291ef65823c9e040ddad14969b3b340a4ef714db093a587c37766d68b8d6b5016e741587e7e6bf7e763b44f0247e64bae30f994d248bfd20541a333e5b225ef6a61199e301738b1e688f70ec1d7fb892c183c95dc543c3e12adf8a5e8b9ca9d04f9445cced3ab256f29e998e69efaa633a7b60e1db5a867924ccab0a171d9d6e1098dfa15acde9553de599eaa56490c8f411e4985111f3d40bddfc5e301edb01547b01a886550a61158f7e2033c59707789bf7c854181d0c2e2a42a93cf09209747d7082e147eb8544de25c3eb14f2e35559ea0c0f5877f2f3fc92132c0ae9da4e45b2f6c866a224ea6d1f28c05320e287750fbc647368d41116e528014cc1852e5531d53e4af938374daba6cee4baa821ed07117253bb3601ddd00d59a3d7fb2ef1f5a2fbba7c429f0cf9a5b3462410fd833a69118f8be9c559b1000cc608fd877fb43f8e65c2d1302622b944462579056874b387208d90623fcdaf93920ca7a9e4ba64ea208758222ad868501cc2c345e2d3a5ea2a17e5069248138c8a79c0251185d29ee73e5afab5354769142d2bf0cb6712727aa6bf84a6245fcdae66e4938d84d1b9dd09a884818622080ff5f98942fb20acd7e0c916c2d5ea7ce6f7e173315384518f",
+		"8a5aea5f50dcc03dc7a7a272b5aeebc040554dbc1ffe36753c4fc75f7ed5f6c2cc0de3a922bf96c78bf0643a73025ad21f45a4a5cadd717612c511ab2bff1190fe5f1ae05ba9f8fe3624de1de2a817da6072ddcdb933b50216811dbe6a9ca79d3a3c6b3a476b079fd0d05f04fb154e2dd3e5cb83b148a006f2bcbf0042efb2ae7b916ea81b27aac25c3bf9a8b6d35440062ad8eae34a83f3ffa2cc7b40346b62174a4422584f72f95316f6b2bee9ff232ba9739301c97c99a9ded26c45d72676eb856ad6ecc81d36a6de36d7f9dafafee11baa43a4b0d5e4ecffa7b9b7dcefd58c397dd373e6db4acd2b2c02717712e6289bed7c813b670c4a0c6735aa7f3b0f1ce556eae9fcc94b501b2c8781ba50a8c6220e8246371c3c7359fe4ef9da786ca7d98256754ca4e496be0a9174bedbecb384bdf470779186d6a833f068d2838a88d90ef3ad48ff963b67c39cc5a3ee123baf7bf3125f64e77af7f30e105d72c4b9b5b237ed251e4c122c6d8c1405e736299c3afd6db16a28c6a9cfa68241e53de4cd388271fe534a6a9b0dbea6171d170db1b89858468885d08fecbd54c8e471c3e25d48e97ba450b96d0d87e00ac732aaa0d3ce4309c1064bd8a4c0808a97e0143e43a24cfa847635125cd41c13e0574487963e9d725c01375db99c31da67b4cf65eff555f0c0ac416c727ff8d438ad7c42030551d68c2e7adda0abb1ca7c10",
+		b,
+	);
+}
+
+#[bench]
+fn modexp_nagydani_4_qube(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000200db34d0e438249c0ed685c949cc28776a05094e1c48691dc3f2dca5fc3356d2a0663bd376e4712839917eb9a19c670407e2c377a2de385a3ff3b52104f7f1f4e0c7bf7717fb913896693dc5edbb65b760ef1b00e42e9d8f9af17352385e1cd742c9b006c0f669995cb0bb21d28c0aced2892267637b6470d8cee0ab27fc5d42658f6e88240c31d6774aa60a7ebd25cd48b56d0da11209f1928e61005c6eb709f3e8e0aaf8d9b10f7d7e296d772264dc76897ccdddadc91efa91c1903b7232a9e4c3b941917b99a3bc0c26497dedc897c25750af60237aa67934a26a2bc491db3dcc677491944bc1f51d3e5d76b8d846a62db03dedd61ff508f91a56d71028125035c3a44cbb041497c83bf3e4ae2a9613a401cc721c547a2afa3b16a2969933d3626ed6d8a7428648f74122fd3f2a02a20758f7f693892c8fd798b39abac01d18506c45e71432639e9f9505719ee822f62ccbf47f6850f096ff77b5afaf4be7d772025791717dbe5abf9b3f40cff7d7aab6f67e38f62faf510747276e20a42127e7500c444f9ed92baf65ade9e836845e39c4316d9dce5f8e2c8083e2c0acbb95296e05e51aab13b6b8f53f06c9c4276e12b0671133218cc3ea907da3bd9a367096d9202128d14846cc2e20d56fc8473ecb07cecbfb8086919f3971926e7045b853d85a69d026195c70f9f7a823536e2a8f4b3e12e94d9b53a934353451094b8103df3143a0057457d75e8c708b6337a6f5a4fd1a06727acf9fb93e2993c62f3378b37d56c85e7b1e00f0145ebf8e4095bd723166293c60b6ac1252291ef65823c9e040ddad14969b3b340a4ef714db093a587c37766d68b8d6b5016e741587e7e6bf7e763b44f0247e64bae30f994d248bfd20541a333e5b225ef6a61199e301738b1e688f70ec1d7fb892c183c95dc543c3e12adf8a5e8b9ca9d04f9445cced3ab256f29e998e69efaa633a7b60e1db5a867924ccab0a171d9d6e1098dfa15acde9553de599eaa56490c8f411e4985111f3d40bddfc5e301edb01547b01a886550a61158f7e2033c59707789bf7c854181d0c2e2a42a93cf09209747d7082e147eb8544de25c3eb14f2e35559ea0c0f5877f2f3fc92132c0ae9da4e45b2f6c866a224ea6d1f28c05320e287750fbc647368d41116e528014cc1852e5531d53e4af938374daba6cee4baa821ed07117253bb3601ddd00d59a3d7fb2ef1f5a2fbba7c429f0cf9a5b3462410fd833a69118f8be9c559b1000cc608fd877fb43f8e65c2d1302622b944462579056874b387208d90623fcdaf93920ca7a9e4ba64ea208758222ad868501cc2c345e2d3a5ea2a17e5069248138c8a79c0251185d29ee73e5afab5354769142d2bf0cb6712727aa6bf84a6245fcdae66e4938d84d1b9dd09a884818622080ff5f98942fb20acd7e0c916c2d5ea7ce6f7e173315384518f",
+		"5a2664252aba2d6e19d9600da582cdd1f09d7a890ac48e6b8da15ae7c6ff1856fc67a841ac2314d283ffa3ca81a0ecf7c27d89ef91a5a893297928f5da0245c99645676b481b7e20a566ee6a4f2481942bee191deec5544600bb2441fd0fb19e2ee7d801ad8911c6b7750affec367a4b29a22942c0f5f4744a4e77a8b654da2a82571037099e9c6d930794efe5cdca73c7b6c0844e386bdca8ea01b3d7807146bb81365e2cdc6475f8c23e0ff84463126189dc9789f72bbce2e3d2d114d728a272f1345122de23df54c922ec7a16e5c2a8f84da8871482bd258c20a7c09bbcd64c7a96a51029bbfe848736a6ba7bf9d931a9b7de0bcaf3635034d4958b20ae9ab3a95a147b0421dd5f7ebff46c971010ebfc4adbbe0ad94d5498c853e7142c450d8c71de4b2f84edbf8acd2e16d00c8115b150b1c30e553dbb82635e781379fe2a56360420ff7e9f70cc64c00aba7e26ed13c7c19622865ae07248daced36416080f35f8cc157a857ed70ea4f347f17d1bee80fa038abd6e39b1ba06b97264388b21364f7c56e192d4b62d9b161405f32ab1e2594e86243e56fcf2cb30d21adef15b9940f91af681da24328c883d892670c6aa47940867a81830a82b82716895db810df1b834640abefb7db2092dd92912cb9a735175bc447be40a503cf22dfe565b4ed7a3293ca0dfd63a507430b323ee248ec82e843b673c97ad730728cebc",
+		b,
+	);
+}
+
+#[bench]
+fn modexp_nagydani_4_pow0x10001(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000200db34d0e438249c0ed685c949cc28776a05094e1c48691dc3f2dca5fc3356d2a0663bd376e4712839917eb9a19c670407e2c377a2de385a3ff3b52104f7f1f4e0c7bf7717fb913896693dc5edbb65b760ef1b00e42e9d8f9af17352385e1cd742c9b006c0f669995cb0bb21d28c0aced2892267637b6470d8cee0ab27fc5d42658f6e88240c31d6774aa60a7ebd25cd48b56d0da11209f1928e61005c6eb709f3e8e0aaf8d9b10f7d7e296d772264dc76897ccdddadc91efa91c1903b7232a9e4c3b941917b99a3bc0c26497dedc897c25750af60237aa67934a26a2bc491db3dcc677491944bc1f51d3e5d76b8d846a62db03dedd61ff508f91a56d71028125035c3a44cbb041497c83bf3e4ae2a9613a401cc721c547a2afa3b16a2969933d3626ed6d8a7428648f74122fd3f2a02a20758f7f693892c8fd798b39abac01d18506c45e71432639e9f9505719ee822f62ccbf47f6850f096ff77b5afaf4be7d772025791717dbe5abf9b3f40cff7d7aab6f67e38f62faf510747276e20a42127e7500c444f9ed92baf65ade9e836845e39c4316d9dce5f8e2c8083e2c0acbb95296e05e51aab13b6b8f53f06c9c4276e12b0671133218cc3ea907da3bd9a367096d9202128d14846cc2e20d56fc8473ecb07cecbfb8086919f3971926e7045b853d85a69d026195c70f9f7a823536e2a8f4b3e12e94d9b53a934353451094b81010001df3143a0057457d75e8c708b6337a6f5a4fd1a06727acf9fb93e2993c62f3378b37d56c85e7b1e00f0145ebf8e4095bd723166293c60b6ac1252291ef65823c9e040ddad14969b3b340a4ef714db093a587c37766d68b8d6b5016e741587e7e6bf7e763b44f0247e64bae30f994d248bfd20541a333e5b225ef6a61199e301738b1e688f70ec1d7fb892c183c95dc543c3e12adf8a5e8b9ca9d04f9445cced3ab256f29e998e69efaa633a7b60e1db5a867924ccab0a171d9d6e1098dfa15acde9553de599eaa56490c8f411e4985111f3d40bddfc5e301edb01547b01a886550a61158f7e2033c59707789bf7c854181d0c2e2a42a93cf09209747d7082e147eb8544de25c3eb14f2e35559ea0c0f5877f2f3fc92132c0ae9da4e45b2f6c866a224ea6d1f28c05320e287750fbc647368d41116e528014cc1852e5531d53e4af938374daba6cee4baa821ed07117253bb3601ddd00d59a3d7fb2ef1f5a2fbba7c429f0cf9a5b3462410fd833a69118f8be9c559b1000cc608fd877fb43f8e65c2d1302622b944462579056874b387208d90623fcdaf93920ca7a9e4ba64ea208758222ad868501cc2c345e2d3a5ea2a17e5069248138c8a79c0251185d29ee73e5afab5354769142d2bf0cb6712727aa6bf84a6245fcdae66e4938d84d1b9dd09a884818622080ff5f98942fb20acd7e0c916c2d5ea7ce6f7e173315384518f",
+		"bed8b970c4a34849fc6926b08e40e20b21c15ed68d18f228904878d4370b56322d0da5789da0318768a374758e6375bfe4641fca5285ec7171828922160f48f5ca7efbfee4d5148612c38ad683ae4e3c3a053d2b7c098cf2b34f2cb19146eadd53c86b2d7ccf3d83b2c370bfb840913ee3879b1057a6b4e07e110b6bcd5e958bc71a14798c91d518cc70abee264b0d25a4110962a764b364ac0b0dd1ee8abc8426d775ec0f22b7e47b32576afaf1b5a48f64573ed1c5c29f50ab412188d9685307323d990802b81dacc06c6e05a1e901830ba9fcc67688dc29c5e27bde0a6e845ca925f5454b6fb3747edfaa2a5820838fb759eadf57f7cb5cec57fc213ddd8a4298fa079c3c0f472b07fb15aa6a7f0a3780bd296ff6a62e58ef443870b02260bd4fd2bbc98255674b8e1f1f9f8d33c7170b0ebbea4523b695911abbf26e41885344823bd0587115fdd83b721a4e8457a31c9a84b3d3520a07e0e35df7f48e5a9d534d0ec7feef1ff74de6a11e7f93eab95175b6ce22c68d78a642ad642837897ec11349205d8593ac19300207572c38d29ca5dfa03bc14cdbc32153c80e5cc3e739403d34c75915e49beb43094cc6dcafb3665b305ddec9286934ae66ec6b777ca528728c851318eb0f207b39f1caaf96db6eeead6b55ed08f451939314577d42bcc9f97c0b52d0234f88fd07e4c1d7780fdebc025cfffcb572cb27a8c33963",
+		b,
+	);
+}
+
+#[bench]
+fn modexp_nagydani_5_square(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000400c5a1611f8be90071a43db23cc2fe01871cc4c0e8ab5743f6378e4fef77f7f6db0095c0727e20225beb665645403453e325ad5f9aeb9ba99bf3c148f63f9c07cf4fe8847ad5242d6b7d4499f93bd47056ddab8f7dee878fc2314f344dbee2a7c41a5d3db91eff372c730c2fdd3a141a4b61999e36d549b9870cf2f4e632c4d5df5f024f81c028000073a0ed8847cfb0593d36a47142f578f05ccbe28c0c06aeb1b1da027794c48db880278f79ba78ae64eedfea3c07d10e0562668d839749dc95f40467d15cf65b9cfc52c7c4bcef1cda3596dd52631aac942f146c7cebd46065131699ce8385b0db1874336747ee020a5698a3d1a1082665721e769567f579830f9d259cec1a836845109c21cf6b25da572512bf3c42fd4b96e43895589042ab60dd41f497db96aec102087fe784165bb45f942859268fd2ff6c012d9d00c02ba83eace047cc5f7b2c392c2955c58a49f0338d6fc58749c9db2155522ac17914ec216ad87f12e0ee95574613942fa615898c4d9e8a3be68cd6afa4e7a003dedbdf8edfee31162b174f965b20ae752ad89c967b3068b6f722c16b354456ba8e280f987c08e0a52d40a2e8f3a59b94d590aeef01879eb7a90b3ee7d772c839c85519cbeaddc0c193ec4874a463b53fcaea3271d80ebfb39b33489365fc039ae549a17a9ff898eea2f4cb27b8dbee4c17b998438575b2b8d107e4a0d66ba7fca85b41a58a8d51f191a35c856dfbe8aef2b00048a694bbccff832d23c8ca7a7ff0b6c0b3011d00b97c86c0628444d267c951d9e4fb8f83e154b8f74fb51aa16535e498235c5597dac9606ed0be3173a3836baa4e7d756ffe1e2879b415d3846bccd538c05b847785699aefde3e305decb600cd8fb0e7d8de5efc26971a6ad4e6d7a2d91474f1023a0ac4b78dc937da0ce607a45974d2cac1c33a2631ff7fe6144a3b2e5cf98b531a9627dea92c1dc82204d09db0439b6a11dd64b484e1263aa45fd9539b6020b55e3baece3986a8bffc1003406348f5c61265099ed43a766ee4f93f5f9c5abbc32a0fd3ac2b35b87f9ec26037d88275bd7dd0a54474995ee34ed3727f3f97c48db544b1980193a4b76a8a3ddab3591ce527f16d91882e67f0103b5cda53f7da54d489fc4ac08b6ab358a5a04aa9daa16219d50bd672a7cb804ed769d218807544e5993f1c27427104b349906a0b654df0bf69328afd3013fbe430155339c39f236df5557bf92f1ded7ff609a8502f49064ec3d1dbfb6c15d3a4c11a4f8acd12278cbf68acd5709463d12e3338a6eddb8c112f199645e23154a8e60879d2a654e3ed9296aa28f134168619691cd2c6b9e2eba4438381676173fc63c2588a3c5910dc149cf3760f0aa9fa9c3f5faa9162b0bf1aac9dd32b706a60ef53cbdb394b6b40222b5bc80eea82ba8958386672564cae3794f977871ab62337cf02e30049201ec12937e7ce79d0f55d9c810e20acf52212aca1d3888949e0e4830aad88d804161230eb89d4d329cc83570fe257217d2119134048dd2ed167646975fc7d77136919a049ea74cf08ddd2b896890bb24a0ba18094a22baa351bf29ad96c66bbb1a598f2ca391749620e62d61c3561a7d3653ccc8892c7b99baaf76bf836e2991cb06d6bc0514568ff0d1ec8bb4b3d6984f5eaefb17d3ea2893722375d3ddb8e389a8eef7d7d198f8e687d6a513983df906099f9a2d23f4f9dec6f8ef2f11fc0a21fac45353b94e00486f5e17d386af42502d09db33cf0cf28310e049c07e88682aeeb00cb833c5174266e62407a57583f1f88b304b7c6e0c84bbe1c0fd423072d37a5bd0aacf764229e5c7cd02473460ba3645cd8e8ae144065bf02d0dd238593d8e230354f67e0b2f23012c23274f80e3ee31e35e2606a4a3f31d94ab755e6d163cff52cbb36b6d0cc67ffc512aeed1dce4d7a0d70ce82f2baba12e8d514dc92a056f994adfb17b5b9712bd5186f27a2fda1f7039c5df2c8587fdc62f5627580c13234b55be4df3056050e2d1ef3218f0dd66cb05265fe1acfb0989d8213f2c19d1735a7cf3fa65d88dad5af52dc2bba22b7abf46c3bc77b5091baab9e8f0ddc4d5e581037de91a9f8dcbc69309be29cc815cf19a20a7585b8b3073edf51fc9baeb3e509b97fa4ecfd621e0fd57bd61cac1b895c03248ff12bdbc57509250df3517e8a3fe1d776836b34ab352b973d932ef708b14f7418f9eceb1d87667e61e3e758649cb083f01b133d37ab2f5afa96d6c84bcacf4efc3851ad308c1e7d9113624fce29fab460ab9d2a48d92cdb281103a5250ad44cb2ff6e67ac670c02fdafb3e0f1353953d6d7d5646ca1568dea55275a050ec501b7c6250444f7219f1ba7521ba3b93d089727ca5f3bbe0d6c1300b423377004954c5628fdb65770b18ced5c9b23a4a5a6d6ef25fe01b4ce278de0bcc4ed86e28a0a68818ffa40970128cf2c38740e80037984428c1bd5113f40ff47512ee6f4e4d8f9b8e8e1b3040d2928d003bd1c1329dc885302fbce9fa81c23b4dc49c7c82d29b52957847898676c89aa5d32b5b0e1c0d5a2b79a19d67562f407f19425687971a957375879d90c5f57c857136c17106c9ab1b99d80e69c8c954ed386493368884b55c939b8d64d26f643e800c56f90c01079d7c534e3b2b7ae352cefd3016da55f6a85eb803b85e2304915fd2001f77c74e28746293c46e4f5f0fd49cf988aafd0026b8e7a3bab2da5cdce1ea26c2e29ec03f4807fac432662b2d6c060be1c7be0e5489de69d0a6e03a4b9117f9244b34a0f1ecba89884f781c6320412413a00c4980287409a2a78c2cd7e65cecebbe4ec1c28cac4dd95f6998e78fc6f1392384331c9436aa10e10e2bf8ad2c4eafbcf276aa7bae64b74428911b3269c749338b0fc5075ad",
+		"d61fe4e3f32ac260915b5b03b78a86d11bfc41d973fce5b0cc59035cf8289a8a2e3878ea15fa46565b0d806e2f85b53873ea20ed653869b688adf83f3ef444535bf91598ff7e80f334fb782539b92f39f55310cc4b35349ab7b278346eda9bc37c0d8acd3557fae38197f412f8d9e57ce6a76b7205c23564cab06e5615be7c6f05c3d05ec690cba91da5e89d55b152ff8dd2157dc5458190025cf94b1ad98f7cbe64e9482faba95e6b33844afc640892872b44a9932096508f4a782a4805323808f23e54b6ff9b841dbfa87db3505ae4f687972c18ea0f0d0af89d36c1c2a5b14560c153c3fee406f5cf15cfd1c0bb45d767426d465f2f14c158495069d0c5955a00150707862ecaae30624ebacdd8ac33e4e6aab3ff90b6ba445a84689386b9e945d01823a65874444316e83767290fcff630d2477f49d5d8ffdd200e08ee1274270f86ed14c687895f6caf5ce528bd970c20d2408a9ba66216324c6a011ac4999098362dbd98a038129a2d40c8da6ab88318aa3046cb660327cc44236d9e5d2163bd0959062195c51ed93d0088b6f92051fc99050ece2538749165976233697ab4b610385366e5ce0b02ad6b61c168ecfbedcdf74278a38de340fd7a5fead8e588e294795f9b011e2e60377a89e25c90e145397cdeabc60fd32444a6b7642a611a83c464d8b8976666351b4865c37b02e6dc21dbcdf5f930341707b618cc0f03c3122646b3385c9df9f2ec730eec9d49e7dfc9153b6e6289da8c4f0ebea9ccc1b751948e3bb7171c9e4d57423b0eeeb79095c030cb52677b3f7e0b45c30f645391f3f9c957afa549c4e0b2465b03c67993cd200b1af01035962edbc4c9e89b31c82ac121987d6529dafdeef67a132dc04b6dc68e77f22862040b75e2ceb9ff16da0fca534e6db7bd12fa7b7f51b6c08c1e23dfcdb7acbd2da0b51c87ffbced065a612e9b1c8bba9b7e2d8d7a2f04fcc4aaf355b60d764879a76b5e16762d5f2f55d585d0c8e82df6940960cddfb72c91dfa71f6b4e1c6ca25dfc39a878e998a663c04fe29d5e83b9586d047b4d7ff70a9f0d44f127e7d741685ca75f11629128d916a0ffef4be586a30c4b70389cc746e84ebf177c01ee8a4511cfbb9d1ecf7f7b33c7dd8177896e10bbc82f838dcd6db7ac67de62bf46b6a640fb580c5d1d2708f3862e3d2b645d0d18e49ef088053e3a220adc0e033c2afcfe61c90e32151152eb3caaf746c5e377d541cafc6cbb0cc0fa48b5caf1728f2e1957f5addfc234f1a9d89e40d49356c9172d0561a695fce6dab1d412321bbf407f63766ffd7b6b3d79bcfa07991c5a9709849c1008689e3b47c50d613980bec239fb64185249d055b30375ccb4354d71fe4d05648fbf6c80634dfc3575f2f24abb714c1e4c95e8896763bf4316e954c7ad19e5780ab7a040ca6fb9271f90a8b22ae738daf6cb",
+		b,
+	);
+}
+
+#[bench]
+fn modexp_nagydani_5_qube(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000400c5a1611f8be90071a43db23cc2fe01871cc4c0e8ab5743f6378e4fef77f7f6db0095c0727e20225beb665645403453e325ad5f9aeb9ba99bf3c148f63f9c07cf4fe8847ad5242d6b7d4499f93bd47056ddab8f7dee878fc2314f344dbee2a7c41a5d3db91eff372c730c2fdd3a141a4b61999e36d549b9870cf2f4e632c4d5df5f024f81c028000073a0ed8847cfb0593d36a47142f578f05ccbe28c0c06aeb1b1da027794c48db880278f79ba78ae64eedfea3c07d10e0562668d839749dc95f40467d15cf65b9cfc52c7c4bcef1cda3596dd52631aac942f146c7cebd46065131699ce8385b0db1874336747ee020a5698a3d1a1082665721e769567f579830f9d259cec1a836845109c21cf6b25da572512bf3c42fd4b96e43895589042ab60dd41f497db96aec102087fe784165bb45f942859268fd2ff6c012d9d00c02ba83eace047cc5f7b2c392c2955c58a49f0338d6fc58749c9db2155522ac17914ec216ad87f12e0ee95574613942fa615898c4d9e8a3be68cd6afa4e7a003dedbdf8edfee31162b174f965b20ae752ad89c967b3068b6f722c16b354456ba8e280f987c08e0a52d40a2e8f3a59b94d590aeef01879eb7a90b3ee7d772c839c85519cbeaddc0c193ec4874a463b53fcaea3271d80ebfb39b33489365fc039ae549a17a9ff898eea2f4cb27b8dbee4c17b998438575b2b8d107e4a0d66ba7fca85b41a58a8d51f191a35c856dfbe8aef2b00048a694bbccff832d23c8ca7a7ff0b6c0b3011d00b97c86c0628444d267c951d9e4fb8f83e154b8f74fb51aa16535e498235c5597dac9606ed0be3173a3836baa4e7d756ffe1e2879b415d3846bccd538c05b847785699aefde3e305decb600cd8fb0e7d8de5efc26971a6ad4e6d7a2d91474f1023a0ac4b78dc937da0ce607a45974d2cac1c33a2631ff7fe6144a3b2e5cf98b531a9627dea92c1dc82204d09db0439b6a11dd64b484e1263aa45fd9539b6020b55e3baece3986a8bffc1003406348f5c61265099ed43a766ee4f93f5f9c5abbc32a0fd3ac2b35b87f9ec26037d88275bd7dd0a54474995ee34ed3727f3f97c48db544b1980193a4b76a8a3ddab3591ce527f16d91882e67f0103b5cda53f7da54d489fc4ac08b6ab358a5a04aa9daa16219d50bd672a7cb804ed769d218807544e5993f1c27427104b349906a0b654df0bf69328afd3013fbe430155339c39f236df5557bf92f1ded7ff609a8502f49064ec3d1dbfb6c15d3a4c11a4f8acd12278cbf68acd5709463d12e3338a6eddb8c112f199645e23154a8e60879d2a654e3ed9296aa28f134168619691cd2c6b9e2eba4438381676173fc63c2588a3c5910dc149cf3760f0aa9fa9c3f5faa9162b0bf1aac9dd32b706a60ef53cbdb394b6b40222b5bc80eea82ba8958386672564cae3794f977871ab62337cf03e30049201ec12937e7ce79d0f55d9c810e20acf52212aca1d3888949e0e4830aad88d804161230eb89d4d329cc83570fe257217d2119134048dd2ed167646975fc7d77136919a049ea74cf08ddd2b896890bb24a0ba18094a22baa351bf29ad96c66bbb1a598f2ca391749620e62d61c3561a7d3653ccc8892c7b99baaf76bf836e2991cb06d6bc0514568ff0d1ec8bb4b3d6984f5eaefb17d3ea2893722375d3ddb8e389a8eef7d7d198f8e687d6a513983df906099f9a2d23f4f9dec6f8ef2f11fc0a21fac45353b94e00486f5e17d386af42502d09db33cf0cf28310e049c07e88682aeeb00cb833c5174266e62407a57583f1f88b304b7c6e0c84bbe1c0fd423072d37a5bd0aacf764229e5c7cd02473460ba3645cd8e8ae144065bf02d0dd238593d8e230354f67e0b2f23012c23274f80e3ee31e35e2606a4a3f31d94ab755e6d163cff52cbb36b6d0cc67ffc512aeed1dce4d7a0d70ce82f2baba12e8d514dc92a056f994adfb17b5b9712bd5186f27a2fda1f7039c5df2c8587fdc62f5627580c13234b55be4df3056050e2d1ef3218f0dd66cb05265fe1acfb0989d8213f2c19d1735a7cf3fa65d88dad5af52dc2bba22b7abf46c3bc77b5091baab9e8f0ddc4d5e581037de91a9f8dcbc69309be29cc815cf19a20a7585b8b3073edf51fc9baeb3e509b97fa4ecfd621e0fd57bd61cac1b895c03248ff12bdbc57509250df3517e8a3fe1d776836b34ab352b973d932ef708b14f7418f9eceb1d87667e61e3e758649cb083f01b133d37ab2f5afa96d6c84bcacf4efc3851ad308c1e7d9113624fce29fab460ab9d2a48d92cdb281103a5250ad44cb2ff6e67ac670c02fdafb3e0f1353953d6d7d5646ca1568dea55275a050ec501b7c6250444f7219f1ba7521ba3b93d089727ca5f3bbe0d6c1300b423377004954c5628fdb65770b18ced5c9b23a4a5a6d6ef25fe01b4ce278de0bcc4ed86e28a0a68818ffa40970128cf2c38740e80037984428c1bd5113f40ff47512ee6f4e4d8f9b8e8e1b3040d2928d003bd1c1329dc885302fbce9fa81c23b4dc49c7c82d29b52957847898676c89aa5d32b5b0e1c0d5a2b79a19d67562f407f19425687971a957375879d90c5f57c857136c17106c9ab1b99d80e69c8c954ed386493368884b55c939b8d64d26f643e800c56f90c01079d7c534e3b2b7ae352cefd3016da55f6a85eb803b85e2304915fd2001f77c74e28746293c46e4f5f0fd49cf988aafd0026b8e7a3bab2da5cdce1ea26c2e29ec03f4807fac432662b2d6c060be1c7be0e5489de69d0a6e03a4b9117f9244b34a0f1ecba89884f781c6320412413a00c4980287409a2a78c2cd7e65cecebbe4ec1c28cac4dd95f6998e78fc6f1392384331c9436aa10e10e2bf8ad2c4eafbcf276aa7bae64b74428911b3269c749338b0fc5075ad",
+		"5f9c70ec884926a89461056ad20ac4c30155e817f807e4d3f5bb743d789c83386762435c3627773fa77da5144451f2a8aad8adba88e0b669f5377c5e9bad70e45c86fe952b613f015a9953b8a5de5eaee4566acf98d41e327d93a35bd5cef4607d025e58951167957df4ff9b1627649d3943805472e5e293d3efb687cfd1e503faafeb2840a3e3b3f85d016051a58e1c9498aab72e63b748d834b31eb05d85dcde65e27834e266b85c75cc4ec0135135e0601cb93eeeb6e0010c8ceb65c4c319623c5e573a2c8c9fbbf7df68a930beb412d3f4dfd146175484f45d7afaa0d2e60684af9b34730f7c8438465ad3e1d0c3237336722f2aa51095bd5759f4b8ab4dda111b684aa3dac62a761722e7ae43495b7709933512c81c4e3c9133a51f7ce9f2b51fcec064f65779666960b4e45df3900f54311f5613e8012dd1b8efd359eda31a778264c72aa8bb419d862734d769076bce2810011989a45374e5c5d8729fec21427f0bf397eacbb4220f603cf463a4b0c94efd858ffd9768cd60d6ce68d755e0fbad007ce5c2223d70c7018345a102e4ab3c60a13a9e7794303156d4c2063e919f2153c13961fb324c80b240742f47773a7a8e25b3e3fb19b00ce839346c6eb3c732fbc6b888df0b1fe0a3d07b053a2e9402c267b2d62f794d8a2840526e3ade15ce2264496ccd7519571dfde47f7a4bb16292241c20b2be59f3f8fb4f6383f232d838c5a22d8c95b6834d9d2ca493f5a505ebe8899503b0e8f9b19e6e2dd81c1628b80016d02097e0134de51054c4e7674824d4d758760fc52377d2cad145e259aa2ffaf54139e1a66b1e0c1c191e32ac59474c6b526f5b3ba07d3e5ec286eddf531fcd5292869be58c9f22ef91026159f7cf9d05ef66b4299f4da48cc1635bf2243051d342d378a22c83390553e873713c0454ce5f3234397111ac3fe3207b86f0ed9fc025c81903e1748103692074f83824fda6341be4f95ff00b0a9a208c267e12fa01825054cc0513629bf3dbb56dc5b90d4316f87654a8be18227978ea0a8a522760cad620d0d14fd38920fb7321314062914275a5f99f677145a6979b156bd82ecd36f23f8e1273cc2759ecc0b2c69d94dad5211d1bed939dd87ed9e07b91d49713a6e16ade0a98aea789f04994e318e4ff2c8a188cd8d43aeb52c6daa3bc29b4af50ea82a247c5cd67b573b34cbadcc0a376d3bbd530d50367b42705d870f2e27a8197ef46070528bfe408360faa2ebb8bf76e9f388572842bcb119f4d84ee34ae31f5cc594f23705a49197b181fb78ed1ec99499c690f843a4d0cf2e226d118e9372271054fbabdcc5c92ae9fefaef0589cd0e722eaf30c1703ec4289c7fd81beaa8a455ccee5298e31e2080c10c366a6fcf56f7d13582ad0bcad037c612b710fc595b70fbefaaca23623b60c6c39b11beb8e5843b6b3dac60f",
+		b,
+	);
+}
+
+
+#[bench]
+fn modexp_nagydani_5_pow0x10001(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000005", // modexp
+		"000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000400c5a1611f8be90071a43db23cc2fe01871cc4c0e8ab5743f6378e4fef77f7f6db0095c0727e20225beb665645403453e325ad5f9aeb9ba99bf3c148f63f9c07cf4fe8847ad5242d6b7d4499f93bd47056ddab8f7dee878fc2314f344dbee2a7c41a5d3db91eff372c730c2fdd3a141a4b61999e36d549b9870cf2f4e632c4d5df5f024f81c028000073a0ed8847cfb0593d36a47142f578f05ccbe28c0c06aeb1b1da027794c48db880278f79ba78ae64eedfea3c07d10e0562668d839749dc95f40467d15cf65b9cfc52c7c4bcef1cda3596dd52631aac942f146c7cebd46065131699ce8385b0db1874336747ee020a5698a3d1a1082665721e769567f579830f9d259cec1a836845109c21cf6b25da572512bf3c42fd4b96e43895589042ab60dd41f497db96aec102087fe784165bb45f942859268fd2ff6c012d9d00c02ba83eace047cc5f7b2c392c2955c58a49f0338d6fc58749c9db2155522ac17914ec216ad87f12e0ee95574613942fa615898c4d9e8a3be68cd6afa4e7a003dedbdf8edfee31162b174f965b20ae752ad89c967b3068b6f722c16b354456ba8e280f987c08e0a52d40a2e8f3a59b94d590aeef01879eb7a90b3ee7d772c839c85519cbeaddc0c193ec4874a463b53fcaea3271d80ebfb39b33489365fc039ae549a17a9ff898eea2f4cb27b8dbee4c17b998438575b2b8d107e4a0d66ba7fca85b41a58a8d51f191a35c856dfbe8aef2b00048a694bbccff832d23c8ca7a7ff0b6c0b3011d00b97c86c0628444d267c951d9e4fb8f83e154b8f74fb51aa16535e498235c5597dac9606ed0be3173a3836baa4e7d756ffe1e2879b415d3846bccd538c05b847785699aefde3e305decb600cd8fb0e7d8de5efc26971a6ad4e6d7a2d91474f1023a0ac4b78dc937da0ce607a45974d2cac1c33a2631ff7fe6144a3b2e5cf98b531a9627dea92c1dc82204d09db0439b6a11dd64b484e1263aa45fd9539b6020b55e3baece3986a8bffc1003406348f5c61265099ed43a766ee4f93f5f9c5abbc32a0fd3ac2b35b87f9ec26037d88275bd7dd0a54474995ee34ed3727f3f97c48db544b1980193a4b76a8a3ddab3591ce527f16d91882e67f0103b5cda53f7da54d489fc4ac08b6ab358a5a04aa9daa16219d50bd672a7cb804ed769d218807544e5993f1c27427104b349906a0b654df0bf69328afd3013fbe430155339c39f236df5557bf92f1ded7ff609a8502f49064ec3d1dbfb6c15d3a4c11a4f8acd12278cbf68acd5709463d12e3338a6eddb8c112f199645e23154a8e60879d2a654e3ed9296aa28f134168619691cd2c6b9e2eba4438381676173fc63c2588a3c5910dc149cf3760f0aa9fa9c3f5faa9162b0bf1aac9dd32b706a60ef53cbdb394b6b40222b5bc80eea82ba8958386672564cae3794f977871ab62337cf010001e30049201ec12937e7ce79d0f55d9c810e20acf52212aca1d3888949e0e4830aad88d804161230eb89d4d329cc83570fe257217d2119134048dd2ed167646975fc7d77136919a049ea74cf08ddd2b896890bb24a0ba18094a22baa351bf29ad96c66bbb1a598f2ca391749620e62d61c3561a7d3653ccc8892c7b99baaf76bf836e2991cb06d6bc0514568ff0d1ec8bb4b3d6984f5eaefb17d3ea2893722375d3ddb8e389a8eef7d7d198f8e687d6a513983df906099f9a2d23f4f9dec6f8ef2f11fc0a21fac45353b94e00486f5e17d386af42502d09db33cf0cf28310e049c07e88682aeeb00cb833c5174266e62407a57583f1f88b304b7c6e0c84bbe1c0fd423072d37a5bd0aacf764229e5c7cd02473460ba3645cd8e8ae144065bf02d0dd238593d8e230354f67e0b2f23012c23274f80e3ee31e35e2606a4a3f31d94ab755e6d163cff52cbb36b6d0cc67ffc512aeed1dce4d7a0d70ce82f2baba12e8d514dc92a056f994adfb17b5b9712bd5186f27a2fda1f7039c5df2c8587fdc62f5627580c13234b55be4df3056050e2d1ef3218f0dd66cb05265fe1acfb0989d8213f2c19d1735a7cf3fa65d88dad5af52dc2bba22b7abf46c3bc77b5091baab9e8f0ddc4d5e581037de91a9f8dcbc69309be29cc815cf19a20a7585b8b3073edf51fc9baeb3e509b97fa4ecfd621e0fd57bd61cac1b895c03248ff12bdbc57509250df3517e8a3fe1d776836b34ab352b973d932ef708b14f7418f9eceb1d87667e61e3e758649cb083f01b133d37ab2f5afa96d6c84bcacf4efc3851ad308c1e7d9113624fce29fab460ab9d2a48d92cdb281103a5250ad44cb2ff6e67ac670c02fdafb3e0f1353953d6d7d5646ca1568dea55275a050ec501b7c6250444f7219f1ba7521ba3b93d089727ca5f3bbe0d6c1300b423377004954c5628fdb65770b18ced5c9b23a4a5a6d6ef25fe01b4ce278de0bcc4ed86e28a0a68818ffa40970128cf2c38740e80037984428c1bd5113f40ff47512ee6f4e4d8f9b8e8e1b3040d2928d003bd1c1329dc885302fbce9fa81c23b4dc49c7c82d29b52957847898676c89aa5d32b5b0e1c0d5a2b79a19d67562f407f19425687971a957375879d90c5f57c857136c17106c9ab1b99d80e69c8c954ed386493368884b55c939b8d64d26f643e800c56f90c01079d7c534e3b2b7ae352cefd3016da55f6a85eb803b85e2304915fd2001f77c74e28746293c46e4f5f0fd49cf988aafd0026b8e7a3bab2da5cdce1ea26c2e29ec03f4807fac432662b2d6c060be1c7be0e5489de69d0a6e03a4b9117f9244b34a0f1ecba89884f781c6320412413a00c4980287409a2a78c2cd7e65cecebbe4ec1c28cac4dd95f6998e78fc6f1392384331c9436aa10e10e2bf8ad2c4eafbcf276aa7bae64b74428911b3269c749338b0fc5075ad",
+		"5a0eb2bdf0ac1cae8e586689fa16cd4b07dfdedaec8a110ea1fdb059dd5253231b6132987598dfc6e11f86780428982d50cf68f67ae452622c3b336b537ef3298ca645e8f89ee39a26758206a5a3f6409afc709582f95274b57b71fae5c6b74619ae6f089a5393c5b79235d9caf699d23d88fb873f78379690ad8405e34c19f5257d596580c7a6a7206a3712825afe630c76b31cdb4a23e7f0632e10f14f4e282c81a66451a26f8df2a352b5b9f607a7198449d1b926e27036810368e691a74b91c61afa73d9d3b99453e7c8b50fd4f09c039a2f2feb5c419206694c31b92df1d9586140cb3417b38d0c503c7b508cc2ed12e813a1c795e9829eb39ee78eeaf360a169b491a1d4e419574e712402de9d48d54c1ae5e03739b7156615e8267e1fb0a897f067afd11fb33f6e24182d7aaaaa18fe5bc1982f20d6b871e5a398f0f6f718181d31ec225cfa9a0a70124ed9a70031bdf0c1c7829f708b6e17d50419ef361cf77d99c85f44607186c8d683106b8bd38a49b5d0fb503b397a83388c5678dcfcc737499d84512690701ed621a6f0172aecf037184ddf0f2453e4053024018e5ab2e30d6d5363b56e8b41509317c99042f517247474ab3abc848e00a07f69c254f46f2a05cf6ed84e5cc906a518fdcfdf2c61ce731f24c5264f1a25fc04934dc28aec112134dd523f70115074ca34e3807aa4cb925147f3a0ce152d323bd8c675ace446d0fd1ae30c4b57f0eb2c23884bc18f0964c0114796c5b6d080c3d89175665fbf63a6381a6a9da39ad070b645c8bb1779506da14439a9f5b5d481954764ea114fac688930bc68534d403cff4210673b6a6ff7ae416b7cd41404c3d3f282fcd193b86d0f54d0006c2a503b40d5c3930da980565b8f9630e9493a79d1c03e74e5f93ac8e4dc1a901ec5e3b3e57049124c7b72ea345aa359e782285d9e6a5c144a378111dd02c40855ff9c2be9b48425cb0b2fd62dc8678fd151121cf26a65e917d65d8e0dacfae108eb5508b601fb8ffa370be1f9a8b749a2d12eeab81f41079de87e2d777994fa4d28188c579ad327f9957fb7bdecec5c680844dd43cb57cf87aeb763c003e65011f73f8c63442df39a92b946a6bd968a1c1e4d5fa7d88476a68bd8e20e5b70a99259c7d3f85fb1b65cd2e93972e6264e74ebf289b8b6979b9b68a85cd5b360c1987f87235c3c845d62489e33acf85d53fa3561fe3a3aee18924588d9c6eba4edb7a4d106b31173e42929f6f0c48c80ce6a72d54eca7c0fe870068b7a7c89c63cdda593f5b32d3cb4ea8a32c39f00ab449155757172d66763ed9527019d6de6c9f2416aa6203f4d11c9ebee1e1d3845099e55504446448027212616167eb36035726daa7698b075286f5379cd3e93cb3e0cf4f9cb8d017facbb5550ed32d5ec5400ae57e47e2bf78d1eaeff9480cc765ceff39db500",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_chfast1(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"18b18acfb4c2c30276db5411368e7185b311dd124691610c5d3b74034e093dc9063c909c4720840cb5134cb9f59fa749755796819658d32efc0d288198f3726607c2b7f58a84bd6145f00c9c2bc0bb1a187f20ff2c92963a88019e7c6a014eed06614e20c147e940f2d70da3f74c9a17df361706a4485c742bd6788478fa17d7",
+		"2243525c5efd4b9c3d3c45ac0ca3fe4dd85e830a4ce6b65fa1eeaee202839703301d1d33be6da8e509df21cc35964723180eed7532537db9ae5e7d48f195c915",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_chfast2(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"2243525c5efd4b9c3d3c45ac0ca3fe4dd85e830a4ce6b65fa1eeaee202839703301d1d33be6da8e509df21cc35964723180eed7532537db9ae5e7d48f195c91518b18acfb4c2c30276db5411368e7185b311dd124691610c5d3b74034e093dc9063c909c4720840cb5134cb9f59fa749755796819658d32efc0d288198f37266",
+		"2bd3e6d0f3b142924f5ca7b49ce5b9d54c4703d7ae5648e61d02268b1a0a9fb721611ce0a6af85915e2f1d70300909ce2e49dfad4a4619c8390cae66cefdb204",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_cdetrio1(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_cdetrio2(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_cdetrio3(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_cdetrio4(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"",
+		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_cdetrio5(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_cdetrio6(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
+		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_cdetrio7(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_cdetrio8(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
+		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_cdetrio9(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_cdetrio10(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_cdetrio11(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
+		"030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd315ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c4",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_cdetrio12(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		"030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd315ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c4",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_cdetrio13(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa901e0559bacb160664764a357af8a9fe70baa9258e0b959273ffc5718c6d4cc7c039730ea8dff1254c0fee9c0ea777d29a9c710b7e616683f194f18c43b43b869073a5ffcc6fc7a28c30723d6e58ce577356982d65b833a5a5c15bf9024b43d98",
+		"15bf2bb17880144b5d1cd2b1f46eff9d617bffd1ca57c37fb5a49bd84e53cf66049c797f9ce0d17083deb32b5e36f2ea2a212ee036598dd7624c168993d1355f",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_add_cdetrio14(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000006", // alt_bn128_add
+		"17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa901e0559bacb160664764a357af8a9fe70baa9258e0b959273ffc5718c6d4cc7c17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa92e83f8d734803fc370eba25ed1f6b8768bd6d83887b87165fc2434fe11a830cb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_mul_chfast1(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000007", // alt_bn128_mul
+		"2bd3e6d0f3b142924f5ca7b49ce5b9d54c4703d7ae5648e61d02268b1a0a9fb721611ce0a6af85915e2f1d70300909ce2e49dfad4a4619c8390cae66cefdb20400000000000000000000000000000000000000000000000011138ce750fa15c2",
+		"070a8d6a982153cae4be29d434e8faef8a47b274a053f5a4ee2a6c9c13c31e5c031b8ce914eba3a9ffb989f9cdd5b0f01943074bf4f0f315690ec3cec6981afc",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_mul_chfast2(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000007", // alt_bn128_mul
+		"070a8d6a982153cae4be29d434e8faef8a47b274a053f5a4ee2a6c9c13c31e5c031b8ce914eba3a9ffb989f9cdd5b0f01943074bf4f0f315690ec3cec6981afc30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",
+		"025a6f4181d2b4ea8b724290ffb40156eb0adb514c688556eb79cdea0752c2bb2eff3f31dea215f1eb86023a133a996eb6300b44da664d64251d05381bb8a02e",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_mul_chfast3(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000007", // alt_bn128_mul
+		"025a6f4181d2b4ea8b724290ffb40156eb0adb514c688556eb79cdea0752c2bb2eff3f31dea215f1eb86023a133a996eb6300b44da664d64251d05381bb8a02e183227397098d014dc2822db40c0ac2ecbc0b548b438e5469e10460b6c3e7ea3",
+		"14789d0d4a730b354403b5fac948113739e276c23e0258d8596ee72f9cd9d3230af18a63153e0ec25ff9f2951dd3fa90ed0197bfef6e2a1a62b5095b9d2b4a27",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_mul_cdetrio1(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000007", // alt_bn128_mul
+		"1a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"2cde5879ba6f13c0b5aa4ef627f159a3347df9722efce88a9afbb20b763b4c411aa7e43076f6aee272755a7f9b84832e71559ba0d2e0b17d5f9f01755e5b0d11",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_mul_cdetrio6(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000007", // alt_bn128_mul
+		"17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa901e0559bacb160664764a357af8a9fe70baa9258e0b959273ffc5718c6d4cc7cffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"29e587aadd7c06722aabba753017c093f70ba7eb1f1c0104ec0564e7e3e21f6022b1143f6a41008e7755c71c3d00b6b915d386de21783ef590486d8afa8453b1",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_mul_cdetrio11(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000007", // alt_bn128_mul
+		"039730ea8dff1254c0fee9c0ea777d29a9c710b7e616683f194f18c43b43b869073a5ffcc6fc7a28c30723d6e58ce577356982d65b833a5a5c15bf9024b43d98ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+		"00a1a234d08efaa2616607e31eca1980128b00b415c845ff25bba3afcb81dc00242077290ed33906aeb8e42fd98c41bcb9057ba03421af3f2d08cfc441186024",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_pairing_jeff1(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000008", // alt_bn128_pairing
+		"1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf411198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_pairing_jeff2(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000008", // alt_bn128_pairing
+		"2eca0c7238bf16e83e7a1e6c5d49540685ff51380f309842a98561558019fc0203d3260361bb8451de5ff5ecd17f010ff22f5c31cdf184e9020b06fa5997db841213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f06967a1237ebfeca9aaae0d6d0bab8e28c198c5a339ef8a2407e31cdac516db922160fa257a5fd5b280642ff47b65eca77e626cb685c84fa6d3b6882a283ddd1198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_pairing_jeff3(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000008", // alt_bn128_pairing
+		"0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba2e89718ad33c8bed92e210e81d1853435399a271913a6520736a4729cf0d51eb01a9e2ffa2e92599b68e44de5bcf354fa2642bd4f26b259daa6f7ce3ed57aeb314a9a87b789a58af499b314e13c3d65bede56c07ea2d418d6874857b70763713178fb49a2d6cd347dc58973ff49613a20757d0fcc22079f9abd10c3baee245901b9e027bd5cfc2cb5db82d4dc9677ac795ec500ecd47deee3b5da006d6d049b811d7511c78158de484232fc68daf8a45cf217d1c2fae693ff5871e8752d73b21198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_pairing_jeff4(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000008", // alt_bn128_pairing
+		"2f2ea0b3da1e8ef11914acf8b2e1b32d99df51f5f4f206fc6b947eae860eddb6068134ddb33dc888ef446b648d72338684d678d2eb2371c61a50734d78da4b7225f83c8b6ab9de74e7da488ef02645c5a16a6652c3c71a15dc37fe3a5dcb7cb122acdedd6308e3bb230d226d16a105295f523a8a02bfc5e8bd2da135ac4c245d065bbad92e7c4e31bf3757f1fe7362a63fbfee50e7dc68da116e67d600d9bf6806d302580dc0661002994e7cd3a7f224e7ddc27802777486bf80f40e4ca3cfdb186bac5188a98c45e6016873d107f5cd131f3a3e339d0375e58bd6219347b008122ae2b09e539e152ec5364e7e2204b03d11d3caa038bfc7cd499f8176aacbee1f39e4e4afc4bc74790a4a028aff2c3d2538731fb755edefd8cb48d6ea589b5e283f150794b6736f670d6a1033f9b46c6f5204f50813eb85c8dc4b59db1c5d39140d97ee4d2b36d99bc49974d18ecca3e7ad51011956051b464d9e27d46cc25e0764bb98575bd466d32db7b15f582b2d5c452b36aa394b789366e5e3ca5aabd415794ab061441e51d01e94640b7e3084a07e02c78cf3103c542bc5b298669f211b88da1679b0b64a63b7e0e7bfe52aae524f73a55be7fe70c7e9bfc94b4cf0da1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f",
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_pairing_jeff5(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000008", // alt_bn128_pairing
+		"20a754d2071d4d53903e3b31a7e98ad6882d58aec240ef981fdf0a9d22c5926a29c853fcea789887315916bbeb89ca37edb355b4f980c9a12a94f30deeed30211213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f1abb4a25eb9379ae96c84fff9f0540abcfc0a0d11aeda02d4f37e4baf74cb0c11073b3ff2cdbb38755f8691ea59e9606696b3ff278acfc098fa8226470d03869217cee0a9ad79a4493b5253e2e4e3a39fc2df38419f230d341f60cb064a0ac290a3d76f140db8418ba512272381446eb73958670f00cf46f1d9e64cba057b53c26f64a8ec70387a13e41430ed3ee4a7db2059cc5fc13c067194bcc0cb49a98552fd72bd9edb657346127da132e5b82ab908f5816c826acb499e22f2412d1a2d70f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2198a1f162a73261f112401aa2db79c7dab1533c9935c77290a6ce3b191f2318d198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_pairing_jeff6(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000008", // alt_bn128_pairing
+		"1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c103188585e2364128fe25c70558f1560f4f9350baf3959e603cc91486e110936198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
+		"0000000000000000000000000000000000000000000000000000000000000000",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_pairing_empty_data(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000008", // alt_bn128_pairing
+		"",
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_pairing_one_point(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000008", // alt_bn128_pairing
+		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
+		"0000000000000000000000000000000000000000000000000000000000000000",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_pairing_two_point_match_2(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000008", // alt_bn128_pairing
+		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d",
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_pairing_two_point_match_3(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000008", // alt_bn128_pairing
+		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_pairing_two_point_match_4(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000008", // alt_bn128_pairing
+		"105456a333e6d636854f987ea7bb713dfd0ae8371a72aea313ae0c32c0bf10160cf031d41b41557f3e7e3ba0c51bebe5da8e6ecd855ec50fc87efcdeac168bcc0476be093a6d2b4bbf907172049874af11e1b6267606e00804d3ff0037ec57fd3010c68cb50161b7d1d96bb71edfec9880171954e56871abf3d93cc94d745fa114c059d74e5b6c4ec14ae5864ebe23a71781d86c29fb8fb6cce94f70d3de7a2101b33461f39d9e887dbb100f170a2345dde3c07e256d1dfa2b657ba5cd030427000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000021a2c3013d2ea92e13c800cde68ef56a294b883f6ac35d25f587c09b1b3c635f7290158a80cd3d66530f74dc94c94adb88f5cdb481acca997b6e60071f08a115f2f997f3dbd66a7afe07fe7862ce239edba9e05c5afff7f8a1259c9733b2dfbb929d1691530ca701b4a106054688728c9972c8512e9789e9567aae23e302ccd75",
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_pairing_ten_point_match_1(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000008", // alt_bn128_pairing
+		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d",
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_pairing_ten_point_match_2(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000008", // alt_bn128_pairing
+		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		b,
+	);
+}
+
+#[bench]
+fn alt_bn128_pairing_ten_point_match_3(b: &mut Bencher) {
+	bench(
+		"0000000000000000000000000000000000000008", // alt_bn128_pairing
+		"105456a333e6d636854f987ea7bb713dfd0ae8371a72aea313ae0c32c0bf10160cf031d41b41557f3e7e3ba0c51bebe5da8e6ecd855ec50fc87efcdeac168bcc0476be093a6d2b4bbf907172049874af11e1b6267606e00804d3ff0037ec57fd3010c68cb50161b7d1d96bb71edfec9880171954e56871abf3d93cc94d745fa114c059d74e5b6c4ec14ae5864ebe23a71781d86c29fb8fb6cce94f70d3de7a2101b33461f39d9e887dbb100f170a2345dde3c07e256d1dfa2b657ba5cd030427000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000021a2c3013d2ea92e13c800cde68ef56a294b883f6ac35d25f587c09b1b3c635f7290158a80cd3d66530f74dc94c94adb88f5cdb481acca997b6e60071f08a115f2f997f3dbd66a7afe07fe7862ce239edba9e05c5afff7f8a1259c9733b2dfbb929d1691530ca701b4a106054688728c9972c8512e9789e9567aae23e302ccd75",
+		"0000000000000000000000000000000000000000000000000000000000000001",
+		b,
+	);
+}

ethcore/benches/evm.rs

@@ -1,91 +0,0 @@
-// Copyright 2015-2018 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-#![feature(test)]
-
-extern crate bn;
-extern crate ethereum_types;
-extern crate ethkey;
-extern crate parity_crypto;
-extern crate rand;
-extern crate rustc_hex;
-extern crate test;
-
-use self::test::Bencher;
-use rand::StdRng;
-
-#[bench]
-fn bn_128_pairing(b: &mut Bencher) {
-	use bn::{pairing, G1, G2, Fr, Group};
-
-	let rng = &mut ::rand::thread_rng();
-
-	let sk0 = Fr::random(rng);
-	let sk1 = Fr::random(rng);
-
-	let pk0 = G1::one() * sk0;
-	let pk1 = G2::one() * sk1;
-
-	b.iter(|| {
-		let _ = pairing(pk0, pk1);
-	});
-}
-
-#[bench]
-fn bn_128_mul(b: &mut Bencher) {
-	use bn::{AffineG1, G1, Fr, Group};
-
-	let mut rng = StdRng::new().unwrap();
-	let p: G1 = G1::random(&mut rng);
-	let fr = Fr::random(&mut rng);
-
-	b.iter(|| {
-		let _ = AffineG1::from_jacobian(p * fr);
-	});
-}
-
-#[bench]
-fn sha256(b: &mut Bencher) {
-	use parity_crypto::digest::sha256;
-
-	let input = [0_u8; 256];
-
-	b.iter(|| {
-		sha256(&input);
-	});
-}
-
-#[bench]
-fn ecrecover(b: &mut Bencher) {
-	use rustc_hex::FromHex;
-	use ethkey::{Signature, recover as ec_recover};
-	use ethereum_types::H256;
-	let input = FromHex::from_hex("47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad000000000000000000000000000000000000000000000000000000000000001b650acf9d3f5f0a2c799776a1254355d5f4061762a237396a99a0e0e3fc2bcd6729514a0dacb2e623ac4abd157cb18163ff942280db4d5caad66ddf941ba12e03").unwrap();
-	let hash = H256::from_slice(&input[0..32]);
-	let v = H256::from_slice(&input[32..64]);
-	let r = H256::from_slice(&input[64..96]);
-	let s = H256::from_slice(&input[96..128]);
-
-	let bit = match v[31] {
-		27 | 28 if &v.0[..31] == &[0; 31] => v[31] - 27,
-		_ => { return; },
-	};
-
-	let s = Signature::from_rsv(&r, &s, bit);
-	b.iter(|| {
-		let _ = ec_recover(&s, &hash);
-	});
-}

ethcore/evm/Cargo.toml

@@ -5,12 +5,13 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 bit-set = "0.4"
-ethereum-types = "0.3"
+parity-bytes = "0.1"
+ethereum-types = "0.4"
 heapsize = "0.4"
 lazy_static = "1.0"
-log = "0.3"
+log = "0.4"
 vm = { path = "../vm" }
-keccak-hash = { git = "https://github.com/paritytech/parity-common" }
+keccak-hash = "0.1"
 parking_lot = "0.6"
 memory-cache = { path = "../../util/memory_cache" }
 

ethcore/evm/src/evm.rs

@@ -45,7 +45,7 @@ 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: 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 {
+			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,
@@ -55,9 +55,15 @@ impl Finalize for Result<GasLeft> {
 	}
 }
 
+impl Finalize for Error {
+	fn finalize<E: Ext>(self, _ext: E) -> Result<FinalizationResult> {
+		Err(self)
+	}
+}
+
 /// Cost calculation type. For low-gas usage we calculate costs using usize instead of U256
 pub trait CostType: Sized + From<usize> + Copy
-	+ ops::Mul<Output=Self> + ops::Div<Output=Self> + ops::Add<Output=Self> + ops::Sub<Output=Self>
+	+ ops::Mul<Output=Self> + ops::Div<Output=Self> + ops::Add<Output=Self> +ops::Sub<Output=Self>
 	+ ops::Shr<usize, Output=Self> + ops::Shl<usize, Output=Self>
 	+ cmp::Ord + fmt::Debug {
 	/// Converts this cost into `U256`

ethcore/evm/src/factory.rs

@@ -17,8 +17,9 @@
 //! Evm factory.
 //!
 use std::sync::Arc;
-use vm::Vm;
+use vm::{Vm, Schedule};
 use ethereum_types::U256;
+use super::vm::ActionParams;
 use super::interpreter::SharedCache;
 use super::vmtype::VMType;
 
@@ -32,12 +33,12 @@ pub struct Factory {
 impl Factory {
 	/// Create fresh instance of VM
 	/// Might choose implementation depending on supplied gas.
-	pub fn create(&self, gas: &U256) -> Box<Vm> {
+	pub fn create(&self, params: ActionParams, schedule: &Schedule, depth: usize) -> Box<Vm> {
 		match self.evm {
-			VMType::Interpreter => if Self::can_fit_in_usize(gas) {
-				Box::new(super::interpreter::Interpreter::<usize>::new(self.evm_cache.clone()))
+			VMType::Interpreter => if Self::can_fit_in_usize(&params.gas) {
+				Box::new(super::interpreter::Interpreter::<usize>::new(params, self.evm_cache.clone(), schedule, depth))
 			} else {
-				Box::new(super::interpreter::Interpreter::<U256>::new(self.evm_cache.clone()))
+				Box::new(super::interpreter::Interpreter::<U256>::new(params, self.evm_cache.clone(), schedule, depth))
 			}
 		}
 	}
@@ -68,7 +69,14 @@ impl Default for Factory {
 
 #[test]
 fn test_create_vm() {
-	let _vm = Factory::default().create(&U256::zero());
+	use vm::Ext;
+	use vm::tests::FakeExt;
+	use bytes::Bytes;
+
+	let mut params = ActionParams::default();
+	params.code = Some(Arc::new(Bytes::default()));
+	let ext = FakeExt::new();
+	let _vm = Factory::default().create(params, ext.schedule(), ext.depth());
 }
 
 /// Create tests by injecting different VM factories

ethcore/evm/src/interpreter/gasometer.rs

@@ -403,7 +403,7 @@ fn calculate_eip1283_sstore_gas<Gas: evm::CostType>(schedule: &Schedule, origina
 }
 
 pub fn handle_eip1283_sstore_clears_refund(ext: &mut vm::Ext, original: &U256, current: &U256, new: &U256) {
-	let sstore_clears_schedule = ext.schedule().sstore_refund_gas;
+	let sstore_clears_schedule = U256::from(ext.schedule().sstore_refund_gas);
 
 	if current == new {
 		// 1. If current value equals new value (this is a no-op), 200 gas is deducted.
@@ -438,11 +438,11 @@ pub fn handle_eip1283_sstore_clears_refund(ext: &mut vm::Ext, original: &U256, c
 				// 2.2.2. If original value equals new value (this storage slot is reset)
 				if original.is_zero() {
 					// 2.2.2.1. If original value is 0, add 19800 gas to refund counter.
-					let refund = ext.schedule().sstore_set_gas - ext.schedule().sload_gas;
+					let refund = U256::from(ext.schedule().sstore_set_gas - ext.schedule().sload_gas);
 					ext.add_sstore_refund(refund);
 				} else {
 					// 2.2.2.2. Otherwise, add 4800 gas to refund counter.
-					let refund = ext.schedule().sstore_reset_gas - ext.schedule().sload_gas;
+					let refund = U256::from(ext.schedule().sstore_reset_gas - ext.schedule().sload_gas);
 					ext.add_sstore_refund(refund);
 				}
 			}

ethcore/evm/src/interpreter/memory.rs

@@ -119,14 +119,19 @@ impl Memory for Vec<u8> {
 	fn into_return_data(mut self, offset: U256, size: U256) -> ReturnData {
 		let mut offset = offset.low_u64() as usize;
 		let size = size.low_u64() as usize;
+
 		if !is_valid_range(offset, size) {
-			return ReturnData::empty()
+			return ReturnData::empty();
 		}
+
 		if self.len() - size > MAX_RETURN_WASTE_BYTES {
-			{ let _ =  self.drain(..offset); }
-			self.truncate(size);
-			self.shrink_to_fit();
-			offset = 0;
+			if offset == 0 {
+				self.truncate(size);
+				self.shrink_to_fit();
+			} else {
+				self = self[offset..(offset + size)].to_vec();
+				offset = 0;
+			}
 		}
 		ReturnData::new(self, offset, size)
 	}

ethcore/evm/src/lib.rs

@@ -23,6 +23,7 @@ extern crate heapsize;
 extern crate vm;
 extern crate keccak_hash as hash;
 extern crate memory_cache;
+extern crate parity_bytes as bytes;
 
 #[macro_use]
 extern crate lazy_static;

ethcore/evm/src/tests.rs

@@ -21,7 +21,7 @@ use std::sync::Arc;
 use std::collections::{HashMap, HashSet};
 use rustc_hex::FromHex;
 use ethereum_types::{U256, H256, Address};
-use vm::{self, ActionParams, ActionValue};
+use vm::{self, ActionParams, ActionValue, Ext};
 use vm::tests::{FakeExt, FakeCall, FakeCallType, test_finalize};
 use factory::Factory;
 use vmtype::VMType;
@@ -38,8 +38,8 @@ fn test_add(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_eq!(gas_left, U256::from(79_988));
@@ -58,8 +58,8 @@ fn test_sha3(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_eq!(gas_left, U256::from(79_961));
@@ -78,8 +78,8 @@ fn test_address(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_eq!(gas_left, U256::from(79_995));
@@ -100,8 +100,8 @@ fn test_origin(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_eq!(gas_left, U256::from(79_995));
@@ -122,8 +122,8 @@ fn test_sender(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_eq!(gas_left, U256::from(79_995));
@@ -157,8 +157,8 @@ fn test_extcodecopy(factory: super::Factory) {
 	ext.codes.insert(sender, Arc::new(sender_code));
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_eq!(gas_left, U256::from(79_935));
@@ -177,8 +177,8 @@ fn test_log_empty(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_eq!(gas_left, U256::from(99_619));
@@ -209,8 +209,8 @@ fn test_log_sender(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_eq!(gas_left, U256::from(98_974));
@@ -234,8 +234,8 @@ fn test_blockhash(factory: super::Factory) {
 	ext.blockhashes.insert(U256::zero(), blockhash.clone());
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_eq!(gas_left, U256::from(79_974));
@@ -256,8 +256,8 @@ fn test_calldataload(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_eq!(gas_left, U256::from(79_991));
@@ -277,8 +277,8 @@ fn test_author(factory: super::Factory) {
 	ext.info.author = author;
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_eq!(gas_left, U256::from(79_995));
@@ -297,8 +297,8 @@ fn test_timestamp(factory: super::Factory) {
 	ext.info.timestamp = timestamp;
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_eq!(gas_left, U256::from(79_995));
@@ -317,8 +317,8 @@ fn test_number(factory: super::Factory) {
 	ext.info.number = number;
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_eq!(gas_left, U256::from(79_995));
@@ -337,8 +337,8 @@ fn test_difficulty(factory: super::Factory) {
 	ext.info.difficulty = difficulty;
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_eq!(gas_left, U256::from(79_995));
@@ -357,8 +357,8 @@ fn test_gas_limit(factory: super::Factory) {
 	ext.info.gas_limit = gas_limit;
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_eq!(gas_left, U256::from(79_995));
@@ -375,8 +375,8 @@ fn test_mul(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "000000000000000000000000000000000000000000000000734349397b853383");
@@ -393,8 +393,8 @@ fn test_sub(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000012364ad0302");
@@ -411,8 +411,8 @@ fn test_div(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "000000000000000000000000000000000000000000000000000000000002e0ac");
@@ -429,8 +429,8 @@ fn test_div_zero(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000000");
@@ -447,8 +447,8 @@ fn test_mod(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000076b4b");
@@ -466,8 +466,8 @@ fn test_smod(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000076b4b");
@@ -485,8 +485,8 @@ fn test_sdiv(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "000000000000000000000000000000000000000000000000000000000002e0ac");
@@ -504,8 +504,8 @@ fn test_exp(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "90fd23767b60204c3d6fc8aec9e70a42a3f127140879c133a20129a597ed0c59");
@@ -524,8 +524,8 @@ fn test_comparison(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000000");
@@ -545,8 +545,8 @@ fn test_signed_comparison(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000000");
@@ -566,8 +566,8 @@ fn test_bitops(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "00000000000000000000000000000000000000000000000000000000000000f0");
@@ -589,8 +589,8 @@ fn test_addmod_mulmod(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000001");
@@ -610,8 +610,8 @@ fn test_byte(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000000");
@@ -629,8 +629,8 @@ fn test_signextend(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000fff");
@@ -649,8 +649,8 @@ fn test_badinstruction_int() {
 	let mut ext = FakeExt::new();
 
 	let err = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap_err()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap_err()
 	};
 
 	match err {
@@ -669,8 +669,8 @@ fn test_pop(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "00000000000000000000000000000000000000000000000000000000000000f0");
@@ -689,8 +689,8 @@ fn test_extops(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000004"); // PC / CALLDATASIZE
@@ -712,11 +712,11 @@ fn test_jumps(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
-	assert_eq!(ext.sstore_clears, ext.schedule.sstore_refund_gas as i128);
+	assert_eq!(ext.sstore_clears, U256::from(ext.schedule().sstore_refund_gas));
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000000"); // 5!
 	assert_store(&ext, 1, "0000000000000000000000000000000000000000000000000000000000000078"); // 5!
 	assert_eq!(gas_left, U256::from(54_117));
@@ -740,8 +740,8 @@ fn test_calls(factory: super::Factory) {
 	};
 
 	let gas_left = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_set_contains(&ext.calls, &FakeCall {
@@ -781,8 +781,8 @@ fn test_create_in_staticcall(factory: super::Factory) {
 	ext.is_static = true;
 
 	let err = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap_err()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap_err()
 	};
 
 	assert_eq!(err, vm::Error::MutableCallInStaticContext);
@@ -1049,8 +1049,8 @@ fn push_two_pop_one_constantinople_test(factory: &super::Factory, opcode: u8, pu
 	let mut ext = FakeExt::new_constantinople();
 
 	let _ = {
-		let mut vm = factory.create(&params.gas);
-		test_finalize(vm.exec(params, &mut ext)).unwrap()
+		let mut vm = factory.create(params, ext.schedule(), ext.depth());
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};
 
 	assert_store(&ext, 0, result);

ethcore/light/Cargo.toml

@@ -7,21 +7,21 @@ version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-log = "0.3"
+log = "0.4"
 ethcore = { path = ".."}
-parity-bytes = { git = "https://github.com/paritytech/parity-common" }
+parity-bytes = "0.1"
 ethcore-transaction = { path = "../transaction" }
-ethereum-types = "0.3"
-memorydb = { git = "https://github.com/paritytech/parity-common" }
-patricia-trie = { git = "https://github.com/paritytech/parity-common" }
+ethereum-types = "0.4"
+memorydb = "0.2.1"
+patricia-trie = "0.2"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 ethcore-network = { path = "../../util/network" }
 ethcore-io = { path = "../../util/io" }
-hashdb = { git = "https://github.com/paritytech/parity-common" }
+hashdb = "0.2.1"
 heapsize = "0.4"
 vm = { path = "../vm" }
-plain_hasher = { git = "https://github.com/paritytech/parity-common" }
-rlp = { git = "https://github.com/paritytech/parity-common" }
+fastmap = { path = "../../util/fastmap" }
+rlp = { version = "0.2.4", features = ["ethereum"] }
 rlp_derive = { path = "../../util/rlp_derive" }
 smallvec = "0.4"
 futures = "0.1"
@@ -32,16 +32,16 @@ serde = "1.0"
 serde_derive = "1.0"
 parking_lot = "0.6"
 stats = { path = "../../util/stats" }
-keccak-hash = { git = "https://github.com/paritytech/parity-common" }
+keccak-hash = "0.1"
 keccak-hasher = { path = "../../util/keccak-hasher" }
 triehash-ethereum = { version = "0.2",  path = "../../util/triehash-ethereum" }
-kvdb = { git = "https://github.com/paritytech/parity-common" }
+kvdb = "0.1"
 memory-cache = { path = "../../util/memory_cache" }
 error-chain = { version = "0.12", default-features = false }
 
 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }
-kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" }
+kvdb-memorydb = "0.1"
 tempdir = "0.3"
 
 [features]

ethcore/light/src/cache.rs

@@ -31,7 +31,7 @@ use ethereum_types::{H256, U256};
 use memory_cache::MemoryLruCache;
 
 /// Configuration for how much data to cache.
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub struct CacheSizes {
 	/// Maximum size, in bytes, of cached headers.
 	pub headers: usize,
@@ -83,33 +83,33 @@ impl Cache {
 			receipts: MemoryLruCache::new(sizes.receipts),
 			chain_score: MemoryLruCache::new(sizes.chain_score),
 			corpus: None,
-			corpus_expiration: corpus_expiration,
+			corpus_expiration,
 		}
 	}
 
 	/// Query header by hash.
 	pub fn block_header(&mut self, hash: &H256) -> Option<encoded::Header> {
-		self.headers.get_mut(hash).map(|x| x.clone())
+		self.headers.get_mut(hash).cloned()
 	}
 
 	/// Query hash by number.
-	pub fn block_hash(&mut self, num: &BlockNumber) -> Option<H256> {
-		self.canon_hashes.get_mut(num).map(|x| x.clone())
+	pub fn block_hash(&mut self, num: BlockNumber) -> Option<H256> {
+		self.canon_hashes.get_mut(&num).map(|h| *h)
 	}
 
 	/// Query block body by block hash.
 	pub fn block_body(&mut self, hash: &H256) -> Option<encoded::Body> {
-		self.bodies.get_mut(hash).map(|x| x.clone())
+		self.bodies.get_mut(hash).cloned()
 	}
 
 	/// Query block receipts by block hash.
 	pub fn block_receipts(&mut self, hash: &H256) -> Option<Vec<Receipt>> {
-		self.receipts.get_mut(hash).map(|x| x.clone())
+		self.receipts.get_mut(hash).cloned()
 	}
 
 	/// Query chain score by block hash.
 	pub fn chain_score(&mut self, hash: &H256) -> Option<U256> {
-		self.chain_score.get_mut(hash).map(|x| x.clone())
+		self.chain_score.get_mut(hash).map(|h| *h)
 	}
 
 	/// Cache the given header.

ethcore/light/src/cht.rs

@@ -92,7 +92,7 @@ pub struct BlockInfo {
 /// Build an in-memory CHT from a closure which provides necessary information
 /// about blocks. If the fetcher ever fails to provide the info, the CHT
 /// will not be generated.
-pub fn build<F>(cht_num: u64, mut fetcher: F) ->  Option<CHT<MemoryDB<KeccakHasher>>>
+pub fn build<F>(cht_num: u64, mut fetcher: F) -> Option<CHT<MemoryDB<KeccakHasher>>>
 	where F: FnMut(BlockId) -> Option<BlockInfo>
 {
 	let mut db = MemoryDB::<KeccakHasher>::new();
@@ -118,8 +118,8 @@ pub fn build<F>(cht_num: u64, mut fetcher: F) ->  Option<CHT<MemoryDB<KeccakHash
 	}
 
 	Some(CHT {
-		db: db,
-		root: root,
+		db,
+		root,
 		number: cht_num,
 	})
 }

ethcore/light/src/client/header_chain.rs

@@ -41,7 +41,7 @@ use ethereum_types::{H256, H264, U256};
 use heapsize::HeapSizeOf;
 use kvdb::{DBTransaction, KeyValueDB};
 use parking_lot::{Mutex, RwLock};
-use plain_hasher::H256FastMap;
+use fastmap::H256FastMap;
 use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp};
 use smallvec::SmallVec;
 
@@ -51,10 +51,10 @@ use smallvec::SmallVec;
 const HISTORY: u64 = 2048;
 
 /// The best block key. Maps to an RLP list: [best_era, last_era]
-const CURRENT_KEY: &'static [u8] = &*b"best_and_latest";
+const CURRENT_KEY: &[u8] = &*b"best_and_latest";
 
 /// Key storing the last canonical epoch transition.
-const LAST_CANONICAL_TRANSITION: &'static [u8] = &*b"canonical_transition";
+const LAST_CANONICAL_TRANSITION: &[u8] = &*b"canonical_transition";
 
 /// Information about a block.
 #[derive(Debug, Clone)]
@@ -97,9 +97,10 @@ struct Entry {
 
 impl HeapSizeOf for Entry {
 	fn heap_size_of_children(&self) -> usize {
-		match self.candidates.spilled() {
-			false => 0,
-			true => self.candidates.capacity() * ::std::mem::size_of::<Candidate>(),
+		if self.candidates.spilled() {
+			self.candidates.capacity() * ::std::mem::size_of::<Candidate>()
+		} else {
+			0
 		}
 	}
 }
@@ -134,7 +135,7 @@ impl Decodable for Entry {
 		// rely on the invariant that the canonical entry is always first.
 		let canon_hash = candidates[0].hash;
 		Ok(Entry {
-			candidates: candidates,
+			candidates,
 			canonical_hash: canon_hash,
 		})
 	}
@@ -269,9 +270,9 @@ impl HeaderChain {
 				best_block: RwLock::new(best_block),
 				candidates: RwLock::new(candidates),
 				live_epoch_proofs: RwLock::new(live_epoch_proofs),
-				db: db,
-				col: col,
-				cache: cache,
+				db,
+				col,
+				cache,
 			}
 
 		} else {
@@ -285,8 +286,8 @@ impl HeaderChain {
 				candidates: RwLock::new(BTreeMap::new()),
 				live_epoch_proofs: RwLock::new(live_epoch_proofs),
 				db: db.clone(),
-				col: col,
-				cache: cache,
+				col,
+				cache,
 			};
 
 			// insert the hardcoded sync into the database.
@@ -302,9 +303,8 @@ impl HeaderChain {
 				let decoded_header_num = decoded_header.number();
 
 				// write the block in the DB.
-				info!(target: "chain", "Inserting hardcoded block #{} in chain",
-					  decoded_header_num);
-				let pending = chain.insert_with_td(&mut batch, decoded_header,
+				info!(target: "chain", "Inserting hardcoded block #{} in chain", decoded_header_num);
+				let pending = chain.insert_with_td(&mut batch, &decoded_header,
 												hardcoded_sync.total_difficulty, None)?;
 
 				// check that we have enough hardcoded CHT roots. avoids panicking later.
@@ -324,7 +324,7 @@ impl HeaderChain {
 		};
 
 		// instantiate genesis epoch data if it doesn't exist.
-		if let None = chain.db.get(col, LAST_CANONICAL_TRANSITION)? {
+		if chain.db.get(col, LAST_CANONICAL_TRANSITION)?.is_none() {
 			let genesis_data = spec.genesis_epoch_data()?;
 
 			{
@@ -349,7 +349,7 @@ impl HeaderChain {
 	pub fn insert(
 		&self,
 		transaction: &mut DBTransaction,
-		header: Header,
+		header: &Header,
 		transition_proof: Option<Vec<u8>>,
 	) -> Result<PendingChanges, BlockImportError> {
 		self.insert_inner(transaction, header, None, transition_proof)
@@ -361,7 +361,7 @@ impl HeaderChain {
 	pub fn insert_with_td(
 		&self,
 		transaction: &mut DBTransaction,
-		header: Header,
+		header: &Header,
 		total_difficulty: U256,
 		transition_proof: Option<Vec<u8>>,
 	) -> Result<PendingChanges, BlockImportError> {
@@ -371,7 +371,7 @@ impl HeaderChain {
 	fn insert_inner(
 		&self,
 		transaction: &mut DBTransaction,
-		header: Header,
+		header: &Header,
 		total_difficulty: Option<U256>,
 		transition_proof: Option<Vec<u8>>,
 	) -> Result<PendingChanges, BlockImportError> {
@@ -381,7 +381,7 @@ impl HeaderChain {
 		let transition = transition_proof.map(|proof| EpochTransition {
 			block_hash: hash,
 			block_number: number,
-			proof: proof,
+			proof,
 		});
 
 		let mut pending = PendingChanges {
@@ -415,9 +415,9 @@ impl HeaderChain {
 			let cur_era = candidates.entry(number)
 				.or_insert_with(|| Entry { candidates: SmallVec::new(), canonical_hash: hash });
 			cur_era.candidates.push(Candidate {
-				hash: hash,
-				parent_hash: parent_hash,
-				total_difficulty: total_difficulty,
+				hash,
+				parent_hash,
+				total_difficulty,
 			});
 
 			// fix ordering of era before writing.
@@ -479,9 +479,9 @@ impl HeaderChain {
 
 			trace!(target: "chain", "New best block: ({}, {}), TD {}", number, hash, total_difficulty);
 			pending.best_block = Some(BlockDescriptor {
-				hash: hash,
-				number: number,
-				total_difficulty: total_difficulty,
+				hash,
+				number,
+				total_difficulty,
 			});
 
 			// produce next CHT root if it's time.
@@ -651,7 +651,7 @@ impl HeaderChain {
 						Ok(db_value) => {
 							db_value.map(|x| x.into_vec()).map(encoded::Header::new)
 								.and_then(|header| {
-									cache.insert_block_header(hash.clone(), header.clone());
+									cache.insert_block_header(hash, header.clone());
 									Some(header)
 								 })
 						},
@@ -772,16 +772,17 @@ impl HeaderChain {
 
 	/// Get block status.
 	pub fn status(&self, hash: &H256) -> BlockStatus {
-		match self.db.get(self.col, &*hash).ok().map_or(false, |x| x.is_some()) {
-			true => BlockStatus::InChain,
-			false => BlockStatus::Unknown,
+		if self.db.get(self.col, hash).ok().map_or(false, |x| x.is_some()) {
+			BlockStatus::InChain
+		} else {
+			BlockStatus::Unknown
 		}
 	}
 
 	/// Insert a pending transition.
-	pub fn insert_pending_transition(&self, batch: &mut DBTransaction, hash: H256, t: PendingEpochTransition) {
+	pub fn insert_pending_transition(&self, batch: &mut DBTransaction, hash: H256, t: &PendingEpochTransition) {
 		let key = pending_transition_key(hash);
-		batch.put(self.col, &*key, &*::rlp::encode(&t));
+		batch.put(self.col, &*key, &*::rlp::encode(t));
 	}
 
 	/// Get pending transition for a specific block hash.
@@ -865,7 +866,7 @@ mod tests {
 	use ethcore::ids::BlockId;
 	use ethcore::header::Header;
 	use ethcore::spec::Spec;
-  	use cache::Cache;
+	use cache::Cache;
 	use kvdb::KeyValueDB;
 	use kvdb_memorydb;
 
@@ -897,7 +898,7 @@ mod tests {
 			parent_hash = header.hash();
 
 			let mut tx = db.transaction();
-			let pending = chain.insert(&mut tx, header, None).unwrap();
+			let pending = chain.insert(&mut tx, &header, None).unwrap();
 			db.write(tx).unwrap();
 			chain.apply_pending(pending);
 
@@ -930,7 +931,7 @@ mod tests {
 			parent_hash = header.hash();
 
 			let mut tx = db.transaction();
-			let pending = chain.insert(&mut tx, header, None).unwrap();
+			let pending = chain.insert(&mut tx, &header, None).unwrap();
 			db.write(tx).unwrap();
 			chain.apply_pending(pending);
 
@@ -949,7 +950,7 @@ mod tests {
 				parent_hash = header.hash();
 
 				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, header, None).unwrap();
+				let pending = chain.insert(&mut tx, &header, None).unwrap();
 				db.write(tx).unwrap();
 				chain.apply_pending(pending);
 
@@ -973,7 +974,7 @@ mod tests {
 				parent_hash = header.hash();
 
 				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, header, None).unwrap();
+				let pending = chain.insert(&mut tx, &header, None).unwrap();
 				db.write(tx).unwrap();
 				chain.apply_pending(pending);
 
@@ -1026,7 +1027,7 @@ mod tests {
 				parent_hash = header.hash();
 
 				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, header, None).unwrap();
+				let pending = chain.insert(&mut tx, &header, None).unwrap();
 				db.write(tx).unwrap();
 				chain.apply_pending(pending);
 
@@ -1066,7 +1067,7 @@ mod tests {
 				parent_hash = header.hash();
 
 				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, header, None).unwrap();
+				let pending = chain.insert(&mut tx, &header, None).unwrap();
 				db.write(tx).unwrap();
 				chain.apply_pending(pending);
 
@@ -1083,7 +1084,7 @@ mod tests {
 				parent_hash = header.hash();
 
 				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, header, None).unwrap();
+				let pending = chain.insert(&mut tx, &header, None).unwrap();
 				db.write(tx).unwrap();
 				chain.apply_pending(pending);
 
@@ -1141,7 +1142,7 @@ mod tests {
 				None
 			};
 
-			let pending = chain.insert(&mut tx, header, epoch_proof).unwrap();
+			let pending = chain.insert(&mut tx, &header, epoch_proof).unwrap();
 			db.write(tx).unwrap();
 			chain.apply_pending(pending);
 
@@ -1169,7 +1170,7 @@ mod tests {
 			parent_hash = header.hash();
 
 			let mut tx = db.transaction();
-			let pending = chain.insert(&mut tx, header, None).unwrap();
+			let pending = chain.insert(&mut tx, &header, None).unwrap();
 			db.write(tx).unwrap();
 			chain.apply_pending(pending);
 
@@ -1208,7 +1209,7 @@ mod tests {
 			parent_hash = header.hash();
 
 			let mut tx = db.transaction();
-			let pending = chain.insert(&mut tx, header, None).expect("failed inserting a transaction");
+			let pending = chain.insert(&mut tx, &header, None).expect("failed inserting a transaction");
 			db.write(tx).unwrap();
 			chain.apply_pending(pending);
 

ethcore/light/src/client/mod.rs

@@ -176,7 +176,7 @@ impl<T: ChainDataFetcher> Client<T> {
 		io_channel: IoChannel<ClientIoMessage>,
 		cache: Arc<Mutex<Cache>>
 	) -> Result<Self, Error> {
-		Ok(Client {
+		Ok(Self {
 			queue: HeaderQueue::new(config.queue, spec.engine.clone(), io_channel, config.check_seal),
 			engine: spec.engine.clone(),
 			chain: {
@@ -185,9 +185,9 @@ impl<T: ChainDataFetcher> Client<T> {
 			},
 			report: RwLock::new(ClientReport::default()),
 			import_lock: Mutex::new(()),
-			db: db,
+			db,
 			listeners: RwLock::new(vec![]),
-			fetcher: fetcher,
+			fetcher,
 			verify_full: config.verify_full,
 		})
 	}
@@ -229,7 +229,7 @@ impl<T: ChainDataFetcher> Client<T> {
 		BlockChainInfo {
 			total_difficulty: best_td,
 			pending_total_difficulty: best_td + self.queue.total_difficulty(),
-			genesis_hash: genesis_hash,
+			genesis_hash,
 			best_block_hash: best_hdr.hash(),
 			best_block_number: best_hdr.number(),
 			best_block_timestamp: best_hdr.timestamp(),
@@ -313,14 +313,14 @@ impl<T: ChainDataFetcher> Client<T> {
 					The node may not be able to synchronize further.", e);
 			}
 
-			let epoch_proof =  self.engine.is_epoch_end(
+			let epoch_proof = self.engine.is_epoch_end(
 				&verified_header,
 				&|h| self.chain.block_header(BlockId::Hash(h)).and_then(|hdr| hdr.decode().ok()),
 				&|h| self.chain.pending_transition(h),
 			);
 
 			let mut tx = self.db.transaction();
-			let pending = match self.chain.insert(&mut tx, verified_header, epoch_proof) {
+			let pending = match self.chain.insert(&mut tx, &verified_header, epoch_proof) {
 				Ok(pending) => {
 					good.push(hash);
 					self.report.write().blocks_imported += 1;
@@ -511,8 +511,8 @@ impl<T: ChainDataFetcher> Client<T> {
 		};
 
 		let mut batch = self.db.transaction();
-		self.chain.insert_pending_transition(&mut batch, header.hash(), epoch::PendingTransition {
-			proof: proof,
+		self.chain.insert_pending_transition(&mut batch, header.hash(), &epoch::PendingTransition {
+			proof,
 		});
 		self.db.write_buffered(batch);
 		Ok(())
@@ -602,7 +602,7 @@ impl<T: ChainDataFetcher> ::ethcore::client::EngineClient for Client<T> {
 		self.chain.epoch_transition_for(parent_hash).map(|(hdr, proof)| EpochTransition {
 			block_hash: hdr.hash(),
 			block_number: hdr.number(),
-			proof: proof,
+			proof,
 		})
 	}
 

ethcore/light/src/client/service.rs

@@ -79,8 +79,8 @@ impl<T: ChainDataFetcher> Service<T> {
 		spec.engine.register_client(Arc::downgrade(&client) as _);
 
 		Ok(Service {
-			client: client,
-			io_service: io_service,
+			client,
+			io_service,
 		})
 	}
 

ethcore/light/src/lib.rs

@@ -68,7 +68,7 @@ extern crate keccak_hasher;
 extern crate memorydb;
 extern crate patricia_trie as trie;
 extern crate patricia_trie_ethereum as ethtrie;
-extern crate plain_hasher;
+extern crate fastmap;
 extern crate rand;
 extern crate rlp;
 extern crate parking_lot;

ethcore/light/src/net/context.rs

@@ -44,6 +44,9 @@ pub trait IoContext {
 
 	/// Persistent peer id
 	fn persistent_peer_id(&self, peer: PeerId) -> Option<NodeId>;
+
+	/// Whether given peer id is reserved peer
+	fn is_reserved_peer(&self, peer: PeerId) -> bool;
 }
 
 impl<T> IoContext for T where T: ?Sized + NetworkContext {
@@ -76,6 +79,10 @@ impl<T> IoContext for T where T: ?Sized + NetworkContext {
 	fn persistent_peer_id(&self, peer: PeerId) -> Option<NodeId> {
 		self.session_info(peer).and_then(|info| info.id)
 	}
+
+	fn is_reserved_peer(&self, peer: PeerId) -> bool {
+		NetworkContext::is_reserved_peer(self, peer)
+	}
 }
 
 /// Basic context for the protocol.
@@ -126,7 +133,7 @@ impl<'a> BasicContext for TickCtx<'a> {
 	}
 
 	fn request_from(&self, peer: PeerId, requests: Requests) -> Result<ReqId, Error> {
-		self.proto.request_from(self.io, &peer, requests)
+		self.proto.request_from(self.io, peer, requests)
 	}
 
 	fn make_announcement(&self, announcement: Announcement) {
@@ -159,7 +166,7 @@ impl<'a> BasicContext for Ctx<'a> {
 	}
 
 	fn request_from(&self, peer: PeerId, requests: Requests) -> Result<ReqId, Error> {
-		self.proto.request_from(self.io, &peer, requests)
+		self.proto.request_from(self.io, peer, requests)
 	}
 
 	fn make_announcement(&self, announcement: Announcement) {

ethcore/light/src/net/load_timer.rs

@@ -108,9 +108,9 @@ impl LoadDistribution {
 
 		LoadTimer {
 			start: Instant::now(),
-			n: n,
+			n,
 			dist: self,
-			kind: kind,
+			kind,
 		}
 	}
 
@@ -120,17 +120,15 @@ impl LoadDistribution {
 	pub fn expected_time(&self, kind: Kind) -> Duration {
 		let samples = self.samples.read();
 		samples.get(&kind).and_then(|s| {
-			if s.len() == 0 { return None }
+			if s.is_empty() { return None }
 
-			let alpha: f64 = 1f64 / s.len() as f64;
-			let start = s.front().expect("length known to be non-zero; qed").clone();
-			let ema = s.iter().skip(1).fold(start as f64, |a, &c| {
+			let alpha: f64 = 1_f64 / s.len() as f64;
+			let start = *s.front().expect("length known to be non-zero; qed") as f64;
+			let ema = s.iter().skip(1).fold(start, |a, &c| {
 				(alpha * c as f64) + ((1.0 - alpha) * a)
 			});
 
-			// TODO: use `Duration::from_nanos` once stable (https://github.com/rust-lang/rust/issues/46507)
-			let ema = ema as u64;
-			Some(Duration::new(ema / 1_000_000_000, (ema % 1_000_000_000) as u32))
+			Some(Duration::from_nanos(ema as u64))
 		}).unwrap_or_else(move || hardcoded_serve_time(kind))
 	}
 

ethcore/light/src/net/mod.rs

@@ -77,7 +77,7 @@ const UPDATE_INTERVAL: Duration = Duration::from_millis(5000);
 const PACKET_COUNT_V1: u8 = 9;
 
 /// Supported protocol versions.
-pub const PROTOCOL_VERSIONS: &'static [(u8, u8)] = &[
+pub const PROTOCOL_VERSIONS: &[(u8, u8)] = &[
 	(1, PACKET_COUNT_V1),
 ];
 
@@ -309,9 +309,9 @@ mod id_guard {
 		/// (for forming responses, triggering handlers) until defused
 		pub fn new(peers: RwLockReadGuard<'a, PeerMap>, peer_id: PeerId, req_id: ReqId) -> Self {
 			IdGuard {
-				peers: peers,
-				peer_id: peer_id,
-				req_id: req_id,
+				peers,
+				peer_id,
+				req_id,
 				active: true,
 			}
 		}
@@ -354,6 +354,7 @@ pub struct LightProtocol {
 	peers: RwLock<PeerMap>,
 	capabilities: RwLock<Capabilities>,
 	flow_params: RwLock<Arc<FlowParams>>,
+	free_flow_params: Arc<FlowParams>,
 	handlers: Vec<Arc<Handler>>,
 	req_id: AtomicUsize,
 	sample_store: Box<SampleStore>,
@@ -375,23 +376,24 @@ impl LightProtocol {
 		);
 
 		LightProtocol {
-			provider: provider,
+			provider,
 			config: params.config,
-			genesis_hash: genesis_hash,
+			genesis_hash,
 			network_id: params.network_id,
 			pending_peers: RwLock::new(HashMap::new()),
 			peers: RwLock::new(HashMap::new()),
 			capabilities: RwLock::new(params.capabilities),
 			flow_params: RwLock::new(Arc::new(flow_params)),
+			free_flow_params: Arc::new(FlowParams::free()),
 			handlers: Vec::new(),
 			req_id: AtomicUsize::new(0),
-			sample_store: sample_store,
-			load_distribution: load_distribution,
+			sample_store,
+			load_distribution,
 		}
 	}
 
 	/// Attempt to get peer status.
-	pub fn peer_status(&self, peer: &PeerId) -> Option<Status> {
+	pub fn peer_status(&self, peer: PeerId) -> Option<Status> {
 		self.peers.read().get(&peer)
 			.map(|peer| peer.lock().status.clone())
 	}
@@ -412,9 +414,9 @@ impl LightProtocol {
 	/// insufficient credits. Does not check capabilities before sending.
 	/// On success, returns a request id which can later be coordinated
 	/// with an event.
-	pub fn request_from(&self, io: &IoContext, peer_id: &PeerId, requests: Requests) -> Result<ReqId, Error> {
+	pub fn request_from(&self, io: &IoContext, peer_id: PeerId, requests: Requests) -> Result<ReqId, Error> {
 		let peers = self.peers.read();
-		let peer = match peers.get(peer_id) {
+		let peer = match peers.get(&peer_id) {
 			Some(peer) => peer,
 			None => return Err(Error::UnknownPeer),
 		};
@@ -442,7 +444,7 @@ impl LightProtocol {
 					peer_id, cost, pre_creds);
 
 				let req_id = ReqId(self.req_id.fetch_add(1, Ordering::SeqCst));
-				io.send(*peer_id, packet::REQUEST, {
+				io.send(peer_id, packet::REQUEST, {
 					let mut stream = RlpStream::new_list(2);
 					stream.append(&req_id.0).append_list(&requests.requests());
 					stream.out()
@@ -471,7 +473,7 @@ impl LightProtocol {
 			// TODO: "urgent" announcements like new blocks?
 			// the timer approach will skip 1 (possibly 2) in rare occasions.
 			if peer_info.sent_head == announcement.head_hash ||
-				peer_info.status.head_num >= announcement.head_num  ||
+				peer_info.status.head_num >= announcement.head_num ||
 				now - peer_info.last_update < UPDATE_INTERVAL {
 				continue
 			}
@@ -528,18 +530,18 @@ impl LightProtocol {
 	//   - check whether peer exists
 	//   - check whether request was made
 	//   - check whether request kinds match
-	fn pre_verify_response(&self, peer: &PeerId, raw: &Rlp) -> Result<IdGuard, Error> {
+	fn pre_verify_response(&self, peer: PeerId, raw: &Rlp) -> Result<IdGuard, Error> {
 		let req_id = ReqId(raw.val_at(0)?);
 		let cur_credits: U256 = raw.val_at(1)?;
 
 		trace!(target: "pip", "pre-verifying response for {} from peer {}", req_id, peer);
 
 		let peers = self.peers.read();
-		let res = match peers.get(peer) {
+		let res = match peers.get(&peer) {
 			Some(peer_info) => {
 				let mut peer_info = peer_info.lock();
 				let peer_info: &mut Peer = &mut *peer_info;
-				let req_info = peer_info.pending_requests.remove(&req_id, Instant::now());
+				let req_info = peer_info.pending_requests.remove(req_id, Instant::now());
 				let last_batched = peer_info.pending_requests.is_empty();
 				let flow_info = peer_info.remote_flow.as_mut();
 
@@ -565,29 +567,29 @@ impl LightProtocol {
 			None => Err(Error::UnknownPeer), // probably only occurs in a race of some kind.
 		};
 
-		res.map(|_| IdGuard::new(peers, *peer, req_id))
+		res.map(|_| IdGuard::new(peers, peer, req_id))
 	}
 
 	/// Handle a packet using the given io context.
 	/// Packet data is _untrusted_, which means that invalid data won't lead to
 	/// issues.
-	pub fn handle_packet(&self, io: &IoContext, peer: &PeerId, packet_id: u8, data: &[u8]) {
+	pub fn handle_packet(&self, io: &IoContext, peer: PeerId, packet_id: u8, data: &[u8]) {
 		let rlp = Rlp::new(data);
 
 		trace!(target: "pip", "Incoming packet {} from peer {}", packet_id, peer);
 
 		// handle the packet
 		let res = match packet_id {
-			packet::STATUS => self.status(peer, io, rlp),
-			packet::ANNOUNCE => self.announcement(peer, io, rlp),
+			packet::STATUS => self.status(peer, io, &rlp),
+			packet::ANNOUNCE => self.announcement(peer, io, &rlp),
 
-			packet::REQUEST => self.request(peer, io, rlp),
-			packet::RESPONSE => self.response(peer, io, rlp),
+			packet::REQUEST => self.request(peer, io, &rlp),
+			packet::RESPONSE => self.response(peer, io, &rlp),
 
-			packet::UPDATE_CREDITS => self.update_credits(peer, io, rlp),
-			packet::ACKNOWLEDGE_UPDATE => self.acknowledge_update(peer, io, rlp),
+			packet::UPDATE_CREDITS => self.update_credits(peer, io, &rlp),
+			packet::ACKNOWLEDGE_UPDATE => self.acknowledge_update(peer, io, &rlp),
 
-			packet::SEND_TRANSACTIONS => self.relay_transactions(peer, io, rlp),
+			packet::SEND_TRANSACTIONS => self.relay_transactions(peer, io, &rlp),
 
 			other => {
 				Err(Error::UnrecognizedPacket(other))
@@ -595,7 +597,7 @@ impl LightProtocol {
 		};
 
 		if let Err(e) = res {
-			punish(*peer, io, e);
+			punish(peer, io, &e);
 		}
 	}
 
@@ -682,14 +684,14 @@ impl LightProtocol {
 	}
 
 	/// called when a peer connects.
-	pub fn on_connect(&self, peer: &PeerId, io: &IoContext) {
-		let proto_version = match io.protocol_version(*peer).ok_or(Error::WrongNetwork) {
+	pub fn on_connect(&self, peer: PeerId, io: &IoContext) {
+		let proto_version = match io.protocol_version(peer).ok_or(Error::WrongNetwork) {
 			Ok(pv) => pv,
-			Err(e) => { punish(*peer, io, e); return }
+			Err(e) => { punish(peer, io, &e); return }
 		};
 
 		if PROTOCOL_VERSIONS.iter().find(|x| x.0 == proto_version).is_none() {
-			punish(*peer, io, Error::UnsupportedProtocolVersion(proto_version));
+			punish(peer, io, &Error::UnsupportedProtocolVersion(proto_version));
 			return;
 		}
 
@@ -705,17 +707,22 @@ impl LightProtocol {
 			last_head: None,
 		};
 
-		let capabilities = self.capabilities.read().clone();
-		let local_flow = self.flow_params.read();
-		let status_packet = status::write_handshake(&status, &capabilities, Some(&**local_flow));
+		let capabilities = self.capabilities.read();
+		let cost_local_flow = self.flow_params.read();
+		let local_flow = if io.is_reserved_peer(peer) {
+			&*self.free_flow_params
+		} else {
+			&**cost_local_flow
+		};
+		let status_packet = status::write_handshake(&status, &capabilities, Some(local_flow));
 
-		self.pending_peers.write().insert(*peer, PendingPeer {
+		self.pending_peers.write().insert(peer, PendingPeer {
 			sent_head: chain_info.best_block_hash,
 			last_update: Instant::now(),
 		});
 
 		trace!(target: "pip", "Sending status to peer {}", peer);
-		io.send(*peer, packet::STATUS, status_packet);
+		io.send(peer, packet::STATUS, status_packet);
 	}
 
 	/// called when a peer disconnects.
@@ -736,8 +743,8 @@ impl LightProtocol {
 
 		for handler in &self.handlers {
 			handler.on_disconnect(&Ctx {
-				peer: peer,
-				io: io,
+				peer,
+				io,
 				proto: self,
 			}, &unfulfilled)
 		}
@@ -748,7 +755,7 @@ impl LightProtocol {
 		where F: FnOnce(&BasicContext) -> T
 	{
 		f(&TickCtx {
-			io: io,
+			io,
 			proto: self,
 		})
 	}
@@ -756,7 +763,7 @@ impl LightProtocol {
 	fn tick_handlers(&self, io: &IoContext) {
 		for handler in &self.handlers {
 			handler.tick(&TickCtx {
-				io: io,
+				io,
 				proto: self,
 			})
 		}
@@ -787,15 +794,15 @@ impl LightProtocol {
 			let mut peer_info = peer_info.lock();
 
 			io.send(*peer_id, packet::UPDATE_CREDITS, packet_body.clone());
-			peer_info.awaiting_acknowledge = Some((now.clone(), new_params.clone()));
+			peer_info.awaiting_acknowledge = Some((now, new_params.clone()));
 		}
 	}
 }
 
 impl LightProtocol {
 	// Handle status message from peer.
-	fn status(&self, peer: &PeerId, io: &IoContext, data: Rlp) -> Result<(), Error> {
-		let pending = match self.pending_peers.write().remove(peer) {
+	fn status(&self, peer: PeerId, io: &IoContext, data: &Rlp) -> Result<(), Error> {
+		let pending = match self.pending_peers.write().remove(&peer) {
 			Some(pending) => pending,
 			None => {
 				return Err(Error::UnexpectedHandshake);
@@ -813,33 +820,37 @@ impl LightProtocol {
 			return Err(Error::WrongNetwork);
 		}
 
-		if Some(status.protocol_version as u8) != io.protocol_version(*peer) {
+		if Some(status.protocol_version as u8) != io.protocol_version(peer) {
 			return Err(Error::BadProtocolVersion);
 		}
 
 		let remote_flow = flow_params.map(|params| (params.create_credits(), params));
-		let local_flow = self.flow_params.read().clone();
+		let local_flow = if io.is_reserved_peer(peer) {
+			self.free_flow_params.clone()
+		} else {
+			self.flow_params.read().clone()
+		};
 
-		self.peers.write().insert(*peer, Mutex::new(Peer {
+		self.peers.write().insert(peer, Mutex::new(Peer {
 			local_credits: local_flow.create_credits(),
 			status: status.clone(),
-			capabilities: capabilities.clone(),
-			remote_flow: remote_flow,
+			capabilities,
+			remote_flow,
 			sent_head: pending.sent_head,
 			last_update: pending.last_update,
 			pending_requests: RequestSet::default(),
 			failed_requests: Vec::new(),
 			propagated_transactions: HashSet::new(),
 			skip_update: false,
-			local_flow: local_flow,
+			local_flow,
 			awaiting_acknowledge: None,
 		}));
 
 		let any_kept = self.handlers.iter().map(
 			|handler| handler.on_connect(
 				&Ctx {
-					peer: *peer,
-					io: io,
+					peer,
+					io,
 					proto: self,
 				},
 				&status,
@@ -855,8 +866,8 @@ impl LightProtocol {
 	}
 
 	// Handle an announcement.
-	fn announcement(&self, peer: &PeerId, io: &IoContext, data: Rlp) -> Result<(), Error> {
-		if !self.peers.read().contains_key(peer) {
+	fn announcement(&self, peer: PeerId, io: &IoContext, data: &Rlp) -> Result<(), Error> {
+		if !self.peers.read().contains_key(&peer) {
 			debug!(target: "pip", "Ignoring announcement from unknown peer");
 			return Ok(())
 		}
@@ -866,7 +877,7 @@ impl LightProtocol {
 		// scope to ensure locks are dropped before moving into handler-space.
 		{
 			let peers = self.peers.read();
-			let peer_info = match peers.get(peer) {
+			let peer_info = match peers.get(&peer) {
 				Some(info) => info,
 				None => return Ok(()),
 			};
@@ -890,8 +901,8 @@ impl LightProtocol {
 
 		for handler in &self.handlers {
 			handler.on_announcement(&Ctx {
-				peer: *peer,
-				io: io,
+				peer,
+				io,
 				proto: self,
 			}, &announcement);
 		}
@@ -900,7 +911,7 @@ impl LightProtocol {
 	}
 
 	// Receive requests from a peer.
-	fn request(&self, peer_id: &PeerId, io: &IoContext, raw: Rlp) -> Result<(), Error> {
+	fn request(&self, peer_id: PeerId, io: &IoContext, raw: &Rlp) -> Result<(), Error> {
 		// the maximum amount of requests we'll fill in a single packet.
 		const MAX_REQUESTS: usize = 256;
 
@@ -908,7 +919,7 @@ impl LightProtocol {
 		use ::request::CompleteRequest;
 
 		let peers = self.peers.read();
-		let peer = match peers.get(peer_id) {
+		let peer = match peers.get(&peer_id) {
 			Some(peer) => peer,
 			None => {
 				debug!(target: "pip", "Ignoring request from unknown peer");
@@ -968,7 +979,7 @@ impl LightProtocol {
 	}
 
 	// handle a packet with responses.
-	fn response(&self, peer: &PeerId, io: &IoContext, raw: Rlp) -> Result<(), Error> {
+	fn response(&self, peer: PeerId, io: &IoContext, raw: &Rlp) -> Result<(), Error> {
 		let (req_id, responses) = {
 			let id_guard = self.pre_verify_response(peer, &raw)?;
 			let responses: Vec<Response> = raw.list_at(2)?;
@@ -977,9 +988,9 @@ impl LightProtocol {
 
 		for handler in &self.handlers {
 			handler.on_responses(&Ctx {
-				io: io,
+				io,
 				proto: self,
-				peer: *peer,
+				peer,
 			}, req_id, &responses);
 		}
 
@@ -987,10 +998,10 @@ impl LightProtocol {
 	}
 
 	// handle an update of request credits parameters.
-	fn update_credits(&self, peer_id: &PeerId, io: &IoContext, raw: Rlp) -> Result<(), Error> {
+	fn update_credits(&self, peer_id: PeerId, io: &IoContext, raw: &Rlp) -> Result<(), Error> {
 		let peers = self.peers.read();
 
-		let peer = peers.get(peer_id).ok_or(Error::UnknownPeer)?;
+		let peer = peers.get(&peer_id).ok_or(Error::UnknownPeer)?;
 		let mut peer = peer.lock();
 
 		trace!(target: "pip", "Received an update to request credit params from peer {}", peer_id);
@@ -1022,9 +1033,9 @@ impl LightProtocol {
 	}
 
 	// handle an acknowledgement of request credits update.
-	fn acknowledge_update(&self, peer_id: &PeerId, _io: &IoContext, _raw: Rlp) -> Result<(), Error> {
+	fn acknowledge_update(&self, peer_id: PeerId, _io: &IoContext, _raw: &Rlp) -> Result<(), Error> {
 		let peers = self.peers.read();
-		let peer = peers.get(peer_id).ok_or(Error::UnknownPeer)?;
+		let peer = peers.get(&peer_id).ok_or(Error::UnknownPeer)?;
 		let mut peer = peer.lock();
 
 		trace!(target: "pip", "Received an acknowledgement for new request credit params from peer {}", peer_id);
@@ -1041,7 +1052,7 @@ impl LightProtocol {
 	}
 
 	// Receive a set of transactions to relay.
-	fn relay_transactions(&self, peer: &PeerId, io: &IoContext, data: Rlp) -> Result<(), Error> {
+	fn relay_transactions(&self, peer: PeerId, io: &IoContext, data: &Rlp) -> Result<(), Error> {
 		const MAX_TRANSACTIONS: usize = 256;
 
 		let txs: Vec<_> = data.iter()
@@ -1053,8 +1064,8 @@ impl LightProtocol {
 
 		for handler in &self.handlers {
 			handler.on_transactions(&Ctx {
-				peer: *peer,
-				io: io,
+				peer,
+				io,
 				proto: self,
 			}, &txs);
 		}
@@ -1064,7 +1075,7 @@ impl LightProtocol {
 }
 
 // if something went wrong, figure out how much to punish the peer.
-fn punish(peer: PeerId, io: &IoContext, e: Error) {
+fn punish(peer: PeerId, io: &IoContext, e: &Error) {
 	match e.punishment() {
 		Punishment::None => {}
 		Punishment::Disconnect => {
@@ -1091,11 +1102,11 @@ impl NetworkProtocolHandler for LightProtocol {
 	}
 
 	fn read(&self, io: &NetworkContext, peer: &PeerId, packet_id: u8, data: &[u8]) {
-		self.handle_packet(&io, peer, packet_id, data);
+		self.handle_packet(&io, *peer, packet_id, data);
 	}
 
 	fn connected(&self, io: &NetworkContext, peer: &PeerId) {
-		self.on_connect(peer, &io);
+		self.on_connect(*peer, &io);
 	}
 
 	fn disconnected(&self, io: &NetworkContext, peer: &PeerId) {

ethcore/light/src/net/request_credits.rs

@@ -46,7 +46,7 @@ pub struct Credits {
 
 impl Credits {
 	/// Get the current amount of credits..
-	pub fn current(&self) -> U256 { self.estimate.clone() }
+	pub fn current(&self) -> U256 { self.estimate }
 
 	/// Make a definitive update.
 	/// This will be the value obtained after receiving
@@ -68,12 +68,11 @@ impl Credits {
 	/// If unsuccessful, the structure will be unaltered an an
 	/// error will be produced.
 	pub fn deduct_cost(&mut self, cost: U256) -> Result<(), Error> {
-		match cost > self.estimate {
-			true => Err(Error::NoCredits),
-			false => {
-				self.estimate = self.estimate - cost;
-				Ok(())
-			}
+		if cost > self.estimate {
+			Err(Error::NoCredits)
+		} else {
+			self.estimate = self.estimate - cost;
+			Ok(())
 		}
 	}
 }
@@ -121,7 +120,7 @@ impl Default for CostTable {
 	fn default() -> Self {
 		// arbitrarily chosen constants.
 		CostTable {
-			base: 100000.into(),
+			base: 100_000.into(),
 			headers: Some(10000.into()),
 			transaction_index: Some(10000.into()),
 			body: Some(15000.into()),
@@ -141,7 +140,7 @@ impl Encodable for CostTable {
 		fn append_cost(s: &mut RlpStream, cost: &Option<U256>, kind: request::Kind) {
 			if let Some(ref cost) = *cost {
 				s.begin_list(2);
-				// hack around https://github.com/paritytech/parity/issues/4356
+				// hack around https://github.com/paritytech/parity-ethereum/issues/4356
 				Encodable::rlp_append(&kind, s);
 				s.append(cost);
 			}
@@ -193,17 +192,17 @@ impl Decodable for CostTable {
 		}
 
 		let table = CostTable {
-			base: base,
-			headers: headers,
-			transaction_index: transaction_index,
-			body: body,
-			receipts: receipts,
-			account: account,
-			storage: storage,
-			code: code,
-			header_proof: header_proof,
-			transaction_proof: transaction_proof,
-			epoch_signal: epoch_signal,
+			base,
+			headers,
+			transaction_index,
+			body,
+			receipts,
+			account,
+			storage,
+			code,
+			header_proof,
+			transaction_proof,
+			epoch_signal,
 		};
 
 		if table.costs_set() == 0 {
@@ -227,9 +226,9 @@ impl FlowParams {
 	/// credit limit, and (minimum) rate of recharge.
 	pub fn new(limit: U256, costs: CostTable, recharge: U256) -> Self {
 		FlowParams {
-			costs: costs,
-			limit: limit,
-			recharge: recharge,
+			costs,
+			limit,
+			recharge,
 		}
 	}
 
@@ -283,7 +282,7 @@ impl FlowParams {
 		};
 
 		FlowParams {
-			costs: costs,
+			costs,
 			limit: max.into(),
 			recharge: recharge.into(),
 		}
@@ -293,19 +292,19 @@ impl FlowParams {
 	pub fn free() -> Self {
 		let free_cost: Option<U256> = Some(0.into());
 		FlowParams {
-			limit: (!0u64).into(),
+			limit: (!0_u64).into(),
 			recharge: 1.into(),
 			costs: CostTable {
 				base: 0.into(),
-				headers: free_cost.clone(),
-				transaction_index: free_cost.clone(),
-				body: free_cost.clone(),
-				receipts: free_cost.clone(),
-				account: free_cost.clone(),
-				storage: free_cost.clone(),
-				code: free_cost.clone(),
-				header_proof: free_cost.clone(),
-				transaction_proof: free_cost.clone(),
+				headers: free_cost,
+				transaction_index: free_cost,
+				body: free_cost,
+				receipts: free_cost,
+				account: free_cost,
+				storage: free_cost,
+				code: free_cost,
+				header_proof: free_cost,
+				transaction_proof: free_cost,
 				epoch_signal: free_cost,
 			}
 		}
@@ -370,7 +369,7 @@ impl FlowParams {
 		// recompute and update only in terms of full seconds elapsed
 		// in order to keep the estimate as an underestimate.
 		let elapsed = (now - credits.recharge_point).as_secs();
-		credits.recharge_point = credits.recharge_point + Duration::from_secs(elapsed);
+		credits.recharge_point += Duration::from_secs(elapsed);
 
 		let elapsed: U256 = elapsed.into();
 
@@ -418,7 +417,7 @@ mod tests {
 		use std::time::Duration;
 
 		let flow_params = FlowParams::new(100.into(), Default::default(), 20.into());
-		let mut credits =  flow_params.create_credits();
+		let mut credits = flow_params.create_credits();
 
 		assert!(credits.deduct_cost(101.into()).is_err());
 		assert!(credits.deduct_cost(10.into()).is_ok());

ethcore/light/src/net/request_set.rs

@@ -73,7 +73,7 @@ impl RequestSet {
 	}
 
 	/// Remove a set of requests from the stack.
-	pub fn remove(&mut self, req_id: &ReqId, now: Instant) -> Option<Requests> {
+	pub fn remove(&mut self, req_id: ReqId, now: Instant) -> Option<Requests> {
 		let id = match self.ids.remove(&req_id) {
 			Some(id) => id,
 			None => return None,
@@ -165,7 +165,7 @@ mod tests {
 		let test_end = test_begin + req_time;
 		assert!(req_set.check_timeout(test_end));
 
-		req_set.remove(&ReqId(0), test_begin + Duration::from_secs(1)).unwrap();
+		req_set.remove(ReqId(0), test_begin + Duration::from_secs(1)).unwrap();
 		assert!(!req_set.check_timeout(test_end));
 		assert!(req_set.check_timeout(test_end + Duration::from_secs(1)));
 	}
@@ -183,7 +183,7 @@ mod tests {
 		}
 
 		for i in (0..5).rev() {
-			assert!(req_set.remove(&ReqId(i), test_end).is_some());
+			assert!(req_set.remove(ReqId(i), test_end).is_some());
 			assert_eq!(req_set.cumulative_cost, i.into());
 		}
 	}

ethcore/light/src/net/status.rs

@@ -43,8 +43,8 @@ enum Key {
 
 impl Key {
 	// get the string value of this key.
-	fn as_str(&self) -> &'static str {
-		match *self {
+	fn as_str(self) -> &'static str {
+		match self {
 			Key::ProtocolVersion => "protocolVersion",
 			Key::NetworkId => "networkId",
 			Key::HeadTD => "headTd",
@@ -85,7 +85,7 @@ impl Key {
 // helper for decoding key-value pairs in the handshake or an announcement.
 struct Parser<'a> {
 	pos: usize,
-	rlp: Rlp<'a>,
+	rlp: &'a Rlp<'a>,
 }
 
 impl<'a> Parser<'a> {
@@ -169,7 +169,7 @@ impl Status {
 }
 
 /// Peer capabilities.
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct Capabilities {
 	/// Whether this peer can serve headers
 	pub serve_headers: bool,
@@ -208,10 +208,10 @@ impl Capabilities {
 ///   - chain status
 ///   - serving capabilities
 ///   - request credit parameters
-pub fn parse_handshake(rlp: Rlp) -> Result<(Status, Capabilities, Option<FlowParams>), DecoderError> {
+pub fn parse_handshake(rlp: &Rlp) -> Result<(Status, Capabilities, Option<FlowParams>), DecoderError> {
 	let mut parser = Parser {
 		pos: 0,
-		rlp: rlp,
+		rlp,
 	};
 
 	let status = Status {
@@ -304,7 +304,7 @@ pub struct Announcement {
 }
 
 /// Parse an announcement.
-pub fn parse_announcement(rlp: Rlp) -> Result<Announcement, DecoderError> {
+pub fn parse_announcement(rlp: &Rlp) -> Result<Announcement, DecoderError> {
 	let mut last_key = None;
 
 	let mut announcement = Announcement {
@@ -320,7 +320,7 @@ pub fn parse_announcement(rlp: Rlp) -> Result<Announcement, DecoderError> {
 
 	let mut parser = Parser {
 		pos: 4,
-		rlp: rlp,
+		rlp,
 	};
 
 	while let Some((key, item)) = parser.get_next()? {
@@ -404,7 +404,7 @@ mod tests {
 		let handshake = write_handshake(&status, &capabilities, Some(&flow_params));
 
 		let (read_status, read_capabilities, read_flow)
-			= parse_handshake(Rlp::new(&handshake)).unwrap();
+			= parse_handshake(&Rlp::new(&handshake)).unwrap();
 
 		assert_eq!(read_status, status);
 		assert_eq!(read_capabilities, capabilities);
@@ -439,7 +439,7 @@ mod tests {
 		let handshake = write_handshake(&status, &capabilities, Some(&flow_params));
 
 		let (read_status, read_capabilities, read_flow)
-			= parse_handshake(Rlp::new(&handshake)).unwrap();
+			= parse_handshake(&Rlp::new(&handshake)).unwrap();
 
 		assert_eq!(read_status, status);
 		assert_eq!(read_capabilities, capabilities);
@@ -489,7 +489,7 @@ mod tests {
 		};
 
 		let (read_status, read_capabilities, read_flow)
-			= parse_handshake(Rlp::new(&interleaved)).unwrap();
+			= parse_handshake(&Rlp::new(&interleaved)).unwrap();
 
 		assert_eq!(read_status, status);
 		assert_eq!(read_capabilities, capabilities);
@@ -510,7 +510,7 @@ mod tests {
 		};
 
 		let serialized = write_announcement(&announcement);
-		let read = parse_announcement(Rlp::new(&serialized)).unwrap();
+		let read = parse_announcement(&Rlp::new(&serialized)).unwrap();
 
 		assert_eq!(read, announcement);
 	}
@@ -522,26 +522,26 @@ mod tests {
 		let mut stream = RlpStream::new_list(6);
 		stream
 			.append(&H256::zero())
-			.append(&10u64)
-			.append(&100_000u64)
-			.append(&2u64)
-			.append_raw(&encode_pair(Key::ServeStateSince, &44u64), 1)
+			.append(&10_u64)
+			.append(&100_000_u64)
+			.append(&2_u64)
+			.append_raw(&encode_pair(Key::ServeStateSince, &44_u64), 1)
 			.append_raw(&encode_flag(Key::ServeHeaders), 1);
 
 		let out = stream.drain();
-		assert!(parse_announcement(Rlp::new(&out)).is_err());
+		assert!(parse_announcement(&Rlp::new(&out)).is_err());
 
 		let mut stream = RlpStream::new_list(6);
 		stream
 			.append(&H256::zero())
-			.append(&10u64)
-			.append(&100_000u64)
-			.append(&2u64)
+			.append(&10_u64)
+			.append(&100_000_u64)
+			.append(&2_u64)
 			.append_raw(&encode_flag(Key::ServeHeaders), 1)
-			.append_raw(&encode_pair(Key::ServeStateSince, &44u64), 1);
+			.append_raw(&encode_pair(Key::ServeStateSince, &44_u64), 1);
 
 		let out = stream.drain();
-		assert!(parse_announcement(Rlp::new(&out)).is_ok());
+		assert!(parse_announcement(&Rlp::new(&out)).is_ok());
 	}
 
 	#[test]
@@ -566,7 +566,7 @@ mod tests {
 		let handshake = write_handshake(&status, &capabilities, None);
 
 		let (read_status, read_capabilities, read_flow)
-			= parse_handshake(Rlp::new(&handshake)).unwrap();
+			= parse_handshake(&Rlp::new(&handshake)).unwrap();
 
 		assert_eq!(read_status, status);
 		assert_eq!(read_capabilities, capabilities);

ethcore/light/src/net/tests/mod.rs

@@ -87,6 +87,10 @@ impl IoContext for Expect {
 	fn persistent_peer_id(&self, _peer: PeerId) -> Option<NodeId> {
 		None
 	}
+
+	fn is_reserved_peer(&self, peer: PeerId) -> bool {
+		peer == 0xff
+	}
 }
 
 // can't implement directly for Arc due to cross-crate orphan rules.
@@ -190,6 +194,10 @@ fn write_handshake(status: &Status, capabilities: &Capabilities, proto: &LightPr
 	::net::status::write_handshake(status, capabilities, Some(&*flow_params))
 }
 
+fn write_free_handshake(status: &Status, capabilities: &Capabilities, proto: &LightProtocol) -> Vec<u8> {
+	::net::status::write_handshake(status, capabilities, Some(&proto.free_flow_params))
+}
+
 // helper for setting up the protocol handler and provider.
 fn setup(capabilities: Capabilities) -> (Arc<TestProviderInner>, LightProtocol) {
 	let provider = Arc::new(TestProviderInner {
@@ -222,13 +230,26 @@ fn status(chain_info: BlockChainInfo) -> Status {
 fn handshake_expected() {
 	let capabilities = capabilities();
 
-	let (provider, proto) = setup(capabilities.clone());
+	let (provider, proto) = setup(capabilities);
 
 	let status = status(provider.client.chain_info());
 
 	let packet_body = write_handshake(&status, &capabilities, &proto);
 
-	proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
+	proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body));
+}
+
+#[test]
+fn reserved_handshake_expected() {
+	let capabilities = capabilities();
+
+	let (provider, proto) = setup(capabilities);
+
+	let status = status(provider.client.chain_info());
+
+	let packet_body = write_free_handshake(&status, &capabilities, &proto);
+
+	proto.on_connect(0xff, &Expect::Send(0xff, packet::STATUS, packet_body));
 }
 
 #[test]
@@ -236,32 +257,32 @@ fn handshake_expected() {
 fn genesis_mismatch() {
 	let capabilities = capabilities();
 
-	let (provider, proto) = setup(capabilities.clone());
+	let (provider, proto) = setup(capabilities);
 
 	let mut status = status(provider.client.chain_info());
 	status.genesis_hash = H256::default();
 
 	let packet_body = write_handshake(&status, &capabilities, &proto);
 
-	proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
+	proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body));
 }
 
 #[test]
 fn credit_overflow() {
 	let capabilities = capabilities();
 
-	let (provider, proto) = setup(capabilities.clone());
+	let (provider, proto) = setup(capabilities);
 
 	let status = status(provider.client.chain_info());
 
 	{
 		let packet_body = write_handshake(&status, &capabilities, &proto);
-		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
+		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body));
 	}
 
 	{
 		let my_status = write_handshake(&status, &capabilities, &proto);
-		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &my_status);
+		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &my_status);
 	}
 
 	// 1 billion requests is far too many for the default flow params.
@@ -273,7 +294,7 @@ fn credit_overflow() {
 	}));
 	let request = make_packet(111, &requests);
 
-	proto.handle_packet(&Expect::Punish(1), &1, packet::REQUEST, &request);
+	proto.handle_packet(&Expect::Punish(1), 1, packet::REQUEST, &request);
 }
 
 // test the basic request types -- these just make sure that requests are parsed
@@ -283,7 +304,7 @@ fn credit_overflow() {
 fn get_block_headers() {
 	let capabilities = capabilities();
 
-	let (provider, proto) = setup(capabilities.clone());
+	let (provider, proto) = setup(capabilities);
 	let flow_params = proto.flow_params.read().clone();
 
 	let cur_status = status(provider.client.chain_info());
@@ -295,8 +316,8 @@ fn get_block_headers() {
 
 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
-		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &my_status);
+		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body));
+		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &my_status);
 	}
 
 	let request = Request::Headers(IncompleteHeadersRequest {
@@ -317,9 +338,7 @@ fn get_block_headers() {
 
 		let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests()).unwrap();
 
-		let response = vec![Response::Headers(HeadersResponse {
-			headers: headers,
-		})];
+		let response = vec![Response::Headers(HeadersResponse { headers })];
 
 		let mut stream = RlpStream::new_list(3);
 		stream.append(&req_id).append(&new_creds).append_list(&response);
@@ -328,14 +347,14 @@ fn get_block_headers() {
 	};
 
 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
 }
 
 #[test]
 fn get_block_bodies() {
 	let capabilities = capabilities();
 
-	let (provider, proto) = setup(capabilities.clone());
+	let (provider, proto) = setup(capabilities);
 	let flow_params = proto.flow_params.read().clone();
 
 	let cur_status = status(provider.client.chain_info());
@@ -347,8 +366,8 @@ fn get_block_bodies() {
 
 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
-		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &my_status);
+		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body));
+		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &my_status);
 	}
 
 	let mut builder = Builder::default();
@@ -376,14 +395,14 @@ fn get_block_bodies() {
 	};
 
 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
 }
 
 #[test]
 fn get_block_receipts() {
 	let capabilities = capabilities();
 
-	let (provider, proto) = setup(capabilities.clone());
+	let (provider, proto) = setup(capabilities);
 	let flow_params = proto.flow_params.read().clone();
 
 	let cur_status = status(provider.client.chain_info());
@@ -395,8 +414,8 @@ fn get_block_receipts() {
 
 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
-		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &my_status);
+		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body));
+		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &my_status);
 	}
 
 	// find the first 10 block hashes starting with `f` because receipts are only provided
@@ -431,14 +450,14 @@ fn get_block_receipts() {
 	};
 
 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
 }
 
 #[test]
 fn get_state_proofs() {
 	let capabilities = capabilities();
 
-	let (provider, proto) = setup(capabilities.clone());
+	let (provider, proto) = setup(capabilities);
 	let flow_params = proto.flow_params.read().clone();
 
 	let provider = TestProvider(provider);
@@ -447,8 +466,8 @@ fn get_state_proofs() {
 
 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
-		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
+		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
+		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &packet_body);
 	}
 
 	let req_id = 112;
@@ -490,22 +509,22 @@ fn get_state_proofs() {
 	};
 
 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
 }
 
 #[test]
 fn get_contract_code() {
 	let capabilities = capabilities();
 
-	let (provider, proto) = setup(capabilities.clone());
+	let (provider, proto) = setup(capabilities);
 	let flow_params = proto.flow_params.read().clone();
 
 	let cur_status = status(provider.client.chain_info());
 
 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
-		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
+		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
+		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &packet_body);
 	}
 
 	let req_id = 112;
@@ -533,22 +552,22 @@ fn get_contract_code() {
 	};
 
 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
 }
 
 #[test]
 fn epoch_signal() {
 	let capabilities = capabilities();
 
-	let (provider, proto) = setup(capabilities.clone());
+	let (provider, proto) = setup(capabilities);
 	let flow_params = proto.flow_params.read().clone();
 
 	let cur_status = status(provider.client.chain_info());
 
 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
-		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
+		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
+		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &packet_body);
 	}
 
 	let req_id = 112;
@@ -576,22 +595,22 @@ fn epoch_signal() {
 	};
 
 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
 }
 
 #[test]
 fn proof_of_execution() {
 	let capabilities = capabilities();
 
-	let (provider, proto) = setup(capabilities.clone());
+	let (provider, proto) = setup(capabilities);
 	let flow_params = proto.flow_params.read().clone();
 
 	let cur_status = status(provider.client.chain_info());
 
 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
-		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
+		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
+		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &packet_body);
 	}
 
 	let req_id = 112;
@@ -622,7 +641,7 @@ fn proof_of_execution() {
 	};
 
 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
 
 	// next: way too much requested gas.
 	if let Request::Execution(ref mut req) = request {
@@ -633,7 +652,7 @@ fn proof_of_execution() {
 	let request_body = make_packet(req_id, &requests);
 
 	let expected = Expect::Punish(1);
-	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
 }
 
 #[test]
@@ -643,7 +662,7 @@ fn id_guard() {
 
 	let capabilities = capabilities();
 
-	let (provider, proto) = setup(capabilities.clone());
+	let (provider, proto) = setup(capabilities);
 	let flow_params = proto.flow_params.read().clone();
 
 	let req_id_1 = ReqId(5143);
@@ -666,7 +685,7 @@ fn id_guard() {
 	proto.peers.write().insert(peer_id, ::parking_lot::Mutex::new(Peer {
 		local_credits: flow_params.create_credits(),
 		status: status(provider.client.chain_info()),
-		capabilities: capabilities.clone(),
+		capabilities,
 		remote_flow: Some((flow_params.create_credits(), (&*flow_params).clone())),
 		sent_head: provider.client.chain_info().best_block_hash,
 		last_update: Instant::now(),
@@ -682,33 +701,33 @@ fn id_guard() {
 	{
 		let mut stream = RlpStream::new_list(3);
 		stream.append(&req_id_1.0);
-		stream.append(&4_000_000usize);
-		stream.begin_list(2).append(&125usize).append(&3usize);
+		stream.append(&4_000_000_usize);
+		stream.begin_list(2).append(&125_usize).append(&3_usize);
 
 		let packet = stream.out();
-		assert!(proto.response(&peer_id, &Expect::Nothing, Rlp::new(&packet)).is_err());
+		assert!(proto.response(peer_id, &Expect::Nothing, &Rlp::new(&packet)).is_err());
 	}
 
 	// next, do an unexpected response.
 	{
 		let mut stream = RlpStream::new_list(3);
-		stream.append(&10000usize);
-		stream.append(&3_000_000usize);
+		stream.append(&10000_usize);
+		stream.append(&3_000_000_usize);
 		stream.begin_list(0);
 
 		let packet = stream.out();
-		assert!(proto.response(&peer_id, &Expect::Nothing, Rlp::new(&packet)).is_err());
+		assert!(proto.response(peer_id, &Expect::Nothing, &Rlp::new(&packet)).is_err());
 	}
 
 	// lastly, do a valid (but empty) response.
 	{
 		let mut stream = RlpStream::new_list(3);
 		stream.append(&req_id_2.0);
-		stream.append(&3_000_000usize);
+		stream.append(&3_000_000_usize);
 		stream.begin_list(0);
 
 		let packet = stream.out();
-		assert!(proto.response(&peer_id, &Expect::Nothing, Rlp::new(&packet)).is_ok());
+		assert!(proto.response(peer_id, &Expect::Nothing, &Rlp::new(&packet)).is_ok());
 	}
 
 	let peers = proto.peers.read();
@@ -723,15 +742,15 @@ fn id_guard() {
 fn get_transaction_index() {
 	let capabilities = capabilities();
 
-	let (provider, proto) = setup(capabilities.clone());
+	let (provider, proto) = setup(capabilities);
 	let flow_params = proto.flow_params.read().clone();
 
 	let cur_status = status(provider.client.chain_info());
 
 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
-		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
+		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
+		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &packet_body);
 	}
 
 	let req_id = 112;
@@ -759,5 +778,5 @@ fn get_transaction_index() {
 	};
 
 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
 }

ethcore/light/src/on_demand/mod.rs

@@ -69,8 +69,8 @@ impl Peer {
 		};
 
 		local_caps.serve_headers >= request.serve_headers &&
-		    can_serve_since(request.serve_chain_since, local_caps.serve_chain_since) &&
-		    can_serve_since(request.serve_state_since, local_caps.serve_state_since)
+			can_serve_since(request.serve_chain_since, local_caps.serve_chain_since) &&
+			can_serve_since(request.serve_state_since, local_caps.serve_state_since)
 	}
 }
 
@@ -111,19 +111,16 @@ impl Pending {
 	// verification.
 	// `idx` is the index of the request the response corresponds to.
 	fn update_header_refs(&mut self, idx: usize, response: &Response) {
-		match *response {
-			Response::HeaderByHash(ref hdr) => {
+		if let Response::HeaderByHash(ref hdr) = *response {
 				// fill the header for all requests waiting on this one.
 				// TODO: could be faster if we stored a map usize => Vec<usize>
 				// but typical use just has one header request that others
 				// depend on.
-				for r in self.requests.iter_mut().skip(idx + 1) {
-					if r.needs_header().map_or(false, |(i, _)| i == idx) {
-						r.provide_header(hdr.clone())
-					}
+			for r in self.requests.iter_mut().skip(idx + 1) {
+				if r.needs_header().map_or(false, |(i, _)| i == idx) {
+					r.provide_header(hdr.clone())
 				}
 			}
-			_ => {}, // no other responses produce headers.
 		}
 	}
 
@@ -265,7 +262,7 @@ impl OnDemand {
 			pending: RwLock::new(Vec::new()),
 			peers: RwLock::new(HashMap::new()),
 			in_transit: RwLock::new(HashMap::new()),
-			cache: cache,
+			cache,
 			no_immediate_dispatch: false,
 		}
 	}
@@ -312,7 +309,7 @@ impl OnDemand {
 				}
 			}
 			if let CheckedRequest::HeaderByHash(ref req, _) = request {
-				header_producers.insert(i, req.0.clone());
+				header_producers.insert(i, req.0);
 			}
 
 			builder.push(request)?;
@@ -323,11 +320,11 @@ impl OnDemand {
 		let capabilities = guess_capabilities(requests.requests());
 
 		self.submit_pending(ctx, Pending {
-			requests: requests,
-			net_requests: net_requests,
+			requests,
+			net_requests,
 			required_capabilities: capabilities,
-			responses: responses,
-			sender: sender,
+			responses,
+			sender,
 		});
 
 		Ok(receiver)
@@ -420,7 +417,7 @@ impl Handler for OnDemand {
 	) -> PeerStatus {
 		self.peers.write().insert(
 			ctx.peer(),
-			Peer { status: status.clone(), capabilities: capabilities.clone() }
+			Peer { status: status.clone(), capabilities: *capabilities }
 		);
 		self.attempt_dispatch(ctx.as_basic());
 		PeerStatus::Kept

ethcore/light/src/on_demand/request.rs

@@ -39,7 +39,7 @@ use transaction::SignedTransaction;
 use trie::Trie;
 use vm::EnvInfo;
 
-const SUPPLIED_MATCHES: &'static str = "supplied responses always match produced requests; enforced by `check_response`; qed";
+const SUPPLIED_MATCHES: &str = "supplied responses always match produced requests; enforced by `check_response`; qed";
 
 /// Core unit of the API: submit batches of these to be answered with `Response`s.
 #[derive(Clone)]
@@ -224,7 +224,7 @@ impl HeaderRef {
 	fn field(&self) -> Field<H256> {
 		match *self {
 			HeaderRef::Stored(ref hdr) => Field::Scalar(hdr.hash()),
-			HeaderRef::Unresolved(_, ref field) => field.clone(),
+			HeaderRef::Unresolved(_, field) => field,
 		}
 	}
 
@@ -232,7 +232,7 @@ impl HeaderRef {
 	fn needs_header(&self) -> Option<(usize, Field<H256>)> {
 		match *self {
 			HeaderRef::Stored(_) => None,
-			HeaderRef::Unresolved(idx, ref field) => Some((idx, field.clone())),
+			HeaderRef::Unresolved(idx, field) => Some((idx, field)),
 		}
 	}
 }
@@ -270,6 +270,7 @@ impl From<Request> for CheckedRequest {
 					max: 1,
 					reverse: false,
 				};
+				trace!(target: "on_demand", "HeaderByHash Request, {:?}", net_req);
 				CheckedRequest::HeaderByHash(req, net_req)
 			}
 			Request::HeaderWithAncestors(req) => {
@@ -286,24 +287,28 @@ impl From<Request> for CheckedRequest {
 				let net_req = net_request::IncompleteHeaderProofRequest {
 					num: req.num().into(),
 				};
+				trace!(target: "on_demand", "HeaderProof Request, {:?}", net_req);
 				CheckedRequest::HeaderProof(req, net_req)
 			}
 			Request::TransactionIndex(req) => {
 				let net_req = net_request::IncompleteTransactionIndexRequest {
-					hash: req.0.clone(),
+					hash: req.0,
 				};
+				trace!(target: "on_demand", "TransactionIndex Request, {:?}", net_req);
 				CheckedRequest::TransactionIndex(req, net_req)
 			}
-			Request::Body(req) =>  {
+			Request::Body(req) => {
 				let net_req = net_request::IncompleteBodyRequest {
 					hash: req.0.field(),
 				};
+				trace!(target: "on_demand", "Body Request, {:?}", net_req);
 				CheckedRequest::Body(req, net_req)
 			}
 			Request::Receipts(req) => {
 				let net_req = net_request::IncompleteReceiptsRequest {
 					hash: req.0.field(),
 				};
+				trace!(target: "on_demand", "Receipt Request, {:?}", net_req);
 				CheckedRequest::Receipts(req, net_req)
 			}
 			Request::Account(req) => {
@@ -311,13 +316,15 @@ impl From<Request> for CheckedRequest {
 					block_hash: req.header.field(),
 					address_hash: ::hash::keccak(&req.address).into(),
 				};
+				trace!(target: "on_demand", "Account Request, {:?}", net_req);
 				CheckedRequest::Account(req, net_req)
 			}
 			Request::Code(req) => {
 				let net_req = net_request::IncompleteCodeRequest {
 					block_hash: req.header.field(),
-					code_hash: req.code_hash.into(),
+					code_hash: req.code_hash,
 				};
+				trace!(target: "on_demand", "Code Request, {:?}", net_req);
 				CheckedRequest::Code(req, net_req)
 			}
 			Request::Execution(req) => {
@@ -330,12 +337,14 @@ impl From<Request> for CheckedRequest {
 					value: req.tx.value,
 					data: req.tx.data.clone(),
 				};
+				trace!(target: "on_demand", "Execution request, {:?}", net_req);
 				CheckedRequest::Execution(req, net_req)
 			}
 			Request::Signal(req) => {
 				let net_req = net_request::IncompleteSignalRequest {
 					block_hash: req.hash.into(),
 				};
+				trace!(target: "on_demand", "Signal Request, {:?}", net_req);
 				CheckedRequest::Signal(req, net_req)
 			}
 		}
@@ -395,7 +404,7 @@ impl CheckedRequest {
 		match *self {
 			CheckedRequest::HeaderProof(ref check, _) => {
 				let mut cache = cache.lock();
-				cache.block_hash(&check.num)
+				cache.block_hash(check.num)
 					.and_then(|h| cache.chain_score(&h).map(|s| (h, s)))
 					.map(|(h, s)| Response::HeaderProof((h, s)))
 			}
@@ -439,7 +448,7 @@ impl CheckedRequest {
 			}
 			CheckedRequest::Body(ref check, ref req) => {
 				// check for empty body.
-				if let Some(hdr) = check.0.as_ref().ok() {
+				if let Ok(hdr) = check.0.as_ref() {
 					if hdr.transactions_root() == KECCAK_NULL_RLP && hdr.uncles_hash() == KECCAK_EMPTY_LIST_RLP {
 						let mut stream = RlpStream::new_list(3);
 						stream.append_raw(hdr.rlp().as_raw(), 1);
@@ -760,9 +769,9 @@ impl HeaderProof {
 	/// Provide the expected CHT root to compare against.
 	pub fn new(num: u64, cht_root: H256) -> Option<Self> {
 		::cht::block_to_cht_number(num).map(|cht_num| HeaderProof {
-			num: num,
-			cht_num: cht_num,
-			cht_root: cht_root,
+			num,
+			cht_num,
+			cht_root,
 		})
 	}
 
@@ -808,9 +817,9 @@ impl HeaderWithAncestors {
 		headers: &[encoded::Header]
 	) -> Result<Vec<encoded::Header>, Error> {
 		let expected_hash = match (self.block_hash, start) {
-			(Field::Scalar(ref h), &net_request::HashOrNumber::Hash(ref h2)) => {
-				if h != h2 { return Err(Error::WrongHash(*h, *h2)) }
-				*h
+			(Field::Scalar(h), &net_request::HashOrNumber::Hash(h2)) => {
+				if h != h2 { return Err(Error::WrongHash(h, h2)) }
+				h
 			}
 			(_, &net_request::HashOrNumber::Hash(h2)) => h2,
 			_ => return Err(Error::HeaderByNumber),
@@ -862,9 +871,9 @@ impl HeaderByHash {
 		headers: &[encoded::Header]
 	) -> Result<encoded::Header, Error> {
 		let expected_hash = match (self.0, start) {
-			(Field::Scalar(ref h), &net_request::HashOrNumber::Hash(ref h2)) => {
-				if h != h2 { return Err(Error::WrongHash(*h, *h2)) }
-				*h
+			(Field::Scalar(h), &net_request::HashOrNumber::Hash(h2)) => {
+				if h != h2 { return Err(Error::WrongHash(h, h2)) }
+				h
 			}
 			(_, &net_request::HashOrNumber::Hash(h2)) => h2,
 			_ => return Err(Error::HeaderByNumber),
@@ -872,12 +881,11 @@ impl HeaderByHash {
 
 		let header = headers.get(0).ok_or(Error::Empty)?;
 		let hash = header.hash();
-		match hash == expected_hash {
-			true => {
-				cache.lock().insert_block_header(hash, header.clone());
-				Ok(header.clone())
-			}
-			false => Err(Error::WrongHash(expected_hash, hash)),
+		if hash == expected_hash {
+			cache.lock().insert_block_header(hash, header.clone());
+			Ok(header.clone())
+		} else {
+			Err(Error::WrongHash(expected_hash, hash))
 		}
 	}
 }
@@ -920,11 +928,13 @@ impl Body {
 		let header = self.0.as_ref()?;
 		let tx_root = ::triehash::ordered_trie_root(body.transactions_rlp().iter().map(|r| r.as_raw()));
 		if tx_root != header.transactions_root() {
+			trace!(target: "on_demand", "Body Response: \"WrongTrieRoot\" tx_root: {:?} header_root: {:?}", tx_root, header.transactions_root());
 			return Err(Error::WrongTrieRoot(header.transactions_root(), tx_root));
 		}
 
 		let uncles_hash = keccak(body.uncles_rlp().as_raw());
 		if uncles_hash != header.uncles_hash() {
+			trace!(target: "on_demand", "Body Response: \"WrongHash\" tx_root: {:?} header_root: {:?}", uncles_hash, header.uncles_hash());
 			return Err(Error::WrongHash(header.uncles_hash(), uncles_hash));
 		}
 
@@ -932,7 +942,6 @@ impl Body {
 		let block = encoded::Block::new_from_header_and_body(&header.view(), &body.view());
 
 		cache.lock().insert_block_body(header.hash(), body.clone());
-
 		Ok(block)
 	}
 }
@@ -947,12 +956,12 @@ impl BlockReceipts {
 		let receipts_root = self.0.as_ref()?.receipts_root();
 		let found_root = ::triehash::ordered_trie_root(receipts.iter().map(|r| ::rlp::encode(r)));
 
-		match receipts_root == found_root {
-			true => {
-				cache.lock().insert_block_receipts(receipts_root, receipts.to_vec());
-				Ok(receipts.to_vec())
-			}
-			false => Err(Error::WrongTrieRoot(receipts_root, found_root)),
+		if receipts_root == found_root {
+			cache.lock().insert_block_receipts(receipts_root, receipts.to_vec());
+			Ok(receipts.to_vec())
+		} else {
+			trace!(target: "on_demand", "Receipt Reponse: \"WrongTrieRoot\" receipts_root: {:?} found_root: {:?}", receipts_root, found_root);
+			Err(Error::WrongTrieRoot(receipts_root, found_root))
 		}
 	}
 }
@@ -985,7 +994,10 @@ impl Account {
 					code_hash: rlp.val_at(3)?,
 				}))
 			},
-			None => Ok(None),
+			None => {
+				trace!(target: "on_demand", "Account {:?} not found", self.address);
+				Ok(None)
+			}
 		}
 	}
 }
@@ -1036,7 +1048,7 @@ impl TransactionProof {
 		let root = self.header.as_ref()?.state_root();
 
 		let mut env_info = self.env_info.clone();
-		env_info.gas_limit = self.tx.gas.clone();
+		env_info.gas_limit = self.tx.gas;
 
 		let proved_execution = state::check_proof(
 			state_items,
@@ -1047,9 +1059,18 @@ impl TransactionProof {
 		);
 
 		match proved_execution {
-			ProvedExecution::BadProof => Err(Error::BadProof),
-			ProvedExecution::Failed(e) => Ok(Err(e)),
-			ProvedExecution::Complete(e) => Ok(Ok(e)),
+			ProvedExecution::BadProof => {
+				trace!(target: "on_demand", "BadExecution Proof");
+				Err(Error::BadProof)
+			}
+			ProvedExecution::Failed(e) => {
+				trace!(target: "on_demand", "Execution Proof failed: {:?}", e);
+				Ok(Err(e))
+			}
+			ProvedExecution::Complete(e) => {
+				trace!(target: "on_demand", "Execution successful: {:?}", e);
+				Ok(Ok(e))
+			}
 		}
 	}
 }

ethcore/light/src/provider.rs

@@ -87,9 +87,9 @@ pub trait Provider: Send + Sync {
 
 		let max = ::std::cmp::min(MAX_HEADERS_PER_REQUEST, req.max);
 
-		let headers: Vec<_> = (0u64..max)
+		let headers: Vec<_> = (0_u64..max)
 			.map(|x: u64| x.saturating_mul(req.skip.saturating_add(1)))
-			.take_while(|x| if req.reverse { x < &start_num } else { best_num.saturating_sub(start_num) >= *x })
+			.take_while(|&x| if req.reverse { x < start_num } else { best_num.saturating_sub(start_num) >= x })
 			.map(|x| if req.reverse { start_num.saturating_sub(x) } else { start_num.saturating_add(x) })
 			.map(|x| self.block_header(BlockId::Number(x)))
 			.take_while(|x| x.is_some())
@@ -99,7 +99,7 @@ pub trait Provider: Send + Sync {
 		if headers.is_empty() {
 			None
 		} else {
-			Some(::request::HeadersResponse { headers: headers })
+			Some(::request::HeadersResponse { headers })
 		}
 	}
 
@@ -172,7 +172,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 
 	fn block_body(&self, req: request::CompleteBodyRequest) -> Option<request::BodyResponse> {
 		BlockChainClient::block_body(self, BlockId::Hash(req.hash))
-			.map(|body| ::request::BodyResponse { body: body })
+			.map(|body| ::request::BodyResponse { body })
 	}
 
 	fn block_receipts(&self, req: request::CompleteReceiptsRequest) -> Option<request::ReceiptsResponse> {
@@ -183,7 +183,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 	fn account_proof(&self, req: request::CompleteAccountRequest) -> Option<request::AccountResponse> {
 		self.prove_account(req.address_hash, BlockId::Hash(req.block_hash)).map(|(proof, acc)| {
 			::request::AccountResponse {
-				proof: proof,
+				proof,
 				nonce: acc.nonce,
 				balance: acc.balance,
 				code_hash: acc.code_hash,
@@ -195,7 +195,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 	fn storage_proof(&self, req: request::CompleteStorageRequest) -> Option<request::StorageResponse> {
 		self.prove_storage(req.address_hash, req.key_hash, BlockId::Hash(req.block_hash)).map(|(proof, item) | {
 			::request::StorageResponse {
-				proof: proof,
+				proof,
 				value: item,
 			}
 		})
@@ -203,7 +203,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 
 	fn contract_code(&self, req: request::CompleteCodeRequest) -> Option<request::CodeResponse> {
 		self.state_data(&req.code_hash)
-			.map(|code| ::request::CodeResponse { code: code })
+			.map(|code| ::request::CodeResponse { code })
 	}
 
 	fn header_proof(&self, req: request::CompleteHeaderProofRequest) -> Option<request::HeaderProofResponse> {
@@ -252,7 +252,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 		// prove our result.
 		match cht.prove(req.num, 0) {
 			Ok(Some(proof)) => Some(::request::HeaderProofResponse {
-				proof: proof,
+				proof,
 				hash: needed_hdr.hash(),
 				td: needed_td,
 			}),
@@ -268,12 +268,12 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 		use transaction::Transaction;
 
 		let id = BlockId::Hash(req.block_hash);
-		let nonce = match self.nonce(&req.from, id.clone()) {
+		let nonce = match self.nonce(&req.from, id) {
 			Some(nonce) => nonce,
 			None => return None,
 		};
 		let transaction = Transaction {
-			nonce: nonce,
+			nonce,
 			gas: req.gas,
 			gas_price: req.gas_price,
 			action: req.action,
@@ -294,7 +294,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 
 	fn epoch_signal(&self, req: request::CompleteSignalRequest) -> Option<request::SignalResponse> {
 		self.epoch_signal(req.block_hash).map(|signal| request::SignalResponse {
-			signal: signal,
+			signal,
 		})
 	}
 }
@@ -310,8 +310,8 @@ impl<L> LightProvider<L> {
 	/// Create a new `LightProvider` from the given client and transaction queue.
 	pub fn new(client: Arc<L>, txqueue: Arc<RwLock<TransactionQueue>>) -> Self {
 		LightProvider {
-			client: client,
-			txqueue: txqueue,
+			client,
+			txqueue,
 		}
 	}
 }

ethcore/light/src/transaction_queue.rs

@@ -29,7 +29,7 @@ use std::collections::hash_map::Entry;
 
 use transaction::{self, Condition, PendingTransaction, SignedTransaction};
 use ethereum_types::{H256, U256, Address};
-use plain_hasher::H256FastMap;
+use fastmap::H256FastMap;
 
 // Knowledge of an account's current nonce.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -74,7 +74,7 @@ impl<'a> From<&'a PendingTransaction> for TransactionInfo {
 	fn from(tx: &'a PendingTransaction) -> Self {
 		TransactionInfo {
 			hash: tx.hash(),
-			nonce: tx.nonce.clone(),
+			nonce: tx.nonce,
 			condition: tx.condition.clone(),
 		}
 	}
@@ -95,7 +95,7 @@ impl AccountTransactions {
 	}
 
 	fn next_nonce(&self) -> U256 {
-		self.current.last().map(|last| last.nonce + 1.into())
+		self.current.last().map(|last| last.nonce + 1)
 			.unwrap_or_else(|| *self.cur_nonce.value())
 	}
 
@@ -104,16 +104,10 @@ impl AccountTransactions {
 		let mut promoted = Vec::new();
 		let mut next_nonce = self.next_nonce();
 
-		loop {
-			match self.future.remove(&next_nonce) {
-				Some(tx) => {
-					promoted.push(tx.hash);
-					self.current.push(tx)
-				},
-				None => break,
-			}
-
-			next_nonce = next_nonce + 1.into();
+		while let Some(tx) = self.future.remove(&next_nonce) {
+			promoted.push(tx.hash);
+			self.current.push(tx);
+			next_nonce = next_nonce + 1;
 		}
 
 		promoted
@@ -154,7 +148,7 @@ impl fmt::Debug for TransactionQueue {
 
 impl TransactionQueue {
 	/// Import a pending transaction to be queued.
-	pub fn import(&mut self, tx: PendingTransaction) -> Result<ImportDestination, transaction::Error>  {
+	pub fn import(&mut self, tx: PendingTransaction) -> Result<ImportDestination, transaction::Error> {
 		let sender = tx.sender();
 		let hash = tx.hash();
 		let nonce = tx.nonce;
@@ -174,7 +168,7 @@ impl TransactionQueue {
 			}
 			Entry::Occupied(mut entry) => {
 				let acct_txs = entry.get_mut();
-				if &nonce < acct_txs.cur_nonce.value() {
+				if nonce < *acct_txs.cur_nonce.value() {
 					// don't accept txs from before known current nonce.
 					if acct_txs.cur_nonce.is_known() {
 						return Err(transaction::Error::Old)
@@ -196,7 +190,7 @@ impl TransactionQueue {
 					}
 					Err(idx) => {
 						let cur_len = acct_txs.current.len();
-						let incr_nonce = nonce + 1.into();
+						let incr_nonce = nonce + 1;
 
 						// current is sorted with one tx per nonce,
 						// so if a tx with given nonce wasn't found that means it is either
@@ -215,7 +209,7 @@ impl TransactionQueue {
 							}
 
 							(ImportDestination::Current, vec![hash])
-						} else if idx == cur_len && acct_txs.current.last().map_or(false, |f| f.nonce + 1.into() != nonce) {
+						} else if idx == cur_len && acct_txs.current.last().map_or(false, |f| f.nonce + 1 != nonce) {
 							trace!(target: "txqueue", "Queued future transaction for {}, nonce={}", sender, nonce);
 							let future_nonce = nonce;
 							acct_txs.future.insert(future_nonce, tx_info);
@@ -535,7 +529,7 @@ mod tests {
 		let tx_b: PendingTransaction = Transaction::default().fake_sign(sender).into();
 		let tx_a: PendingTransaction = {
 			let mut tx_a = Transaction::default();
-			tx_a.gas_price = tx_b.gas_price + 1.into();
+			tx_a.gas_price = tx_b.gas_price + 1;
 			tx_a.fake_sign(sender).into()
 		};
 

ethcore/light/src/types/request/mod.rs

@@ -349,7 +349,7 @@ impl Encodable for Request {
 	fn rlp_append(&self, s: &mut RlpStream) {
 		s.begin_list(2);
 
-		// hack around https://github.com/paritytech/parity/issues/4356
+		// hack around https://github.com/paritytech/parity-ethereum/issues/4356
 		Encodable::rlp_append(&self.kind(), s);
 
 		match *self {
@@ -596,7 +596,7 @@ impl Encodable for Response {
 	fn rlp_append(&self, s: &mut RlpStream) {
 		s.begin_list(2);
 
-		// hack around https://github.com/paritytech/parity/issues/4356
+		// hack around https://github.com/paritytech/parity-ethereum/issues/4356
 		Encodable::rlp_append(&self.kind(), s);
 
 		match *self {
@@ -764,9 +764,7 @@ pub mod header {
 				headers.push(encoded::Header::new(item.as_raw().to_owned()));
 			}
 
-			Ok(Response {
-				headers: headers,
-			})
+			Ok(Response { headers })
 		}
 	}
 
@@ -814,7 +812,7 @@ pub mod header_proof {
 		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
 			if let Field::BackReference(req, idx) = self.num {
 				self.num = match oracle(req, idx) {
-					Ok(Output::Number(num)) => Field::Scalar(num.into()),
+					Ok(Output::Number(num)) => Field::Scalar(num),
 					_ => Field::BackReference(req, idx),
 				}
 			}
@@ -1053,7 +1051,7 @@ pub mod block_body {
 		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::Hash(hash)) => Field::Scalar(hash),
 					_ => Field::BackReference(req, idx),
 				}
 			}
@@ -1152,14 +1150,14 @@ pub mod account {
 		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
 			if let Field::BackReference(req, idx) = self.block_hash {
 				self.block_hash = match oracle(req, idx) {
-					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash.into()),
+					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash),
 					_ => Field::BackReference(req, idx),
 				}
 			}
 
 			if let Field::BackReference(req, idx) = self.address_hash {
 				self.address_hash = match oracle(req, idx) {
-					Ok(Output::Hash(address_hash)) => Field::Scalar(address_hash.into()),
+					Ok(Output::Hash(address_hash)) => Field::Scalar(address_hash),
 					_ => Field::BackReference(req, idx),
 				}
 			}
@@ -1257,21 +1255,21 @@ pub mod storage {
 		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
 			if let Field::BackReference(req, idx) = self.block_hash {
 				self.block_hash = match oracle(req, idx) {
-					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash.into()),
+					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash),
 					_ => Field::BackReference(req, idx),
 				}
 			}
 
 			if let Field::BackReference(req, idx) = self.address_hash {
 				self.address_hash = match oracle(req, idx) {
-					Ok(Output::Hash(address_hash)) => Field::Scalar(address_hash.into()),
+					Ok(Output::Hash(address_hash)) => Field::Scalar(address_hash),
 					_ => Field::BackReference(req, idx),
 				}
 			}
 
 			if let Field::BackReference(req, idx) = self.key_hash {
 				self.key_hash = match oracle(req, idx) {
-					Ok(Output::Hash(key_hash)) => Field::Scalar(key_hash.into()),
+					Ok(Output::Hash(key_hash)) => Field::Scalar(key_hash),
 					_ => Field::BackReference(req, idx),
 				}
 			}
@@ -1357,14 +1355,14 @@ pub mod contract_code {
 		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
 			if let Field::BackReference(req, idx) = self.block_hash {
 				self.block_hash = match oracle(req, idx) {
-					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash.into()),
+					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash),
 					_ => Field::BackReference(req, idx),
 				}
 			}
 
 			if let Field::BackReference(req, idx) = self.code_hash {
 				self.code_hash = match oracle(req, idx) {
-					Ok(Output::Hash(code_hash)) => Field::Scalar(code_hash.into()),
+					Ok(Output::Hash(code_hash)) => Field::Scalar(code_hash),
 					_ => Field::BackReference(req, idx),
 				}
 			}
@@ -1452,7 +1450,7 @@ pub mod execution {
 		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
 			if let Field::BackReference(req, idx) = self.block_hash {
 				self.block_hash = match oracle(req, idx) {
-					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash.into()),
+					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash),
 					_ => Field::BackReference(req, idx),
 				}
 			}
@@ -1514,9 +1512,7 @@ pub mod execution {
 				items.push(item);
 			}
 
-			Ok(Response {
-				items: items,
-			})
+			Ok(Response { items })
 		}
 	}
 
@@ -1578,7 +1574,7 @@ pub mod epoch_signal {
 		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
 			if let Field::BackReference(req, idx) = self.block_hash {
 				self.block_hash = match oracle(req, idx) {
-					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash.into()),
+					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash),
 					_ => Field::BackReference(req, idx),
 				}
 			}

ethcore/node_filter/Cargo.toml

@@ -10,16 +10,16 @@ authors = ["Parity Technologies <admin@parity.io>"]
 ethcore = { path = ".."}
 ethcore-network = { path = "../../util/network" }
 ethcore-network-devp2p = { path = "../../util/network-devp2p" }
-ethereum-types = "0.3"
-log = "0.3"
+ethereum-types = "0.4"
+log = "0.4"
 parking_lot = "0.6"
-ethabi = "5.1"
-ethabi-derive = "5.0"
-ethabi-contract = "5.0"
+ethabi = "5.1.2"
+ethabi-derive = "5.1.3"
+ethabi-contract = "5.1.1"
 lru-cache = "0.1"
 
 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }
-kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" }
+kvdb-memorydb = "0.1"
 ethcore-io = { path = "../../util/io" }
 tempdir = "0.3"

ethcore/private-tx/Cargo.toml

@@ -7,34 +7,36 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 error-chain = { version = "0.12", default-features = false }
-ethabi = "5.1"
-ethabi-contract = "5.0"
-ethabi-derive = "5.0"
+ethabi = "5.1.2"
+ethabi-derive = "5.1.3"
+ethabi-contract = "5.1.1"
 ethcore = { path = ".." }
-parity-bytes = { git = "https://github.com/paritytech/parity-common" }
-parity-crypto = { git = "https://github.com/paritytech/parity-common" }
+parity-bytes = "0.1"
+parity-crypto = "0.1"
 ethcore-io = { path = "../../util/io" }
 ethcore-logger = { path = "../../logger" }
 ethcore-miner = { path = "../../miner" }
 ethcore-transaction = { path = "../transaction" }
-ethereum-types = "0.3"
+ethereum-types = "0.4"
 ethjson = { path = "../../json" }
 ethkey = { path = "../../ethkey" }
 fetch = { path = "../../util/fetch" }
 futures = "0.1"
-keccak-hash = { git = "https://github.com/paritytech/parity-common" }
-log = "0.3"
+heapsize = "0.4"
+keccak-hash = "0.1.2"
+log = "0.4"
 parking_lot = "0.6"
-patricia-trie = { git = "https://github.com/paritytech/parity-common" }
+patricia-trie = "0.2"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 rand = "0.3"
-rlp = { git = "https://github.com/paritytech/parity-common" }
+rlp = { version = "0.2.4", features = ["ethereum"] }
 rlp_derive = { path = "../../util/rlp_derive" }
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 tiny-keccak = "1.4"
+transaction-pool = "1.13.2"
 url = "1"
 
 [dev-dependencies]

ethcore/private-tx/src/encryptor.rs

@@ -208,7 +208,7 @@ impl Encryptor for SecretStoreEncryptor {
 		let key = match self.retrieve_key("", false, contract_address, &*accounts) {
 			Ok(key) => Ok(key),
 			Err(Error(ErrorKind::EncryptionKeyNotFound(_), _)) => {
-				trace!("Key for account wasnt found in sstore. Creating. Address: {:?}", contract_address);
+				trace!(target: "privatetx", "Key for account wasnt found in sstore. Creating. Address: {:?}", contract_address);
 				self.retrieve_key(&format!("/{}", self.config.threshold), true, contract_address, &*accounts)
 			}
 			Err(err) => Err(err),

ethcore/private-tx/src/error.rs

@@ -21,12 +21,14 @@ use ethcore::account_provider::SignError;
 use ethcore::error::{Error as EthcoreError, ExecutionError};
 use transaction::Error as TransactionError;
 use ethkey::Error as KeyError;
+use txpool::Error as TxPoolError;
 
 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."];
 	}
 
 	errors {

ethcore/private-tx/src/lib.rs

@@ -37,9 +37,11 @@ extern crate ethkey;
 extern crate ethjson;
 extern crate fetch;
 extern crate futures;
+extern crate heapsize;
 extern crate keccak_hash as hash;
 extern crate parking_lot;
 extern crate patricia_trie as trie;
+extern crate transaction_pool as txpool;
 extern crate patricia_trie_ethereum as ethtrie;
 extern crate rlp;
 extern crate url;
@@ -61,7 +63,7 @@ extern crate rand;
 extern crate ethcore_logger;
 
 pub use encryptor::{Encryptor, SecretStoreEncryptor, EncryptorConfig, NoopEncryptor};
-pub use private_transactions::{PrivateTransactionDesc, VerificationStore, PrivateTransactionSigningDesc, SigningStore};
+pub use private_transactions::{VerifiedPrivateTransaction, VerificationStore, PrivateTransactionSigningDesc, SigningStore};
 pub use messages::{PrivateTransaction, SignedPrivateTransaction};
 pub use error::{Error, ErrorKind};
 
@@ -71,7 +73,7 @@ use std::time::Duration;
 use ethereum_types::{H128, H256, U256, Address};
 use hash::keccak;
 use rlp::*;
-use parking_lot::{Mutex, RwLock};
+use parking_lot::RwLock;
 use bytes::Bytes;
 use ethkey::{Signature, recover, public_to_address};
 use io::IoChannel;
@@ -128,9 +130,8 @@ pub struct Provider {
 	signer_account: Option<Address>,
 	passwords: Vec<Password>,
 	notify: RwLock<Vec<Weak<ChainNotify>>>,
-	transactions_for_signing: Mutex<SigningStore>,
-	// TODO [ToDr] Move the Mutex/RwLock inside `VerificationStore` after refactored to `drain`.
-	transactions_for_verification: Mutex<VerificationStore>,
+	transactions_for_signing: RwLock<SigningStore>,
+	transactions_for_verification: VerificationStore,
 	client: Arc<Client>,
 	miner: Arc<Miner>,
 	accounts: Arc<AccountProvider>,
@@ -161,8 +162,8 @@ impl Provider where {
 			signer_account: config.signer_account,
 			passwords: config.passwords,
 			notify: RwLock::default(),
-			transactions_for_signing: Mutex::default(),
-			transactions_for_verification: Mutex::default(),
+			transactions_for_signing: RwLock::default(),
+			transactions_for_verification: VerificationStore::default(),
 			client,
 			miner,
 			accounts,
@@ -190,9 +191,9 @@ impl Provider where {
 	/// 3. Save it with state returned on prev step to the queue for signing
 	/// 4. Broadcast corresponding message to the chain
 	pub fn create_private_transaction(&self, signed_transaction: SignedTransaction) -> Result<Receipt, Error> {
-		trace!("Creating private transaction from regular transaction: {:?}", signed_transaction);
+		trace!(target: "privatetx", "Creating private transaction from regular transaction: {:?}", signed_transaction);
 		if self.signer_account.is_none() {
-			trace!("Signing account not set");
+			warn!(target: "privatetx", "Signing account not set");
 			bail!(ErrorKind::SignerAccountNotSet);
 		}
 		let tx_hash = signed_transaction.hash();
@@ -203,10 +204,7 @@ impl Provider where {
 			Action::Call(contract) => {
 				let data = signed_transaction.rlp_bytes();
 				let encrypted_transaction = self.encrypt(&contract, &Self::iv_from_transaction(&signed_transaction), &data)?;
-				let private = PrivateTransaction {
-					encrypted: encrypted_transaction,
-					contract,
-				};
+				let private = PrivateTransaction::new(encrypted_transaction, contract);
 				// TODO [ToDr] Using BlockId::Latest is bad here,
 				// the block may change in the middle of execution
 				// causing really weird stuff to happen.
@@ -215,16 +213,16 @@ impl Provider where {
 				// in private-tx to avoid such mistakes.
 				let contract_nonce = self.get_contract_nonce(&contract, BlockId::Latest)?;
 				let private_state = self.execute_private_transaction(BlockId::Latest, &signed_transaction)?;
-				trace!("Private transaction created, encrypted transaction: {:?}, private state: {:?}", private, private_state);
+				trace!(target: "privatetx", "Private transaction created, encrypted transaction: {:?}, private state: {:?}", private, private_state);
 				let contract_validators = self.get_validators(BlockId::Latest, &contract)?;
-				trace!("Required validators: {:?}", contract_validators);
+				trace!(target: "privatetx", "Required validators: {:?}", contract_validators);
 				let private_state_hash = self.calculate_state_hash(&private_state, contract_nonce);
-				trace!("Hashed effective private state for sender: {:?}", private_state_hash);
-				self.transactions_for_signing.lock().add_transaction(private.hash(), signed_transaction, contract_validators, private_state, contract_nonce)?;
-				self.broadcast_private_transaction(private.rlp_bytes().into_vec());
+				trace!(target: "privatetx", "Hashed effective private state for sender: {:?}", private_state_hash);
+				self.transactions_for_signing.write().add_transaction(private.hash(), signed_transaction, contract_validators, private_state, contract_nonce)?;
+				self.broadcast_private_transaction(private.hash(), private.rlp_bytes().into_vec());
 				Ok(Receipt {
 					hash: tx_hash,
-					contract_address: None,
+					contract_address: Some(contract),
 					status_code: 0,
 				})
 			}
@@ -240,14 +238,6 @@ impl Provider where {
 		keccak(&state_buf.as_ref())
 	}
 
-	/// Extract signed transaction from private transaction
-	fn extract_original_transaction(&self, private: PrivateTransaction, contract: &Address) -> Result<UnverifiedTransaction, Error> {
-		let encrypted_transaction = private.encrypted;
-		let transaction_bytes = self.decrypt(contract, &encrypted_transaction)?;
-		let original_transaction: UnverifiedTransaction = Rlp::new(&transaction_bytes).as_val()?;
-		Ok(original_transaction)
-	}
-
 	fn pool_client<'a>(&'a self, nonce_cache: &'a NonceCache) -> miner::pool_client::PoolClient<'a, Client> {
 		let engine = self.client.engine();
 		let refuse_service_transactions = true;
@@ -261,48 +251,122 @@ impl Provider where {
 	}
 
 	/// Retrieve and verify the first available private transaction for every sender
-	///
-	/// TODO [ToDr] It seems that:
-	/// The 3 methods `ready_transaction,get_descriptor,remove` are always used in conjuction so most likely
-	/// can be replaced with a single `drain()` method instead.
-	/// Thanks to this we also don't really need to lock the entire verification for the time of execution.
-	fn process_queue(&self) -> Result<(), Error> {
+	fn process_verification_queue(&self) -> Result<(), Error> {
 		let nonce_cache = NonceCache::new(NONCE_CACHE_SIZE);
-		let mut verification_queue = self.transactions_for_verification.lock();
-		let ready_transactions = verification_queue.ready_transactions(self.pool_client(&nonce_cache));
-		for transaction in ready_transactions {
-			let transaction_hash = transaction.signed().hash();
-			match verification_queue.private_transaction_descriptor(&transaction_hash) {
-				Ok(desc) => {
-					if !self.validator_accounts.contains(&desc.validator_account) {
-						trace!("Cannot find validator account in config");
-						bail!(ErrorKind::ValidatorAccountNotSet);
+		let process_transaction = |transaction: &VerifiedPrivateTransaction| -> Result<_, String> {
+			let private_hash = transaction.private_transaction.hash();
+			match transaction.validator_account {
+				None => {
+					trace!(target: "privatetx", "Propagating transaction further");
+					self.broadcast_private_transaction(private_hash, transaction.private_transaction.rlp_bytes().into_vec());
+					return Ok(());
+				}
+				Some(validator_account) => {
+					if !self.validator_accounts.contains(&validator_account) {
+						trace!(target: "privatetx", "Propagating transaction further");
+						self.broadcast_private_transaction(private_hash, transaction.private_transaction.rlp_bytes().into_vec());
+						return Ok(());
 					}
-					let account = desc.validator_account;
-					if let Action::Call(contract) = transaction.signed().action {
+					let tx_action = transaction.transaction.action.clone();
+					if let Action::Call(contract) = tx_action {
 						// TODO [ToDr] Usage of BlockId::Latest
-						let contract_nonce = self.get_contract_nonce(&contract, BlockId::Latest)?;
-						let private_state = self.execute_private_transaction(BlockId::Latest, transaction.signed())?;
+						let contract_nonce = self.get_contract_nonce(&contract, BlockId::Latest);
+						if let Err(e) = contract_nonce {
+							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 {
+							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!("Hashed effective private state for validator: {:?}", private_state_hash);
-						let password = find_account_password(&self.passwords, &*self.accounts, &account);
-						let signed_state = self.accounts.sign(account, password, private_state_hash)?;
-						let signed_private_transaction = SignedPrivateTransaction::new(desc.private_hash, signed_state, None);
-						trace!("Sending signature for private transaction: {:?}", signed_private_transaction);
-						self.broadcast_signed_private_transaction(signed_private_transaction.rlp_bytes().into_vec());
+						trace!(target: "privatetx", "Hashed effective private state for validator: {:?}", private_state_hash);
+						let password = find_account_password(&self.passwords, &*self.accounts, &validator_account);
+						let signed_state = self.accounts.sign(validator_account, password, private_state_hash);
+						if let Err(e) = signed_state {
+							bail!("Cannot sign the state: {:?}", e);
+						}
+						let signed_state = signed_state.expect("Error was checked before");
+						let signed_private_transaction = SignedPrivateTransaction::new(private_hash, signed_state, None);
+						trace!(target: "privatetx", "Sending signature for private transaction: {:?}", signed_private_transaction);
+						self.broadcast_signed_private_transaction(signed_private_transaction.hash(), signed_private_transaction.rlp_bytes().into_vec());
 					} else {
-						warn!("Incorrect type of action for the transaction");
+						bail!("Incorrect type of action for the transaction");
 					}
-				},
-				Err(e) => {
-					warn!("Cannot retrieve descriptor for transaction with error {:?}", e);
 				}
 			}
-			verification_queue.remove_private_transaction(&transaction_hash);
+			Ok(())
+		};
+		let ready_transactions = self.transactions_for_verification.drain(self.pool_client(&nonce_cache));
+		for transaction in ready_transactions {
+			if let Err(e) = process_transaction(&transaction) {
+				warn!(target: "privatetx", "Error: {:?}", e);
+			}
 		}
 		Ok(())
 	}
 
+	/// Add signed private transaction into the store
+	/// Creates corresponding public transaction if last required signature collected and sends it to the chain
+	pub fn process_signature(&self, signed_tx: &SignedPrivateTransaction) -> Result<(), Error> {
+		trace!(target: "privatetx", "Processing signed private transaction");
+		let private_hash = signed_tx.private_transaction_hash();
+		let desc = match self.transactions_for_signing.read().get(&private_hash) {
+			None => {
+				// Not our transaction, broadcast further to peers
+				self.broadcast_signed_private_transaction(signed_tx.hash(), signed_tx.rlp_bytes().into_vec());
+				return Ok(());
+			},
+			Some(desc) => desc,
+		};
+		let last = self.last_required_signature(&desc, signed_tx.signature())?;
+
+		if last {
+			let mut signatures = desc.received_signatures.clone();
+			signatures.push(signed_tx.signature());
+			let rsv: Vec<Signature> = signatures.into_iter().map(|sign| sign.into_electrum().into()).collect();
+			//Create public transaction
+			let public_tx = self.public_transaction(
+				desc.state.clone(),
+				&desc.original_transaction,
+				&rsv,
+				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 password = find_account_password(&self.passwords, &*self.accounts, &signer_account);
+			let signature = self.accounts.sign(signer_account, password, hash)?;
+			let signed = SignedTransaction::new(public_tx.with_signature(signature, chain_id))?;
+			match self.miner.import_own_transaction(&*self.client, signed.into()) {
+				Ok(_) => trace!(target: "privatetx", "Public transaction added to queue"),
+				Err(err) => {
+					warn!(target: "privatetx", "Failed to add transaction to queue, error: {:?}", err);
+					bail!(err);
+				}
+			}
+			//Remove from store for signing
+			if let Err(err) = self.transactions_for_signing.write().remove(&private_hash) {
+				warn!(target: "privatetx", "Failed to remove transaction from signing store, error: {:?}", err);
+				bail!(err);
+			}
+		} else {
+			//Add signature to the store
+			match self.transactions_for_signing.write().add_signature(&private_hash, signed_tx.signature()) {
+				Ok(_) => trace!(target: "privatetx", "Signature stored for private transaction"),
+				Err(err) => {
+					warn!(target: "privatetx", "Failed to add signature to signing store, error: {:?}", err);
+					bail!(err);
+				}
+			}
+		}
+		Ok(())
+ 	}
+
 	fn last_required_signature(&self, desc: &PrivateTransactionSigningDesc, sign: Signature) -> Result<bool, Error>  {
 		if desc.received_signatures.contains(&sign) {
 			return Ok(false);
@@ -316,26 +380,26 @@ impl Provider where {
 						Ok(desc.received_signatures.len() + 1 == desc.validators.len())
 					}
 					false => {
-						trace!("Sender's state doesn't correspond to validator's");
+						warn!(target: "privatetx", "Sender's state doesn't correspond to validator's");
 						bail!(ErrorKind::StateIncorrect);
 					}
 				}
 			}
 			Err(err) => {
-				trace!("Sender's state doesn't correspond to validator's, error {:?}", err);
+				warn!(target: "privatetx", "Sender's state doesn't correspond to validator's, error {:?}", err);
 				bail!(err);
 			}
 		}
 	}
 
 	/// Broadcast the private transaction message to the chain
-	fn broadcast_private_transaction(&self, message: Bytes) {
-		self.notify(|notify| notify.broadcast(ChainMessageType::PrivateTransaction(message.clone())));
+	fn broadcast_private_transaction(&self, transaction_hash: H256, message: Bytes) {
+		self.notify(|notify| notify.broadcast(ChainMessageType::PrivateTransaction(transaction_hash, message.clone())));
 	}
 
 	/// Broadcast signed private transaction message to the chain
-	fn broadcast_signed_private_transaction(&self, message: Bytes) {
-		self.notify(|notify| notify.broadcast(ChainMessageType::SignedPrivateTransaction(message.clone())));
+	fn broadcast_signed_private_transaction(&self, transaction_hash: H256, message: Bytes) {
+		self.notify(|notify| notify.broadcast(ChainMessageType::SignedPrivateTransaction(transaction_hash, message.clone())));
 	}
 
 	fn iv_from_transaction(transaction: &SignedTransaction) -> H128 {
@@ -351,12 +415,12 @@ impl Provider where {
 	}
 
 	fn encrypt(&self, contract_address: &Address, initialisation_vector: &H128, data: &[u8]) -> Result<Bytes, Error> {
-		trace!("Encrypt data using key(address): {:?}", contract_address);
+		trace!(target: "privatetx", "Encrypt data using key(address): {:?}", contract_address);
 		Ok(self.encryptor.encrypt(contract_address, &*self.accounts, initialisation_vector, data)?)
 	}
 
 	fn decrypt(&self, contract_address: &Address, data: &[u8]) -> Result<Bytes, Error> {
-		trace!("Decrypt data using key(address): {:?}", contract_address);
+		trace!(target: "privatetx", "Decrypt data using key(address): {:?}", contract_address);
 		Ok(self.encryptor.decrypt(contract_address, &*self.accounts, data)?)
 	}
 
@@ -421,7 +485,7 @@ impl Provider where {
 			Action::Call(ref contract_address) => {
 				let contract_code = Arc::new(self.get_decrypted_code(contract_address, block)?);
 				let contract_state = self.get_decrypted_state(contract_address, block)?;
-				trace!("Patching contract at {:?}, code: {:?}, state: {:?}", contract_address, contract_code, contract_state);
+				trace!(target: "privatetx", "Patching contract at {:?}, code: {:?}, state: {:?}", contract_address, contract_code, contract_state);
 				state.patch_account(contract_address, contract_code, Self::snapshot_to_storage(contract_state))?;
 				Some(*contract_address)
 			},
@@ -435,7 +499,9 @@ impl Provider where {
 			let (new_address, _) = ethcore_contract_address(engine.create_address_scheme(env_info.number), &sender, &nonce, &transaction.data);
 			Some(new_address)
 		});
-		let result = Executive::new(&mut state, &env_info, engine.machine()).transact_virtual(transaction, options)?;
+		let machine = engine.machine();
+		let schedule = machine.schedule(env_info.number);
+		let result = Executive::new(&mut state, &env_info, &machine, &schedule).transact_virtual(transaction, options)?;
 		let (encrypted_code, encrypted_storage) = match contract_address {
 			None => bail!(ErrorKind::ContractDoesNotExist),
 			Some(address) => {
@@ -447,7 +513,7 @@ impl Provider where {
 				(enc_code, self.encrypt(&address, &Self::iv_from_transaction(transaction), &Self::snapshot_from_storage(&storage))?)
 			},
 		};
-		trace!("Private contract executed. code: {:?}, state: {:?}, result: {:?}", encrypted_code, encrypted_storage, result.output);
+		trace!(target: "privatetx", "Private contract executed. code: {:?}, state: {:?}, result: {:?}", encrypted_code, encrypted_storage, result.output);
 		Ok(PrivateExecutionResult {
 			code: encrypted_code,
 			state: encrypted_storage,
@@ -548,12 +614,12 @@ impl Provider where {
 
 pub trait Importer {
 	/// Process received private transaction
-	fn import_private_transaction(&self, _rlp: &[u8]) -> Result<(), Error>;
+	fn import_private_transaction(&self, _rlp: &[u8]) -> Result<H256, Error>;
 
 	/// Add signed private transaction into the store
 	///
 	/// Creates corresponding public transaction if last required signature collected and sends it to the chain
-	fn import_signed_private_transaction(&self, _rlp: &[u8]) -> Result<(), Error>;
+	fn import_signed_private_transaction(&self, _rlp: &[u8]) -> Result<H256, Error>;
 }
 
 // TODO [ToDr] Offload more heavy stuff to the IoService thread.
@@ -562,115 +628,59 @@ pub trait Importer {
 // for both verification and execution.
 
 impl Importer for Arc<Provider> {
-	fn import_private_transaction(&self, rlp: &[u8]) -> Result<(), Error> {
-		trace!("Private transaction received");
+	fn import_private_transaction(&self, rlp: &[u8]) -> Result<H256, Error> {
+		trace!(target: "privatetx", "Private transaction received");
 		let private_tx: PrivateTransaction = Rlp::new(rlp).as_val()?;
-		let contract = private_tx.contract;
+		let private_tx_hash = private_tx.hash();
+		let contract = private_tx.contract();
 		let contract_validators = self.get_validators(BlockId::Latest, &contract)?;
 
 		let validation_account = contract_validators
 			.iter()
 			.find(|address| self.validator_accounts.contains(address));
 
-		match validation_account {
-			None => {
-				// TODO [ToDr] This still seems a bit invalid, imho we should still import the transaction to the pool.
-				// Importing to pool verifies correctness and nonce; here we are just blindly forwarding.
-				//
-				// Not for verification, broadcast further to peers
-				self.broadcast_private_transaction(rlp.into());
-				return Ok(());
-			},
-			Some(&validation_account) => {
-				let hash = private_tx.hash();
-				trace!("Private transaction taken for verification");
-				let original_tx = self.extract_original_transaction(private_tx, &contract)?;
-				trace!("Validating transaction: {:?}", original_tx);
-				// Verify with the first account available
-				trace!("The following account will be used for verification: {:?}", validation_account);
-				let nonce_cache = NonceCache::new(NONCE_CACHE_SIZE);
-				self.transactions_for_verification.lock().add_transaction(
-					original_tx,
-					contract,
-					validation_account,
-					hash,
-					self.pool_client(&nonce_cache),
-				)?;
-				let provider = Arc::downgrade(self);
-				self.channel.send(ClientIoMessage::execute(move |_| {
-					if let Some(provider) = provider.upgrade() {
-						if let Err(e) = provider.process_queue() {
-							debug!("Unable to process the queue: {}", e);
-						}
-					}
-				})).map_err(|_| ErrorKind::ClientIsMalformed.into())
+		//extract the original transaction
+		let encrypted_data = private_tx.encrypted();
+		let transaction_bytes = self.decrypt(&contract, &encrypted_data)?;
+		let original_tx: UnverifiedTransaction = Rlp::new(&transaction_bytes).as_val()?;
+		let nonce_cache = NonceCache::new(NONCE_CACHE_SIZE);
+		//add to the queue for further verification
+		self.transactions_for_verification.add_transaction(
+			original_tx,
+			validation_account.map(|&account| account),
+			private_tx,
+			self.pool_client(&nonce_cache),
+		)?;
+		let provider = Arc::downgrade(self);
+		let result = self.channel.send(ClientIoMessage::execute(move |_| {
+			if let Some(provider) = provider.upgrade() {
+				if let Err(e) = provider.process_verification_queue() {
+					warn!(target: "privatetx", "Unable to process the queue: {}", e);
+				}
 			}
+		}));
+		if let Err(e) = result {
+			warn!(target: "privatetx", "Error sending NewPrivateTransaction message: {:?}", e);
 		}
+		Ok(private_tx_hash)
 	}
 
-	fn import_signed_private_transaction(&self, rlp: &[u8]) -> Result<(), Error> {
+	fn import_signed_private_transaction(&self, rlp: &[u8]) -> Result<H256, Error> {
 		let tx: SignedPrivateTransaction = Rlp::new(rlp).as_val()?;
-		trace!("Signature for private transaction received: {:?}", tx);
+		trace!(target: "privatetx", "Signature for private transaction received: {:?}", tx);
 		let private_hash = tx.private_transaction_hash();
-		let desc = match self.transactions_for_signing.lock().get(&private_hash) {
-			None => {
-				// TODO [ToDr] Verification (we can't just blindly forward every transaction)
-
-				// Not our transaction, broadcast further to peers
-				self.broadcast_signed_private_transaction(rlp.into());
-				return Ok(());
-			},
-			Some(desc) => desc,
-		};
-
-		let last = self.last_required_signature(&desc, tx.signature())?;
-
-		if last {
-			let mut signatures = desc.received_signatures.clone();
-			signatures.push(tx.signature());
-			let rsv: Vec<Signature> = signatures.into_iter().map(|sign| sign.into_electrum().into()).collect();
-			//Create public transaction
-			let public_tx = self.public_transaction(
-				desc.state.clone(),
-				&desc.original_transaction,
-				&rsv,
-				desc.original_transaction.nonce,
-				desc.original_transaction.gas_price
-			)?;
-			trace!("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 password = find_account_password(&self.passwords, &*self.accounts, &signer_account);
-			let signature = self.accounts.sign(signer_account, password, hash)?;
-			let signed = SignedTransaction::new(public_tx.with_signature(signature, chain_id))?;
-			match self.miner.import_own_transaction(&*self.client, signed.into()) {
-				Ok(_) => trace!("Public transaction added to queue"),
-				Err(err) => {
-					trace!("Failed to add transaction to queue, error: {:?}", err);
-					bail!(err);
-				}
-			}
-			//Remove from store for signing
-			match self.transactions_for_signing.lock().remove(&private_hash) {
-				Ok(_) => {}
-				Err(err) => {
-					trace!("Failed to remove transaction from signing store, error: {:?}", err);
-					bail!(err);
-				}
-			}
-		} else {
-			//Add signature to the store
-			match self.transactions_for_signing.lock().add_signature(&private_hash, tx.signature()) {
-				Ok(_) => trace!("Signature stored for private transaction"),
-				Err(err) => {
-					trace!("Failed to add signature to signing store, error: {:?}", err);
-					bail!(err);
+		let provider = Arc::downgrade(self);
+		let result = self.channel.send(ClientIoMessage::execute(move |_| {
+			if let Some(provider) = provider.upgrade() {
+				if let Err(e) = provider.process_signature(&tx) {
+					warn!(target: "privatetx", "Unable to process the signature: {}", e);
 				}
 			}
+		}));
+		if let Err(e) = result {
+			warn!(target: "privatetx", "Error sending NewSignedPrivateTransaction message: {:?}", e);
 		}
-		Ok(())
+		Ok(private_hash)
 	}
 }
 
@@ -687,9 +697,9 @@ fn find_account_password(passwords: &Vec<Password>, account_provider: &AccountPr
 impl ChainNotify for Provider {
 	fn new_blocks(&self, imported: Vec<H256>, _invalid: Vec<H256>, _route: ChainRoute, _sealed: Vec<H256>, _proposed: Vec<Bytes>, _duration: Duration) {
 		if !imported.is_empty() {
-			trace!("New blocks imported, try to prune the queue");
-			if let Err(err) = self.process_queue() {
-				trace!("Cannot prune private transactions queue. error: {:?}", err);
+			trace!(target: "privatetx", "New blocks imported, try to prune the queue");
+			if let Err(err) = self.process_verification_queue() {
+				warn!(target: "privatetx", "Cannot prune private transactions queue. error: {:?}", err);
 			}
 		}
 	}

ethcore/private-tx/src/messages.rs

@@ -25,15 +25,41 @@ use transaction::signature::{add_chain_replay_protection, check_replay_protectio
 #[derive(Default, Debug, Clone, PartialEq, RlpEncodable, RlpDecodable, Eq)]
 pub struct PrivateTransaction {
 	/// Encrypted data
-	pub encrypted: Bytes,
+	encrypted: Bytes,
 	/// Address of the contract
-	pub contract: Address,
+	contract: Address,
+	/// Hash
+	hash: H256,
 }
 
 impl PrivateTransaction {
-	/// Compute hash on private transaction
+	/// Constructor
+	pub fn new(encrypted: Bytes, contract: Address) -> Self {
+		PrivateTransaction {
+			encrypted,
+			contract,
+			hash: 0.into(),
+		}.compute_hash()
+	}
+
+	fn compute_hash(mut self) -> PrivateTransaction {
+		self.hash = keccak(&*self.rlp_bytes());
+		self
+	}
+
+	/// Hash of the private transaction
 	pub fn hash(&self) -> H256 {
-		keccak(&*self.rlp_bytes())
+		self.hash
+	}
+
+	/// Address of the contract
+	pub fn contract(&self) -> Address {
+		self.contract
+	}
+
+	/// Encrypted data
+	pub fn encrypted(&self) -> Bytes {
+		self.encrypted.clone()
 	}
 }
 
@@ -49,6 +75,8 @@ pub struct SignedPrivateTransaction {
 	r: U256,
 	/// The S field of the signature
 	s: U256,
+	/// Hash
+	hash: H256,
 }
 
 impl SignedPrivateTransaction {
@@ -59,7 +87,13 @@ impl SignedPrivateTransaction {
 			r: sig.r().into(),
 			s: sig.s().into(),
 			v: add_chain_replay_protection(sig.v() as u64, chain_id),
-		}
+			hash: 0.into(),
+		}.compute_hash()
+	}
+
+	fn compute_hash(mut self) -> SignedPrivateTransaction {
+		self.hash = keccak(&*self.rlp_bytes());
+		self
 	}
 
 	pub fn standard_v(&self) -> u8 { check_replay_protection(self.v) }
@@ -73,4 +107,9 @@ impl SignedPrivateTransaction {
 	pub fn private_transaction_hash(&self) -> H256 {
 		self.private_transaction_hash
 	}
+
+	/// Own hash
+	pub fn hash(&self) -> H256 {
+		self.hash
+	}
 }

ethcore/private-tx/src/private_transactions.rs

@@ -15,61 +15,139 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::sync::Arc;
+use std::cmp;
 use std::collections::{HashMap, HashSet};
 
 use bytes::Bytes;
 use ethcore_miner::pool;
 use ethereum_types::{H256, U256, Address};
+use heapsize::HeapSizeOf;
 use ethkey::Signature;
+use messages::PrivateTransaction;
+use parking_lot::RwLock;
 use transaction::{UnverifiedTransaction, SignedTransaction};
-
+use txpool;
+use txpool::{VerifiedTransaction, Verifier};
 use error::{Error, ErrorKind};
 
+type Pool = txpool::Pool<VerifiedPrivateTransaction, pool::scoring::NonceAndGasPrice>;
+
 /// Maximum length for private transactions queues.
 const MAX_QUEUE_LEN: usize = 8312;
 
-/// Desriptor for private transaction stored in queue for verification
-#[derive(Default, Debug, Clone, PartialEq, Eq)]
-pub struct PrivateTransactionDesc {
-	/// Hash of the private transaction
-	pub private_hash: H256,
-	/// Contract's address used in private transaction
-	pub contract: Address,
+/// Private transaction stored in queue for verification
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct VerifiedPrivateTransaction {
+	/// Original private transaction
+	pub private_transaction: PrivateTransaction,
 	/// Address that should be used for verification
-	pub validator_account: Address,
+	pub validator_account: Option<Address>,
+	/// Resulting verified transaction
+	pub transaction: SignedTransaction,
+	/// Original transaction hash
+	pub transaction_hash: H256,
+	/// Original transaction sender
+	pub transaction_sender: Address,
+}
+
+impl txpool::VerifiedTransaction for VerifiedPrivateTransaction {
+	type Hash = H256;
+	type Sender = Address;
+
+	fn hash(&self) -> &H256 {
+		&self.transaction_hash
+	}
+
+	fn mem_usage(&self) -> usize {
+		self.transaction.heap_size_of_children()
+	}
+
+	fn sender(&self) -> &Address {
+		&self.transaction_sender
+	}
+}
+
+impl pool::ScoredTransaction for VerifiedPrivateTransaction {
+	fn priority(&self) -> pool::Priority {
+		pool::Priority::Regular
+	}
+
+	/// Gets transaction gas price.
+	fn gas_price(&self) -> &U256 {
+		&self.transaction.gas_price
+	}
+
+	/// Gets transaction nonce.
+	fn nonce(&self) -> U256 {
+		self.transaction.nonce
+	}
+}
+
+/// Checks readiness of transactions by looking if the transaction from sender already exists.
+/// Guarantees only one transaction per sender
+#[derive(Debug)]
+pub struct PrivateReadyState<C> {
+	senders: HashSet<Address>,
+	state: C,
+}
+
+impl<C> PrivateReadyState<C> {
+	/// Create new State checker, given client interface.
+	pub fn new(
+		state: C,
+	) -> Self {
+		PrivateReadyState {
+			senders: Default::default(),
+			state,
+		}
+	}
+}
+
+impl<C: pool::client::NonceClient> txpool::Ready<VerifiedPrivateTransaction> for PrivateReadyState<C> {
+	fn is_ready(&mut self, tx: &VerifiedPrivateTransaction) -> txpool::Readiness {
+		let sender = tx.sender();
+		let state = &self.state;
+		let state_nonce = state.account_nonce(sender);
+		if self.senders.contains(sender) {
+			txpool::Readiness::Future
+		} else {
+			self.senders.insert(*sender);
+			match tx.transaction.nonce.cmp(&state_nonce) {
+				cmp::Ordering::Greater => txpool::Readiness::Future,
+				cmp::Ordering::Less => txpool::Readiness::Stale,
+				cmp::Ordering::Equal => txpool::Readiness::Ready,
+			}
+		}
+	}
 }
 
 /// Storage for private transactions for verification
 pub struct VerificationStore {
-	/// Descriptors for private transactions in queue for verification with key - hash of the original transaction
-	descriptors: HashMap<H256, PrivateTransactionDesc>,
-	/// Queue with transactions for verification
-	///
-	/// TODO [ToDr] Might actually be better to use `txpool` directly and:
-	/// 1. Store descriptors inside `VerifiedTransaction`
-	/// 2. Use custom `ready` implementation to only fetch one transaction per sender.
-	/// 3. Get rid of passing dummy `block_number` and `timestamp`
-	transactions: pool::TransactionQueue,
+	verification_pool: RwLock<Pool>,
+	verification_options: pool::verifier::Options,
 }
 
 impl Default for VerificationStore {
 	fn default() -> Self {
 		VerificationStore {
-			descriptors: Default::default(),
-			transactions: pool::TransactionQueue::new(
-				pool::Options {
-					max_count: MAX_QUEUE_LEN,
-					max_per_sender: MAX_QUEUE_LEN / 10,
-					max_mem_usage: 8 * 1024 * 1024,
-				},
-				pool::verifier::Options {
-					// TODO [ToDr] This should probably be based on some real values?
-					minimal_gas_price: 0.into(),
-					block_gas_limit: 8_000_000.into(),
-					tx_gas_limit: U256::max_value(),
-				},
-				pool::PrioritizationStrategy::GasPriceOnly,
-			)
+			verification_pool: RwLock::new(
+				txpool::Pool::new(
+					txpool::NoopListener,
+					pool::scoring::NonceAndGasPrice(pool::PrioritizationStrategy::GasPriceOnly),
+					pool::Options {
+						max_count: MAX_QUEUE_LEN,
+						max_per_sender: MAX_QUEUE_LEN / 10,
+						max_mem_usage: 8 * 1024 * 1024,
+					},
+				)
+			),
+			verification_options: pool::verifier::Options {
+				// TODO [ToDr] This should probably be based on some real values?
+				minimal_gas_price: 0.into(),
+				block_gas_limit: 8_000_000.into(),
+				tx_gas_limit: U256::max_value(),
+				no_early_reject: false,
+			},
 		}
 	}
 }
@@ -77,66 +155,43 @@ impl Default for VerificationStore {
 impl VerificationStore {
 	/// Adds private transaction for verification into the store
 	pub fn add_transaction<C: pool::client::Client>(
-		&mut self,
+		&self,
 		transaction: UnverifiedTransaction,
-		contract: Address,
-		validator_account: Address,
-		private_hash: H256,
+		validator_account: Option<Address>,
+		private_transaction: PrivateTransaction,
 		client: C,
 	) -> Result<(), Error> {
-		if self.descriptors.len() > MAX_QUEUE_LEN {
-			bail!(ErrorKind::QueueIsFull);
-		}
 
-		let transaction_hash = transaction.hash();
-		if self.descriptors.get(&transaction_hash).is_some() {
-			bail!(ErrorKind::PrivateTransactionAlreadyImported);
-		}
-
-		let results = self.transactions.import(
-			client,
-			vec![pool::verifier::Transaction::Unverified(transaction)],
-		);
-
-		// Verify that transaction was imported
-		results.into_iter()
-			.next()
-			.expect("One transaction inserted; one result returned; qed")?;
-
-		self.descriptors.insert(transaction_hash, PrivateTransactionDesc {
-			private_hash,
-			contract,
+		let options = self.verification_options.clone();
+		// Use pool's verifying pipeline for original transaction's verification
+		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();
+		let signed_hash = signed_tx.hash();
+		let signed_sender = signed_tx.sender();
+		let verified = VerifiedPrivateTransaction {
+			private_transaction,
 			validator_account,
-		});
-
+			transaction: signed_tx,
+			transaction_hash: signed_hash,
+			transaction_sender: signed_sender,
+		};
+		let mut pool = self.verification_pool.write();
+		pool.import(verified)?;
 		Ok(())
 	}
 
-	/// Returns transactions ready for verification
+	/// Drains transactions ready for verification from the pool
 	/// Returns only one transaction per sender because several cannot be verified in a row without verification from other peers
-	pub fn ready_transactions<C: pool::client::NonceClient>(&self, client: C) -> Vec<Arc<pool::VerifiedTransaction>> {
-		// We never store PendingTransactions and we don't use internal cache,
-		// so we don't need to provide real block number of timestamp here
-		let block_number = 0;
-		let timestamp = 0;
-		let nonce_cap = None;
-
-		self.transactions.collect_pending(client, block_number, timestamp, nonce_cap, |transactions| {
-			// take only one transaction per sender
-			let mut senders = HashSet::with_capacity(self.descriptors.len());
-			transactions.filter(move |tx| senders.insert(tx.signed().sender())).collect()
-		})
-	}
-
-	/// Returns descriptor of the corresponding private transaction
-	pub fn private_transaction_descriptor(&self, transaction_hash: &H256) -> Result<&PrivateTransactionDesc, Error> {
-		self.descriptors.get(transaction_hash).ok_or(ErrorKind::PrivateTransactionNotFound.into())
-	}
-
-	/// Remove transaction from the queue for verification
-	pub fn remove_private_transaction(&mut self, transaction_hash: &H256) {
-		self.descriptors.remove(transaction_hash);
-		self.transactions.remove(&[*transaction_hash], true);
+	pub fn drain<C: pool::client::NonceClient>(&self, client: C) -> Vec<Arc<VerifiedPrivateTransaction>> {
+		let ready = PrivateReadyState::new(client);
+		let transactions: Vec<_> = self.verification_pool.read().pending(ready).collect();
+		let mut pool = self.verification_pool.write();
+		for tx in &transactions {
+			pool.remove(tx.hash(), true);
+		}
+		transactions
 	}
 }
 

ethcore/res/ethereum/byzantium_test.json

@@ -9,8 +9,9 @@
 				"blockReward": "0x29A2241AF62C0000",
 				"homesteadTransition": "0x0",
 				"eip100bTransition": "0x0",
-				"eip649Reward": "0x29A2241AF62C0000",
-				"eip649Transition": "0x0"
+				"difficultyBombDelays": {
+					"0": 3000000
+				}
 			}
 		}
 	},

ethcore/res/ethereum/classic.json

@@ -3076,7 +3076,9 @@
 		"enode://72e445f4e89c0f476d404bc40478b0df83a5b500d2d2e850e08eb1af0cd464ab86db6160d0fde64bd77d5f0d33507ae19035671b3c74fec126d6e28787669740@104.198.71.200:30303",
 		"enode://39abab9d2a41f53298c0c9dc6bbca57b0840c3ba9dccf42aa27316addc1b7e56ade32a0a9f7f52d6c5db4fe74d8824bcedfeaecf1a4e533cacb71cf8100a9442@144.76.238.49:30303",
 		"enode://f50e675a34f471af2438b921914b5f06499c7438f3146f6b8936f1faeb50b8a91d0d0c24fb05a66f05865cd58c24da3e664d0def806172ddd0d4c5bdbf37747e@144.76.238.49:30306",
-		"enode://83b33409349ffa25e150555f7b4f8deebc68f3d34d782129dc3c8ba07b880c209310a4191e1725f2f6bef59bce9452d821111eaa786deab08a7e6551fca41f4f@159.89.223.6:30303"
+		"enode://83b33409349ffa25e150555f7b4f8deebc68f3d34d782129dc3c8ba07b880c209310a4191e1725f2f6bef59bce9452d821111eaa786deab08a7e6551fca41f4f@159.89.223.6:30303",
+		"enode://5cd218959f8263bc3721d7789070806b0adff1a0ed3f95ec886fb469f9362c7507e3b32b256550b9a7964a23a938e8d42d45a0c34b332bfebc54b29081e83b93@35.187.57.94:30303",
+		"enode://6dd3ac8147fa82e46837ec8c3223d69ac24bcdbab04b036a3705c14f3a02e968f7f1adfcdb002aacec2db46e625c04bf8b5a1f85bb2d40a479b3cc9d45a444af@104.237.131.102:30303"
 	],
 	"accounts": {
 		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },

ethcore/res/ethereum/constantinople_test.json

@@ -6,13 +6,12 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
-				"blockReward": "0x29A2241AF62C0000",
+				"blockReward": "0x1BC16D674EC80000",
 				"homesteadTransition": "0x0",
 				"eip100bTransition": "0x0",
-				"eip649Transition": "0x5",
-				"eip649Reward": "0x1BC16D674EC80000",
-				"eip1234Transition": "0x5",
-				"eip1234Reward": "0x1BC16D674EC80000"
+				"difficultyBombDelays": {
+					"0": 5000000
+				}
 			}
 		}
 	},
@@ -59,9 +58,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 } } } },
-		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x00", "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x00", "pricing": { "modexp": { "divisor": 100 } } } },
 		"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 } } } },
+		"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 } } } }
 	}
 }

ethcore/res/ethereum/ellaism.json

@@ -58,7 +58,8 @@
 		"enode://5dd35866da95aea15211fb1f98684f6e8c4e355e6aa3cc17585680ed53fa164477b8c52cb6ca4b24ec4d80f3d48ff9212b53feb131d825c7945a3abaaf02d24d@178.79.189.58:60606",
 		"enode://6c585c18024eb902ca093278af73b04863ac904caabc39ac2920c23532307c572ad92afd828a990c980d272b1f26307f2409cc97aec3ff9fe866732cae49a8c2@144.217.163.224:31337",
 		"enode://edd90c4cc64528802ad52fd127d80b641ff80fd43fa5292fb111c8bd2914482dffee288fd1b0d26440c6b2c669b10a53cbcd37c895ba0d6194110e100a965b2d@188.166.179.159:30303",
-		"enode://9d960373335c1cc38ca696dea8f2893e2a071c8f21524f21e8aae22be032acc3b67797b1d21e866f9d832943ae7d9555b8466c6ab34f473d21e547114952df37@213.32.53.183:30303"
+		"enode://9d960373335c1cc38ca696dea8f2893e2a071c8f21524f21e8aae22be032acc3b67797b1d21e866f9d832943ae7d9555b8466c6ab34f473d21e547114952df37@213.32.53.183:30303",
+		"enode://5120308ebf25261c8423866a3a082e8d0f31106343d8b3b6c4dfe9d41bd900f5e03c64356ba51b6d343a951846a3f5ede5c5dd05925eaea4e4b9c35b1be9237c@95.53.247.188:30303"
 	],
 	"accounts": {
 		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },

ethcore/res/ethereum/expanse.json

@@ -8,15 +8,19 @@
 				"difficultyBoundDivisor": "0x0800",
 				"difficultyIncrementDivisor": "0x3C",
 				"durationLimit": "0x3C",
-				"blockReward": "0x6f05b59d3b200000",
+				"blockReward": {
+					"0x0": "0x6f05b59d3b200000",
+					"0xC3500": "0x3782DACE9D900000"
+				},
 				"homesteadTransition": "0x30d40",
 				"difficultyHardforkTransition": "0x59d9",
 				"difficultyHardforkBoundDivisor": "0x0200",
 				"bombDefuseTransition": "0x30d40",
 				"eip100bTransition": "0xC3500",
 				"metropolisDifficultyIncrementDivisor": "0x1E",
-				"eip649Transition": "0xC3500",
-				"eip649Reward": "0x3782DACE9D900000",
+				"difficultyBombDelays": {
+					"0xC3500": 3000000
+				},
 				"expip2Transition": "0xC3500",
 				"expip2DurationLimit": "0x1E"
 			}
@@ -64,6 +68,7 @@
 		"enode://96d3919b903e7f5ad59ac2f73c43be9172d9d27e2771355db03fd194732b795829a31fe2ea6de109d0804786c39a807e155f065b4b94c6fce167becd0ac02383@45.55.22.34:42786",
 		"enode://5f6c625bf287e3c08aad568de42d868781e961cbda805c8397cfb7be97e229419bef9a5a25a75f97632787106bba8a7caf9060fab3887ad2cfbeb182ab0f433f@46.101.182.53:42786",
 		"enode://d33a8d4c2c38a08971ed975b750f21d54c927c0bf7415931e214465a8d01651ecffe4401e1db913f398383381413c78105656d665d83f385244ab302d6138414@128.199.183.48:42786",
+		"enode://df872f81e25f72356152b44cab662caf1f2e57c3a156ecd20e9ac9246272af68a2031b4239a0bc831f2c6ab34733a041464d46b3ea36dce88d6c11714446e06b@178.62.208.109:42786",
 		"enode://f6f0d6b9b7d02ec9e8e4a16e38675f3621ea5e69860c739a65c1597ca28aefb3cec7a6d84e471ac927d42a1b64c1cbdefad75e7ce8872d57548ddcece20afdd1@159.203.64.95:42786"
 	],
 	"accounts": {

ethcore/res/ethereum/foundation.json

@@ -7,7 +7,10 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
-				"blockReward": "0x4563918244F40000",
+				"blockReward": {
+					"0": "0x4563918244F40000",
+					"4370000": "0x29A2241AF62C0000"
+				},
 				"homesteadTransition": "0x118c30",
 				"daoHardforkTransition": "0x1d4c00",
 				"daoHardforkBeneficiary": "0xbf4ed7b27f1d666546e30d74d50d173d20bca754",
@@ -129,9 +132,10 @@
 					"0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
 					"0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
 				],
-				"eip649Reward": "0x29A2241AF62C0000",
 				"eip100bTransition": 4370000,
-				"eip649Transition": 4370000
+				"difficultyBombDelays": {
+					"4370000": 3000000
+				}
 			}
 		}
 	},

ethcore/res/ethereum/mcip3_test.json

@@ -9,7 +9,6 @@
 				"durationLimit":"0x0d",
 				"homesteadTransition":"0x118c30",
 				"eip100bTransition":"0x7fffffffffffff",
-				"eip649Transition":"0x7fffffffffffff",
 				"blockReward":"0x1105a0185b50a80000",
 				"mcip3Transition":"0x00",
 				"mcip3MinerReward":"0xd8d726b7177a80000",

ethcore/res/ethereum/mcip6_byz.json

@@ -1,157 +1,159 @@
 {
-	"name":"Musicoin Byzantium Test",
-	"dataDir":"mcip6test",
-	"engine":{
-		"Ethash":{
-			"params":{
-				"minimumDifficulty":"0x020000",
-				"difficultyBoundDivisor":"0x0800",
-				"durationLimit":"0x0d",
-				"homesteadTransition":"0x17",
-				"eip100bTransition":"0x2a",
-				"eip649Transition":"0x2a",
-				"blockReward":"0x1105a0185b50a80000",
-				"mcip3Transition":"0x17",
-				"mcip3MinerReward":"0xd8d726b7177a80000",
-				"mcip3UbiReward":"0x2b5e3af16b1880000",
-				"mcip3UbiContract":"0x00efdd5883ec628983e9063c7d969fe268bbf310",
-				"mcip3DevReward":"0xc249fdd327780000",
-				"mcip3DevContract":"0x00756cf8159095948496617f5fb17ed95059f536"
+	"name": "Musicoin Byzantium Test",
+	"dataDir": "mcip6test",
+	"engine": {
+		"Ethash": {
+			"params": {
+				"minimumDifficulty": "0x020000",
+				"difficultyBoundDivisor": "0x0800",
+				"durationLimit": "0x0d",
+				"homesteadTransition": "0x17",
+				"eip100bTransition": "0x2a",
+				"blockReward": "0x1105a0185b50a80000",
+				"mcip3Transition": "0x17",
+				"mcip3MinerReward": "0xd8d726b7177a80000",
+				"mcip3UbiReward": "0x2b5e3af16b1880000",
+				"mcip3UbiContract": "0x00efdd5883ec628983e9063c7d969fe268bbf310",
+				"mcip3DevReward": "0xc249fdd327780000",
+				"mcip3DevContract": "0x00756cf8159095948496617f5fb17ed95059f536",
+				"difficultyBombDelays": {
+					"0x2a": 3000000
+				}
 			}
 		}
 	},
-	"params":{
-		"gasLimitBoundDivisor":"0x0400",
-		"registrar":"0x5C271c4C9A67E7D73b7b3669d47504741354f21D",
-		"accountStartNonce":"0x00",
-		"maximumExtraDataSize":"0x20",
-		"minGasLimit":"0x1388",
-		"networkID":"0x76740c",
-		"forkBlock":"0x2b",
-		"forkCanonHash":"0x23c3171e864a5d513a3ef85e4cf86dac4cc36b89e5b8e63bf0ebcca68b9e43c9",
-		"eip150Transition":"0x2a",
-		"eip160Transition":"0x7fffffffffffff",
-		"eip161abcTransition":"0x7fffffffffffff",
-		"eip161dTransition":"0x7fffffffffffff",
-		"eip98Transition":"0x7fffffffffffff",
-		"eip140Transition":"0x2a",
-		"eip155Transition":"0x2a",
-		"eip211Transition":"0x2a",
-		"eip214Transition":"0x2a",
-		"eip658Transition":"0x2a",
-		"maxCodeSize":"0x6000",
+	"params": {
+		"gasLimitBoundDivisor": "0x0400",
+		"registrar": "0x5C271c4C9A67E7D73b7b3669d47504741354f21D",
+		"accountStartNonce": "0x00",
+		"maximumExtraDataSize": "0x20",
+		"minGasLimit": "0x1388",
+		"networkID": "0x76740c",
+		"forkBlock": "0x2b",
+		"forkCanonHash": "0x23c3171e864a5d513a3ef85e4cf86dac4cc36b89e5b8e63bf0ebcca68b9e43c9",
+		"eip150Transition": "0x2a",
+		"eip160Transition": "0x7fffffffffffff",
+		"eip161abcTransition": "0x7fffffffffffff",
+		"eip161dTransition": "0x7fffffffffffff",
+		"eip98Transition": "0x7fffffffffffff",
+		"eip140Transition": "0x2a",
+		"eip155Transition": "0x2a",
+		"eip211Transition": "0x2a",
+		"eip214Transition": "0x2a",
+		"eip658Transition": "0x2a",
+		"maxCodeSize": "0x6000",
 		"maxCodeSizeTransition": "0x7fffffffffffff"
 	},
-	"genesis":{
-		"seal":{
-			"ethereum":{
-				"nonce":"0x000000000000002a",
-				"mixHash":"0x00000000000000000000000000000000000000647572616c65787365646c6578"
+	"genesis": {
+		"seal": {
+			"ethereum": {
+				"nonce": "0x000000000000002a",
+				"mixHash": "0x00000000000000000000000000000000000000647572616c65787365646c6578"
 			}
 		},
-		"difficulty":"0x3d0900",
-		"author":"0x0000000000000000000000000000000000000000",
-		"timestamp":"0x00",
-		"parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData":"",
-		"gasLimit":"0x7a1200"
+		"difficulty": "0x3d0900",
+		"author": "0x0000000000000000000000000000000000000000",
+		"timestamp": "0x00",
+		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+		"extraData": "",
+		"gasLimit": "0x7a1200"
 	},
-	"nodes":[
+	"nodes": [
 		"enode://5ddc110733f6d34101973cdef3f9b43484159acf6f816d3b1ee92bc3c98ea453e857bb1207edf0ec0242008ab3a0f9f05eeaee99d47bd414c08a5bdf4847de13@176.9.3.148:30303",
         "enode://38f074f4db8e64dfbaf87984bf290eef67772a901a7113d1b62f36216be152b8450c393d6fc562a5e38f04f99bc8f439a99010a230b1d92dc1df43bf0bd00615@176.9.3.148:30403"
 	],
-	"accounts":{
-		"0000000000000000000000000000000000000001":{
-			"balance":"1",
-			"builtin":{
-				"name":"ecrecover",
-				"pricing":{
-					"linear":{
-						"base":3000,
-						"word":0
+	"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
+		"0000000000000000000000000000000000000002": {
+			"balance": "1",
+			"builtin": {
+				"name": "sha256",
+				"pricing": {
+					"linear": {
+						"base": 60,
+						"word": 12
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000003":{
-			"balance":"1",
-			"builtin":{
-				"name":"ripemd160",
-				"pricing":{
-					"linear":{
-						"base":600,
-						"word":120
+		"0000000000000000000000000000000000000003": {
+			"balance": "1",
+			"builtin": {
+				"name": "ripemd160",
+				"pricing": {
+					"linear": {
+						"base": 600,
+						"word": 120
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000004":{
-			"balance":"1",
-			"builtin":{
-				"name":"identity",
-				"pricing":{
-					"linear":{
-						"base":15,
-						"word":3
+		"0000000000000000000000000000000000000004": {
+			"balance": "1",
+			"builtin": {
+				"name": "identity",
+				"pricing": {
+					"linear": {
+						"base": 15,
+						"word": 3
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000005":{
-			"builtin":{
-				"name":"modexp",
-				"activate_at":"0x2a",
-				"pricing":{
-					"modexp":{
-						"divisor":20
+		"0000000000000000000000000000000000000005": {
+			"builtin": {
+				"name": "modexp",
+				"activate_at": "0x2a",
+				"pricing": {
+					"modexp": {
+						"divisor": 20
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000006":{
-			"builtin":{
-				"name":"alt_bn128_add",
-				"activate_at":"0x2a",
-				"pricing":{
-					"linear":{
-						"base":500,
-						"word":0
+		"0000000000000000000000000000000000000006": {
+			"builtin": {
+				"name": "alt_bn128_add",
+				"activate_at": "0x2a",
+				"pricing": {
+					"linear": {
+						"base": 500,
+						"word": 0
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000007":{
-			"builtin":{
-				"name":"alt_bn128_mul",
-				"activate_at":"0x2a",
-				"pricing":{
-					"linear":{
-						"base":40000,
-						"word":0
+		"0000000000000000000000000000000000000007": {
+			"builtin": {
+				"name": "alt_bn128_mul",
+				"activate_at": "0x2a",
+				"pricing": {
+					"linear": {
+						"base": 40000,
+						"word": 0
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000008":{
-			"builtin":{
-				"name":"alt_bn128_pairing",
-				"activate_at":"0x2a",
-				"pricing":{
-					"alt_bn128_pairing":{
-						"base":100000,
-						"pair":80000
+		"0000000000000000000000000000000000000008": {
+			"builtin": {
+				"name": "alt_bn128_pairing",
+				"activate_at": "0x2a",
+				"pricing": {
+					"alt_bn128_pairing": {
+						"base": 100000,
+						"pair": 80000
 					}
 				}
 			}

ethcore/res/ethereum/morden.json

@@ -54,7 +54,15 @@
 		"enode://fd008499e9c4662f384b3cff23438879d31ced24e2d19504c6389bc6da6c882f9c2f8dbed972f7058d7650337f54e4ba17bb49c7d11882dd1731d26a6e62e3cb@35.187.57.94:30304",
 		"enode://30a1fd71f28aa6f66fe662af9ecc75f0a6980f06b71598f2b19d3dda04223fc0e53b47e40c9171d5014e9f5b59d9954de125782da592f5d95ea39066e2591d5d@104.237.131.102:30304",
 		"enode://7909d51011d8a153351169f21d3a7bbedb3be1e17d38c1f2fad06504dd5aa07a00f00845835d535fe702bf379c4d7209a51f4d1b723e0ca8b8732bd21fba3b30@139.162.133.42:30303",
-		"enode://a088dfb2f5305be9232e8071c5535f13718a4017e247a0b35074b807d43d99e022880c27302cdb5b1e98ad34c083dbbb483f2b17bdc66149bad037154d6ace96@139.162.127.72:30303"
+		"enode://a088dfb2f5305be9232e8071c5535f13718a4017e247a0b35074b807d43d99e022880c27302cdb5b1e98ad34c083dbbb483f2b17bdc66149bad037154d6ace96@139.162.127.72:30303",
+		"enode://1fac84e8fe252d63764563f4f526323393b52aaaf832693f7a8a1637f6920311d7d04a7cb91945273e6c644d5c3b01a6bf8a172ae653c918e1bf8eb79e7e6baf@94.152.212.32:40404",
+		"enode://3666177e0e2e56bebaef318c8ba4aed3d05ce788df1eb0e48b79fce40fcf3445feb4ccc4ce2fd4aadc3c146858e276bdef1cb63437215f17e6e5dd8c41403427@144.202.23.122:30303",
+		"enode://3666177e0e2e56bebaef318c8ba4aed3d05ce788df1eb0e48b79fce40fcf3445feb4ccc4ce2fd4aadc3c146858e276bdef1cb63437215f17e6e5dd8c41403427@45.76.16.230:30303",
+		"enode://78d8897b376e549c2b47664e4c81fd023b089d0a417275731760739b7f98dd639d632bb7b75e92606c7d6abbbe96f69f06d85e0a41a143f1f0a3c55ff2b1d732@144.202.101.214:30303",
+		"enode://a329e2399e6d72009690faa15a82ae13ef2015bc5e72ffb22f92ea83cf3bfc9ce45d43c38b3c2289c148939d3911e9d1a9e940f41698dba54508b59489072b2a@5.135.157.4:30303",
+		"enode://d79b12fc48a494ba7053bbc30cbe510060ebb3a2ce9bb4f88076303e97e31e2af263c61e797af0af20419b7268b2bfb2d2f196b57242a454035ecb6001cc69a2@94.23.49.75:30303",
+		"enode://f4a1805a51cfdf5afdddf0b43b8d4b687657497311797464046dce65388b9e5a538b55bdb23ae4eac54485a81d47adad48731294efc9d73fbc9f297f625aec70@198.27.80.32:30303",
+		"enode://f570df80b5589dfb0a7657adb62b93dc55e76d491694d8965c6382964e6f397ae0b8c3548ef0a108151f3b1485c75769ff203df2db7ace385ee98fdb2766ba3b@86.8.233.254:30303"
 	],
 	"accounts": {
 		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },

ethcore/res/ethereum/musicoin.json

@@ -9,14 +9,16 @@
 				"durationLimit":"0x0d",
 				"homesteadTransition":"0x118c30",
 				"eip100bTransition":"0x21e88e",
-				"eip649Transition":"0x21e88e",
 				"blockReward":"0x1105a0185b50a80000",
 				"mcip3Transition":"0x124f81",
 				"mcip3MinerReward":"0xd8d726b7177a80000",
 				"mcip3UbiReward":"0x2b5e3af16b1880000",
 				"mcip3UbiContract":"0x00efdd5883ec628983e9063c7d969fe268bbf310",
 				"mcip3DevReward":"0xc249fdd327780000",
-				"mcip3DevContract":"0x00756cf8159095948496617f5fb17ed95059f536"
+				"mcip3DevContract":"0x00756cf8159095948496617f5fb17ed95059f536",
+				"difficultyBombDelays": {
+					"0x21e88e": 3000000
+				}
 			}
 		}
 	},
@@ -61,7 +63,15 @@
 		"enode://b58c0c71f08864c0cf7fa9dea2c4cbefae5ae7a36cc30d286603b24982d25f3ccc056b589119324c51768fc2054b8c529ecf682e06e1e9980170b93ff194ed7a@132.148.132.9:30303",
 		"enode://d302f52c8789ad87ee528f1431a67f1aa646c9bec17babb4665dfb3d61de5b9119a70aa77b2147a5f28854092ba09769323c1c552a6ac6f6a34cbcf767e2d2fe@158.69.248.48:30303",
 		"enode://c72564bce8331ae298fb8ece113a456e3927d7e5989c2be3e445678b3600579f722410ef9bbfe339335d676af77343cb21b5b1703b7bebc32be85fce937a2220@191.252.185.71:30303",
-		"enode://e3ae4d25ee64791ff98bf17c37acf90933359f2505c00f65c84f6863231a32a94153cadb0a462e428f18f35ded6bd91cd91033d26576a28558c22678be9cfaee@5.63.158.137:35555"
+		"enode://e3ae4d25ee64791ff98bf17c37acf90933359f2505c00f65c84f6863231a32a94153cadb0a462e428f18f35ded6bd91cd91033d26576a28558c22678be9cfaee@5.63.158.137:35555",
+		"enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303",
+		"enode://3f1d12044546b76342d59d4a05532c14b85aa669704bfe1f864fe079415aa2c02d743e03218e57a33fb94523adb54032871a6c51b2cc5514cb7c7e35b3ed0a99@13.93.211.84:30303",
+		"enode://78de8a0916848093c73790ead81d1928bec737d565119932b98c6b100d944b7a95e94f847f689fc723399d2e31129d182f7ef3863f2b4c820abbf3ab2722344d@191.235.84.50:30303",
+		"enode://158f8aab45f6d19c6cbf4a089c2670541a8da11978a2f90dbf6a502a4a3bab80d288afdbeb7ec0ef6d92de563767f3b1ea9e8e334ca711e9f8e2df5a0385e8e6@13.75.154.138:30303",
+		"enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303",
+		"enode://979b7fa28feeb35a4741660a16076f1943202cb72b6af70d327f053e248bab9ba81760f39d0701ef1d8f89cc1fbd2cacba0710a12cd5314d5e0c9021aa3637f9@5.1.83.226:30303",
+		"enode://d302f52c8789ad87ee528f1431a67f1aa646c9bec17babb4665dfb3d61de5b9119a70aa77b2147a5f28854092ba09769323c1c552a6ac6f6a34cbcf767e2d2fe@158.69.248.48:30303",
+		"enode://c72564bce8331ae298fb8ece113a456e3927d7e5989c2be3e445678b3600579f722410ef9bbfe339335d676af77343cb21b5b1703b7bebc32be85fce937a2220@191.252.185.71:30303"
 	],
 	"accounts":{
 		"0000000000000000000000000000000000000001":{

ethcore/res/ethereum/ropsten.json

@@ -7,13 +7,17 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
-				"blockReward": "0x4563918244F40000",
+				"blockReward": {
+					"0": "0x4563918244F40000",
+					"1700000": "0x29A2241AF62C0000",
+					"4230000": "0x1BC16D674EC80000"
+				},
 				"homesteadTransition": 0,
 				"eip100bTransition": 1700000,
-				"eip649Transition": 1700000,
-				"eip649Reward": "0x29A2241AF62C0000",
-				"eip1234Transition": 4230000,
-				"eip1234Reward": "0x1BC16D674EC80000"
+				"difficultyBombDelays": {
+					"1700000": 3000000,
+					"4230000": 2000000
+				}
 			}
 		}
 	},
@@ -24,8 +28,8 @@
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x3",
-		"forkBlock": "0x40E80F",
-		"forkCanonHash": "0x3e12d5c0f8d63fbc5831cc7f7273bd824fa4d0a9a4102d65d99a7ea5604abc00",
+		"forkBlock": 3383558,
+		"forkCanonHash": "0x6b4b80d65951375a70bc1ecf9a270d152dd355454d57869abbae2e42c213e0f3",
 		"maxCodeSize": 24576,
 		"maxCodeSizeTransition": 10,
 		"eip150Transition": 0,
@@ -2119,7 +2123,8 @@
 		"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"
+		"enode://865a63255b3bb68023b6bffd5095118fcc13e79dcf014fe4e47e065c350c7cc72af2e53eff895f11ba1bbb6a2b33271c1116ee870f266618eadfc2e78aa7349c@52.176.100.77:30303",
+		"enode://691907d5a7dee24884b791e799183e5db01f4fe0b6e9b795ffaf5cf85a3023a637f2abadc82fc0da168405092df869126377c5f190794cd2d1c067245ae2b1ce@13.125.237.43:30303"
 	],
 	"accounts": {
 		"0000000000000000000000000000000000000000": { "balance": "1" },

ethcore/res/ethereum/transition_test.json

@@ -6,11 +6,15 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
-				"blockReward": "0x4563918244F40000",
+				"blockReward": {
+					"0x0": "0x4563918244F40000",
+					"0x5": "0x29A2241AF62C0000"
+				},
 				"homesteadTransition": "0",
-				"eip649Reward": "0x29A2241AF62C0000",
 				"eip100bTransition": "5",
-				"eip649Transition": "5"
+				"difficultyBombDelays": {
+					"5": 3000000
+				}
 			}
 		}
 	},

ethcore/res/instant_seal.json

@@ -1,7 +1,9 @@
 {
 	"name": "DevelopmentChain",
 	"engine": {
-		"instantSeal": null
+		"instantSeal": {
+			"params": {}
+		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",

ethcore/res/tx_permission_tests/contract_ver_2_genesis.json

@@ -17,7 +17,8 @@
 		"minGasLimit": "0x1388",
 		"networkID" : "0x69",
 		"gasLimitBoundDivisor": "0x0400",
-		"transactionPermissionContract": "0x0000000000000000000000000000000000000005"
+		"transactionPermissionContract": "0x0000000000000000000000000000000000000005",
+		"transactionPermissionContractTransition": "1"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/tx_permission_tests/deprecated_contract_genesis.json

@@ -17,7 +17,8 @@
 		"minGasLimit": "0x1388",
 		"networkID" : "0x69",
 		"gasLimitBoundDivisor": "0x0400",
-		"transactionPermissionContract": "0x0000000000000000000000000000000000000005"
+		"transactionPermissionContract": "0x0000000000000000000000000000000000000005",
+		"transactionPermissionContractTransition": "1"
 	},
 	"genesis": {
 		"seal": {

ethcore/service/Cargo.toml

@@ -10,12 +10,13 @@ ethcore = { path = ".." }
 ethcore-io = { path = "../../util/io" }
 ethcore-private-tx = { path = "../private-tx" }
 ethcore-sync = { path = "../sync" }
-kvdb = { git = "https://github.com/paritytech/parity-common" }
-log = "0.3"
+ethereum-types = "0.4"
+kvdb = "0.1"
+log = "0.4"
 stop-guard = { path = "../../util/stop-guard" }
-trace-time = { path = "../../util/trace-time" }
+trace-time = "0.1"
 
 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }
 tempdir = "0.3"
-kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" }
+kvdb-rocksdb = "0.1.3"

ethcore/service/src/lib.rs

@@ -19,6 +19,7 @@ extern crate ethcore;
 extern crate ethcore_io as io;
 extern crate ethcore_private_tx;
 extern crate ethcore_sync as sync;
+extern crate ethereum_types;
 extern crate kvdb;
 extern crate stop_guard;
 

ethcore/service/src/service.rs

@@ -21,6 +21,7 @@ use std::path::Path;
 use std::time::Duration;
 
 use ansi_term::Colour;
+use ethereum_types::H256;
 use io::{IoContext, TimerToken, IoHandler, IoService, IoError};
 use stop_guard::StopGuard;
 
@@ -54,12 +55,24 @@ impl PrivateTxService {
 }
 
 impl PrivateTxHandler for PrivateTxService {
-	fn import_private_transaction(&self, rlp: &[u8]) -> Result<(), String> {
-		self.provider.import_private_transaction(rlp).map_err(|e| e.to_string())
+	fn import_private_transaction(&self, rlp: &[u8]) -> Result<H256, String> {
+		match self.provider.import_private_transaction(rlp) {
+			Ok(import_result) => Ok(import_result),
+			Err(err) => {
+				warn!(target: "privatetx", "Unable to import private transaction packet: {}", err);
+				bail!(err.to_string())
+			}
+		}
 	}
 
-	fn import_signed_private_transaction(&self, rlp: &[u8]) -> Result<(), String> {
-		self.provider.import_signed_private_transaction(rlp).map_err(|e| e.to_string())
+	fn import_signed_private_transaction(&self, rlp: &[u8]) -> Result<H256, String> {
+		match self.provider.import_signed_private_transaction(rlp) {
+			Ok(import_result) => Ok(import_result),
+			Err(err) => {
+				warn!(target: "privatetx", "Unable to import signed private transaction packet: {}", err);
+				bail!(err.to_string())
+			}
+		}
 	}
 }
 
@@ -95,6 +108,7 @@ impl ClientService {
 		let pruning = config.pruning;
 		let client = Client::new(config, &spec, blockchain_db.clone(), miner.clone(), io_service.channel())?;
 		miner.set_io_channel(io_service.channel());
+		miner.set_in_chain_checker(&client.clone());
 
 		let snapshot_params = SnapServiceParams {
 			engine: spec.engine.clone(),

ethcore/src/block.rs

@@ -14,7 +14,22 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Blockchain block.
+//! Base data structure of this module is `Block`.
+//!
+//! Blocks can be produced by a local node or they may be received from the network.
+//!
+//! To create a block locally, we start with an `OpenBlock`. This block is mutable
+//! and can be appended to with transactions and uncles.
+//!
+//! When ready, `OpenBlock` can be closed and turned into a `ClosedBlock`. A `ClosedBlock` can
+//! be reopend again by a miner under certain circumstances. On block close, state commit is
+//! performed.
+//!
+//! `LockedBlock` is a version of a `ClosedBlock` that cannot be reopened. It can be sealed
+//! using an engine.
+//!
+//! `ExecutedBlock` is an underlaying data structure used by all structs above to store block
+//! related info.
 
 use std::cmp;
 use std::collections::HashSet;
@@ -25,7 +40,7 @@ use engines::EthEngine;
 use error::{Error, BlockError};
 use ethereum_types::{H256, U256, Address, Bloom};
 use factory::Factories;
-use hash::{keccak, KECCAK_NULL_RLP, KECCAK_EMPTY_LIST_RLP};
+use hash::keccak;
 use header::{Header, ExtendedHeader};
 use receipt::{Receipt, TransactionOutcome};
 use rlp::{Rlp, RlpStream, Encodable, Decodable, DecoderError, encode_list};
@@ -36,7 +51,6 @@ use transaction::{UnverifiedTransaction, SignedTransaction, Error as Transaction
 use triehash::ordered_trie_root;
 use unexpected::{Mismatch, OutOfBounds};
 use verification::PreverifiedBlock;
-use views::BlockView;
 use vm::{EnvInfo, LastHashes};
 
 /// A block, encoded as it is on the block chain.
@@ -51,11 +65,6 @@ pub struct Block {
 }
 
 impl Block {
-	/// Returns true if the given bytes form a valid encoding of a block in RLP.
-	pub fn is_good(b: &[u8]) -> bool {
-		Rlp::new(b).as_val::<Block>().is_ok()
-	}
-
 	/// Get the RLP-encoding of the block with the seal.
 	pub fn rlp_bytes(&self) -> Bytes {
 		let mut block_rlp = RlpStream::new_list(3);
@@ -85,16 +94,22 @@ impl Decodable for Block {
 /// An internal type for a block's common elements.
 #[derive(Clone)]
 pub struct ExecutedBlock {
-	header: Header,
-	transactions: Vec<SignedTransaction>,
-	uncles: Vec<Header>,
-	receipts: Vec<Receipt>,
-	transactions_set: HashSet<H256>,
-	state: State<StateDB>,
-	traces: Tracing,
-	last_hashes: Arc<LastHashes>,
-	is_finalized: bool,
-	metadata: Option<Vec<u8>>,
+	/// Executed block header.
+	pub header: Header,
+	/// Executed transactions.
+	pub transactions: Vec<SignedTransaction>,
+	/// Uncles.
+	pub uncles: Vec<Header>,
+	/// Transaction receipts.
+	pub receipts: Vec<Receipt>,
+	/// Hashes of already executed transactions.
+	pub transactions_set: HashSet<H256>,
+	/// Underlaying state.
+	pub state: State<StateDB>,
+	/// Transaction traces.
+	pub traces: Tracing,
+	/// Hashes of last 256 blocks.
+	pub last_hashes: Arc<LastHashes>,
 }
 
 impl ExecutedBlock {
@@ -113,8 +128,6 @@ impl ExecutedBlock {
 				Tracing::Disabled
 			},
 			last_hashes: last_hashes,
-			is_finalized: false,
-			metadata: None,
 		}
 	}
 
@@ -169,20 +182,14 @@ pub trait IsBlock {
 	/// Get all information on receipts in this block.
 	fn receipts(&self) -> &[Receipt] { &self.block().receipts }
 
-	/// Get all information concerning transaction tracing in this block.
-	fn traces(&self) -> &Tracing { &self.block().traces }
-
 	/// Get all uncles in this block.
 	fn uncles(&self) -> &[Header] { &self.block().uncles }
-
-	/// Get tracing enabled flag for this block.
-	fn tracing_enabled(&self) -> bool { self.block().traces.is_enabled() }
 }
 
-/// Trait for a object that has a state database.
+/// Trait for an object that owns an `ExecutedBlock`
 pub trait Drain {
-	/// Drop this object and return the underlying database.
-	fn drain(self) -> StateDB;
+	/// Returns `ExecutedBlock`
+	fn drain(self) -> ExecutedBlock;
 }
 
 impl IsBlock for ExecutedBlock {
@@ -209,26 +216,6 @@ impl ::parity_machine::Transactions for ExecutedBlock {
 	}
 }
 
-impl ::parity_machine::Finalizable for ExecutedBlock {
-	fn is_finalized(&self) -> bool {
-		self.is_finalized
-	}
-
-	fn mark_finalized(&mut self) {
-		self.is_finalized = true;
-	}
-}
-
-impl ::parity_machine::WithMetadata for ExecutedBlock {
-	fn metadata(&self) -> Option<&[u8]> {
-		self.metadata.as_ref().map(|v| v.as_ref())
-	}
-
-	fn set_metadata(&mut self, value: Option<Vec<u8>>) {
-		self.metadata = value;
-	}
-}
-
 /// Block that is ready for transactions to be added.
 ///
 /// It's a bit like a Vec<Transaction>, except that whenever a transaction is pushed, we execute it and
@@ -245,10 +232,7 @@ pub struct OpenBlock<'x> {
 #[derive(Clone)]
 pub struct ClosedBlock {
 	block: ExecutedBlock,
-	uncle_bytes: Bytes,
 	unclosed_state: State<StateDB>,
-	unclosed_finalization_state: bool,
-	unclosed_metadata: Option<Vec<u8>>,
 }
 
 /// Just like `ClosedBlock` except that we can't reopen it and it's faster.
@@ -257,7 +241,6 @@ pub struct ClosedBlock {
 #[derive(Clone)]
 pub struct LockedBlock {
 	block: ExecutedBlock,
-	uncle_bytes: Bytes,
 }
 
 /// A block that has a valid seal.
@@ -265,7 +248,6 @@ pub struct LockedBlock {
 /// The block's header has valid seal arguments. The block cannot be reversed into a `ClosedBlock` or `OpenBlock`.
 pub struct SealedBlock {
 	block: ExecutedBlock,
-	uncle_bytes: Bytes,
 }
 
 impl<'x> OpenBlock<'x> {
@@ -409,22 +391,25 @@ impl<'x> OpenBlock<'x> {
 	}
 
 	/// Turn this into a `ClosedBlock`.
-	pub fn close(self) -> ClosedBlock {
+	pub fn close(self) -> Result<ClosedBlock, Error> {
+		let unclosed_state = self.block.state.clone();
+		let locked = self.close_and_lock()?;
+
+		Ok(ClosedBlock {
+			block: locked.block,
+			unclosed_state,
+		})
+	}
+
+	/// Turn this into a `LockedBlock`.
+	pub fn close_and_lock(self) -> Result<LockedBlock, Error> {
 		let mut s = self;
 
-		let unclosed_state = s.block.state.clone();
-		let unclosed_metadata = s.block.metadata.clone();
-		let unclosed_finalization_state = s.block.is_finalized;
+		s.engine.on_close_block(&mut s.block)?;
+		s.block.state.commit()?;
 
-		if let Err(e) = s.engine.on_close_block(&mut s.block) {
-			warn!("Encountered error on closing the block: {}", e);
-		}
-
-		if let Err(e) = s.block.state.commit() {
-			warn!("Encountered error on state commit: {}", e);
-		}
 		s.block.header.set_transactions_root(ordered_trie_root(s.block.transactions.iter().map(|e| e.rlp_bytes())));
-		let uncle_bytes = encode_list(&s.block.uncles).into_vec();
+		let uncle_bytes = encode_list(&s.block.uncles);
 		s.block.header.set_uncles_hash(keccak(&uncle_bytes));
 		s.block.header.set_state_root(s.block.state.root().clone());
 		s.block.header.set_receipts_root(ordered_trie_root(s.block.receipts.iter().map(|r| r.rlp_bytes())));
@@ -434,49 +419,9 @@ impl<'x> OpenBlock<'x> {
 		}));
 		s.block.header.set_gas_used(s.block.receipts.last().map_or_else(U256::zero, |r| r.gas_used));
 
-		ClosedBlock {
+		Ok(LockedBlock {
 			block: s.block,
-			uncle_bytes,
-			unclosed_state,
-			unclosed_metadata,
-			unclosed_finalization_state,
-		}
-	}
-
-	/// Turn this into a `LockedBlock`.
-	pub fn close_and_lock(self) -> LockedBlock {
-		let mut s = self;
-
-		if let Err(e) = s.engine.on_close_block(&mut s.block) {
-			warn!("Encountered error on closing the block: {}", e);
-		}
-
-		if let Err(e) = s.block.state.commit() {
-			warn!("Encountered error on state commit: {}", e);
-		}
-
-		if s.block.header.transactions_root().is_zero() || s.block.header.transactions_root() == &KECCAK_NULL_RLP {
-			s.block.header.set_transactions_root(ordered_trie_root(s.block.transactions.iter().map(|e| e.rlp_bytes())));
-		}
-		let uncle_bytes = encode_list(&s.block.uncles).into_vec();
-		if s.block.header.uncles_hash().is_zero() || s.block.header.uncles_hash() == &KECCAK_EMPTY_LIST_RLP {
-			s.block.header.set_uncles_hash(keccak(&uncle_bytes));
-		}
-		if s.block.header.receipts_root().is_zero() || s.block.header.receipts_root() == &KECCAK_NULL_RLP {
-			s.block.header.set_receipts_root(ordered_trie_root(s.block.receipts.iter().map(|r| r.rlp_bytes())));
-		}
-
-		s.block.header.set_state_root(s.block.state.root().clone());
-		s.block.header.set_log_bloom(s.block.receipts.iter().fold(Bloom::zero(), |mut b, r| {
-			b.accrue_bloom(&r.log_bloom);
-			b
-		}));
-		s.block.header.set_gas_used(s.block.receipts.last().map_or_else(U256::zero, |r| r.gas_used));
-
-		LockedBlock {
-			block: s.block,
-			uncle_bytes,
-		}
+		})
 	}
 
 	#[cfg(test)]
@@ -488,11 +433,11 @@ impl<'x> IsBlock for OpenBlock<'x> {
 	fn block(&self) -> &ExecutedBlock { &self.block }
 }
 
-impl<'x> IsBlock for ClosedBlock {
+impl IsBlock for ClosedBlock {
 	fn block(&self) -> &ExecutedBlock { &self.block }
 }
 
-impl<'x> IsBlock for LockedBlock {
+impl IsBlock for LockedBlock {
 	fn block(&self) -> &ExecutedBlock { &self.block }
 }
 
@@ -504,7 +449,6 @@ impl ClosedBlock {
 	pub fn lock(self) -> LockedBlock {
 		LockedBlock {
 			block: self.block,
-			uncle_bytes: self.uncle_bytes,
 		}
 	}
 
@@ -513,8 +457,6 @@ impl ClosedBlock {
 		// revert rewards (i.e. set state back at last transaction's state).
 		let mut block = self.block;
 		block.state = self.unclosed_state;
-		block.metadata = self.unclosed_metadata;
-		block.is_finalized = self.unclosed_finalization_state;
 		OpenBlock {
 			block: block,
 			engine: engine,
@@ -523,7 +465,6 @@ impl ClosedBlock {
 }
 
 impl LockedBlock {
-
 	/// Removes outcomes from receipts and updates the receipt root.
 	///
 	/// This is done after the block is enacted for historical reasons.
@@ -556,7 +497,9 @@ impl LockedBlock {
 		}
 		s.block.header.set_seal(seal);
 		s.block.header.compute_hash();
-		Ok(SealedBlock { block: s.block, uncle_bytes: s.uncle_bytes })
+		Ok(SealedBlock {
+			block: s.block
+		})
 	}
 
 	/// Provide a valid seal in order to turn this into a `SealedBlock`.
@@ -566,23 +509,22 @@ impl LockedBlock {
 		self,
 		engine: &EthEngine,
 		seal: Vec<Bytes>,
-	) -> Result<SealedBlock, (Error, LockedBlock)> {
+	) -> Result<SealedBlock, Error> {
 		let mut s = self;
 		s.block.header.set_seal(seal);
 		s.block.header.compute_hash();
 
 		// TODO: passing state context to avoid engines owning it?
-		match engine.verify_local_seal(&s.block.header) {
-			Err(e) => Err((e, s)),
-			_ => Ok(SealedBlock { block: s.block, uncle_bytes: s.uncle_bytes }),
-		}
+		engine.verify_local_seal(&s.block.header)?;
+		Ok(SealedBlock {
+			block: s.block
+		})
 	}
 }
 
 impl Drain for LockedBlock {
-	/// Drop this object and return the underlieing database.
-	fn drain(self) -> StateDB {
-		self.block.state.drop().1
+	fn drain(self) -> ExecutedBlock {
+		self.block
 	}
 }
 
@@ -592,15 +534,14 @@ impl SealedBlock {
 		let mut block_rlp = RlpStream::new_list(3);
 		block_rlp.append(&self.block.header);
 		block_rlp.append_list(&self.block.transactions);
-		block_rlp.append_raw(&self.uncle_bytes, 1);
+		block_rlp.append_list(&self.block.uncles);
 		block_rlp.out()
 	}
 }
 
 impl Drain for SealedBlock {
-	/// Drop this object and return the underlieing database.
-	fn drain(self) -> StateDB {
-		self.block.state.drop().1
+	fn drain(self) -> ExecutedBlock {
+		self.block
 	}
 }
 
@@ -623,7 +564,7 @@ fn enact(
 	ancestry: &mut Iterator<Item=ExtendedHeader>,
 ) -> Result<LockedBlock, Error> {
 	{
-		if ::log::max_log_level() >= ::log::LogLevel::Trace {
+		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())?);
@@ -651,7 +592,7 @@ fn enact(
 		b.push_uncle(u)?;
 	}
 
-	Ok(b.close_and_lock())
+	b.close_and_lock()
 }
 
 /// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
@@ -666,12 +607,11 @@ pub fn enact_verified(
 	is_epoch_begin: bool,
 	ancestry: &mut Iterator<Item=ExtendedHeader>,
 ) -> Result<LockedBlock, Error> {
-	let view = view!(BlockView, &block.bytes);
 
 	enact(
 		block.header,
 		block.transactions,
-		view.uncles(),
+		block.uncles,
 		engine,
 		tracing,
 		db,
@@ -697,10 +637,11 @@ mod tests {
 	use ethereum_types::Address;
 	use std::sync::Arc;
 	use transaction::SignedTransaction;
+	use verification::queue::kind::blocks::Unverified;
 
 	/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
 	fn enact_bytes(
-		block_bytes: &[u8],
+		block_bytes: Vec<u8>,
 		engine: &EthEngine,
 		tracing: bool,
 		db: StateDB,
@@ -708,10 +649,10 @@ mod tests {
 		last_hashes: Arc<LastHashes>,
 		factories: Factories,
 	) -> Result<LockedBlock, Error> {
-		let block = view!(BlockView, block_bytes);
-		let header = block.header();
+		let block = Unverified::from_rlp(block_bytes)?;
+		let header = block.header;
 		let transactions: Result<Vec<_>, Error> = block
-			.transactions()
+			.transactions
 			.into_iter()
 			.map(SignedTransaction::new)
 			.map(|r| r.map_err(Into::into))
@@ -719,7 +660,7 @@ mod tests {
 		let transactions = transactions?;
 
 		{
-			if ::log::max_log_level() >= ::log::LogLevel::Trace {
+			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())?);
@@ -743,16 +684,16 @@ mod tests {
 		b.populate_from(&header);
 		b.push_transactions(transactions)?;
 
-		for u in &block.uncles() {
-			b.push_uncle(u.clone())?;
+		for u in block.uncles {
+			b.push_uncle(u)?;
 		}
 
-		Ok(b.close_and_lock())
+		b.close_and_lock()
 	}
 
 	/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header. Seal the block aferwards
 	fn enact_and_seal(
-		block_bytes: &[u8],
+		block_bytes: Vec<u8>,
 		engine: &EthEngine,
 		tracing: bool,
 		db: StateDB,
@@ -760,8 +701,9 @@ mod tests {
 		last_hashes: Arc<LastHashes>,
 		factories: Factories,
 	) -> Result<SealedBlock, Error> {
-		let header = view!(BlockView, block_bytes).header_view();
-		Ok(enact_bytes(block_bytes, engine, tracing, db, parent, last_hashes, factories)?.seal(engine, header.seal())?)
+		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())?)
 	}
 
 	#[test]
@@ -772,7 +714,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(&*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();
+		let b = b.close_and_lock().unwrap();
 		let _ = b.seal(&*spec.engine, vec![]);
 	}
 
@@ -786,16 +728,16 @@ 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, &mut Vec::new().into_iter()).unwrap()
-			.close_and_lock().seal(engine, vec![]).unwrap();
+			.close_and_lock().unwrap().seal(engine, vec![]).unwrap();
 		let orig_bytes = b.rlp_bytes();
-		let orig_db = b.drain();
+		let orig_db = b.drain().state.drop().1;
 
 		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
-		let e = enact_and_seal(&orig_bytes, engine, false, db, &genesis_header, last_hashes, Default::default()).unwrap();
+		let e = enact_and_seal(orig_bytes.clone(), engine, false, db, &genesis_header, last_hashes, Default::default()).unwrap();
 
 		assert_eq!(e.rlp_bytes(), orig_bytes);
 
-		let db = e.drain();
+		let db = e.drain().state.drop().1;
 		assert_eq!(orig_db.journal_db().keys(), db.journal_db().keys());
 		assert!(orig_db.journal_db().keys().iter().filter(|k| orig_db.journal_db().get(k.0) != db.journal_db().get(k.0)).next() == None);
 	}
@@ -816,20 +758,20 @@ mod tests {
 		uncle2_header.set_extra_data(b"uncle2".to_vec());
 		open_block.push_uncle(uncle1_header).unwrap();
 		open_block.push_uncle(uncle2_header).unwrap();
-		let b = open_block.close_and_lock().seal(engine, vec![]).unwrap();
+		let b = open_block.close_and_lock().unwrap().seal(engine, vec![]).unwrap();
 
 		let orig_bytes = b.rlp_bytes();
-		let orig_db = b.drain();
+		let orig_db = b.drain().state.drop().1;
 
 		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
-		let e = enact_and_seal(&orig_bytes, engine, false, db, &genesis_header, last_hashes, Default::default()).unwrap();
+		let e = enact_and_seal(orig_bytes.clone(), engine, false, db, &genesis_header, last_hashes, Default::default()).unwrap();
 
 		let bytes = e.rlp_bytes();
 		assert_eq!(bytes, orig_bytes);
 		let uncles = view!(BlockView, &bytes).uncles();
 		assert_eq!(uncles[1].extra_data(), b"uncle2");
 
-		let db = e.drain();
+		let db = e.drain().state.drop().1;
 		assert_eq!(orig_db.journal_db().keys(), db.journal_db().keys());
 		assert!(orig_db.journal_db().keys().iter().filter(|k| orig_db.journal_db().get(k.0) != db.journal_db().get(k.0)).next() == None);
 	}

ethcore/src/blockchain/blockchain.rs

@@ -286,7 +286,7 @@ impl BlockProvider for BlockChain {
 
 		// Read from DB and populate cache
 		let b = self.db.key_value().get(db::COL_HEADERS, hash)
-			.expect("Low level database error. Some issue with disk?")?;
+			.expect("Low level database error when fetching block header data. Some issue with disk?")?;
 
 		let header = encoded::Header::new(decompress(&b, blocks_swapper()).into_vec());
 		let mut write = self.block_headers.write();
@@ -316,7 +316,7 @@ impl BlockProvider for BlockChain {
 
 		// Read from DB and populate cache
 		let b = self.db.key_value().get(db::COL_BODIES, hash)
-			.expect("Low level database error. Some issue with disk?")?;
+			.expect("Low level database error when fetching block body data. Some issue with disk?")?;
 
 		let body = encoded::Body::new(decompress(&b, blocks_swapper()).into_vec());
 		let mut write = self.block_bodies.write();
@@ -362,7 +362,7 @@ impl BlockProvider for BlockChain {
 		I: Iterator<Item = B> {
 		self.db.blooms()
 			.filter(from_block, to_block, blooms)
-			.expect("Low level database error. Some issue with disk?")
+			.expect("Low level database error when searching blooms. Some issue with disk?")
 	}
 
 	/// Returns logs matching given filter. The order of logs returned will be the same as the order of the blocks
@@ -466,9 +466,7 @@ impl<'a> Iterator for AncestryWithMetadataIter<'a> {
 					Some(ExtendedHeader {
 						parent_total_difficulty: details.total_difficulty - *header.difficulty(),
 						is_finalized: details.is_finalized,
-						metadata: details.metadata,
-
-						header: header,
+						header,
 					})
 				},
 				_ => {
@@ -552,7 +550,9 @@ impl BlockChain {
 		};
 
 		// load best block
-		let best_block_hash = match bc.db.key_value().get(db::COL_EXTRA, b"best").unwrap() {
+		let best_block_hash = match bc.db.key_value().get(db::COL_EXTRA, b"best")
+			.expect("Low-level database error when fetching 'best' block. Some issue with disk?")
+		{
 			Some(best) => {
 				H256::from_slice(&best)
 			}
@@ -569,7 +569,6 @@ impl BlockChain {
 					parent: header.parent_hash(),
 					children: vec![],
 					is_finalized: false,
-					metadata: None,
 				};
 
 				let mut batch = DBTransaction::new();
@@ -580,15 +579,18 @@ impl BlockChain {
 				batch.write(db::COL_EXTRA, &header.number(), &hash);
 
 				batch.put(db::COL_EXTRA, b"best", &hash);
-				bc.db.key_value().write(batch).expect("Low level database error. Some issue with disk?");
+				bc.db.key_value().write(batch).expect("Low level database error when fetching 'best' block. Some issue with disk?");
 				hash
 			}
 		};
 
 		{
 			// Fetch best block details
-			let best_block_total_difficulty = bc.block_details(&best_block_hash).unwrap().total_difficulty;
-			let best_block_rlp = bc.block(&best_block_hash).unwrap();
+			let best_block_total_difficulty = bc.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 = bc.block(&best_block_hash)
+				.expect("Best block is from a known block hash; qed");
 
 			// and write them
 			let mut best_block = bc.best_block.write();
@@ -602,8 +604,12 @@ impl BlockChain {
 		{
 			let best_block_number = bc.best_block.read().header.number();
 			// Fetch first and best ancient block details
-			let raw_first = bc.db.key_value().get(db::COL_EXTRA, b"first").unwrap().map(|v| v.into_vec());
-			let mut best_ancient = bc.db.key_value().get(db::COL_EXTRA, b"ancient").unwrap().map(|h| H256::from_slice(&h));
+			let raw_first = bc.db.key_value().get(db::COL_EXTRA, b"first")
+				.expect("Low level database error when fetching 'first' block. Some issue with disk?")
+				.map(|v| v.into_vec());
+			let mut best_ancient = bc.db.key_value().get(db::COL_EXTRA, b"ancient")
+				.expect("Low level database error when fetching 'best ancient' block. Some issue with disk?")
+				.map(|h| H256::from_slice(&h));
 			let best_ancient_number;
 			if best_ancient.is_none() && best_block_number > 1 && bc.block_hash(1).is_none() {
 				best_ancient = Some(bc.genesis_hash());
@@ -634,7 +640,7 @@ impl BlockChain {
 						trace!("First block calculated: {:?}", hash);
 						let mut batch = db.key_value().transaction();
 						batch.put(db::COL_EXTRA, b"first", &hash);
-						db.key_value().write(batch).expect("Low level database error.");
+						db.key_value().write(batch).expect("Low level database error when writing 'first' block. Some issue with disk?");
 						bc.first_block = Some(hash);
 					}
 				},
@@ -766,10 +772,11 @@ impl BlockChain {
 	/// `parent_td` is a parent total diffuculty
 	/// Supply a dummy parent total difficulty when the parent block may not be in the chain.
 	/// Returns true if the block is disconnected.
-	pub fn insert_unordered_block(&self, batch: &mut DBTransaction, bytes: &[u8], receipts: Vec<Receipt>, parent_td: Option<U256>, is_best: bool, is_ancient: bool) -> bool {
-		let block = view!(BlockView, bytes);
-		let header = block.header_view();
-		let hash = header.hash();
+	pub fn insert_unordered_block(&self, batch: &mut DBTransaction, block: encoded::Block, receipts: Vec<Receipt>, parent_td: Option<U256>, is_best: bool, is_ancient: bool) -> bool {
+		let block_number = block.header_view().number();
+		let block_parent_hash = block.header_view().parent_hash();
+		let block_difficulty = block.header_view().difficulty();
+		let hash = block.header_view().hash();
 
 		if self.is_known(&hash) {
 			return false;
@@ -777,45 +784,45 @@ impl BlockChain {
 
 		assert!(self.pending_best_block.read().is_none());
 
-		let compressed_header = compress(block.header_rlp().as_raw(), blocks_swapper());
-		let compressed_body = compress(&Self::block_to_body(bytes), blocks_swapper());
+		let compressed_header = compress(block.header_view().rlp().as_raw(), blocks_swapper());
+		let compressed_body = compress(&Self::block_to_body(block.raw()), blocks_swapper());
 
 		// store block in db
 		batch.put(db::COL_HEADERS, &hash, &compressed_header);
 		batch.put(db::COL_BODIES, &hash, &compressed_body);
 
-		let maybe_parent = self.block_details(&header.parent_hash());
+		let maybe_parent = self.block_details(&block_parent_hash);
 
 		if let Some(parent_details) = maybe_parent {
 			// parent known to be in chain.
 			let info = BlockInfo {
 				hash: hash,
-				number: header.number(),
-				total_difficulty: parent_details.total_difficulty + header.difficulty(),
+				number: block_number,
+				total_difficulty: parent_details.total_difficulty + block_difficulty,
 				location: BlockLocation::CanonChain,
 			};
 
 			self.prepare_update(batch, ExtrasUpdate {
-				block_hashes: self.prepare_block_hashes_update(bytes, &info),
-				block_details: self.prepare_block_details_update(bytes, &info, false, None),
+				block_hashes: self.prepare_block_hashes_update(&info),
+				block_details: self.prepare_block_details_update(block_parent_hash, &info, false),
 				block_receipts: self.prepare_block_receipts_update(receipts, &info),
-				blocks_blooms: self.prepare_block_blooms_update(bytes, &info),
-				transactions_addresses: self.prepare_transaction_addresses_update(bytes, &info),
+				blocks_blooms: self.prepare_block_blooms_update(block.header_view().log_bloom(), &info),
+				transactions_addresses: self.prepare_transaction_addresses_update(block.view().transaction_hashes(), &info),
 				info: info,
-				block: bytes
+				block,
 			}, is_best);
 
 			if is_ancient {
 				let mut best_ancient_block = self.best_ancient_block.write();
 				let ancient_number = best_ancient_block.as_ref().map_or(0, |b| b.number);
-				if self.block_hash(header.number() + 1).is_some() {
+				if self.block_hash(block_number + 1).is_some() {
 					batch.delete(db::COL_EXTRA, b"ancient");
 					*best_ancient_block = None;
-				} else if header.number() > ancient_number {
+				} else if block_number > ancient_number {
 					batch.put(db::COL_EXTRA, b"ancient", &hash);
 					*best_ancient_block = Some(BestAncientBlock {
 						hash: hash,
-						number: header.number(),
+						number: block_number,
 					});
 				}
 			}
@@ -828,32 +835,31 @@ impl BlockChain {
 
 			let info = BlockInfo {
 				hash: hash,
-				number: header.number(),
-				total_difficulty: d + header.difficulty(),
+				number: block_number,
+				total_difficulty: d + block_difficulty,
 				location: BlockLocation::CanonChain,
 			};
 
 			// TODO [sorpaas] support warp sync insertion of finalization and metadata.
 			let block_details = BlockDetails {
-				number: header.number(),
+				number: block_number,
 				total_difficulty: info.total_difficulty,
-				parent: header.parent_hash(),
+				parent: block_parent_hash,
 				children: Vec::new(),
 				is_finalized: false,
-				metadata: None,
 			};
 
 			let mut update = HashMap::new();
 			update.insert(hash, block_details);
 
 			self.prepare_update(batch, ExtrasUpdate {
-				block_hashes: self.prepare_block_hashes_update(bytes, &info),
+				block_hashes: self.prepare_block_hashes_update(&info),
 				block_details: update,
 				block_receipts: self.prepare_block_receipts_update(receipts, &info),
-				blocks_blooms: self.prepare_block_blooms_update(bytes, &info),
-				transactions_addresses: self.prepare_transaction_addresses_update(bytes, &info),
+				blocks_blooms: self.prepare_block_blooms_update(block.header_view().log_bloom(), &info),
+				transactions_addresses: self.prepare_transaction_addresses_update(block.view().transaction_hashes(), &info),
 				info: info,
-				block: bytes,
+				block,
 			}, is_best);
 			true
 		}
@@ -965,41 +971,36 @@ impl BlockChain {
 	/// Inserts the block into backing cache database.
 	/// Expects the block to be valid and already verified.
 	/// If the block is already known, does nothing.
-	pub fn insert_block(&self, batch: &mut DBTransaction, bytes: &[u8], receipts: Vec<Receipt>, extras: ExtrasInsert) -> ImportRoute {
-		let block = view!(BlockView, bytes);
-		let header = block.header_view();
-
-		let parent_hash = header.parent_hash();
+	pub fn insert_block(&self, batch: &mut DBTransaction, block: encoded::Block, receipts: Vec<Receipt>, extras: ExtrasInsert) -> ImportRoute {
+		let parent_hash = block.header_view().parent_hash();
 		let best_hash = self.best_block_hash();
 
 		let route = self.tree_route(best_hash, parent_hash).expect("forks are only kept when it has common ancestors; tree route from best to prospective's parent always exists; qed");
 
-		self.insert_block_with_route(batch, bytes, receipts, route, extras)
+		self.insert_block_with_route(batch, block, receipts, route, extras)
 	}
 
 	/// Inserts the block into backing cache database with already generated route information.
 	/// Expects the block to be valid and already verified and route is tree route information from current best block to new block's parent.
 	/// If the block is already known, does nothing.
-	pub fn insert_block_with_route(&self, batch: &mut DBTransaction, bytes: &[u8], receipts: Vec<Receipt>, route: TreeRoute, extras: ExtrasInsert) -> ImportRoute {
-		// create views onto rlp
-		let block = view!(BlockView, bytes);
-		let header = block.header_view();
-		let hash = header.hash();
+	pub fn insert_block_with_route(&self, batch: &mut DBTransaction, block: encoded::Block, receipts: Vec<Receipt>, route: TreeRoute, extras: ExtrasInsert) -> ImportRoute {
+		let hash = block.header_view().hash();
+		let parent_hash = block.header_view().parent_hash();
 
-		if self.is_known_child(&header.parent_hash(), &hash) {
+		if self.is_known_child(&parent_hash, &hash) {
 			return ImportRoute::none();
 		}
 
 		assert!(self.pending_best_block.read().is_none());
 
-		let compressed_header = compress(block.header_rlp().as_raw(), blocks_swapper());
-		let compressed_body = compress(&Self::block_to_body(bytes), blocks_swapper());
+		let compressed_header = compress(block.header_view().rlp().as_raw(), blocks_swapper());
+		let compressed_body = compress(&Self::block_to_body(block.raw()), blocks_swapper());
 
 		// store block in db
 		batch.put(db::COL_HEADERS, &hash, &compressed_header);
 		batch.put(db::COL_BODIES, &hash, &compressed_body);
 
-		let info = self.block_info(&header, route, &extras);
+		let info = self.block_info(&block.header_view(), route, &extras);
 
 		if let BlockLocation::BranchBecomingCanonChain(ref d) = info.location {
 			info!(target: "reorg", "Reorg to {} ({} {} {})",
@@ -1011,13 +1012,13 @@ impl BlockChain {
 		}
 
 		self.prepare_update(batch, ExtrasUpdate {
-			block_hashes: self.prepare_block_hashes_update(bytes, &info),
-			block_details: self.prepare_block_details_update(bytes, &info, extras.is_finalized, extras.metadata),
+			block_hashes: self.prepare_block_hashes_update(&info),
+			block_details: self.prepare_block_details_update(parent_hash, &info, extras.is_finalized),
 			block_receipts: self.prepare_block_receipts_update(receipts, &info),
-			blocks_blooms: self.prepare_block_blooms_update(bytes, &info),
-			transactions_addresses: self.prepare_transaction_addresses_update(bytes, &info),
+			blocks_blooms: self.prepare_block_blooms_update(block.header_view().log_bloom(), &info),
+			transactions_addresses: self.prepare_transaction_addresses_update(block.view().transaction_hashes(), &info),
 			info: info.clone(),
-			block: bytes,
+			block,
 		}, true);
 
 		ImportRoute::from(info)
@@ -1088,7 +1089,7 @@ impl BlockChain {
 		if let Some((block, blooms)) = update.blocks_blooms {
 			self.db.blooms()
 				.insert_blooms(block, blooms.iter())
-				.expect("Low level database error. Some issue with disk?");
+				.expect("Low level database error when updating blooms. Some issue with disk?");
 		}
 
 		// These cached values must be updated last with all four locks taken to avoid
@@ -1097,11 +1098,10 @@ impl BlockChain {
 			let mut best_block = self.pending_best_block.write();
 			if is_best && update.info.location != BlockLocation::Branch {
 				batch.put(db::COL_EXTRA, b"best", &update.info.hash);
-				let block = encoded::Block::new(update.block.to_vec());
 				*best_block = Some(BestBlock {
 					total_difficulty: update.info.total_difficulty,
-					header: block.decode_header(),
-					block,
+					header: update.block.decode_header(),
+					block: update.block,
 				});
 			}
 
@@ -1221,16 +1221,13 @@ impl BlockChain {
 	}
 
 	/// This function returns modified block hashes.
-	fn prepare_block_hashes_update(&self, block_bytes: &[u8], info: &BlockInfo) -> HashMap<BlockNumber, H256> {
+	fn prepare_block_hashes_update(&self, info: &BlockInfo) -> HashMap<BlockNumber, H256> {
 		let mut block_hashes = HashMap::new();
-		let block = view!(BlockView, block_bytes);
-		let header = block.header_view();
-		let number = header.number();
 
 		match info.location {
 			BlockLocation::Branch => (),
 			BlockLocation::CanonChain => {
-				block_hashes.insert(number, info.hash);
+				block_hashes.insert(info.number, info.hash);
 			},
 			BlockLocation::BranchBecomingCanonChain(ref data) => {
 				let ancestor_number = self.block_number(&data.ancestor).expect("Block number of ancestor is always in DB");
@@ -1240,7 +1237,7 @@ impl BlockChain {
 					block_hashes.insert(start_number + index as BlockNumber, hash);
 				}
 
-				block_hashes.insert(number, info.hash);
+				block_hashes.insert(info.number, info.hash);
 			}
 		}
 
@@ -1249,23 +1246,18 @@ impl BlockChain {
 
 	/// This function returns modified block details.
 	/// Uses the given parent details or attempts to load them from the database.
-	fn prepare_block_details_update(&self, block_bytes: &[u8], info: &BlockInfo, is_finalized: bool, metadata: Option<Vec<u8>>) -> HashMap<H256, BlockDetails> {
-		let block = view!(BlockView, block_bytes);
-		let header = block.header_view();
-		let parent_hash = header.parent_hash();
-
+	fn prepare_block_details_update(&self, parent_hash: H256, info: &BlockInfo, is_finalized: bool) -> HashMap<H256, BlockDetails> {
 		// update parent
 		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.
 		let details = BlockDetails {
-			number: header.number(),
+			number: info.number,
 			total_difficulty: info.total_difficulty,
 			parent: parent_hash,
 			children: vec![],
 			is_finalized: is_finalized,
-			metadata: metadata,
 		};
 
 		// write to batch
@@ -1283,10 +1275,7 @@ impl BlockChain {
 	}
 
 	/// This function returns modified transaction addresses.
-	fn prepare_transaction_addresses_update(&self, block_bytes: &[u8], info: &BlockInfo) -> HashMap<H256, Option<TransactionAddress>> {
-		let block = view!(BlockView, block_bytes);
-		let transaction_hashes = block.transaction_hashes();
-
+	fn prepare_transaction_addresses_update(&self, transaction_hashes: Vec<H256>, info: &BlockInfo) -> HashMap<H256, Option<TransactionAddress>> {
 		match info.location {
 			BlockLocation::CanonChain => {
 				transaction_hashes.into_iter()
@@ -1351,14 +1340,10 @@ impl BlockChain {
 	/// Later, BloomIndexer is used to map bloom location on filter layer (BloomIndex)
 	/// to bloom location in database (BlocksBloomLocation).
 	///
-	fn prepare_block_blooms_update(&self, block_bytes: &[u8], info: &BlockInfo) -> Option<(u64, Vec<Bloom>)> {
-		let block = view!(BlockView, block_bytes);
-		let header = block.header_view();
-
+	fn prepare_block_blooms_update(&self, log_bloom: Bloom, info: &BlockInfo) -> Option<(u64, Vec<Bloom>)> {
 		match info.location {
 			BlockLocation::Branch => None,
 			BlockLocation::CanonChain => {
-				let log_bloom = header.log_bloom();
 				if log_bloom.is_zero() {
 					None
 				} else {
@@ -1366,15 +1351,17 @@ impl BlockChain {
 				}
 			},
 			BlockLocation::BranchBecomingCanonChain(ref data) => {
-				let ancestor_number = self.block_number(&data.ancestor).unwrap();
+				let ancestor_number = self.block_number(&data.ancestor)
+					.expect("hash belongs to an ancestor of an inserted block; this branch is only reachable for normal block insertion (non-ancient); ancestors of an inserted block are always available for normal block insertion; block number of an inserted block is always available; qed");
 				let start_number = ancestor_number + 1;
 
 				let mut blooms: Vec<Bloom> = data.enacted.iter()
-					.map(|hash| self.block_header_data(hash).unwrap())
+					.map(|hash| self.block_header_data(hash)
+						 .expect("hash belongs to an inserted block; block header data of an inserted block is always available; qed"))
 					.map(|h| h.log_bloom())
 					.collect();
 
-				blooms.push(header.log_bloom());
+				blooms.push(log_bloom);
 				Some((start_number, blooms))
 			}
 		}
@@ -1510,18 +1497,19 @@ mod tests {
 	use log_entry::{LogEntry, LocalizedLogEntry};
 	use ethkey::Secret;
 	use test_helpers::new_db;
+	use encoded;
 
-	fn new_chain(genesis: &[u8], db: Arc<BlockChainDB>) -> BlockChain {
-		BlockChain::new(Config::default(), genesis, db)
+	fn new_chain(genesis: encoded::Block, db: Arc<BlockChainDB>) -> BlockChain {
+		BlockChain::new(Config::default(), genesis.raw(), db)
 	}
 
-	fn insert_block(db: &Arc<BlockChainDB>, bc: &BlockChain, bytes: &[u8], receipts: Vec<Receipt>) -> ImportRoute {
-		insert_block_commit(db, bc, bytes, receipts, true)
+	fn insert_block(db: &Arc<BlockChainDB>, bc: &BlockChain, block: encoded::Block, receipts: Vec<Receipt>) -> ImportRoute {
+		insert_block_commit(db, bc, block, receipts, true)
 	}
 
-	fn insert_block_commit(db: &Arc<BlockChainDB>, bc: &BlockChain, bytes: &[u8], receipts: Vec<Receipt>, commit: bool) -> ImportRoute {
+	fn insert_block_commit(db: &Arc<BlockChainDB>, bc: &BlockChain, block: encoded::Block, receipts: Vec<Receipt>, commit: bool) -> ImportRoute {
 		let mut batch = db.key_value().transaction();
-		let res = insert_block_batch(&mut batch, bc, bytes, receipts);
+		let res = insert_block_batch(&mut batch, bc, block, receipts);
 		db.key_value().write(batch).unwrap();
 		if commit {
 			bc.commit();
@@ -1529,25 +1517,24 @@ mod tests {
 		res
 	}
 
-	fn insert_block_batch(batch: &mut DBTransaction, bc: &BlockChain, bytes: &[u8], receipts: Vec<Receipt>) -> ImportRoute {
-		use views::BlockView;
+	fn insert_block_batch(batch: &mut DBTransaction, bc: &BlockChain, block: encoded::Block, receipts: Vec<Receipt>) -> ImportRoute {
 		use blockchain::ExtrasInsert;
 
-		let block = view!(BlockView, bytes);
-		let header = block.header_view();
-		let parent_hash = header.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();
-		let fork_choice = if block_total_difficulty > bc.best_block_total_difficulty() {
-			::engines::ForkChoice::New
-		} else {
-			::engines::ForkChoice::Old
+		let fork_choice = {
+			let header = block.header_view();
+			let parent_hash = header.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() {
+				::engines::ForkChoice::New
+			} else {
+				::engines::ForkChoice::Old
+			}
 		};
 
-		bc.insert_block(batch, bytes, receipts, ExtrasInsert {
+		bc.insert_block(batch, block, receipts, ExtrasInsert {
 			fork_choice: fork_choice,
 			is_finalized: false,
-			metadata: None
 		})
 	}
 
@@ -1558,11 +1545,11 @@ mod tests {
 		let first = genesis.add_block();
 
 		let db = new_db();
-		let bc = new_chain(&genesis.last().encoded(), db.clone());
+		let bc = new_chain(genesis.last().encoded(), db.clone());
 		assert_eq!(bc.best_block_number(), 0);
 
 		// when
-		insert_block_commit(&db, &bc, &first.last().encoded(), vec![], false);
+		insert_block_commit(&db, &bc, first.last().encoded(), vec![], false);
 		assert_eq!(bc.best_block_number(), 0);
 		bc.commit();
 		// NOTE no db.write here (we want to check if best block is cached)
@@ -1583,7 +1570,7 @@ mod tests {
 		let first_hash = first.hash();
 
 		let db = new_db();
-		let bc = new_chain(&genesis.encoded(), db.clone());
+		let bc = new_chain(genesis.encoded(), db.clone());
 
 		assert_eq!(bc.genesis_hash(), genesis_hash);
 		assert_eq!(bc.best_block_hash(), genesis_hash);
@@ -1592,7 +1579,7 @@ mod tests {
 		assert_eq!(bc.block_details(&genesis_hash).unwrap().children, vec![]);
 
 		let mut batch = db.key_value().transaction();
-		insert_block_batch(&mut batch, &bc, &first.encoded(), vec![]);
+		insert_block_batch(&mut batch, &bc, first.encoded(), vec![]);
 		db.key_value().write(batch).unwrap();
 		bc.commit();
 
@@ -1612,13 +1599,13 @@ mod tests {
 		let generator = BlockGenerator::new(vec![first_10]);
 
 		let db = new_db();
-		let bc = new_chain(&genesis.last().encoded(), db.clone());
+		let bc = new_chain(genesis.last().encoded(), db.clone());
 
 		let mut block_hashes = vec![genesis.last().hash()];
 		let mut batch = db.key_value().transaction();
 		for block in generator {
 			block_hashes.push(block.hash());
-			insert_block_batch(&mut batch, &bc, &block.encoded(), vec![]);
+			insert_block_batch(&mut batch, &bc, block.encoded(), vec![]);
 			bc.commit();
 		}
 		db.key_value().write(batch).unwrap();
@@ -1656,10 +1643,10 @@ mod tests {
 		);
 
 		let db = new_db();
-		let bc = new_chain(&genesis.last().encoded(), db.clone());
+		let bc = new_chain(genesis.last().encoded(), db.clone());
 
 		for b in generator {
-			insert_block(&db, &bc, &b.encoded(), vec![]);
+			insert_block(&db, &bc, b.encoded(), vec![]);
 		}
 
 		assert_eq!(uncle_headers, bc.find_uncle_headers(&b4a_hash, 3).unwrap());
@@ -1692,12 +1679,12 @@ mod tests {
 		let b2_hash = b2.last().hash();
 
 		let db = new_db();
-		let bc = new_chain(&genesis.last().encoded(), db.clone());
+		let bc = new_chain(genesis.last().encoded(), db.clone());
 
 		let mut batch = db.key_value().transaction();
-		let _ = insert_block_batch(&mut batch, &bc, &b1a.last().encoded(), vec![]);
+		let _ = insert_block_batch(&mut batch, &bc, b1a.last().encoded(), vec![]);
 		bc.commit();
-		let _ = insert_block_batch(&mut batch, &bc, &b1b.last().encoded(), vec![]);
+		let _ = insert_block_batch(&mut batch, &bc, b1b.last().encoded(), vec![]);
 		bc.commit();
 		db.key_value().write(batch).unwrap();
 
@@ -1709,7 +1696,7 @@ mod tests {
 
 		// now let's make forked chain the canon chain
 		let mut batch = db.key_value().transaction();
-		let _ = insert_block_batch(&mut batch, &bc, &b2.last().encoded(), vec![]);
+		let _ = insert_block_batch(&mut batch, &bc, b2.last().encoded(), vec![]);
 		bc.commit();
 		db.key_value().write(batch).unwrap();
 
@@ -1767,12 +1754,12 @@ mod tests {
 		let t3_hash = t3.hash();
 
 		let db = new_db();
-		let bc = new_chain(&genesis.last().encoded(), db.clone());
+		let bc = new_chain(genesis.last().encoded(), db.clone());
 
 		let mut batch = db.key_value().transaction();
-		let _ = insert_block_batch(&mut batch, &bc, &b1a.last().encoded(), vec![]);
+		let _ = insert_block_batch(&mut batch, &bc, b1a.last().encoded(), vec![]);
 		bc.commit();
-		let _ = insert_block_batch(&mut batch, &bc, &b1b.last().encoded(), vec![]);
+		let _ = insert_block_batch(&mut batch, &bc, b1b.last().encoded(), vec![]);
 		bc.commit();
 		db.key_value().write(batch).unwrap();
 
@@ -1788,7 +1775,7 @@ mod tests {
 
 		// now let's make forked chain the canon chain
 		let mut batch = db.key_value().transaction();
-		let _ = insert_block_batch(&mut batch, &bc, &b2.last().encoded(), vec![]);
+		let _ = insert_block_batch(&mut batch, &bc, b2.last().encoded(), vec![]);
 		bc.commit();
 		db.key_value().write(batch).unwrap();
 
@@ -1825,19 +1812,19 @@ mod tests {
 		let best_block_hash = b3a_hash;
 
 		let db = new_db();
-		let bc = new_chain(&genesis.last().encoded(), db.clone());
+		let bc = new_chain(genesis.last().encoded(), db.clone());
 
 		let mut batch = db.key_value().transaction();
-		let ir1 = insert_block_batch(&mut batch, &bc, &b1.last().encoded(), vec![]);
+		let ir1 = insert_block_batch(&mut batch, &bc, b1.last().encoded(), vec![]);
 		bc.commit();
-		let ir2 = insert_block_batch(&mut batch, &bc, &b2.last().encoded(), vec![]);
+		let ir2 = insert_block_batch(&mut batch, &bc, b2.last().encoded(), vec![]);
 		bc.commit();
-		let ir3b = insert_block_batch(&mut batch, &bc, &b3b.last().encoded(), vec![]);
+		let ir3b = insert_block_batch(&mut batch, &bc, b3b.last().encoded(), vec![]);
 		bc.commit();
 		db.key_value().write(batch).unwrap();
 		assert_eq!(bc.block_hash(3).unwrap(), b3b_hash);
 		let mut batch = db.key_value().transaction();
-		let ir3a = insert_block_batch(&mut batch, &bc, &b3a.last().encoded(), vec![]);
+		let ir3a = insert_block_batch(&mut batch, &bc, b3a.last().encoded(), vec![]);
 		bc.commit();
 		db.key_value().write(batch).unwrap();
 
@@ -1939,17 +1926,17 @@ mod tests {
 		let db = new_db();
 
 		{
-			let bc = new_chain(&genesis.last().encoded(), db.clone());
+			let bc = new_chain(genesis.last().encoded(), db.clone());
 			assert_eq!(bc.best_block_hash(), genesis_hash);
 			let mut batch = db.key_value().transaction();
-			insert_block_batch(&mut batch, &bc, &first.last().encoded(), vec![]);
+			insert_block_batch(&mut batch, &bc, first.last().encoded(), vec![]);
 			db.key_value().write(batch).unwrap();
 			bc.commit();
 			assert_eq!(bc.best_block_hash(), first_hash);
 		}
 
 		{
-			let bc = new_chain(&genesis.last().encoded(), db.clone());
+			let bc = new_chain(genesis.last().encoded(), db.clone());
 
 			assert_eq!(bc.best_block_hash(), first_hash);
 		}
@@ -1999,9 +1986,9 @@ mod tests {
 		let b1_hash: H256 = "f53f268d23a71e85c7d6d83a9504298712b84c1a2ba220441c86eeda0bf0b6e3".into();
 
 		let db = new_db();
-		let bc = new_chain(&genesis, db.clone());
+		let bc = new_chain(encoded::Block::new(genesis), db.clone());
 		let mut batch = db.key_value().transaction();
-		insert_block_batch(&mut batch, &bc, &b1, vec![]);
+		insert_block_batch(&mut batch, &bc, encoded::Block::new(b1), vec![]);
 		db.key_value().write(batch).unwrap();
 		bc.commit();
 
@@ -2067,8 +2054,8 @@ mod tests {
 		let b3_number = b3.last().number();
 
 		let db = new_db();
-		let bc = new_chain(&genesis.last().encoded(), db.clone());
-		insert_block(&db, &bc, &b1.last().encoded(), vec![Receipt {
+		let bc = new_chain(genesis.last().encoded(), db.clone());
+		insert_block(&db, &bc, b1.last().encoded(), vec![Receipt {
 			outcome: TransactionOutcome::StateRoot(H256::default()),
 			gas_used: 10_000.into(),
 			log_bloom: Default::default(),
@@ -2085,7 +2072,7 @@ mod tests {
 				LogEntry { address: Default::default(), topics: vec![], data: vec![3], },
 			],
 		}]);
-		insert_block(&db, &bc, &b2.last().encoded(), vec![
+		insert_block(&db, &bc, b2.last().encoded(), vec![
 			Receipt {
 				outcome: TransactionOutcome::StateRoot(H256::default()),
 				gas_used: 10_000.into(),
@@ -2095,7 +2082,7 @@ mod tests {
 				],
 			}
 		]);
-		insert_block(&db, &bc, &b3.last().encoded(), vec![
+		insert_block(&db, &bc, b3.last().encoded(), vec![
 			Receipt {
 				outcome: TransactionOutcome::StateRoot(H256::default()),
 				gas_used: 10_000.into(),
@@ -2195,27 +2182,27 @@ mod tests {
 		let b2a = b1a.add_block_with_bloom(bloom_ba);
 
 		let db = new_db();
-		let bc = new_chain(&genesis.last().encoded(), db.clone());
+		let bc = new_chain(genesis.last().encoded(), db.clone());
 
 		let blocks_b1 = bc.blocks_with_bloom(Some(&bloom_b1), 0, 5);
 		let blocks_b2 = bc.blocks_with_bloom(Some(&bloom_b2), 0, 5);
 		assert!(blocks_b1.is_empty());
 		assert!(blocks_b2.is_empty());
 
-		insert_block(&db, &bc, &b1.last().encoded(), vec![]);
+		insert_block(&db, &bc, b1.last().encoded(), vec![]);
 		let blocks_b1 = bc.blocks_with_bloom(Some(&bloom_b1), 0, 5);
 		let blocks_b2 = bc.blocks_with_bloom(Some(&bloom_b2), 0, 5);
 		assert_eq!(blocks_b1, vec![1]);
 		assert!(blocks_b2.is_empty());
 
-		insert_block(&db, &bc, &b2.last().encoded(), vec![]);
+		insert_block(&db, &bc, b2.last().encoded(), vec![]);
 		let blocks_b1 = bc.blocks_with_bloom(Some(&bloom_b1), 0, 5);
 		let blocks_b2 = bc.blocks_with_bloom(Some(&bloom_b2), 0, 5);
 		assert_eq!(blocks_b1, vec![1]);
 		assert_eq!(blocks_b2, vec![2]);
 
 		// hasn't been forked yet
-		insert_block(&db, &bc, &b1a.last().encoded(), vec![]);
+		insert_block(&db, &bc, b1a.last().encoded(), vec![]);
 		let blocks_b1 = bc.blocks_with_bloom(Some(&bloom_b1), 0, 5);
 		let blocks_b2 = bc.blocks_with_bloom(Some(&bloom_b2), 0, 5);
 		let blocks_ba = bc.blocks_with_bloom(Some(&bloom_ba), 0, 5);
@@ -2224,7 +2211,7 @@ mod tests {
 		assert!(blocks_ba.is_empty());
 
 		// fork has happend
-		insert_block(&db, &bc, &b2a.last().encoded(), vec![]);
+		insert_block(&db, &bc, b2a.last().encoded(), vec![]);
 		let blocks_b1 = bc.blocks_with_bloom(Some(&bloom_b1), 0, 5);
 		let blocks_b2 = bc.blocks_with_bloom(Some(&bloom_b2), 0, 5);
 		let blocks_ba = bc.blocks_with_bloom(Some(&bloom_ba), 0, 5);
@@ -2233,7 +2220,7 @@ mod tests {
 		assert_eq!(blocks_ba, vec![1, 2]);
 
 		// fork back
-		insert_block(&db, &bc, &b3.last().encoded(), vec![]);
+		insert_block(&db, &bc, b3.last().encoded(), vec![]);
 		let blocks_b1 = bc.blocks_with_bloom(Some(&bloom_b1), 0, 5);
 		let blocks_b2 = bc.blocks_with_bloom(Some(&bloom_b2), 0, 5);
 		let blocks_ba = bc.blocks_with_bloom(Some(&bloom_ba), 0, 5);
@@ -2257,13 +2244,13 @@ mod tests {
 		let b1_total_difficulty = genesis.last().difficulty() + b1.last().difficulty();
 
 		let db = new_db();
-		let bc = new_chain(&genesis.last().encoded(), db.clone());
+		let bc = new_chain(genesis.last().encoded(), db.clone());
 		let mut batch = db.key_value().transaction();
-		bc.insert_unordered_block(&mut batch, &b2.last().encoded(), vec![], Some(b1_total_difficulty), false, false);
+		bc.insert_unordered_block(&mut batch, b2.last().encoded(), vec![], Some(b1_total_difficulty), false, false);
 		bc.commit();
-		bc.insert_unordered_block(&mut batch, &b3.last().encoded(), vec![], None, true, false);
+		bc.insert_unordered_block(&mut batch, b3.last().encoded(), vec![], None, true, false);
 		bc.commit();
-		bc.insert_unordered_block(&mut batch, &b1.last().encoded(), vec![], None, false, false);
+		bc.insert_unordered_block(&mut batch, b1.last().encoded(), vec![], None, false, false);
 		bc.commit();
 		db.key_value().write(batch).unwrap();
 
@@ -2290,23 +2277,23 @@ mod tests {
 
 		let db = new_db();
 		{
-			let bc = new_chain(&genesis.last().encoded(), db.clone());
+			let bc = new_chain(genesis.last().encoded(), db.clone());
 
 			let mut batch = db.key_value().transaction();
 			// create a longer fork
 			for block in generator {
-				insert_block_batch(&mut batch, &bc, &block.encoded(), vec![]);
+				insert_block_batch(&mut batch, &bc, block.encoded(), vec![]);
 				bc.commit();
 			}
 
 			assert_eq!(bc.best_block_number(), 5);
-			insert_block_batch(&mut batch, &bc, &uncle.last().encoded(), vec![]);
+			insert_block_batch(&mut batch, &bc, uncle.last().encoded(), vec![]);
 			db.key_value().write(batch).unwrap();
 			bc.commit();
 		}
 
 		// re-loading the blockchain should load the correct best block.
-		let bc = new_chain(&genesis.last().encoded(), db);
+		let bc = new_chain(genesis.last().encoded(), db);
 		assert_eq!(bc.best_block_number(), 5);
 	}
 
@@ -2321,13 +2308,13 @@ mod tests {
 
 		let db = new_db();
 		{
-			let bc = new_chain(&genesis.last().encoded(), db.clone());
+			let bc = new_chain(genesis.last().encoded(), db.clone());
 
 			let mut batch = db.key_value().transaction();
 			// create a longer fork
 			for (i, block) in generator.into_iter().enumerate() {
 
-				insert_block_batch(&mut batch, &bc, &block.encoded(), vec![]);
+				insert_block_batch(&mut batch, &bc, block.encoded(), vec![]);
 				bc.insert_epoch_transition(&mut batch, i as u64, EpochTransition {
 					block_hash: block.hash(),
 					block_number: i as u64 + 1,
@@ -2338,7 +2325,7 @@ mod tests {
 
 			assert_eq!(bc.best_block_number(), 5);
 
-			insert_block_batch(&mut batch, &bc, &uncle.last().encoded(), vec![]);
+			insert_block_batch(&mut batch, &bc, uncle.last().encoded(), vec![]);
 			bc.insert_epoch_transition(&mut batch, 999, EpochTransition {
 				block_hash: uncle.last().hash(),
 				block_number: 1,
@@ -2353,7 +2340,7 @@ mod tests {
 		}
 
 		// re-loading the blockchain should load the correct best block.
-		let bc = new_chain(&genesis.last().encoded(), db);
+		let bc = new_chain(genesis.last().encoded(), db);
 
 		assert_eq!(bc.best_block_number(), 5);
 		assert_eq!(bc.epoch_transitions().map(|(i, _)| i).collect::<Vec<_>>(), vec![0, 1, 2, 3, 4]);
@@ -2374,7 +2361,7 @@ mod tests {
 
 		let db = new_db();
 
-		let bc = new_chain(&genesis.last().encoded(), db.clone());
+		let bc = new_chain(genesis.last().encoded(), db.clone());
 
 		let mut batch = db.key_value().transaction();
 		bc.insert_epoch_transition(&mut batch, 0, EpochTransition {
@@ -2388,7 +2375,7 @@ mod tests {
 		// and a non-canonical fork of 8 from genesis.
 		let fork_hash = {
 			for block in fork_generator {
-				insert_block(&db, &bc, &block.encoded(), vec![]);
+				insert_block(&db, &bc, block.encoded(), vec![]);
 			}
 
 			assert_eq!(bc.best_block_number(), 7);
@@ -2396,7 +2383,7 @@ mod tests {
 		};
 
 		for block in next_generator {
-			insert_block(&db, &bc, &block.encoded(), vec![]);
+			insert_block(&db, &bc, block.encoded(), vec![]);
 		}
 
 		assert_eq!(bc.best_block_number(), 10);

ethcore/src/blockchain/extras.rs

@@ -152,17 +152,15 @@ pub struct BlockDetails {
 	pub children: Vec<H256>,
 	/// Whether the block is considered finalized
 	pub is_finalized: bool,
-	/// Additional block metadata
-	pub metadata: Option<Vec<u8>>,
 }
 
 impl rlp::Encodable for BlockDetails {
 	fn rlp_append(&self, stream: &mut rlp::RlpStream) {
-		let use_short_version = self.metadata.is_none() && !self.is_finalized;
+		let use_short_version = !self.is_finalized;
 
 		match use_short_version {
 			true => { stream.begin_list(4); },
-			false => { stream.begin_list(6); },
+			false => { stream.begin_list(5); },
 		}
 
 		stream.append(&self.number);
@@ -171,7 +169,6 @@ impl rlp::Encodable for BlockDetails {
 		stream.append_list(&self.children);
 		if !use_short_version {
 			stream.append(&self.is_finalized);
-			stream.append(&self.metadata);
 		}
 	}
 }
@@ -180,7 +177,7 @@ impl rlp::Decodable for BlockDetails {
 	fn decode(rlp: &rlp::Rlp) -> Result<Self, rlp::DecoderError> {
 		let use_short_version = match rlp.item_count()? {
 			4 => true,
-			6 => false,
+			5 => false,
 			_ => return Err(rlp::DecoderError::RlpIncorrectListLen),
 		};
 
@@ -194,11 +191,6 @@ impl rlp::Decodable for BlockDetails {
 			} else {
 				rlp.val_at(4)?
 			},
-			metadata: if use_short_version {
-				None
-			} else {
-				rlp.val_at(5)?
-			},
 		})
 	}
 }
@@ -252,7 +244,7 @@ pub struct EpochTransitions {
 #[cfg(test)]
 mod tests {
 	use rlp::*;
-	
+
 	use super::BlockReceipts;
 
 	#[test]

ethcore/src/blockchain/generator.rs

@@ -19,11 +19,11 @@
 use std::collections::VecDeque;
 use ethereum_types::{U256, H256, Bloom};
 
-use bytes::Bytes;
 use header::Header;
 use rlp::encode;
 use transaction::SignedTransaction;
 use views::BlockView;
+use encoded;
 
 /// Helper structure, used for encoding blocks.
 #[derive(Default, Clone, RlpEncodable)]
@@ -41,7 +41,7 @@ impl Block {
 
 	#[inline]
 	pub fn hash(&self) -> H256 {
-		view!(BlockView, &self.encoded()).header_view().hash()
+		view!(BlockView, &self.encoded().raw()).header_view().hash()
 	}
 
 	#[inline]
@@ -50,8 +50,8 @@ impl Block {
 	}
 
 	#[inline]
-	pub fn encoded(&self) -> Bytes {
-		encode(self).into_vec()
+	pub fn encoded(&self) -> encoded::Block {
+		encoded::Block::new(encode(self).into_vec())
 	}
 
 	#[inline]

ethcore/src/blockchain/update.rs

@@ -19,13 +19,14 @@ use ethereum_types::{H256, Bloom};
 use header::BlockNumber;
 use blockchain::block_info::BlockInfo;
 use blockchain::extras::{BlockDetails, BlockReceipts, TransactionAddress};
+use encoded::Block;
 
 /// Block extras update info.
-pub struct ExtrasUpdate<'a> {
+pub struct ExtrasUpdate {
 	/// Block info.
 	pub info: BlockInfo,
 	/// Current block uncompressed rlp bytes
-	pub block: &'a [u8],
+	pub block: Block,
 	/// Modified block hashes.
 	pub block_hashes: HashMap<BlockNumber, H256>,
 	/// Modified block details.
@@ -44,6 +45,4 @@ pub struct ExtrasInsert {
 	pub fork_choice: ::engines::ForkChoice,
 	/// Is the inserted block considered finalized.
 	pub is_finalized: bool,
-	/// New block local metadata.
-	pub metadata: Option<Vec<u8>>,
 }

ethcore/src/builtin.rs

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+//! Standard built-in contracts.
+
 use std::cmp::{max, min};
 use std::io::{self, Read};
 
@@ -27,6 +29,7 @@ use bytes::BytesRef;
 use ethkey::{Signature, recover as ec_recover};
 use ethjson;
 
+/// Execution error.
 #[derive(Debug)]
 pub struct Error(pub &'static str);
 
@@ -207,8 +210,8 @@ impl From<ethjson::spec::Builtin> for Builtin {
 	}
 }
 
-// Ethereum builtin creator.
-fn ethereum_builtin(name: &str) -> Box<Impl> {
+/// Ethereum built-in factory.
+pub fn ethereum_builtin(name: &str) -> Box<Impl> {
 	match name {
 		"identity" => Box::new(Identity) as Box<Impl>,
 		"ecrecover" => Box::new(EcRecover) as Box<Impl>,

ethcore/src/client/bad_blocks.rs

@@ -0,0 +1,81 @@
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Stores recently seen bad blocks.
+
+use bytes::{Bytes, ToPretty};
+use ethereum_types::H256;
+use itertools::Itertools;
+use memory_cache::MemoryLruCache;
+use parking_lot::RwLock;
+use verification::queue::kind::blocks::Unverified;
+
+/// Recently seen bad blocks.
+pub struct BadBlocks {
+	last_blocks: RwLock<MemoryLruCache<H256, (Unverified, String)>>,
+}
+
+impl Default for BadBlocks {
+	fn default() -> Self {
+		BadBlocks {
+			last_blocks: RwLock::new(MemoryLruCache::new(8 * 1024 * 1024)),
+		}
+	}
+}
+
+impl BadBlocks {
+	/// Reports given RLP as invalid block.
+	pub fn report(&self, raw: Bytes, message: String) {
+		match Unverified::from_rlp(raw) {
+			Ok(unverified) => {
+				error!(
+					target: "client",
+					"\nBad block detected: {}\nRLP: {}\nHeader: {:?}\nUncles: {}\nTransactions:{}\n",
+					message,
+					unverified.bytes.to_hex(),
+					unverified.header,
+					unverified.uncles
+						.iter()
+						.enumerate()
+						.map(|(index, uncle)| format!("[Uncle {}] {:?}", index, uncle))
+						.join("\n"),
+					unverified.transactions
+						.iter()
+						.enumerate()
+						.map(|(index, tx)| format!("[Tx {}] {:?}", index, tx))
+						.join("\n"),
+				);
+				self.last_blocks.write().insert(unverified.header.hash(), (unverified, message));
+			},
+			Err(err) => {
+				error!(target: "client", "Bad undecodable block detected: {}\n{:?}", message, err);
+			},
+		}
+	}
+
+	/// Returns a list of recently detected bad blocks with error descriptions.
+	pub fn bad_blocks(&self) -> Vec<(Unverified, String)> {
+		self.last_blocks.read()
+			.backstore()
+			.iter()
+			.map(|(_k, (unverified, message))| (
+				Unverified::from_rlp(unverified.bytes.clone())
+					.expect("Bytes coming from UnverifiedBlock so decodable; qed"),
+				message.clone(),
+			))
+			.collect()
+	}
+}

ethcore/src/client/chain_notify.rs

@@ -26,9 +26,9 @@ pub enum ChainMessageType {
 	/// Consensus message
 	Consensus(Vec<u8>),
 	/// Message with private transaction
-	PrivateTransaction(Vec<u8>),
+	PrivateTransaction(H256, Vec<u8>),
 	/// Message with signed private transaction
-	SignedPrivateTransaction(Vec<u8>),
+	SignedPrivateTransaction(H256, Vec<u8>),
 }
 
 /// Route type to indicate whether it is enacted or retracted.

ethcore/src/client/client.rs

@@ -34,25 +34,25 @@ use ethereum_types::{H256, Address, U256};
 use block::{IsBlock, LockedBlock, Drain, ClosedBlock, OpenBlock, enact_verified, SealedBlock};
 use blockchain::{BlockChain, BlockChainDB, BlockProvider, TreeRoute, ImportRoute, TransactionAddress, ExtrasInsert};
 use client::ancient_import::AncientVerifier;
-use client::Error as ClientError;
 use client::{
 	Nonce, Balance, ChainInfo, BlockInfo, CallContract, TransactionInfo,
 	RegistryInfo, ReopenBlock, PrepareOpenBlock, ScheduleInfo, ImportSealedBlock,
 	BroadcastProposalBlock, ImportBlock, StateOrBlock, StateInfo, StateClient, Call,
 	AccountData, BlockChain as BlockChainTrait, BlockProducer, SealedBlockImporter,
-	ClientIoMessage
+	ClientIoMessage,
 };
 use client::{
 	BlockId, TransactionId, UncleId, TraceId, ClientConfig, BlockChainClient,
 	TraceFilter, CallAnalytics, BlockImportError, Mode,
 	ChainNotify, ChainRoute, PruningInfo, ProvingBlockChainClient, EngineInfo, ChainMessageType,
-	IoClient,
+	IoClient, BadBlocks,
 };
+use client::bad_blocks;
 use encoded;
 use engines::{EthEngine, EpochTransition, ForkChoice};
 use error::{
 	ImportErrorKind, BlockImportErrorKind, ExecutionError, CallError, BlockError, ImportResult,
-	QueueError, QueueErrorKind, Error as EthcoreError
+	QueueError, QueueErrorKind, Error as EthcoreError, EthcoreResult,
 };
 use vm::{EnvInfo, LastHashes};
 use evm::Schedule;
@@ -76,16 +76,15 @@ use transaction::{self, LocalizedTransaction, UnverifiedTransaction, SignedTrans
 use types::filter::Filter;
 use types::ancestry_action::AncestryAction;
 use verification;
-use verification::{PreverifiedBlock, Verifier};
-use verification::queue::BlockQueue;
-use views::BlockView;
-use parity_machine::{Finalizable, WithMetadata};
+use verification::{PreverifiedBlock, Verifier, BlockQueue};
+use verification::queue::kind::blocks::Unverified;
+use verification::queue::kind::BlockLike;
 
 // re-export
 pub use types::blockchain_info::BlockChainInfo;
 pub use types::block_status::BlockStatus;
 pub use blockchain::CacheSize as BlockChainCacheSize;
-pub use verification::queue::QueueInfo as BlockQueueInfo;
+pub use verification::QueueInfo as BlockQueueInfo;
 
 use_contract!(registry, "Registry", "res/contracts/registrar.json");
 
@@ -165,6 +164,9 @@ struct Importer {
 
 	/// Ethereum engine to be used during import
 	pub engine: Arc<EthEngine>,
+
+	/// A lru cache of recently detected bad blocks
+	pub bad_blocks: bad_blocks::BadBlocks,
 }
 
 /// Blockchain database client backed by a persistent database. Owns and manages a blockchain and a block queue.
@@ -215,7 +217,7 @@ pub struct Client {
 	/// Queued ancient blocks, make sure they are imported in order.
 	queued_ancient_blocks: Arc<RwLock<(
 		HashSet<H256>,
-		VecDeque<(Header, Bytes, Bytes)>
+		VecDeque<(Unverified, Bytes)>
 	)>>,
 	ancient_blocks_import_lock: Arc<Mutex<()>>,
 	/// Consensus messages import queue
@@ -256,6 +258,7 @@ impl Importer {
 			miner,
 			ancient_verifier: AncientVerifier::new(engine.clone()),
 			engine,
+			bad_blocks: Default::default(),
 		})
 	}
 
@@ -293,22 +296,26 @@ impl Importer {
 					continue;
 				}
 
-				if let Ok(closed_block) = self.check_and_close_block(block, client) {
-					if self.engine.is_proposal(&header) {
-						self.block_queue.mark_as_good(&[hash]);
-						proposed_blocks.push(bytes);
-					} else {
-						imported_blocks.push(hash);
+				match self.check_and_lock_block(block, client) {
+					Ok(closed_block) => {
+						if self.engine.is_proposal(&header) {
+							self.block_queue.mark_as_good(&[hash]);
+							proposed_blocks.push(bytes);
+						} else {
+							imported_blocks.push(hash);
 
-						let transactions_len = closed_block.transactions().len();
+							let transactions_len = closed_block.transactions().len();
 
-						let route = self.commit_block(closed_block, &header, &bytes, client);
-						import_results.push(route);
+							let route = self.commit_block(closed_block, &header, encoded::Block::new(bytes), client);
+							import_results.push(route);
 
-						client.report.write().accrue_block(&header, transactions_len);
-					}
-				} else {
-					invalid_blocks.insert(header.hash());
+							client.report.write().accrue_block(&header, transactions_len);
+						}
+					},
+					Err(err) => {
+						self.bad_blocks.report(bytes, format!("{:?}", err));
+						invalid_blocks.insert(hash);
+					},
 				}
 			}
 
@@ -348,7 +355,7 @@ impl Importer {
 		imported
 	}
 
-	fn check_and_close_block(&self, block: PreverifiedBlock, client: &Client) -> Result<LockedBlock, ()> {
+	fn check_and_lock_block(&self, block: PreverifiedBlock, client: &Client) -> EthcoreResult<LockedBlock> {
 		let engine = &*self.engine;
 		let header = block.header.clone();
 
@@ -356,7 +363,7 @@ impl Importer {
 		let best_block_number = client.chain.read().best_block_number();
 		if client.pruning_info().earliest_state > header.number() {
 			warn!(target: "client", "Block import failed for #{} ({})\nBlock is ancient (current best block: #{}).", header.number(), header.hash(), best_block_number);
-			return Err(());
+			bail!("Block is ancient");
 		}
 
 		// Check if parent is in chain
@@ -364,7 +371,7 @@ impl Importer {
 			Some(h) => h,
 			None => {
 				warn!(target: "client", "Block import failed for #{} ({}): Parent not found ({}) ", header.number(), header.hash(), header.parent_hash());
-				return Err(());
+				bail!("Parent not found");
 			}
 		};
 
@@ -375,8 +382,7 @@ impl Importer {
 			&parent,
 			engine,
 			Some(verification::FullFamilyParams {
-				block_bytes: &block.bytes,
-				transactions: &block.transactions,
+				block: &block,
 				block_provider: &**chain,
 				client
 			}),
@@ -384,13 +390,13 @@ impl Importer {
 
 		if let Err(e) = verify_family_result {
 			warn!(target: "client", "Stage 3 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
-			return Err(());
+			bail!(e);
 		};
 
 		let verify_external_result = self.verifier.verify_block_external(&header, engine);
 		if let Err(e) = verify_external_result {
 			warn!(target: "client", "Stage 4 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
-			return Err(());
+			bail!(e);
 		};
 
 		// Enact Verified Block
@@ -410,9 +416,13 @@ impl Importer {
 			&mut chain.ancestry_with_metadata_iter(*header.parent_hash()),
 		);
 
-		let mut locked_block = enact_result.map_err(|e| {
-			warn!(target: "client", "Block import failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
-		})?;
+		let mut locked_block = match enact_result {
+			Ok(b) => b,
+			Err(e) => {
+				warn!(target: "client", "Block import failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
+				bail!(e);
+			}
+		};
 
 		// Strip receipts for blocks before validate_receipts_transition,
 		// if the expected receipts root header does not match.
@@ -426,7 +436,7 @@ impl Importer {
 		// Final Verification
 		if let Err(e) = self.verifier.verify_block_final(&header, locked_block.block().header()) {
 			warn!(target: "client", "Stage 5 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
-			return Err(());
+			bail!(e);
 		}
 
 		Ok(locked_block)
@@ -436,58 +446,53 @@ impl Importer {
 	///
 	/// The block is guaranteed to be the next best blocks in the
 	/// first block sequence. Does no sealing or transaction validation.
-	fn import_old_block(&self, header: &Header, block_bytes: &[u8], receipts_bytes: &[u8], db: &KeyValueDB, chain: &BlockChain) -> Result<H256, ::error::Error> {
+	fn import_old_block(&self, unverified: Unverified, receipts_bytes: &[u8], db: &KeyValueDB, chain: &BlockChain) -> EthcoreResult<()> {
 		let receipts = ::rlp::decode_list(receipts_bytes);
-		let hash = header.hash();
 		let _import_lock = self.import_lock.lock();
 
 		{
 			trace_time!("import_old_block");
 			// verify the block, passing the chain for updating the epoch verifier.
 			let mut rng = OsRng::new()?;
-			self.ancient_verifier.verify(&mut rng, &header, &chain)?;
+			self.ancient_verifier.verify(&mut rng, &unverified.header, &chain)?;
 
 			// Commit results
 			let mut batch = DBTransaction::new();
-			chain.insert_unordered_block(&mut batch, block_bytes, receipts, None, false, true);
+			chain.insert_unordered_block(&mut batch, encoded::Block::new(unverified.bytes), receipts, None, false, true);
 			// Final commit to the DB
 			db.write_buffered(batch);
 			chain.commit();
 		}
 		db.flush().expect("DB flush failed.");
-		Ok(hash)
+		Ok(())
 	}
 
 	// NOTE: the header of the block passed here is not necessarily sealed, as
 	// it is for reconstructing the state transition.
 	//
 	// The header passed is from the original block data and is sealed.
-	fn commit_block<B>(&self, block: B, header: &Header, block_data: &[u8], client: &Client) -> ImportRoute where B: IsBlock + Drain {
+	fn commit_block<B>(&self, block: B, header: &Header, block_data: encoded::Block, client: &Client) -> ImportRoute where B: Drain {
 		let hash = &header.hash();
 		let number = header.number();
 		let parent = header.parent_hash();
 		let chain = client.chain.read();
+		let is_finalized = false;
 
 		// Commit results
-		let receipts = block.receipts().to_owned();
-		let traces = block.traces().clone().drain();
-
-		assert_eq!(header.hash(), view!(BlockView, block_data).header_view().hash());
-
-		//let traces = From::from(block.traces().clone().unwrap_or_else(Vec::new));
+		let block = block.drain();
+		debug_assert_eq!(header.hash(), block_data.header_view().hash());
 
 		let mut batch = DBTransaction::new();
 
-		let ancestry_actions = self.engine.ancestry_actions(block.block(), &mut chain.ancestry_with_metadata_iter(*parent));
+		let ancestry_actions = self.engine.ancestry_actions(&block, &mut chain.ancestry_with_metadata_iter(*parent));
 
+		let receipts = block.receipts;
+		let traces = block.traces.drain();
 		let best_hash = chain.best_block_hash();
-		let metadata = block.block().metadata().map(Into::into);
-		let is_finalized = block.block().is_finalized();
 
 		let new = ExtendedHeader {
 			header: header.clone(),
-			is_finalized: is_finalized,
-			metadata: metadata,
+			is_finalized,
 			parent_total_difficulty: chain.block_details(&parent).expect("Parent block is in the database; qed").total_difficulty
 		};
 
@@ -503,8 +508,6 @@ impl Importer {
 			ExtendedHeader {
 				parent_total_difficulty: details.total_difficulty - *header.difficulty(),
 				is_finalized: details.is_finalized,
-				metadata: details.metadata,
-
 				header: header,
 			}
 		};
@@ -519,13 +522,13 @@ impl Importer {
 		// CHECK! I *think* this is fine, even if the state_root is equal to another
 		// already-imported block of the same number.
 		// TODO: Prove it with a test.
-		let mut state = block.drain();
+		let mut state = block.state.drop().1;
 
 		// check epoch end signal, potentially generating a proof on the current
 		// state.
 		self.check_epoch_end_signal(
 			&header,
-			block_data,
+			block_data.raw(),
 			&receipts,
 			&state,
 			&chain,
@@ -542,8 +545,7 @@ impl Importer {
 
 		let route = chain.insert_block(&mut batch, block_data, receipts.clone(), ExtrasInsert {
 			fork_choice: fork_choice,
-			is_finalized: is_finalized,
-			metadata: new.metadata,
+			is_finalized,
 		});
 
 		client.tracedb.read().import(&mut batch, TraceImportRequest {
@@ -624,7 +626,9 @@ impl Importer {
 							).expect("state known to be available for just-imported block; qed");
 
 							let options = TransactOptions::with_no_tracing().dont_check_nonce();
-							let res = Executive::new(&mut state, &env_info, self.engine.machine())
+							let machine = self.engine.machine();
+							let schedule = machine.schedule(env_info.number);
+							let res = Executive::new(&mut state, &env_info, &machine, &schedule)
 								.transact(&transaction, options);
 
 							let res = match res {
@@ -946,7 +950,7 @@ impl Client {
 	}
 
 	// prune ancient states until below the memory limit or only the minimum amount remain.
-	fn prune_ancient(&self, mut state_db: StateDB, chain: &BlockChain) -> Result<(), ClientError> {
+	fn prune_ancient(&self, mut state_db: StateDB, chain: &BlockChain) -> Result<(), ::error::Error> {
 		let number = match state_db.journal_db().latest_era() {
 			Some(n) => n,
 			None => return Ok(()),
@@ -1152,7 +1156,8 @@ impl Client {
 			},
 		};
 
-		snapshot::take_snapshot(&*self.engine, &self.chain.read(), start_hash, db.as_hashdb(), writer, p)?;
+		let processing_threads = self.config.snapshot.processing_threads;
+		snapshot::take_snapshot(&*self.engine, &self.chain.read(), start_hash, db.as_hashdb(), writer, p, processing_threads)?;
 
 		Ok(())
 	}
@@ -1240,8 +1245,9 @@ impl Client {
 				.dont_check_nonce()
 				.save_output_from_contract();
 			let original_state = if state_diff { Some(state.clone()) } else { None };
+			let schedule = machine.schedule(env_info.number);
 
-			let mut ret = Executive::new(state, env_info, machine).transact_virtual(transaction, options)?;
+			let mut ret = Executive::new(state, env_info, &machine, &schedule).transact_virtual(transaction, options)?;
 
 			if let Some(original) = original_state {
 				ret.state_diff = Some(state.diff_from(original).map_err(ExecutionError::from)?);
@@ -1332,7 +1338,7 @@ impl ChainInfo for Client {
 }
 
 impl BlockInfo for Client {
-	fn block_header(&self, id: BlockId) -> Option<::encoded::Header> {
+	fn block_header(&self, id: BlockId) -> Option<encoded::Header> {
 		let chain = self.chain.read();
 
 		Self::block_hash(&chain, id).and_then(|hash| chain.block_header_data(&hash))
@@ -1392,23 +1398,26 @@ impl CallContract for Client {
 }
 
 impl ImportBlock for Client {
-	fn import_block(&self, bytes: Bytes) -> Result<H256, BlockImportError> {
-		use verification::queue::kind::BlockLike;
-		use verification::queue::kind::blocks::Unverified;
-
-		// create unverified block here so the `keccak` calculation can be cached.
-		let unverified = Unverified::from_rlp(bytes)?;
-
-		{
-			if self.chain.read().is_known(&unverified.hash()) {
-				bail!(BlockImportErrorKind::Import(ImportErrorKind::AlreadyInChain));
-			}
-			let status = self.block_status(BlockId::Hash(unverified.parent_hash()));
-			if status == BlockStatus::Unknown || status == BlockStatus::Pending {
-				bail!(BlockImportErrorKind::Block(BlockError::UnknownParent(unverified.parent_hash())));
-			}
+	fn import_block(&self, unverified: Unverified) -> Result<H256, BlockImportError> {
+		if self.chain.read().is_known(&unverified.hash()) {
+			bail!(BlockImportErrorKind::Import(ImportErrorKind::AlreadyInChain));
+		}
+
+		let status = self.block_status(BlockId::Hash(unverified.parent_hash()));
+		if status == BlockStatus::Unknown {
+			bail!(BlockImportErrorKind::Block(BlockError::UnknownParent(unverified.parent_hash())));
+		}
+
+		let raw = unverified.bytes.clone();
+		match self.importer.block_queue.import(unverified).map_err(Into::into) {
+			Ok(res) => Ok(res),
+			// we only care about block errors (not import errors)
+			Err(BlockImportError(BlockImportErrorKind::Block(err), _))=> {
+				self.importer.bad_blocks.report(raw, format!("{:?}", err));
+				bail!(BlockImportErrorKind::Block(err))
+			},
+			Err(e) => Err(e),
 		}
-		Ok(self.importer.block_queue.import(unverified)?)
 	}
 }
 
@@ -1486,34 +1495,30 @@ impl Call for Client {
 		let sender = t.sender();
 		let options = || TransactOptions::with_tracing().dont_check_nonce();
 
-		let exec = |gas| {
+		let cond = |gas| {
 			let mut tx = t.as_unsigned().clone();
 			tx.gas = gas;
 			let tx = tx.fake_sign(sender);
 
 			let mut clone = state.clone();
-			Executive::new(&mut clone, &env_info, self.engine.machine())
+			let machine = self.engine.machine();
+			let schedule = machine.schedule(env_info.number);
+			Ok(Executive::new(&mut clone, &env_info, &machine, &schedule)
 				.transact_virtual(&tx, options())
-				.ok()
 				.map(|r| r.exception.is_none())
+				.unwrap_or(false))
 		};
 
-		let cond = |gas| exec(gas).unwrap_or(false);
-
-		if !cond(upper) {
+		if !cond(upper)? {
 			upper = max_upper;
-			match exec(upper) {
-				Some(false) => return Err(CallError::Exceptional),
-				None => {
-					trace!(target: "estimate_gas", "estimate_gas failed with {}", upper);
-					let err = ExecutionError::Internal(format!("Requires higher than upper limit of {}", upper));
-					return Err(err.into())
-				},
-				_ => {},
+			if !cond(upper)? {
+				trace!(target: "estimate_gas", "estimate_gas failed with {}", upper);
+				let err = ExecutionError::Internal(format!("Requires higher than upper limit of {}", upper));
+				return Err(err.into())
 			}
 		}
 		let lower = t.gas_required(&self.engine.schedule(env_info.number)).into();
-		if cond(lower) {
+		if cond(lower)? {
 			trace!(target: "estimate_gas", "estimate_gas succeeded with {}", lower);
 			return Ok(lower)
 		}
@@ -1522,12 +1527,12 @@ impl Call for Client {
 		/// Returns the lowest value between `lower` and `upper` for which `cond` returns true.
 		/// We assert: `cond(lower) = false`, `cond(upper) = true`
 		fn binary_chop<F, E>(mut lower: U256, mut upper: U256, mut cond: F) -> Result<U256, E>
-			where F: FnMut(U256) -> bool
+			where F: FnMut(U256) -> Result<bool, E>
 		{
 			while upper - lower > 1.into() {
-				let mid = (lower + upper) / 2.into();
+				let mid = (lower + upper) / 2;
 				trace!(target: "estimate_gas", "{} .. {} .. {}", lower, mid, upper);
-				let c = cond(mid);
+				let c = cond(mid)?;
 				match c {
 					true => upper = mid,
 					false => lower = mid,
@@ -1549,6 +1554,12 @@ impl EngineInfo for Client {
 	}
 }
 
+impl BadBlocks for Client {
+	fn bad_blocks(&self) -> Vec<(Unverified, String)> {
+		self.importer.bad_blocks.bad_blocks()
+	}
+}
+
 impl BlockChainClient for Client {
 	fn replay(&self, id: TransactionId, analytics: CallAnalytics) -> Result<Executed, CallError> {
 		let address = self.transaction_address(id).ok_or(CallError::TransactionNotFound)?;
@@ -1707,6 +1718,9 @@ impl BlockChainClient for Client {
 		if let Some(after) = after {
 			if let Err(e) = iter.seek(after) {
 				trace!(target: "fatdb", "list_accounts: Couldn't seek the DB: {:?}", e);
+			} else {
+				// Position the iterator after the `after` element
+				iter.next();
 			}
 		}
 
@@ -1750,7 +1764,10 @@ impl BlockChainClient for Client {
 
 		if let Some(after) = after {
 			if let Err(e) = iter.seek(after) {
-				trace!(target: "fatdb", "list_accounts: Couldn't seek the DB: {:?}", e);
+				trace!(target: "fatdb", "list_storage: Couldn't seek the DB: {:?}", e);
+			} else {
+				// Position the iterator after the `after` element
+				iter.next();
 			}
 		}
 
@@ -1826,76 +1843,100 @@ impl BlockChainClient for Client {
 		self.engine.additional_params().into_iter().collect()
 	}
 
-	fn logs(&self, filter: Filter) -> Vec<LocalizedLogEntry> {
-		// Wrap the logic inside a closure so that we can take advantage of question mark syntax.
-		let fetch_logs = || {
-			let chain = self.chain.read();
+	fn logs(&self, filter: Filter) -> Result<Vec<LocalizedLogEntry>, BlockId> {
+		let chain = self.chain.read();
 
-			// First, check whether `filter.from_block` and `filter.to_block` is on the canon chain. If so, we can use the
-			// optimized version.
-			let is_canon = |id| {
-				match id {
-					// If it is referred by number, then it is always on the canon chain.
-					&BlockId::Earliest | &BlockId::Latest | &BlockId::Number(_) => true,
-					// If it is referred by hash, we see whether a hash -> number -> hash conversion gives us the same
-					// result.
-					&BlockId::Hash(ref hash) => chain.is_canon(hash),
-				}
-			};
-
-			let blocks = if is_canon(&filter.from_block) && is_canon(&filter.to_block) {
-				// If we are on the canon chain, use bloom filter to fetch required hashes.
-				let from = self.block_number_ref(&filter.from_block)?;
-				let to = self.block_number_ref(&filter.to_block)?;
-
-				chain.blocks_with_bloom(&filter.bloom_possibilities(), from, to)
-					.into_iter()
-					.filter_map(|n| chain.block_hash(n))
-					.collect::<Vec<H256>>()
-			} else {
-				// Otherwise, we use a slower version that finds a link between from_block and to_block.
-				let from_hash = Self::block_hash(&chain, filter.from_block)?;
-				let from_number = chain.block_number(&from_hash)?;
-				let to_hash = Self::block_hash(&chain, filter.from_block)?;
-
-				let blooms = filter.bloom_possibilities();
-				let bloom_match = |header: &encoded::Header| {
-					blooms.iter().any(|bloom| header.log_bloom().contains_bloom(bloom))
-				};
-
-				let (blocks, last_hash) = {
-					let mut blocks = Vec::new();
-					let mut current_hash = to_hash;
-
-					loop {
-						let header = chain.block_header_data(&current_hash)?;
-						if bloom_match(&header) {
-							blocks.push(current_hash);
-						}
-
-						// Stop if `from` block is reached.
-						if header.number() <= from_number {
-							break;
-						}
-						current_hash = header.parent_hash();
-					}
-
-					blocks.reverse();
-					(blocks, current_hash)
-				};
-
-				// Check if we've actually reached the expected `from` block.
-				if last_hash != from_hash || blocks.is_empty() {
-					return None;
-				}
-
-				blocks
-			};
-
-			Some(self.chain.read().logs(blocks, |entry| filter.matches(entry), filter.limit))
+		// First, check whether `filter.from_block` and `filter.to_block` is on the canon chain. If so, we can use the
+		// optimized version.
+		let is_canon = |id| {
+			match id {
+				// If it is referred by number, then it is always on the canon chain.
+				&BlockId::Earliest | &BlockId::Latest | &BlockId::Number(_) => true,
+				// If it is referred by hash, we see whether a hash -> number -> hash conversion gives us the same
+				// result.
+				&BlockId::Hash(ref hash) => chain.is_canon(hash),
+			}
 		};
 
-		fetch_logs().unwrap_or_default()
+		let blocks = if is_canon(&filter.from_block) && is_canon(&filter.to_block) {
+			// If we are on the canon chain, use bloom filter to fetch required hashes.
+			//
+			// If we are sure the block does not exist (where val > best_block_number), then return error. Note that we
+			// don't need to care about pending blocks here because RPC query sets pending back to latest (or handled
+			// pending logs themselves).
+			let from = match self.block_number_ref(&filter.from_block) {
+				Some(val) if val <= chain.best_block_number() => val,
+				_ => return Err(filter.from_block.clone()),
+			};
+			let to = match self.block_number_ref(&filter.to_block) {
+				Some(val) if val <= chain.best_block_number() => val,
+				_ => return Err(filter.to_block.clone()),
+			};
+
+			// If from is greater than to, then the current bloom filter behavior is to just return empty
+			// result. There's no point to continue here.
+			if from > to {
+				return Err(filter.to_block.clone());
+			}
+
+			chain.blocks_with_bloom(&filter.bloom_possibilities(), from, to)
+				.into_iter()
+				.filter_map(|n| chain.block_hash(n))
+				.collect::<Vec<H256>>()
+		} else {
+			// Otherwise, we use a slower version that finds a link between from_block and to_block.
+			let from_hash = match Self::block_hash(&chain, filter.from_block) {
+				Some(val) => val,
+				None => return Err(filter.from_block.clone()),
+			};
+			let from_number = match chain.block_number(&from_hash) {
+				Some(val) => val,
+				None => return Err(BlockId::Hash(from_hash)),
+			};
+			let to_hash = match Self::block_hash(&chain, filter.to_block) {
+				Some(val) => val,
+				None => return Err(filter.to_block.clone()),
+			};
+
+			let blooms = filter.bloom_possibilities();
+			let bloom_match = |header: &encoded::Header| {
+				blooms.iter().any(|bloom| header.log_bloom().contains_bloom(bloom))
+			};
+
+			let (blocks, last_hash) = {
+				let mut blocks = Vec::new();
+				let mut current_hash = to_hash;
+
+				loop {
+					let header = match chain.block_header_data(&current_hash) {
+						Some(val) => val,
+						None => return Err(BlockId::Hash(current_hash)),
+					};
+					if bloom_match(&header) {
+						blocks.push(current_hash);
+					}
+
+					// Stop if `from` block is reached.
+					if header.number() <= from_number {
+						break;
+					}
+					current_hash = header.parent_hash();
+				}
+
+				blocks.reverse();
+				(blocks, current_hash)
+			};
+
+			// Check if we've actually reached the expected `from` block.
+			if last_hash != from_hash || blocks.is_empty() {
+				// In this case, from_hash is the cause (for not matching last_hash).
+				return Err(BlockId::Hash(from_hash));
+			}
+
+			blocks
+		};
+
+		Ok(self.chain.read().logs(blocks, |entry| filter.matches(entry), filter.limit))
 	}
 
 	fn filter_traces(&self, filter: TraceFilter) -> Option<Vec<LocalizedTrace>> {
@@ -2050,24 +2091,23 @@ impl IoClient for Client {
 		});
 	}
 
-	fn queue_ancient_block(&self, block_bytes: Bytes, receipts_bytes: Bytes) -> Result<H256, BlockImportError> {
+	fn queue_ancient_block(&self, unverified: Unverified, receipts_bytes: Bytes) -> Result<H256, BlockImportError> {
 		trace_time!("queue_ancient_block");
-		let header: Header = ::rlp::Rlp::new(&block_bytes).val_at(0)?;
-		let hash = header.hash();
 
+		let hash = unverified.hash();
 		{
 			// check block order
 			if self.chain.read().is_known(&hash) {
 				bail!(BlockImportErrorKind::Import(ImportErrorKind::AlreadyInChain));
 			}
-			let parent_hash = header.parent_hash();
+			let parent_hash = unverified.parent_hash();
 			// NOTE To prevent race condition with import, make sure to check queued blocks first
 			// (and attempt to acquire lock)
-			let is_parent_pending = self.queued_ancient_blocks.read().0.contains(parent_hash);
+			let is_parent_pending = self.queued_ancient_blocks.read().0.contains(&parent_hash);
 			if !is_parent_pending {
-				let status = self.block_status(BlockId::Hash(*parent_hash));
-				if  status == BlockStatus::Unknown || status == BlockStatus::Pending {
-					bail!(BlockImportErrorKind::Block(BlockError::UnknownParent(*parent_hash)));
+				let status = self.block_status(BlockId::Hash(parent_hash));
+				if  status == BlockStatus::Unknown {
+					bail!(BlockImportErrorKind::Block(BlockError::UnknownParent(parent_hash)));
 				}
 			}
 		}
@@ -2076,7 +2116,7 @@ impl IoClient for Client {
 		{
 			let mut queued = self.queued_ancient_blocks.write();
 			queued.0.insert(hash);
-			queued.1.push_back((header, block_bytes, receipts_bytes));
+			queued.1.push_back((unverified, receipts_bytes));
 		}
 
 		let queued = self.queued_ancient_blocks.clone();
@@ -2088,11 +2128,10 @@ impl IoClient for Client {
 			let _lock = lock.lock();
 			for _i in 0..MAX_ANCIENT_BLOCKS_TO_IMPORT {
 				let first = queued.write().1.pop_front();
-				if let Some((header, block_bytes, receipts_bytes)) = first {
-					let hash = header.hash();
+				if let Some((unverified, receipts_bytes)) = first {
+					let hash = unverified.hash();
 					let result = client.importer.import_old_block(
-						&header,
-						&block_bytes,
+						unverified,
 						&receipts_bytes,
 						&**client.db.read().key_value(),
 						&*client.chain.read(),
@@ -2156,7 +2195,7 @@ impl ReopenBlock for Client {
 }
 
 impl PrepareOpenBlock for Client {
-	fn prepare_open_block(&self, author: Address, gas_range_target: (U256, U256), extra_data: Bytes) -> OpenBlock {
+	fn prepare_open_block(&self, author: Address, gas_range_target: (U256, U256), extra_data: Bytes) -> Result<OpenBlock, EthcoreError> {
 		let engine = &*self.engine;
 		let chain = self.chain.read();
 		let best_header = chain.best_block_header();
@@ -2175,7 +2214,7 @@ impl PrepareOpenBlock for Client {
 			extra_data,
 			is_epoch_begin,
 			&mut chain.ancestry_with_metadata_iter(best_header.hash()),
-		).expect("OpenBlock::new only fails if parent state root invalid; state root of best block's header is never invalid; qed");
+		)?;
 
 		// Add uncles
 		chain
@@ -2191,7 +2230,7 @@ impl PrepareOpenBlock for Client {
 												qed");
 			});
 
-		open_block
+		Ok(open_block)
 	}
 }
 
@@ -2216,7 +2255,7 @@ impl ImportSealedBlock for Client {
 			let block_data = block.rlp_bytes();
 			let header = block.header().clone();
 
-			let route = self.importer.commit_block(block, &header, &block_data, self);
+			let route = self.importer.commit_block(block, &header, encoded::Block::new(block_data), self);
 			trace!(target: "client", "Imported sealed block #{} ({})", number, h);
 			self.state_db.write().sync_cache(&route.enacted, &route.retracted, false);
 			route
@@ -2401,6 +2440,7 @@ mod tests {
 		use std::sync::atomic::{AtomicBool, Ordering};
 		use kvdb::DBTransaction;
 		use blockchain::ExtrasInsert;
+		use encoded;
 
 		let client = generate_dummy_client(0);
 		let genesis = client.chain_info().best_block_hash;
@@ -2413,10 +2453,9 @@ mod tests {
 			let another_client = client.clone();
 			thread::spawn(move || {
 				let mut batch = DBTransaction::new();
-				another_client.chain.read().insert_block(&mut batch, &new_block, Vec::new(), ExtrasInsert {
+				another_client.chain.read().insert_block(&mut batch, encoded::Block::new(new_block), Vec::new(), ExtrasInsert {
 					fork_choice: ::engines::ForkChoice::New,
 					is_finalized: false,
-					metadata: None,
 				});
 				go_thread.store(true, Ordering::SeqCst);
 			});
@@ -2498,7 +2537,7 @@ mod tests {
 			block_hash: block_hash,
 			block_number: block_number,
 			cumulative_gas_used: gas_used,
-			gas_used: gas_used - 5.into(),
+			gas_used: gas_used - 5,
 			contract_address: None,
 			logs: vec![LocalizedLogEntry {
 				entry: logs[0].clone(),

ethcore/src/client/config.rs

@@ -19,6 +19,7 @@ use std::fmt::{Display, Formatter, Error as FmtError};
 
 use verification::{VerifierType, QueueConfig};
 use journaldb;
+use snapshot::SnapshotConfiguration;
 
 pub use std::time::Duration;
 pub use blockchain::Config as BlockChainConfig;
@@ -120,6 +121,8 @@ pub struct ClientConfig {
 	pub check_seal: bool,
 	/// Maximal number of transactions queued for verification in a separate thread.
 	pub transaction_verification_queue_size: usize,
+	/// Snapshot configuration
+	pub snapshot: SnapshotConfiguration,
 }
 
 impl Default for ClientConfig {
@@ -144,6 +147,7 @@ impl Default for ClientConfig {
 			history_mem: 32 * mb,
 			check_seal: true,
 			transaction_verification_queue_size: 8192,
+			snapshot: Default::default(),
 		}
 	}
 }

ethcore/src/client/error.rs

@@ -1,55 +0,0 @@
-// Copyright 2015-2018 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt::{Display, Formatter, Error as FmtError};
-use std::io;
-use ethtrie::TrieError;
-
-/// Client configuration errors.
-#[derive(Debug)]
-pub enum Error {
-	/// TrieDB-related error.
-	Trie(TrieError),
-	/// Io error.
-	Io(io::Error),
-}
-
-impl From<TrieError> for Error {
-	fn from(err: TrieError) -> Self {
-		Error::Trie(err)
-	}
-}
-
-impl From<io::Error> for Error {
-	fn from(err: io::Error) -> Self {
-		Error::Io(err)
-	}
-}
-
-impl<E> From<Box<E>> for Error where Error: From<E> {
-	fn from(err: Box<E>) -> Self {
-		Error::from(*err)
-	}
-}
-
-impl Display for Error {
-	fn fmt(&self, f: &mut Formatter) -> Result<(), FmtError> {
-		match *self {
-			Error::Trie(ref err) => write!(f, "{}", err),
-			Error::Io(ref err) => write!(f, "{}", err),
-		}
-	}
-}

ethcore/src/client/evm_test_client.rs

@@ -19,7 +19,7 @@
 use std::fmt;
 use std::sync::Arc;
 use ethereum_types::{H256, U256, H160};
-use {factory, journaldb, trie, kvdb_memorydb, bytes};
+use {factory, journaldb, trie, kvdb_memorydb};
 use kvdb::{self, KeyValueDB};
 use {state, state_db, client, executive, trace, transaction, db, spec, pod_state, log_entry, receipt};
 use factory::Factories;
@@ -86,9 +86,9 @@ impl<'a> EvmTestClient<'a> {
 			ForkSpec::EIP150 => Some(ethereum::new_eip150_test()),
 			ForkSpec::EIP158 => Some(ethereum::new_eip161_test()),
 			ForkSpec::Byzantium => Some(ethereum::new_byzantium_test()),
-			ForkSpec::Constantinople => Some(ethereum::new_constantinople_test()),
 			ForkSpec::EIP158ToByzantiumAt5 => Some(ethereum::new_transition_test()),
 			ForkSpec::FrontierToHomesteadAt5 | ForkSpec::HomesteadToDaoAt5 | ForkSpec::HomesteadToEIP150At5 => None,
+			_ => None,
 		}
 	}
 
@@ -183,12 +183,12 @@ impl<'a> EvmTestClient<'a> {
 			gas_limit: *genesis.gas_limit(),
 		};
 		let mut substate = state::Substate::new();
-		let mut output = vec![];
-		let mut executive = executive::Executive::new(&mut self.state, &info, self.spec.engine.machine());
+		let machine = self.spec.engine.machine();
+		let schedule = machine.schedule(info.number);
+		let mut executive = executive::Executive::new(&mut self.state, &info, &machine, &schedule);
 		executive.call(
 			params,
 			&mut substate,
-			bytes::BytesRef::Flexible(&mut output),
 			tracer,
 			vm_tracer,
 		).map_err(EvmTestError::Evm)

ethcore/src/client/mod.rs

@@ -17,9 +17,9 @@
 //! Blockchain database client.
 
 mod ancient_import;
+mod bad_blocks;
 mod client;
 mod config;
-mod error;
 #[cfg(any(test, feature = "test-helpers"))]
 mod evm_test_client;
 mod io_message;
@@ -29,7 +29,6 @@ mod trace;
 
 pub use self::client::*;
 pub use self::config::{Mode, ClientConfig, DatabaseCompactionProfile, BlockChainConfig, VMType};
-pub use self::error::Error;
 #[cfg(any(test, feature = "test-helpers"))]
 pub use self::evm_test_client::{EvmTestClient, EvmTestError, TransactResult};
 pub use self::io_message::ClientIoMessage;
@@ -38,7 +37,7 @@ pub use self::test_client::{TestBlockChainClient, EachBlockWith};
 pub use self::chain_notify::{ChainNotify, ChainRoute, ChainRouteType, ChainMessageType};
 pub use self::traits::{
     Nonce, Balance, ChainInfo, BlockInfo, ReopenBlock, PrepareOpenBlock, CallContract, TransactionInfo, RegistryInfo, ScheduleInfo, ImportSealedBlock, BroadcastProposalBlock, ImportBlock,
-    StateOrBlock, StateClient, Call, EngineInfo, AccountData, BlockChain, BlockProducer, SealedBlockImporter
+    StateOrBlock, StateClient, Call, EngineInfo, AccountData, BlockChain, BlockProducer, SealedBlockImporter, BadBlocks,
 };
 pub use state::StateInfo;
 pub use self::traits::{BlockChainClient, EngineClient, ProvingBlockChainClient, IoClient};

ethcore/src/client/test_client.rs

@@ -39,20 +39,22 @@ use client::{
 	PrepareOpenBlock, BlockChainClient, BlockChainInfo, BlockStatus, BlockId, Mode,
 	TransactionId, UncleId, TraceId, TraceFilter, LastHashes, CallAnalytics, BlockImportError,
 	ProvingBlockChainClient, ScheduleInfo, ImportSealedBlock, BroadcastProposalBlock, ImportBlock, StateOrBlock,
-	Call, StateClient, EngineInfo, AccountData, BlockChain, BlockProducer, SealedBlockImporter, IoClient
+	Call, StateClient, EngineInfo, AccountData, BlockChain, BlockProducer, SealedBlockImporter, IoClient,
+	BadBlocks,
 };
 use db::{NUM_COLUMNS, COL_STATE};
 use header::{Header as BlockHeader, BlockNumber};
 use filter::Filter;
 use log_entry::LocalizedLogEntry;
 use receipt::{Receipt, LocalizedReceipt, TransactionOutcome};
-use error::ImportResult;
+use error::{Error, ImportResult};
 use vm::Schedule;
 use miner::{self, Miner, MinerService};
 use spec::Spec;
 use types::basic_account::BasicAccount;
 use types::pruning_info::PruningInfo;
 use verification::queue::QueueInfo;
+use verification::queue::kind::blocks::Unverified;
 use block::{OpenBlock, SealedBlock, ClosedBlock};
 use executive::Executed;
 use error::CallError;
@@ -93,6 +95,8 @@ pub struct TestBlockChainClient {
 	pub receipts: RwLock<HashMap<TransactionId, LocalizedReceipt>>,
 	/// Logs
 	pub logs: RwLock<Vec<LocalizedLogEntry>>,
+	/// Should return errors on logs.
+	pub error_on_logs: RwLock<Option<BlockId>>,
 	/// Block queue size.
 	pub queue_size: AtomicUsize,
 	/// Miner
@@ -114,7 +118,7 @@ pub struct TestBlockChainClient {
 }
 
 /// Used for generating test client blocks.
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 pub enum EachBlockWith {
 	/// Plain block.
 	Nothing,
@@ -177,6 +181,7 @@ impl TestBlockChainClient {
 			traces: RwLock::new(None),
 			history: RwLock::new(None),
 			disabled: AtomicBool::new(false),
+			error_on_logs: RwLock::new(None),
 		};
 
 		// insert genesis hash.
@@ -232,68 +237,73 @@ impl TestBlockChainClient {
 		*self.logs.write() = logs;
 	}
 
-	/// Add blocks to test client.
-	pub fn add_blocks(&self, count: usize, with: EachBlockWith) {
-		let len = self.numbers.read().len();
-		for n in len..(len + count) {
-			let mut header = BlockHeader::new();
-			header.set_difficulty(From::from(n));
-			header.set_parent_hash(self.last_hash.read().clone());
-			header.set_number(n as BlockNumber);
-			header.set_gas_limit(U256::from(1_000_000));
-			header.set_extra_data(self.extra_data.clone());
-			let uncles = match with {
-				EachBlockWith::Uncle | EachBlockWith::UncleAndTransaction => {
-					let mut uncles = RlpStream::new_list(1);
-					let mut uncle_header = BlockHeader::new();
-					uncle_header.set_difficulty(From::from(n));
-					uncle_header.set_parent_hash(self.last_hash.read().clone());
-					uncle_header.set_number(n as BlockNumber);
-					uncles.append(&uncle_header);
-					header.set_uncles_hash(keccak(uncles.as_raw()));
-					uncles
-				},
-				_ => RlpStream::new_list(0)
-			};
-			let txs = match with {
-				EachBlockWith::Transaction | EachBlockWith::UncleAndTransaction => {
-					let mut txs = RlpStream::new_list(1);
-					let keypair = Random.generate().unwrap();
-					// Update nonces value
-					self.nonces.write().insert(keypair.address(), U256::one());
-					let tx = Transaction {
-						action: Action::Create,
-						value: U256::from(100),
-						data: "3331600055".from_hex().unwrap(),
-						gas: U256::from(100_000),
-						gas_price: U256::from(200_000_000_000u64),
-						nonce: U256::zero()
-					};
-					let signed_tx = tx.sign(keypair.secret(), None);
-					txs.append(&signed_tx);
-					txs.out()
-				},
-				_ => ::rlp::EMPTY_LIST_RLP.to_vec()
-			};
-
-			let mut rlp = RlpStream::new_list(3);
-			rlp.append(&header);
-			rlp.append_raw(&txs, 1);
-			rlp.append_raw(uncles.as_raw(), 1);
-			self.import_block(rlp.as_raw().to_vec()).unwrap();
-		}
+	/// Set return errors on logs.
+	pub fn set_error_on_logs(&self, val: Option<BlockId>) {
+		*self.error_on_logs.write() = val;
 	}
 
-	/// Make a bad block by setting invalid extra data.
-	pub fn corrupt_block(&self, n: BlockNumber) {
-		let hash = self.block_hash(BlockId::Number(n)).unwrap();
-		let mut header: BlockHeader = self.block_header(BlockId::Number(n)).unwrap().decode().expect("decoding failed");
-		header.set_extra_data(b"This extra data is way too long to be considered valid".to_vec());
+	/// Add a block to test client.
+	pub fn add_block<F>(&self, with: EachBlockWith, hook: F)
+		where F: Fn(BlockHeader) -> BlockHeader
+	{
+		let n = self.numbers.read().len();
+
+		let mut header = BlockHeader::new();
+		header.set_difficulty(From::from(n));
+		header.set_parent_hash(self.last_hash.read().clone());
+		header.set_number(n as BlockNumber);
+		header.set_gas_limit(U256::from(1_000_000));
+		header.set_extra_data(self.extra_data.clone());
+
+		header = hook(header);
+
+		let uncles = match with {
+			EachBlockWith::Uncle | EachBlockWith::UncleAndTransaction => {
+				let mut uncles = RlpStream::new_list(1);
+				let mut uncle_header = BlockHeader::new();
+				uncle_header.set_difficulty(From::from(n));
+				uncle_header.set_parent_hash(self.last_hash.read().clone());
+				uncle_header.set_number(n as BlockNumber);
+				uncles.append(&uncle_header);
+				header.set_uncles_hash(keccak(uncles.as_raw()));
+				uncles
+			},
+			_ => RlpStream::new_list(0)
+		};
+		let txs = match with {
+			EachBlockWith::Transaction | EachBlockWith::UncleAndTransaction => {
+				let mut txs = RlpStream::new_list(1);
+				let keypair = Random.generate().unwrap();
+				// Update nonces value
+				self.nonces.write().insert(keypair.address(), U256::one());
+				let tx = Transaction {
+					action: Action::Create,
+					value: U256::from(100),
+					data: "3331600055".from_hex().unwrap(),
+					gas: U256::from(100_000),
+					gas_price: U256::from(200_000_000_000u64),
+					nonce: U256::zero()
+				};
+				let signed_tx = tx.sign(keypair.secret(), None);
+				txs.append(&signed_tx);
+				txs.out()
+			},
+			_ => ::rlp::EMPTY_LIST_RLP.to_vec()
+		};
+
 		let mut rlp = RlpStream::new_list(3);
 		rlp.append(&header);
-		rlp.append_raw(&::rlp::NULL_RLP, 1);
-		rlp.append_raw(&::rlp::NULL_RLP, 1);
-		self.blocks.write().insert(hash, rlp.out());
+		rlp.append_raw(&txs, 1);
+		rlp.append_raw(uncles.as_raw(), 1);
+		let unverified = Unverified::from_rlp(rlp.out()).unwrap();
+		self.import_block(unverified).unwrap();
+	}
+
+	/// Add a sequence of blocks to test client.
+	pub fn add_blocks(&self, count: usize, with: EachBlockWith) {
+		for _ in 0..count {
+			self.add_block(with, |header| header);
+		}
 	}
 
 	/// Make a bad block by setting invalid parent hash.
@@ -373,7 +383,7 @@ impl ReopenBlock for TestBlockChainClient {
 }
 
 impl PrepareOpenBlock for TestBlockChainClient {
-	fn prepare_open_block(&self, author: Address, gas_range_target: (U256, U256), extra_data: Bytes) -> OpenBlock {
+	fn prepare_open_block(&self, author: Address, gas_range_target: (U256, U256), extra_data: Bytes) -> Result<OpenBlock, Error> {
 		let engine = &*self.spec.engine;
 		let genesis_header = self.spec.genesis_header();
 		let db = self.spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
@@ -391,10 +401,10 @@ impl PrepareOpenBlock for TestBlockChainClient {
 			extra_data,
 			false,
 			&mut Vec::new().into_iter(),
-		).expect("Opening block for tests will not fail.");
+		)?;
 		// TODO [todr] Override timestamp for predictability
 		open_block.set_timestamp(*self.latest_block_timestamp.read());
-		open_block
+		Ok(open_block)
 	}
 }
 
@@ -512,8 +522,8 @@ impl RegistryInfo for TestBlockChainClient {
 }
 
 impl ImportBlock for TestBlockChainClient {
-	fn import_block(&self, b: Bytes) -> Result<H256, BlockImportError> {
-		let header = view!(BlockView, &b).header();
+	fn import_block(&self, unverified: Unverified) -> Result<H256, BlockImportError> {
+		let header = unverified.header;
 		let h = header.hash();
 		let number: usize = header.number() as usize;
 		if number > self.blocks.read().len() {
@@ -539,7 +549,7 @@ impl ImportBlock for TestBlockChainClient {
 				*difficulty = *difficulty + header.difficulty().clone();
 			}
 			mem::replace(&mut *self.last_hash.write(), h.clone());
-			self.blocks.write().insert(h.clone(), b);
+			self.blocks.write().insert(h.clone(), unverified.bytes);
 			self.numbers.write().insert(number, h.clone());
 			let mut parent_hash = header.parent_hash().clone();
 			if number > 0 {
@@ -552,7 +562,7 @@ impl ImportBlock for TestBlockChainClient {
 			}
 		}
 		else {
-			self.blocks.write().insert(h.clone(), b.to_vec());
+			self.blocks.write().insert(h.clone(), unverified.bytes);
 		}
 		Ok(h)
 	}
@@ -605,6 +615,19 @@ impl EngineInfo for TestBlockChainClient {
 	}
 }
 
+impl BadBlocks for TestBlockChainClient {
+	fn bad_blocks(&self) -> Vec<(Unverified, String)> {
+		vec![
+			(Unverified {
+				header: Default::default(),
+				transactions: vec![],
+				uncles: vec![],
+				bytes: vec![1, 2, 3],
+			}, "Invalid block".into())
+		]
+	}
+}
+
 impl BlockChainClient for TestBlockChainClient {
 	fn replay(&self, _id: TransactionId, _analytics: CallAnalytics) -> Result<Executed, CallError> {
 		self.execution_result.read().clone().unwrap()
@@ -663,13 +686,18 @@ impl BlockChainClient for TestBlockChainClient {
 		self.receipts.read().get(&id).cloned()
 	}
 
-	fn logs(&self, filter: Filter) -> Vec<LocalizedLogEntry> {
+	fn logs(&self, filter: Filter) -> Result<Vec<LocalizedLogEntry>, BlockId> {
+		match self.error_on_logs.read().as_ref() {
+			Some(id) => return Err(id.clone()),
+			None => (),
+		}
+
 		let mut logs = self.logs.read().clone();
 		let len = logs.len();
-		match filter.limit {
+		Ok(match filter.limit {
 			Some(limit) if limit <= len => logs.split_off(len - limit),
 			_ => logs,
-		}
+		})
 	}
 
 	fn last_hashes(&self) -> LastHashes {
@@ -854,8 +882,8 @@ impl IoClient for TestBlockChainClient {
 		self.miner.import_external_transactions(self, txs);
 	}
 
-	fn queue_ancient_block(&self, b: Bytes, _r: Bytes) -> Result<H256, BlockImportError> {
-		self.import_block(b)
+	fn queue_ancient_block(&self, unverified: Unverified, _r: Bytes) -> Result<H256, BlockImportError> {
+		self.import_block(unverified)
 	}
 
 	fn queue_consensus_message(&self, message: Bytes) {

ethcore/src/client/traits.rs

@@ -24,7 +24,7 @@ use blockchain::TreeRoute;
 use client::Mode;
 use encoded;
 use vm::LastHashes;
-use error::{ImportResult, CallError, BlockImportError};
+use error::{Error, ImportResult, CallError, BlockImportError};
 use evm::Schedule;
 use executive::Executed;
 use filter::Filter;
@@ -34,6 +34,7 @@ use receipt::LocalizedReceipt;
 use trace::LocalizedTrace;
 use transaction::{self, LocalizedTransaction, SignedTransaction};
 use verification::queue::QueueInfo as BlockQueueInfo;
+use verification::queue::kind::blocks::Unverified;
 use state::StateInfo;
 use header::Header;
 use engines::EthEngine;
@@ -167,7 +168,7 @@ pub trait RegistryInfo {
 /// Provides methods to import block into blockchain
 pub trait ImportBlock {
 	/// Import a block into the blockchain.
-	fn import_block(&self, bytes: Bytes) -> Result<H256, BlockImportError>;
+	fn import_block(&self, block: Unverified) -> Result<H256, BlockImportError>;
 }
 
 /// Provides `call_contract` method
@@ -204,15 +205,21 @@ pub trait IoClient: Sync + Send {
 	fn queue_transactions(&self, transactions: Vec<Bytes>, peer_id: usize);
 
 	/// Queue block import with transaction receipts. Does no sealing and transaction validation.
-	fn queue_ancient_block(&self, block_bytes: Bytes, receipts_bytes: Bytes) -> Result<H256, BlockImportError>;
+	fn queue_ancient_block(&self, block_bytes: Unverified, receipts_bytes: Bytes) -> Result<H256, BlockImportError>;
 
 	/// Queue conensus engine message.
 	fn queue_consensus_message(&self, message: Bytes);
 }
 
+/// Provides recently seen bad blocks.
+pub trait BadBlocks {
+	/// Returns a list of blocks that were recently not imported because they were invalid.
+	fn bad_blocks(&self) -> Vec<(Unverified, String)>;
+}
+
 /// Blockchain database client. Owns and manages a blockchain and a block queue.
 pub trait BlockChainClient : Sync + Send + AccountData + BlockChain + CallContract + RegistryInfo + ImportBlock
-+ IoClient {
++ IoClient + BadBlocks {
 	/// Look up the block number for the given block ID.
 	fn block_number(&self, id: BlockId) -> Option<BlockNumber>;
 
@@ -296,8 +303,8 @@ pub trait BlockChainClient : Sync + Send + AccountData + BlockChain + CallContra
 	/// Get the registrar address, if it exists.
 	fn additional_params(&self) -> BTreeMap<String, String>;
 
-	/// Returns logs matching given filter.
-	fn logs(&self, filter: Filter) -> Vec<LocalizedLogEntry>;
+	/// Returns logs matching given filter. If one of the filtering block cannot be found, returns the block id that caused the error.
+	fn logs(&self, filter: Filter) -> Result<Vec<LocalizedLogEntry>, BlockId>;
 
 	/// Replays a given transaction for inspection.
 	fn replay(&self, t: TransactionId, analytics: CallAnalytics) -> Result<Executed, CallError>;
@@ -392,7 +399,7 @@ pub trait PrepareOpenBlock {
 		author: Address,
 		gas_range_target: (U256, U256),
 		extra_data: Bytes
-	) -> OpenBlock;
+	) -> Result<OpenBlock, Error>;
 }
 
 /// Provides methods used for sealing new state

ethcore/src/encoded.rs

@@ -222,6 +222,11 @@ impl Block {
 
 	/// Consume the view and return the raw bytes.
 	pub fn into_inner(self) -> Vec<u8> { self.0 }
+
+	/// Returns the reference to slice of bytes
+	pub fn raw(&self) -> &[u8] {
+		&self.0
+	}
 }
 
 // forwarders to borrowed header view.

ethcore/src/engines/authority_round/mod.rs

@@ -100,7 +100,11 @@ impl From<ethjson::spec::AuthorityRoundParams> for AuthorityRoundParams {
 			immediate_transitions: p.immediate_transitions.unwrap_or(false),
 			block_reward: p.block_reward.map_or_else(Default::default, Into::into),
 			block_reward_contract_transition: p.block_reward_contract_transition.map_or(0, Into::into),
-			block_reward_contract: p.block_reward_contract_address.map(BlockRewardContract::new),
+			block_reward_contract: match (p.block_reward_contract_code, p.block_reward_contract_address) {
+				(Some(code), _) => Some(BlockRewardContract::new_from_code(Arc::new(code.into()))),
+				(_, Some(address)) => Some(BlockRewardContract::new_from_address(address.into())),
+				(None, None) => None,
+			},
 			maximum_uncle_count_transition: p.maximum_uncle_count_transition.map_or(0, Into::into),
 			maximum_uncle_count: p.maximum_uncle_count.map_or(0, Into::into),
 			empty_steps_transition: p.empty_steps_transition.map_or(u64::max_value(), |n| ::std::cmp::max(n.into(), 1)),
@@ -317,7 +321,7 @@ impl EmptyStep {
 
 impl fmt::Display for EmptyStep {
 	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		write!(f, "({:x}, {}, {:x})", self.signature, self.step, self.parent_hash)
+		write!(f, "({}, {}, {})", self.signature, self.step, self.parent_hash)
 	}
 }
 
@@ -825,10 +829,6 @@ impl Engine<EthereumMachine> for AuthorityRound {
 
 	/// Additional engine-specific information for the user/developer concerning `header`.
 	fn extra_info(&self, header: &Header) -> BTreeMap<String, String> {
-		if header.seal().len() < header_expected_seal_fields(header, self.empty_steps_transition) {
-			return BTreeMap::default();
-		}
-
 		let step = header_step(header, self.empty_steps_transition).as_ref().map(ToString::to_string).unwrap_or("".into());
 		let signature = header_signature(header, self.empty_steps_transition).as_ref().map(ToString::to_string).unwrap_or("".into());
 
@@ -1049,7 +1049,7 @@ impl Engine<EthereumMachine> for AuthorityRound {
 
 	/// Apply the block reward on finalisation of the block.
 	fn on_close_block(&self, block: &mut ExecutedBlock) -> Result<(), Error> {
-		let mut benefactors = Vec::new();
+		let mut beneficiaries = Vec::new();
 		if block.header().number() >= self.empty_steps_transition {
 			let empty_steps = if block.header().seal().is_empty() {
 				// this is a new block, calculate rewards based on the empty steps messages we have accumulated
@@ -1075,32 +1075,22 @@ impl Engine<EthereumMachine> for AuthorityRound {
 
 			for empty_step in empty_steps {
 				let author = empty_step.author()?;
-				benefactors.push((author, RewardKind::EmptyStep));
+				beneficiaries.push((author, RewardKind::EmptyStep));
 			}
 		}
 
 		let author = *block.header().author();
-		benefactors.push((author, RewardKind::Author));
+		beneficiaries.push((author, RewardKind::Author));
 
 		let rewards: Vec<_> = match self.block_reward_contract {
 			Some(ref c) if block.header().number() >= self.block_reward_contract_transition => {
-				// NOTE: this logic should be moved to a function when another
-				//       engine needs support for block reward contract.
-				let mut call = |to, data| {
-					let result = self.machine.execute_as_system(
-						block,
-						to,
-						U256::max_value(), // unbounded gas? maybe make configurable.
-						Some(data),
-					);
-					result.map_err(|e| format!("{}", e))
-				};
+				let mut call = super::default_system_or_code_call(&self.machine, block);
 
-				let rewards = c.reward(&benefactors, &mut call)?;
+				let rewards = c.reward(&beneficiaries, &mut call)?;
 				rewards.into_iter().map(|(author, amount)| (author, RewardKind::External, amount)).collect()
 			},
 			_ => {
-				benefactors.into_iter().map(|(author, reward_kind)| (author, reward_kind, self.block_reward)).collect()
+				beneficiaries.into_iter().map(|(author, reward_kind)| (author, reward_kind, self.block_reward)).collect()
 			},
 		};
 
@@ -1413,17 +1403,15 @@ impl Engine<EthereumMachine> for AuthorityRound {
 
 #[cfg(test)]
 mod tests {
-	use std::collections::BTreeMap;
 	use std::sync::Arc;
 	use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
 	use hash::keccak;
 	use ethereum_types::{Address, H520, H256, U256};
-	use ethkey::Signature;
 	use header::Header;
 	use rlp::encode;
 	use block::*;
 	use test_helpers::{
-		generate_dummy_client_with_spec_and_accounts, get_temp_state_db, generate_dummy_client,
+		generate_dummy_client_with_spec_and_accounts, get_temp_state_db,
 		TestNotify
 	};
 	use account_provider::AccountProvider;
@@ -1471,9 +1459,9 @@ mod tests {
 		let db2 = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b1 = OpenBlock::new(engine, Default::default(), false, db1, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
-		let b1 = b1.close_and_lock();
+		let b1 = b1.close_and_lock().unwrap();
 		let b2 = OpenBlock::new(engine, Default::default(), false, db2, &genesis_header, last_hashes, addr2, (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
-		let b2 = b2.close_and_lock();
+		let b2 = b2.close_and_lock().unwrap();
 
 		engine.set_signer(tap.clone(), addr1, "1".into());
 		if let Seal::Regular(seal) = engine.generate_seal(b1.block(), &genesis_header) {
@@ -1505,9 +1493,9 @@ mod tests {
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 
 		let b1 = OpenBlock::new(engine, Default::default(), false, db1, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
-		let b1 = b1.close_and_lock();
+		let b1 = b1.close_and_lock().unwrap();
 		let b2 = OpenBlock::new(engine, Default::default(), false, db2, &genesis_header, last_hashes, addr2, (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
-		let b2 = b2.close_and_lock();
+		let b2 = b2.close_and_lock().unwrap();
 
 		engine.set_signer(tap.clone(), addr1, "1".into());
 		match engine.generate_seal(b1.block(), &genesis_header) {
@@ -1772,16 +1760,17 @@ mod tests {
 		let db1 = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
 
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
-		let b1 = OpenBlock::new(engine, Default::default(), false, db1, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
-		let b1 = b1.close_and_lock();
 
-		let client = generate_dummy_client(0);
+		let client = generate_dummy_client_with_spec_and_accounts(Spec::new_test_round_empty_steps, None);
 		let notify = Arc::new(TestNotify::default());
 		client.add_notify(notify.clone());
 		engine.register_client(Arc::downgrade(&client) as _);
 
 		engine.set_signer(tap.clone(), addr1, "1".into());
 
+		let b1 = OpenBlock::new(engine, Default::default(), false, db1, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
+		let b1 = b1.close_and_lock().unwrap();
+
 		// the block is empty so we don't seal and instead broadcast an empty step message
 		assert_eq!(engine.generate_seal(b1.block(), &genesis_header), Seal::None);
 
@@ -1806,9 +1795,14 @@ mod tests {
 
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 
+		let client = generate_dummy_client_with_spec_and_accounts(Spec::new_test_round_empty_steps, None);
+		let notify = Arc::new(TestNotify::default());
+		client.add_notify(notify.clone());
+		engine.register_client(Arc::downgrade(&client) as _);
+
 		// step 2
 		let b1 = OpenBlock::new(engine, Default::default(), false, db1, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
-		let b1 = b1.close_and_lock();
+		let b1 = b1.close_and_lock().unwrap();
 
 		// since the block is empty it isn't sealed and we generate empty steps
 		engine.set_signer(tap.clone(), addr1, "1".into());
@@ -1825,7 +1819,7 @@ mod tests {
 			value: U256::from(1),
 			data: vec![],
 		}.fake_sign(addr2), None).unwrap();
-		let b2 = b2.close_and_lock();
+		let b2 = b2.close_and_lock().unwrap();
 
 		// we will now seal a block with 1tx and include the accumulated empty step message
 		engine.set_signer(tap.clone(), addr2, "0".into());
@@ -1854,9 +1848,14 @@ mod tests {
 
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 
+		let client = generate_dummy_client_with_spec_and_accounts(Spec::new_test_round_empty_steps, None);
+		let notify = Arc::new(TestNotify::default());
+		client.add_notify(notify.clone());
+		engine.register_client(Arc::downgrade(&client) as _);
+
 		// step 2
 		let b1 = OpenBlock::new(engine, Default::default(), false, db1, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
-		let b1 = b1.close_and_lock();
+		let b1 = b1.close_and_lock().unwrap();
 
 		// since the block is empty it isn't sealed and we generate empty steps
 		engine.set_signer(tap.clone(), addr1, "1".into());
@@ -1865,7 +1864,7 @@ mod tests {
 
 		// step 3
 		let b2 = OpenBlock::new(engine, Default::default(), false, db2, &genesis_header, last_hashes.clone(), addr2, (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
-		let b2 = b2.close_and_lock();
+		let b2 = b2.close_and_lock().unwrap();
 		engine.set_signer(tap.clone(), addr2, "0".into());
 		assert_eq!(engine.generate_seal(b2.block(), &genesis_header), Seal::None);
 		engine.step();
@@ -1873,7 +1872,7 @@ mod tests {
 		// step 4
 		// the spec sets the maximum_empty_steps to 2 so we will now seal an empty block and include the empty step messages
 		let b3 = OpenBlock::new(engine, Default::default(), false, db3, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
-		let b3 = b3.close_and_lock();
+		let b3 = b3.close_and_lock().unwrap();
 
 		engine.set_signer(tap.clone(), addr1, "1".into());
 		if let Seal::Regular(seal) = engine.generate_seal(b3.block(), &genesis_header) {
@@ -1906,7 +1905,7 @@ mod tests {
 
 		// step 2
 		let b1 = OpenBlock::new(engine, Default::default(), false, db1, &genesis_header, last_hashes.clone(), addr1, (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
-		let b1 = b1.close_and_lock();
+		let b1 = b1.close_and_lock().unwrap();
 
 		// since the block is empty it isn't sealed and we generate empty steps
 		engine.set_signer(tap.clone(), addr1, "1".into());
@@ -1919,10 +1918,10 @@ mod tests {
 		let addr1_balance = b2.block().state().balance(&addr1).unwrap();
 
 		// after closing the block `addr1` should be reward twice, one for the included empty step message and another for block creation
-		let b2 = b2.close_and_lock();
+		let b2 = b2.close_and_lock().unwrap();
 
 		// the spec sets the block reward to 10
-		assert_eq!(b2.block().state().balance(&addr1).unwrap(), addr1_balance + (10 * 2).into())
+		assert_eq!(b2.block().state().balance(&addr1).unwrap(), addr1_balance + (10 * 2))
 	}
 
 	#[test]
@@ -2039,7 +2038,7 @@ mod tests {
 			false,
 			&mut Vec::new().into_iter(),
 		).unwrap();
-		let b1 = b1.close_and_lock();
+		let b1 = b1.close_and_lock().unwrap();
 
 		// since the block is empty it isn't sealed and we generate empty steps
 		engine.set_signer(tap.clone(), addr1, "1".into());
@@ -2065,48 +2064,12 @@ mod tests {
 
 		// after closing the block `addr1` should be reward twice, one for the included empty step
 		// message and another for block creation
-		let b2 = b2.close_and_lock();
+		let b2 = b2.close_and_lock().unwrap();
 
 		// the contract rewards (1000 + kind) for each benefactor/reward kind
 		assert_eq!(
 			b2.block().state().balance(&addr1).unwrap(),
-			addr1_balance + (1000 + 0).into() + (1000 + 2).into(),
+			addr1_balance + (1000 + 0) + (1000 + 2),
 		)
 	}
-
-	#[test]
-	fn extra_info_from_seal() {
-		let (spec, tap, accounts) = setup_empty_steps();
-		let engine = &*spec.engine;
-
-		let addr1 = accounts[0];
-		engine.set_signer(tap.clone(), addr1, "1".into());
-
-		let mut header: Header = Header::default();
-		let empty_step = empty_step(engine, 1, &header.parent_hash());
-		let sealed_empty_step = empty_step.sealed();
-
-		header.set_number(2);
-		header.set_seal(vec![
-			encode(&2usize).to_vec(),
-			encode(&H520::default()).to_vec(),
-			::rlp::encode_list(&vec![sealed_empty_step]).to_vec(),
-		]);
-
-		let info = engine.extra_info(&header);
-
-		let mut expected = BTreeMap::default();
-		expected.insert("step".into(), "2".into());
-		expected.insert("signature".into(), Signature::from(H520::default()).to_string());
-		expected.insert("emptySteps".into(), format!("[{}]", empty_step));
-
-		assert_eq!(info, expected);
-
-		header.set_seal(vec![]);
-
-		assert_eq!(
-			engine.extra_info(&header),
-			BTreeMap::default(),
-		);
-	}
 }

ethcore/src/engines/basic_authority.rs

@@ -252,7 +252,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, addr, (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
-		let b = b.close_and_lock();
+		let b = b.close_and_lock().unwrap();
 		if let Seal::Regular(seal) = engine.generate_seal(b.block(), &genesis_header) {
 			assert!(b.try_seal(engine, seal).is_ok());
 		}

ethcore/src/engines/block_reward.rs

@@ -21,33 +21,48 @@ use ethabi;
 use ethabi::ParamType;
 use ethereum_types::{H160, Address, U256};
 
+use std::sync::Arc;
+use hash::keccak;
 use error::Error;
 use machine::WithRewards;
 use parity_machine::{Machine, WithBalances};
 use trace;
-use super::SystemCall;
+use types::BlockNumber;
+use super::{SystemOrCodeCall, SystemOrCodeCallKind};
 
 use_contract!(block_reward_contract, "BlockReward", "res/contracts/block_reward.json");
 
 /// The kind of block reward.
 /// Depending on the consensus engine the allocated block reward might have
 /// different semantics which could lead e.g. to different reward values.
-#[repr(u8)]
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]
 pub enum RewardKind {
 	/// Reward attributed to the block author.
-	Author = 0,
-	/// Reward attributed to the block uncle(s).
-	Uncle = 1,
+	Author,
 	/// Reward attributed to the author(s) of empty step(s) included in the block (AuthorityRound engine).
-	EmptyStep = 2,
+	EmptyStep,
 	/// Reward attributed by an external protocol (e.g. block reward contract).
-	External = 3,
+	External,
+	/// Reward attributed to the block uncle(s) with given difference.
+	Uncle(u8),
+}
+
+impl RewardKind {
+	/// Create `RewardKind::Uncle` from given current block number and uncle block number.
+	pub fn uncle(number: BlockNumber, uncle: BlockNumber) -> Self {
+		RewardKind::Uncle(if number > uncle && number - uncle <= u8::max_value().into() { (number - uncle) as u8 } else { 0 })
+	}
 }
 
 impl From<RewardKind> for u16 {
 	fn from(reward_kind: RewardKind) -> Self {
-		reward_kind as u16
+		match reward_kind {
+			RewardKind::Author => 0,
+			RewardKind::EmptyStep => 2,
+			RewardKind::External => 3,
+
+			RewardKind::Uncle(depth) => 100 + depth as u16,
+		}
 	}
 }
 
@@ -55,7 +70,7 @@ impl Into<trace::RewardType> for RewardKind {
 	fn into(self) -> trace::RewardType {
 		match self {
 			RewardKind::Author => trace::RewardType::Block,
-			RewardKind::Uncle => trace::RewardType::Uncle,
+			RewardKind::Uncle(_) => trace::RewardType::Uncle,
 			RewardKind::EmptyStep => trace::RewardType::EmptyStep,
 			RewardKind::External => trace::RewardType::External,
 		}
@@ -63,38 +78,50 @@ impl Into<trace::RewardType> for RewardKind {
 }
 
 /// A client for the block reward contract.
+#[derive(PartialEq, Debug)]
 pub struct BlockRewardContract {
-	/// Address of the contract.
-	address: Address,
+	kind: SystemOrCodeCallKind,
 	block_reward_contract: block_reward_contract::BlockReward,
 }
 
 impl BlockRewardContract {
-	/// Create a new block reward contract client targeting the given address.
-	pub fn new(address: Address) -> BlockRewardContract {
+	/// Create a new block reward contract client targeting the system call kind.
+	pub fn new(kind: SystemOrCodeCallKind) -> BlockRewardContract {
 		BlockRewardContract {
-			address,
+			kind,
 			block_reward_contract: block_reward_contract::BlockReward::default(),
 		}
 	}
 
-	/// Calls the block reward contract with the given benefactors list (and associated reward kind)
+	/// Create a new block reward contract client targeting the contract address.
+	pub fn new_from_address(address: Address) -> BlockRewardContract {
+		Self::new(SystemOrCodeCallKind::Address(address))
+	}
+
+	/// Create a new block reward contract client targeting the given code.
+	pub fn new_from_code(code: Arc<Vec<u8>>) -> BlockRewardContract {
+		let code_hash = keccak(&code[..]);
+
+		Self::new(SystemOrCodeCallKind::Code(code, code_hash))
+	}
+
+	/// Calls the block reward contract with the given beneficiaries list (and associated reward kind)
 	/// and returns the reward allocation (address - value). The block reward contract *must* be
 	/// called by the system address so the `caller` must ensure that (e.g. using
 	/// `machine.execute_as_system`).
 	pub fn reward(
 		&self,
-		benefactors: &[(Address, RewardKind)],
-		caller: &mut SystemCall,
+		beneficiaries: &[(Address, RewardKind)],
+		caller: &mut SystemOrCodeCall,
 	) -> Result<Vec<(Address, U256)>, Error> {
 		let reward = self.block_reward_contract.functions().reward();
 
 		let input = reward.input(
-			benefactors.iter().map(|&(address, _)| H160::from(address)),
-			benefactors.iter().map(|&(_, ref reward_kind)| u16::from(*reward_kind)),
+			beneficiaries.iter().map(|&(address, _)| H160::from(address)),
+			beneficiaries.iter().map(|&(_, ref reward_kind)| u16::from(*reward_kind)),
 		);
 
-		let output = caller(self.address, input)
+		let output = caller(self.kind.clone(), input)
 			.map_err(Into::into)
 			.map_err(::engines::EngineError::FailedSystemCall)?;
 
@@ -127,7 +154,7 @@ impl BlockRewardContract {
 	}
 }
 
-/// Applies the given block rewards, i.e. adds the given balance to each benefactors' address.
+/// Applies the given block rewards, i.e. adds the given balance to each beneficiary' address.
 /// If tracing is enabled the operations are recorded.
 pub fn apply_block_rewards<M: Machine + WithBalances + WithRewards>(
 	rewards: &[(Address, RewardKind, U256)],
@@ -139,7 +166,7 @@ pub fn apply_block_rewards<M: Machine + WithBalances + WithRewards>(
 	}
 
 	let rewards: Vec<_> = rewards.into_iter().map(|&(a, k, r)| (a, k.into(), r)).collect();
-	machine.note_rewards(block,  &rewards)
+	machine.note_rewards(block, &rewards)
 }
 
 #[cfg(test)]
@@ -149,6 +176,7 @@ mod test {
 	use spec::Spec;
 	use test_helpers::generate_dummy_client_with_spec_and_accounts;
 
+	use engines::SystemOrCodeCallKind;
 	use super::{BlockRewardContract, RewardKind};
 
 	#[test]
@@ -161,7 +189,7 @@ mod test {
 		let machine = Spec::new_test_machine();
 
 		// the spec has a block reward contract defined at the given address
-		let block_reward_contract = BlockRewardContract::new(
+		let block_reward_contract = BlockRewardContract::new_from_address(
 			"0000000000000000000000000000000000000042".into(),
 		);
 
@@ -170,32 +198,37 @@ mod test {
 				"0000000000000000000000000000000000000001".into(),
 				(3141562.into(), 31415620.into()),
 				vec![],
-			);
+			).unwrap();
 
-			let result = machine.execute_as_system(
-				block.block_mut(),
-				to,
-				U256::max_value(),
-				Some(data),
-			);
+			let result = match to {
+				SystemOrCodeCallKind::Address(to) => {
+					machine.execute_as_system(
+						block.block_mut(),
+						to,
+						U256::max_value(),
+						Some(data),
+					)
+				},
+				_ => panic!("Test reward contract is created by an address, we never reach this branch."),
+			};
 
 			result.map_err(|e| format!("{}", e))
 		};
 
-		// if no benefactors are given no rewards are attributed
+		// if no beneficiaries are given no rewards are attributed
 		assert!(block_reward_contract.reward(&vec![], &mut call).unwrap().is_empty());
 
 		// the contract rewards (1000 + kind) for each benefactor
-		let benefactors = vec![
+		let beneficiaries = vec![
 			("0000000000000000000000000000000000000033".into(), RewardKind::Author),
-			("0000000000000000000000000000000000000034".into(), RewardKind::Uncle),
+			("0000000000000000000000000000000000000034".into(), RewardKind::Uncle(1)),
 			("0000000000000000000000000000000000000035".into(), RewardKind::EmptyStep),
 		];
 
-		let rewards = block_reward_contract.reward(&benefactors, &mut call).unwrap();
+		let rewards = block_reward_contract.reward(&beneficiaries, &mut call).unwrap();
 		let expected = vec![
 			("0000000000000000000000000000000000000033".into(), U256::from(1000)),
-			("0000000000000000000000000000000000000034".into(), U256::from(1000 + 1)),
+			("0000000000000000000000000000000000000034".into(), U256::from(1000 + 101)),
 			("0000000000000000000000000000000000000035".into(), U256::from(1000 + 2)),
 		];
 

ethcore/src/engines/instant_seal.rs

@@ -17,17 +17,33 @@
 use engines::{Engine, Seal};
 use parity_machine::{Machine, Transactions, TotalScoredHeader};
 
+/// `InstantSeal` params.
+#[derive(Default, Debug, PartialEq)]
+pub struct InstantSealParams {
+	/// Whether to use millisecond timestamp
+	pub millisecond_timestamp: bool,
+}
+
+impl From<::ethjson::spec::InstantSealParams> for InstantSealParams {
+	fn from(p: ::ethjson::spec::InstantSealParams) -> Self {
+		InstantSealParams {
+			millisecond_timestamp: p.millisecond_timestamp,
+		}
+	}
+}
+
 /// An engine which does not provide any consensus mechanism, just seals blocks internally.
 /// Only seals blocks which have transactions.
 pub struct InstantSeal<M> {
+	params: InstantSealParams,
 	machine: M,
 }
 
 impl<M> InstantSeal<M> {
 	/// Returns new instance of InstantSeal over the given state machine.
-	pub fn new(machine: M) -> Self {
+	pub fn new(params: InstantSealParams, machine: M) -> Self {
 		InstantSeal {
-			machine: machine,
+			params, machine,
 		}
 	}
 }
@@ -56,8 +72,12 @@ impl<M: Machine> Engine<M> for InstantSeal<M>
 	fn open_block_header_timestamp(&self, parent_timestamp: u64) -> u64 {
 		use std::{time, cmp};
 
-		let now = time::SystemTime::now().duration_since(time::UNIX_EPOCH).unwrap_or_default();
-		cmp::max(now.as_secs(), parent_timestamp)
+		let dur = time::SystemTime::now().duration_since(time::UNIX_EPOCH).unwrap_or_default();
+		let mut now = dur.as_secs();
+		if self.params.millisecond_timestamp {
+			now = now * 1000 + dur.subsec_millis() as u64;
+		}
+		cmp::max(now, parent_timestamp)
 	}
 
 	fn is_timestamp_valid(&self, header_timestamp: u64, parent_timestamp: u64) -> bool {
@@ -87,7 +107,7 @@ mod tests {
 		let genesis_header = spec.genesis_header();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, Address::default(), (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
-		let b = b.close_and_lock();
+		let b = b.close_and_lock().unwrap();
 		if let Seal::Regular(seal) = engine.generate_seal(b.block(), &genesis_header) {
 			assert!(b.try_seal(engine, seal).is_ok());
 		}

ethcore/src/engines/mod.rs

@@ -32,7 +32,7 @@ pub mod epoch;
 pub use self::authority_round::AuthorityRound;
 pub use self::basic_authority::BasicAuthority;
 pub use self::epoch::{EpochVerifier, Transition as EpochTransition};
-pub use self::instant_seal::InstantSeal;
+pub use self::instant_seal::{InstantSeal, InstantSealParams};
 pub use self::null_engine::NullEngine;
 pub use self::tendermint::Tendermint;
 
@@ -44,7 +44,7 @@ use self::epoch::PendingTransition;
 
 use account_provider::AccountProvider;
 use builtin::Builtin;
-use vm::{EnvInfo, Schedule, CreateContractAddress};
+use vm::{EnvInfo, Schedule, CreateContractAddress, CallType, ActionValue};
 use error::Error;
 use header::{Header, BlockNumber};
 use snapshot::SnapshotComponents;
@@ -133,6 +133,48 @@ pub enum Seal {
 /// A system-calling closure. Enacts calls on a block's state from the system address.
 pub type SystemCall<'a> = FnMut(Address, Vec<u8>) -> Result<Vec<u8>, String> + 'a;
 
+/// A system-calling closure. Enacts calls on a block's state with code either from an on-chain contract, or hard-coded EVM or WASM (if enabled on-chain) codes.
+pub type SystemOrCodeCall<'a> = FnMut(SystemOrCodeCallKind, Vec<u8>) -> Result<Vec<u8>, String> + 'a;
+
+/// Kind of SystemOrCodeCall, this is either an on-chain address, or code.
+#[derive(PartialEq, Debug, Clone)]
+pub enum SystemOrCodeCallKind {
+	/// On-chain address.
+	Address(Address),
+	/// Hard-coded code.
+	Code(Arc<Vec<u8>>, H256),
+}
+
+/// Default SystemOrCodeCall implementation.
+pub fn default_system_or_code_call<'a>(machine: &'a ::machine::EthereumMachine, block: &'a mut ::block::ExecutedBlock) -> impl FnMut(SystemOrCodeCallKind, Vec<u8>) -> Result<Vec<u8>, String> + 'a {
+	move |to, data| {
+		let result = match to {
+			SystemOrCodeCallKind::Address(address) => {
+				machine.execute_as_system(
+					block,
+					address,
+					U256::max_value(),
+					Some(data),
+				)
+			},
+			SystemOrCodeCallKind::Code(code, code_hash) => {
+				machine.execute_code_as_system(
+					block,
+					None,
+					Some(code),
+					Some(code_hash),
+					Some(ActionValue::Apparent(U256::zero())),
+					U256::max_value(),
+					Some(data),
+					Some(CallType::StaticCall),
+				)
+			},
+		};
+
+		result.map_err(|e| format!("{}", e))
+	}
+}
+
 /// Type alias for a function we can get headers by hash through.
 pub type Headers<'a, H> = Fn(H256) -> Option<H> + 'a;
 
@@ -257,9 +299,11 @@ pub trait Engine<M: Machine>: Sync + Send {
 	fn verify_local_seal(&self, header: &M::Header) -> Result<(), M::Error>;
 
 	/// Phase 1 quick block verification. Only does checks that are cheap. Returns either a null `Ok` or a general error detailing the problem with import.
+	/// The verification module can optionally avoid checking the seal (`check_seal`), if seal verification is disabled this method won't be called.
 	fn verify_block_basic(&self, _header: &M::Header) -> Result<(), M::Error> { Ok(()) }
 
 	/// Phase 2 verification. Perform costly checks such as transaction signatures. Returns either a null `Ok` or a general error detailing the problem with import.
+	/// The verification module can optionally avoid checking the seal (`check_seal`), if seal verification is disabled this method won't be called.
 	fn verify_block_unordered(&self, _header: &M::Header) -> Result<(), M::Error> { Ok(()) }
 
 	/// Phase 3 verification. Check block information against parent. Returns either a null `Ok` or a general error detailing the problem with import.

ethcore/src/engines/null_engine.rs

@@ -89,7 +89,7 @@ impl<M: WithBalances + WithRewards> Engine<M> for NullEngine<M>
 		for u in LiveBlock::uncles(&*block) {
 			let uncle_author = u.author();
 			let result_uncle_reward = (reward * U256::from(8 + u.number() - number)).shr(3);
-			rewards.push((*uncle_author, RewardKind::Uncle, result_uncle_reward));
+			rewards.push((*uncle_author, RewardKind::uncle(number, u.number()), result_uncle_reward));
 		}
 
 		block_reward::apply_block_rewards(&rewards, block, &self.machine)

ethcore/src/engines/tendermint/mod.rs

@@ -454,8 +454,8 @@ impl Engine<EthereumMachine> for Tendermint {
 	fn populate_from_parent(&self, header: &mut Header, parent: &Header) {
 		// Chain scoring: total weight is sqrt(U256::max_value())*height - view
 		let new_difficulty = U256::from(U128::max_value())
-			+ consensus_view(parent).expect("Header has been verified; qed").into()
-			- self.view.load(AtomicOrdering::SeqCst).into();
+			+ consensus_view(parent).expect("Header has been verified; qed")
+			- self.view.load(AtomicOrdering::SeqCst);
 
 		header.set_difficulty(new_difficulty);
 	}
@@ -803,7 +803,7 @@ mod tests {
 		let genesis_header = spec.genesis_header();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(spec.engine.as_ref(), Default::default(), false, db.boxed_clone(), &genesis_header, last_hashes, proposer, (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
-		let b = b.close();
+		let b = b.close().unwrap();
 		if let Seal::Proposal(seal) = spec.engine.generate_seal(b.block(), &genesis_header) {
 			(b, seal)
 		} else {

ethcore/src/engines/validator_set/multi.rs

@@ -158,6 +158,7 @@ mod tests {
 	use test_helpers::{generate_dummy_client_with_spec_and_accounts, generate_dummy_client_with_spec_and_data};
 	use types::ids::BlockId;
 	use ethereum_types::Address;
+	use verification::queue::kind::blocks::Unverified;
 
 	use super::Multi;
 
@@ -198,7 +199,7 @@ mod tests {
 		let sync_client = generate_dummy_client_with_spec_and_data(Spec::new_validator_multi, 0, 0, &[]);
 		sync_client.engine().register_client(Arc::downgrade(&sync_client) as _);
 		for i in 1..4 {
-			sync_client.import_block(client.block(BlockId::Number(i)).unwrap().into_inner()).unwrap();
+			sync_client.import_block(Unverified::from_rlp(client.block(BlockId::Number(i)).unwrap().into_inner()).unwrap()).unwrap();
 		}
 		sync_client.flush_queue();
 		assert_eq!(sync_client.chain_info().best_block_number, 3);

ethcore/src/engines/validator_set/safe_contract.rs

@@ -458,6 +458,7 @@ mod tests {
 	use test_helpers::{generate_dummy_client_with_spec_and_accounts, generate_dummy_client_with_spec_and_data};
 	use super::super::ValidatorSet;
 	use super::{ValidatorSafeContract, EVENT_NAME_HASH};
+	use verification::queue::kind::blocks::Unverified;
 
 	#[test]
 	fn fetches_validators() {
@@ -530,7 +531,7 @@ mod tests {
 		let sync_client = generate_dummy_client_with_spec_and_data(Spec::new_validator_safe_contract, 0, 0, &[]);
 		sync_client.engine().register_client(Arc::downgrade(&sync_client) as _);
 		for i in 1..4 {
-			sync_client.import_block(client.block(BlockId::Number(i)).unwrap().into_inner()).unwrap();
+			sync_client.import_block(Unverified::from_rlp(client.block(BlockId::Number(i)).unwrap().into_inner()).unwrap()).unwrap();
 		}
 		sync_client.flush_queue();
 		assert_eq!(sync_client.chain_info().best_block_number, 3);

ethcore/src/error.rs

@@ -24,7 +24,6 @@ use unexpected::{Mismatch, OutOfBounds};
 use ethtrie::TrieError;
 use io::*;
 use header::BlockNumber;
-use client::Error as ClientError;
 use snapshot::Error as SnapshotError;
 use engines::EngineError;
 use ethkey::Error as EthkeyError;
@@ -269,12 +268,6 @@ error_chain! {
 	}
 
 	errors {
-		#[doc = "Client configuration error."]
-		Client(err: ClientError) {
-			description("Client configuration error.")
-			display("Client configuration error {}", err)
-		}
-
 		#[doc = "Snapshot error."]
 		Snapshot(err: SnapshotError) {
 			description("Snapshot error.")
@@ -316,15 +309,6 @@ error_chain! {
 /// Result of import block operation.
 pub type ImportResult = EthcoreResult<H256>;
 
-impl From<ClientError> for Error {
-	fn from(err: ClientError) -> Error {
-		match err {
-			ClientError::Trie(err) => ErrorKind::Trie(err).into(),
-			_ => ErrorKind::Client(err).into()
-		}
-	}
-}
-
 impl From<AccountsError> for Error {
 	fn from(err: AccountsError) -> Error {
 		ErrorKind::AccountProvider(err).into()

ethcore/src/ethereum/ethash.rs

@@ -19,7 +19,7 @@ use std::cmp;
 use std::collections::BTreeMap;
 use std::sync::Arc;
 use hash::{KECCAK_EMPTY_LIST_RLP};
-use engines::block_reward::{self, RewardKind};
+use engines::block_reward::{self, BlockRewardContract, RewardKind};
 use ethash::{self, quick_get_difficulty, slow_hash_block_number, EthashManager, OptimizeFor};
 use ethereum_types::{H256, H64, U256, Address};
 use unexpected::{OutOfBounds, Mismatch};
@@ -36,9 +36,6 @@ use machine::EthereumMachine;
 const SNAPSHOT_BLOCKS: u64 = 5000;
 /// Maximum number of blocks allowed in an ethash snapshot.
 const MAX_SNAPSHOT_BLOCKS: u64 = 30000;
-/// Default number of blocks the difficulty bomb is delayed in EIP-{649,1234}
-const DEFAULT_EIP649_DELAY: u64 = 3_000_000;
-const DEFAULT_EIP1234_DELAY: u64 = 2_000_000;
 
 /// Ethash specific seal
 #[derive(Debug, PartialEq)]
@@ -114,23 +111,17 @@ pub struct EthashParams {
 	/// MCIP-3 contract address for the developer funds.
 	pub mcip3_dev_contract: Address,
 	/// Block reward in base units.
-	pub block_reward: U256,
-	/// EIP-649 transition block.
-	pub eip649_transition: u64,
-	/// EIP-649 bomb delay.
-	pub eip649_delay: u64,
-	/// EIP-649 base reward.
-	pub eip649_reward: Option<U256>,
-	/// EIP-1234 transition block.
-	pub eip1234_transition: u64,
-	/// EIP-1234 bomb delay.
-	pub eip1234_delay: u64,
-	/// EIP-1234 base reward.
-	pub eip1234_reward: Option<U256>,
+	pub block_reward: BTreeMap<BlockNumber, U256>,
 	/// EXPIP-2 block height
 	pub expip2_transition: u64,
 	/// EXPIP-2 duration limit
 	pub expip2_duration_limit: u64,
+	/// Block reward contract transition block.
+	pub block_reward_contract_transition: u64,
+	/// Block reward contract.
+	pub block_reward_contract: Option<BlockRewardContract>,
+	/// Difficulty bomb delays.
+	pub difficulty_bomb_delays: BTreeMap<BlockNumber, BlockNumber>,
 }
 
 impl From<ethjson::spec::EthashParams> for EthashParams {
@@ -155,15 +146,37 @@ impl From<ethjson::spec::EthashParams> for EthashParams {
 			mcip3_ubi_contract: p.mcip3_ubi_contract.map_or_else(Address::new, Into::into),
 			mcip3_dev_reward: p.mcip3_dev_reward.map_or(U256::from(0), Into::into),
 			mcip3_dev_contract: p.mcip3_dev_contract.map_or_else(Address::new, Into::into),
-			block_reward: p.block_reward.map_or_else(Default::default, Into::into),
-			eip649_transition: p.eip649_transition.map_or(u64::max_value(), Into::into),
-			eip649_delay: p.eip649_delay.map_or(DEFAULT_EIP649_DELAY, Into::into),
-			eip649_reward: p.eip649_reward.map(Into::into),
-			eip1234_transition: p.eip1234_transition.map_or(u64::max_value(), Into::into),
-			eip1234_delay: p.eip1234_delay.map_or(DEFAULT_EIP1234_DELAY, Into::into),
-			eip1234_reward: p.eip1234_reward.map(Into::into),
+			block_reward: p.block_reward.map_or_else(
+				|| {
+					let mut ret = BTreeMap::new();
+					ret.insert(0, U256::zero());
+					ret
+				},
+				|reward| {
+					match reward {
+						ethjson::spec::BlockReward::Single(reward) => {
+							let mut ret = BTreeMap::new();
+							ret.insert(0, reward.into());
+							ret
+						},
+						ethjson::spec::BlockReward::Multi(multi) => {
+							multi.into_iter()
+								.map(|(block, reward)| (block.into(), reward.into()))
+								.collect()
+						},
+					}
+				}),
 			expip2_transition: p.expip2_transition.map_or(u64::max_value(), Into::into),
 			expip2_duration_limit: p.expip2_duration_limit.map_or(30, Into::into),
+			block_reward_contract_transition: p.block_reward_contract_transition.map_or(0, Into::into),
+			block_reward_contract: match (p.block_reward_contract_code, p.block_reward_contract_address) {
+				(Some(code), _) => Some(BlockRewardContract::new_from_code(Arc::new(code.into()))),
+				(_, Some(address)) => Some(BlockRewardContract::new_from_address(address.into())),
+				(None, None) => None,
+			},
+			difficulty_bomb_delays: p.difficulty_bomb_delays.unwrap_or_default().into_iter()
+				.map(|(block, delay)| (block.into(), delay.into()))
+				.collect()
 		}
 	}
 }
@@ -241,54 +254,71 @@ impl Engine<EthereumMachine> for Arc<Ethash> {
 		let author = *LiveBlock::header(&*block).author();
 		let number = LiveBlock::header(&*block).number();
 
-		let mut rewards = Vec::new();
+		let rewards = match self.ethash_params.block_reward_contract {
+			Some(ref c) if number >= self.ethash_params.block_reward_contract_transition => {
+				let mut beneficiaries = Vec::new();
 
-		// Applies EIP-{649,1234} reward, defaults to block_reward.
-		let reward = if number >= self.ethash_params.eip1234_transition {
-			self.ethash_params.eip1234_reward.unwrap_or(self.ethash_params.block_reward)
-		} else if number >= self.ethash_params.eip649_transition {
-			self.ethash_params.eip649_reward.unwrap_or(self.ethash_params.block_reward)
-		} else {
-			self.ethash_params.block_reward
+				beneficiaries.push((author, RewardKind::Author));
+				for u in LiveBlock::uncles(&*block) {
+					let uncle_author = u.author();
+					beneficiaries.push((*uncle_author, RewardKind::uncle(number, u.number())));
+				}
+
+				let mut call = engines::default_system_or_code_call(&self.machine, block);
+
+				let rewards = c.reward(&beneficiaries, &mut call)?;
+				rewards.into_iter().map(|(author, amount)| (author, RewardKind::External, amount)).collect()
+			},
+			_ => {
+				let mut rewards = Vec::new();
+
+				let (_, reward) = self.ethash_params.block_reward.iter()
+					.rev()
+					.find(|&(block, _)| *block <= number)
+					.expect("Current block's reward is not found; this indicates a chain config error; qed");
+				let reward = *reward;
+
+				// Applies ECIP-1017 eras.
+				let eras_rounds = self.ethash_params.ecip1017_era_rounds;
+				let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, reward, number);
+
+				let n_uncles = LiveBlock::uncles(&*block).len();
+
+				// Bestow block rewards.
+				let mut result_block_reward = reward + reward.shr(5) * U256::from(n_uncles);
+
+				if number >= self.ethash_params.mcip3_transition {
+					result_block_reward = self.ethash_params.mcip3_miner_reward;
+
+					let ubi_contract = self.ethash_params.mcip3_ubi_contract;
+					let ubi_reward = self.ethash_params.mcip3_ubi_reward;
+					let dev_contract = self.ethash_params.mcip3_dev_contract;
+					let dev_reward = self.ethash_params.mcip3_dev_reward;
+
+					rewards.push((author, RewardKind::Author, result_block_reward));
+					rewards.push((ubi_contract, RewardKind::External, ubi_reward));
+					rewards.push((dev_contract, RewardKind::External, dev_reward));
+
+				} else {
+					rewards.push((author, RewardKind::Author, result_block_reward));
+				}
+
+				// Bestow uncle rewards.
+				for u in LiveBlock::uncles(&*block) {
+					let uncle_author = u.author();
+					let result_uncle_reward = if eras == 0 {
+						(reward * U256::from(8 + u.number() - number)).shr(3)
+					} else {
+						reward.shr(5)
+					};
+
+					rewards.push((*uncle_author, RewardKind::uncle(number, u.number()), result_uncle_reward));
+				}
+
+				rewards
+			},
 		};
 
-		// Applies ECIP-1017 eras.
-		let eras_rounds = self.ethash_params.ecip1017_era_rounds;
-		let (eras, reward) = ecip1017_eras_block_reward(eras_rounds, reward, number);
-
-		let n_uncles = LiveBlock::uncles(&*block).len();
-
-		// Bestow block rewards.
-		let mut result_block_reward = reward + reward.shr(5) * U256::from(n_uncles);
-
-		if number >= self.ethash_params.mcip3_transition {
-			result_block_reward = self.ethash_params.mcip3_miner_reward;
-
-			let ubi_contract = self.ethash_params.mcip3_ubi_contract;
-			let ubi_reward = self.ethash_params.mcip3_ubi_reward;
-			let dev_contract = self.ethash_params.mcip3_dev_contract;
-			let dev_reward = self.ethash_params.mcip3_dev_reward;
-
-			rewards.push((author, RewardKind::Author, result_block_reward));
-			rewards.push((ubi_contract, RewardKind::External, ubi_reward));
-			rewards.push((dev_contract, RewardKind::External, dev_reward));
-
-		} else {
-			rewards.push((author, RewardKind::Author, result_block_reward));
-		}
-
-		// Bestow uncle rewards.
-		for u in LiveBlock::uncles(&*block) {
-			let uncle_author = u.author();
-			let result_uncle_reward = if eras == 0 {
-				(reward * U256::from(8 + u.number() - number)).shr(3)
-			} else {
-				reward.shr(5)
-			};
-
-			rewards.push((*uncle_author, RewardKind::Uncle, result_uncle_reward));
-		}
-
 		block_reward::apply_block_rewards(&rewards, block, &self.machine)
 	}
 
@@ -439,22 +469,20 @@ impl Ethash {
 		if header.number() < self.ethash_params.bomb_defuse_transition {
 			if header.number() < self.ethash_params.ecip1010_pause_transition {
 				let mut number = header.number();
-				if number >= self.ethash_params.eip1234_transition {
-					number = number.saturating_sub(self.ethash_params.eip1234_delay);
-				}
-				if number >= self.ethash_params.eip649_transition {
-					number = number.saturating_sub(self.ethash_params.eip649_delay);
+				let original_number = number;
+				for (block, delay) in &self.ethash_params.difficulty_bomb_delays {
+					if original_number >= *block {
+						number = number.saturating_sub(*delay);
+					}
 				}
 				let period = (number / EXP_DIFF_PERIOD) as usize;
 				if period > 1 {
 					target = cmp::max(min_difficulty, target + (U256::from(1) << (period - 2)));
 				}
-			}
-			else if header.number() < self.ethash_params.ecip1010_continue_transition {
+			} else if header.number() < self.ethash_params.ecip1010_continue_transition {
 				let fixed_difficulty = ((self.ethash_params.ecip1010_pause_transition / EXP_DIFF_PERIOD) - 2) as usize;
 				target = cmp::max(min_difficulty, target + (U256::from(1) << fixed_difficulty));
-			}
-			else {
+			} else {
 				let period = ((parent.number() + 1) / EXP_DIFF_PERIOD) as usize;
 				let delay = ((self.ethash_params.ecip1010_continue_transition - self.ethash_params.ecip1010_pause_transition) / EXP_DIFF_PERIOD) as usize;
 				target = cmp::max(min_difficulty, target + (U256::from(1) << (period - delay - 2)));
@@ -483,6 +511,7 @@ fn ecip1017_eras_block_reward(era_rounds: u64, mut reward: U256, block_number:u6
 mod tests {
 	use std::str::FromStr;
 	use std::sync::Arc;
+	use std::collections::BTreeMap;
 	use ethereum_types::{H64, H256, U256, Address};
 	use block::*;
 	use test_helpers::get_temp_state_db;
@@ -508,7 +537,11 @@ mod tests {
 			metropolis_difficulty_increment_divisor: 9,
 			homestead_transition: 1150000,
 			duration_limit: 13,
-			block_reward: 0.into(),
+			block_reward: {
+				let mut ret = BTreeMap::new();
+				ret.insert(0, 0.into());
+				ret
+			},
 			difficulty_hardfork_transition: u64::max_value(),
 			difficulty_hardfork_bound_divisor: U256::from(0),
 			bomb_defuse_transition: u64::max_value(),
@@ -522,14 +555,11 @@ mod tests {
 			mcip3_ubi_contract: "0000000000000000000000000000000000000001".into(),
 			mcip3_dev_reward: 0.into(),
 			mcip3_dev_contract: "0000000000000000000000000000000000000001".into(),
-			eip649_transition: u64::max_value(),
-			eip649_delay: 3_000_000,
-			eip649_reward: None,
-			eip1234_transition: u64::max_value(),
-			eip1234_delay: 2_000_000,
-			eip1234_reward: None,
 			expip2_transition: u64::max_value(),
 			expip2_duration_limit: 30,
+			block_reward_contract: None,
+			block_reward_contract_transition: 0,
+			difficulty_bomb_delays: BTreeMap::new(),
 		}
 	}
 
@@ -541,7 +571,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, Address::zero(), (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
-		let b = b.close();
+		let b = b.close().unwrap();
 		assert_eq!(b.state().balance(&Address::zero()).unwrap(), U256::from_str("4563918244f40000").unwrap());
 	}
 
@@ -595,7 +625,7 @@ mod tests {
 		uncle.set_author(uncle_author);
 		b.push_uncle(uncle).unwrap();
 
-		let b = b.close();
+		let b = b.close().unwrap();
 		assert_eq!(b.state().balance(&Address::zero()).unwrap(), "478eae0e571ba000".into());
 		assert_eq!(b.state().balance(&uncle_author).unwrap(), "3cb71f51fc558000".into());
 	}
@@ -608,7 +638,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, Address::zero(), (3141562.into(), 31415620.into()), vec![], false, &mut Vec::new().into_iter()).unwrap();
-		let b = b.close();
+		let b = b.close().unwrap();
 
 		let ubi_contract: Address = "00efdd5883ec628983e9063c7d969fe268bbf310".into();
 		let dev_contract: Address = "00756cf8159095948496617f5fb17ed95059f536".into();

ethcore/src/ethereum/mod.rs

@@ -30,7 +30,8 @@ pub use self::denominations::*;
 use machine::EthereumMachine;
 use super::spec::*;
 
-fn load<'a, T: Into<Option<SpecParams<'a>>>>(params: T, b: &[u8]) -> Spec {
+/// Load chain spec from `SpecParams` and JSON.
+pub fn load<'a, T: Into<Option<SpecParams<'a>>>>(params: T, b: &[u8]) -> Spec {
 	match params.into() {
 		Some(params) => Spec::load(params, b),
 		None => Spec::load(&::std::env::temp_dir(), b)

ethcore/src/executive.rs

@@ -21,11 +21,11 @@ use hash::keccak;
 use ethereum_types::{H256, U256, U512, Address};
 use bytes::{Bytes, BytesRef};
 use state::{Backend as StateBackend, State, Substate, CleanupMode};
-use machine::EthereumMachine as Machine;
 use error::ExecutionError;
+use machine::EthereumMachine as Machine;
 use evm::{CallType, Finalize, FinalizationResult};
 use vm::{
-	self, Ext, EnvInfo, CreateContractAddress, ReturnData, CleanDustMode, ActionParams,
+	self, EnvInfo, CreateContractAddress, ReturnData, CleanDustMode, ActionParams,
 	ActionValue, Schedule,
 };
 use externalities::*;
@@ -170,28 +170,31 @@ pub struct Executive<'a, B: 'a> {
 	state: &'a mut State<B>,
 	info: &'a EnvInfo,
 	machine: &'a Machine,
+	schedule: &'a Schedule,
 	depth: usize,
 	static_flag: bool,
 }
 
 impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 	/// Basic constructor.
-	pub fn new(state: &'a mut State<B>, info: &'a EnvInfo, machine: &'a Machine) -> Self {
+	pub fn new(state: &'a mut State<B>, info: &'a EnvInfo, machine: &'a Machine, schedule: &'a Schedule) -> Self {
 		Executive {
 			state: state,
 			info: info,
 			machine: machine,
+			schedule: schedule,
 			depth: 0,
 			static_flag: false,
 		}
 	}
 
 	/// Populates executive from parent properties. Increments executive depth.
-	pub fn from_parent(state: &'a mut State<B>, info: &'a EnvInfo, machine: &'a Machine, parent_depth: usize, static_flag: bool) -> Self {
+	pub fn from_parent(state: &'a mut State<B>, info: &'a EnvInfo, machine: &'a Machine, schedule: &'a Schedule, parent_depth: usize, static_flag: bool) -> Self {
 		Executive {
 			state: state,
 			info: info,
 			machine: machine,
+			schedule: schedule,
 			depth: parent_depth + 1,
 			static_flag: static_flag,
 		}
@@ -202,13 +205,13 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		&'any mut self,
 		origin_info: OriginInfo,
 		substate: &'any mut Substate,
-		output: OutputPolicy<'any, 'any>,
+		output: OutputPolicy,
 		tracer: &'any mut T,
 		vm_tracer: &'any mut V,
 		static_call: bool,
 	) -> Externalities<'any, T, V, B> where T: Tracer, V: VMTracer {
 		let is_static = self.static_flag || static_call;
-		Externalities::new(self.state, self.info, self.machine, self.depth, origin_info, substate, output, tracer, vm_tracer, is_static)
+		Externalities::new(self.state, self.info, self.machine, self.schedule, self.depth, origin_info, substate, output, tracer, vm_tracer, is_static)
 	}
 
 	/// This function should be used to execute transaction.
@@ -247,7 +250,7 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		let sender = t.sender();
 		let nonce = self.state.nonce(&sender)?;
 
-		let schedule = self.machine.schedule(self.info.number);
+		let schedule = self.schedule;
 		let base_gas_required = U256::from(t.gas_required(&schedule));
 
 		if t.gas < base_gas_required {
@@ -310,8 +313,12 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 					call_type: CallType::None,
 					params_type: vm::ParamsType::Embedded,
 				};
-				let mut out = if output_from_create { Some(vec![]) } else { None };
-				(self.create(params, &mut substate, &mut out, &mut tracer, &mut vm_tracer), out.unwrap_or_else(Vec::new))
+				let res = self.create(params, &mut substate, &mut tracer, &mut vm_tracer);
+				let out = match &res {
+					Ok(res) if output_from_create => res.return_data.to_vec(),
+					_ => Vec::new(),
+				};
+				(res, out)
 			},
 			Action::Call(ref address) => {
 				let params = ActionParams {
@@ -328,8 +335,12 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 					call_type: CallType::Call,
 					params_type: vm::ParamsType::Separate,
 				};
-				let mut out = vec![];
-				(self.call(params, &mut substate, BytesRef::Flexible(&mut out), &mut tracer, &mut vm_tracer), out)
+				let res = self.call(params, &mut substate, &mut tracer, &mut vm_tracer);
+				let out = match &res {
+					Ok(res) => res.return_data.to_vec(),
+					_ => Vec::new(),
+				};
+				(res, out)
 			}
 		};
 
@@ -339,7 +350,6 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 
 	fn exec_vm<T, V>(
 		&mut self,
-		schedule: Schedule,
 		params: ActionParams,
 		unconfirmed_substate: &mut Substate,
 		output_policy: OutputPolicy,
@@ -353,20 +363,22 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		// Ordinary execution - keep VM in same thread
 		if self.depth != depth_threshold {
 			let vm_factory = self.state.vm_factory();
-			let mut ext = self.as_externalities(OriginInfo::from(&params), unconfirmed_substate, output_policy, tracer, vm_tracer, static_call);
-			trace!(target: "executive", "ext.schedule.have_delegate_call: {}", ext.schedule().have_delegate_call);
-			let mut vm = vm_factory.create(&params, &schedule);
-			return vm.exec(params, &mut ext).finalize(ext);
+			let origin_info = OriginInfo::from(&params);
+			trace!(target: "executive", "ext.schedule.have_delegate_call: {}", self.schedule.have_delegate_call);
+			let mut vm = vm_factory.create(params, self.schedule, self.depth);
+			let mut ext = self.as_externalities(origin_info, unconfirmed_substate, output_policy, tracer, vm_tracer, static_call);
+			return vm.exec(&mut ext).finalize(ext);
 		}
 
 		// Start in new thread with stack size needed up to max depth
 		crossbeam::scope(|scope| {
 			let vm_factory = self.state.vm_factory();
-			let mut ext = self.as_externalities(OriginInfo::from(&params), unconfirmed_substate, output_policy, tracer, vm_tracer, static_call);
+			let origin_info = OriginInfo::from(&params);
 
-			scope.builder().stack_size(::std::cmp::max(schedule.max_depth.saturating_sub(depth_threshold) * STACK_SIZE_PER_DEPTH, local_stack_size)).spawn(move || {
-				let mut vm = vm_factory.create(&params, &schedule);
-				vm.exec(params, &mut ext).finalize(ext)
+			scope.builder().stack_size(::std::cmp::max(self.schedule.max_depth.saturating_sub(depth_threshold) * STACK_SIZE_PER_DEPTH, local_stack_size)).spawn(move || {
+				let mut vm = vm_factory.create(params, self.schedule, self.depth);
+				let mut ext = self.as_externalities(origin_info, unconfirmed_substate, output_policy, tracer, vm_tracer, static_call);
+				vm.exec(&mut ext).finalize(ext)
 			}).expect("Sub-thread creation cannot fail; the host might run out of resources; qed")
 		}).join()
 	}
@@ -379,7 +391,6 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		&mut self,
 		params: ActionParams,
 		substate: &mut Substate,
-		mut output: BytesRef,
 		tracer: &mut T,
 		vm_tracer: &mut V
 	) -> vm::Result<FinalizationResult> where T: Tracer, V: VMTracer {
@@ -395,7 +406,7 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		// backup used in case of running out of gas
 		self.state.checkpoint();
 
-		let schedule = self.machine.schedule(self.info.number);
+		let schedule = self.schedule;
 
 		// at first, transfer value to destination
 		if let ActionValue::Transfer(val) = params.value {
@@ -413,8 +424,6 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 			let default = [];
 			let data = if let Some(ref d) = params.data { d as &[u8] } else { &default as &[u8] };
 
-			let trace_info = tracer.prepare_trace_call(&params);
-
 			let cost = builtin.cost(data);
 			if cost <= params.gas {
 				let mut builtin_out_buffer = Vec::new();
@@ -425,11 +434,15 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 				if let Err(e) = result {
 					self.state.revert_to_checkpoint();
 					let evm_err: vm::Error = e.into();
-					tracer.trace_failed_call(trace_info, vec![], evm_err.clone().into());
+					let trace_info = tracer.prepare_trace_call(&params);
+					tracer.trace_failed_call(
+						trace_info,
+						vec![],
+						evm_err.clone().into()
+					);
 					Err(evm_err)
 				} else {
 					self.state.discard_checkpoint();
-					output.write(0, &builtin_out_buffer);
 
 					// Trace only top level calls and calls with balance transfer to builtins. The reason why we don't
 					// trace all internal calls to builtin contracts is that memcpy (IDENTITY) is a heavily used
@@ -439,15 +452,11 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 						ActionValue::Apparent(_) => false,
 					};
 					if self.depth == 0 || is_transferred {
-						let mut trace_output = tracer.prepare_trace_output();
-						if let Some(out) = trace_output.as_mut() {
-							*out = output.to_owned();
-						}
-
+						let trace_info = tracer.prepare_trace_call(&params);
 						tracer.trace_call(
 							trace_info,
 							cost,
-							trace_output,
+							&builtin_out_buffer,
 							vec![]
 						);
 					}
@@ -463,13 +472,17 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 				// just drain the whole gas
 				self.state.revert_to_checkpoint();
 
-				tracer.trace_failed_call(trace_info, vec![], vm::Error::OutOfGas.into());
+				let trace_info = tracer.prepare_trace_call(&params);
+				tracer.trace_failed_call(
+					trace_info,
+					vec![],
+					vm::Error::OutOfGas.into()
+				);
 
 				Err(vm::Error::OutOfGas)
 			}
 		} else {
 			let trace_info = tracer.prepare_trace_call(&params);
-			let mut trace_output = tracer.prepare_trace_output();
 			let mut subtracer = tracer.subtracer();
 
 			let gas = params.gas;
@@ -482,7 +495,7 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 				let mut subvmtracer = vm_tracer.prepare_subtrace(params.code.as_ref().expect("scope is conditional on params.code.is_some(); qed"));
 
 				let res = {
-					self.exec_vm(schedule, params, &mut unconfirmed_substate, OutputPolicy::Return(output, trace_output.as_mut()), &mut subtracer, &mut subvmtracer)
+					self.exec_vm(params, &mut unconfirmed_substate, OutputPolicy::Return, &mut subtracer, &mut subvmtracer)
 				};
 
 				vm_tracer.done_subtrace(subvmtracer);
@@ -491,12 +504,14 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 
 				let traces = subtracer.drain();
 				match res {
-					Ok(ref res) if res.apply_state => tracer.trace_call(
-						trace_info,
-						gas - res.gas_left,
-						trace_output,
-						traces
-					),
+					Ok(ref res) if res.apply_state => {
+						tracer.trace_call(
+							trace_info,
+							gas - res.gas_left,
+							&res.return_data,
+							traces
+						);
+					},
 					Ok(_) => tracer.trace_failed_call(trace_info, traces, vm::Error::Reverted.into()),
 					Err(ref e) => tracer.trace_failed_call(trace_info, traces, e.into()),
 				};
@@ -510,7 +525,7 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 				// otherwise it's just a basic transaction, only do tracing, if necessary.
 				self.state.discard_checkpoint();
 
-				tracer.trace_call(trace_info, U256::zero(), trace_output, vec![]);
+				tracer.trace_call(trace_info, U256::zero(), &[], vec![]);
 				Ok(FinalizationResult {
 					gas_left: params.gas,
 					return_data: ReturnData::empty(),
@@ -527,7 +542,6 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		&mut self,
 		params: ActionParams,
 		substate: &mut Substate,
-		output: &mut Option<Bytes>,
 		tracer: &mut T,
 		vm_tracer: &mut V,
 	) -> vm::Result<FinalizationResult> where T: Tracer, V: VMTracer {
@@ -555,7 +569,7 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		let mut unconfirmed_substate = Substate::new();
 
 		// create contract and transfer value to it if necessary
-		let schedule = self.machine.schedule(self.info.number);
+		let schedule = self.schedule;
 		let nonce_offset = if schedule.no_empty {1} else {0}.into();
 		let prev_bal = self.state.balance(&params.address)?;
 		if let ActionValue::Transfer(val) = params.value {
@@ -566,7 +580,6 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		}
 
 		let trace_info = tracer.prepare_trace_create(&params);
-		let mut trace_output = tracer.prepare_trace_output();
 		let mut subtracer = tracer.subtracer();
 		let gas = params.gas;
 		let created = params.address.clone();
@@ -574,10 +587,9 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		let mut subvmtracer = vm_tracer.prepare_subtrace(params.code.as_ref().expect("two ways into create (Externalities::create and Executive::transact_with_tracer); both place `Some(...)` `code` in `params`; qed"));
 
 		let res = self.exec_vm(
-			schedule,
 			params,
 			&mut unconfirmed_substate,
-			OutputPolicy::InitContract(output.as_mut().or(trace_output.as_mut())),
+			OutputPolicy::InitContract,
 			&mut subtracer,
 			&mut subvmtracer
 		);
@@ -585,13 +597,15 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		vm_tracer.done_subtrace(subvmtracer);
 
 		match res {
-			Ok(ref res) if res.apply_state => tracer.trace_create(
-				trace_info,
-				gas - res.gas_left,
-				trace_output.map(|data| output.as_ref().map(|out| out.to_vec()).unwrap_or(data)),
-				created,
-				subtracer.drain()
-			),
+			Ok(ref res) if res.apply_state => {
+				tracer.trace_create(
+					trace_info,
+					gas - res.gas_left,
+					&res.return_data,
+					created,
+					subtracer.drain()
+				);
+			}
 			Ok(_) => tracer.trace_failed_create(trace_info, subtracer.drain(), vm::Error::Reverted.into()),
 			Err(ref e) => tracer.trace_failed_create(trace_info, subtracer.drain(), e.into())
 		};
@@ -610,11 +624,10 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		trace: Vec<T>,
 		vm_trace: Option<V>
 	) -> Result<Executed<T, V>, ExecutionError> {
-		let schedule = self.machine.schedule(self.info.number);
+		let schedule = self.schedule;
 
 		// refunds from SSTORE nonzero -> zero
-		assert!(substate.sstore_clears_refund >= 0, "On transaction level, sstore clears refund cannot go below zero.");
-		let sstore_refunds = U256::from(substate.sstore_clears_refund as u64);
+		let sstore_refunds = substate.sstore_clears_refund;
 		// refunds from contract suicides
 		let suicide_refunds = U256::from(schedule.suicide_refund_gas) * U256::from(substate.suicides.len());
 		let refunds_bound = sstore_refunds + suicide_refunds;
@@ -714,7 +727,6 @@ mod tests {
 	use ethkey::{Generator, Random};
 	use super::*;
 	use ethereum_types::{H256, U256, U512, Address};
-	use bytes::BytesRef;
 	use vm::{ActionParams, ActionValue, CallType, EnvInfo, CreateContractAddress};
 	use evm::{Factory, VMType};
 	use error::ExecutionError;
@@ -760,11 +772,12 @@ mod tests {
 		state.add_balance(&sender, &U256::from(0x100u64), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let machine = make_frontier_machine(0);
+		let schedule = machine.schedule(info.number);
 		let mut substate = Substate::new();
 
 		let FinalizationResult { gas_left, .. } = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
-			ex.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer).unwrap()
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+			ex.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap()
 		};
 
 		assert_eq!(gas_left, U256::from(79_975));
@@ -817,11 +830,12 @@ mod tests {
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let machine = make_frontier_machine(0);
+		let schedule = machine.schedule(info.number);
 		let mut substate = Substate::new();
 
 		let FinalizationResult { gas_left, .. } = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
-			ex.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer).unwrap()
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+			ex.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap()
 		};
 
 		assert_eq!(gas_left, U256::from(62_976));
@@ -859,13 +873,13 @@ mod tests {
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let machine = make_byzantium_machine(5);
+		let schedule = machine.schedule(info.number);
 		let mut substate = Substate::new();
 		let mut tracer = ExecutiveTracer::default();
 		let mut vm_tracer = ExecutiveVMTracer::toplevel();
 
-		let mut ex = Executive::new(&mut state, &info, &machine);
-		let output = BytesRef::Fixed(&mut[0u8;0]);
-		ex.call(params, &mut substate, output, &mut tracer, &mut vm_tracer).unwrap();
+		let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+		ex.call(params, &mut substate, &mut tracer, &mut vm_tracer).unwrap();
 
 		assert_eq!(tracer.drain(), vec![FlatTrace {
 			action: trace::Action::Call(trace::Call {
@@ -892,7 +906,7 @@ mod tests {
 				call_type: CallType::Call
 			}), result: trace::Res::Call(trace::CallResult {
 				gas_used: 600.into(),
-				output: vec![]
+				output: vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 156, 17, 133, 165, 197, 233, 252, 84, 97, 40, 8, 151, 126, 232, 245, 72, 178, 37, 141, 49]
 			}),
 			subtraces: 0,
 			trace_address: vec![0].into_iter().collect(),
@@ -943,14 +957,14 @@ mod tests {
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let machine = make_frontier_machine(5);
+		let schedule = machine.schedule(info.number);
 		let mut substate = Substate::new();
 		let mut tracer = ExecutiveTracer::default();
 		let mut vm_tracer = ExecutiveVMTracer::toplevel();
 
 		let FinalizationResult { gas_left, .. } = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
-			let output = BytesRef::Fixed(&mut[0u8;0]);
-			ex.call(params, &mut substate, output, &mut tracer, &mut vm_tracer).unwrap()
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+			ex.call(params, &mut substate, &mut tracer, &mut vm_tracer).unwrap()
 		};
 
 		assert_eq!(gas_left, U256::from(44_752));
@@ -1059,14 +1073,14 @@ mod tests {
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let machine = ::ethereum::new_byzantium_test_machine();
+		let schedule = machine.schedule(info.number);
 		let mut substate = Substate::new();
 		let mut tracer = ExecutiveTracer::default();
 		let mut vm_tracer = ExecutiveVMTracer::toplevel();
 
 		let FinalizationResult { gas_left, .. } = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
-			let output = BytesRef::Fixed(&mut[0u8;0]);
-			ex.call(params, &mut substate, output, &mut tracer, &mut vm_tracer).unwrap()
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+			ex.call(params, &mut substate, &mut tracer, &mut vm_tracer).unwrap()
 		};
 
 		assert_eq!(gas_left, U256::from(62967));
@@ -1131,13 +1145,14 @@ mod tests {
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let machine = make_frontier_machine(5);
+		let schedule = machine.schedule(info.number);
 		let mut substate = Substate::new();
 		let mut tracer = ExecutiveTracer::default();
 		let mut vm_tracer = ExecutiveVMTracer::toplevel();
 
 		let FinalizationResult { gas_left, .. } = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
-			ex.create(params.clone(), &mut substate, &mut None, &mut tracer, &mut vm_tracer).unwrap()
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+			ex.create(params.clone(), &mut substate, &mut tracer, &mut vm_tracer).unwrap()
 		};
 
 		assert_eq!(gas_left, U256::from(96_776));
@@ -1218,11 +1233,12 @@ mod tests {
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let machine = make_frontier_machine(0);
+		let schedule = machine.schedule(info.number);
 		let mut substate = Substate::new();
 
 		let FinalizationResult { gas_left, .. } = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
-			ex.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer).unwrap()
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+			ex.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap()
 		};
 
 		assert_eq!(gas_left, U256::from(62_976));
@@ -1269,11 +1285,12 @@ mod tests {
 		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let machine = make_frontier_machine(1024);
+		let schedule = machine.schedule(info.number);
 		let mut substate = Substate::new();
 
 		{
-			let mut ex = Executive::new(&mut state, &info, &machine);
-			ex.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer).unwrap();
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+			ex.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap();
 		}
 
 		assert_eq!(substate.contracts_created.len(), 1);
@@ -1329,11 +1346,12 @@ mod tests {
 
 		let info = EnvInfo::default();
 		let machine = make_frontier_machine(0);
+		let schedule = machine.schedule(info.number);
 		let mut substate = Substate::new();
 
 		let FinalizationResult { gas_left, .. } = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
-			ex.call(params, &mut substate, BytesRef::Fixed(&mut []), &mut NoopTracer, &mut NoopVMTracer).unwrap()
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+			ex.call(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap()
 		};
 
 		assert_eq!(gas_left, U256::from(73_237));
@@ -1373,11 +1391,12 @@ mod tests {
 		state.init_code(&address, code).unwrap();
 		let info = EnvInfo::default();
 		let machine = make_frontier_machine(0);
+		let schedule = machine.schedule(info.number);
 		let mut substate = Substate::new();
 
 		let FinalizationResult { gas_left, .. } = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
-			ex.call(params, &mut substate, BytesRef::Fixed(&mut []), &mut NoopTracer, &mut NoopVMTracer).unwrap()
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+			ex.call(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap()
 		};
 
 		assert_eq!(gas_left, U256::from(59_870));
@@ -1406,9 +1425,10 @@ mod tests {
 		let mut info = EnvInfo::default();
 		info.gas_limit = U256::from(100_000);
 		let machine = make_frontier_machine(0);
+		let schedule = machine.schedule(info.number);
 
 		let executed = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
 			let opts = TransactOptions::with_no_tracing();
 			ex.transact(&t, opts).unwrap()
 		};
@@ -1443,9 +1463,10 @@ mod tests {
 		let mut info = EnvInfo::default();
 		info.gas_limit = U256::from(100_000);
 		let machine = make_frontier_machine(0);
+		let schedule = machine.schedule(info.number);
 
 		let res = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
 			let opts = TransactOptions::with_no_tracing();
 			ex.transact(&t, opts)
 		};
@@ -1476,9 +1497,10 @@ mod tests {
 		info.gas_used = U256::from(20_000);
 		info.gas_limit = U256::from(100_000);
 		let machine = make_frontier_machine(0);
+		let schedule = machine.schedule(info.number);
 
 		let res = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
 			let opts = TransactOptions::with_no_tracing();
 			ex.transact(&t, opts)
 		};
@@ -1509,9 +1531,10 @@ mod tests {
 		let mut info = EnvInfo::default();
 		info.gas_limit = U256::from(100_000);
 		let machine = make_frontier_machine(0);
+		let schedule = machine.schedule(info.number);
 
 		let res = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
 			let opts = TransactOptions::with_no_tracing();
 			ex.transact(&t, opts)
 		};
@@ -1542,11 +1565,12 @@ mod tests {
 		state.add_balance(&sender, &U256::from_str("152d02c7e14af6800000").unwrap(), CleanupMode::NoEmpty).unwrap();
 		let info = EnvInfo::default();
 		let machine = make_frontier_machine(0);
+		let schedule = machine.schedule(info.number);
 		let mut substate = Substate::new();
 
 		let result = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
-			ex.create(params, &mut substate, &mut None, &mut NoopTracer, &mut NoopVMTracer)
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+			ex.create(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer)
 		};
 
 		match result {
@@ -1575,13 +1599,15 @@ mod tests {
 		params.value = ActionValue::Transfer(U256::zero());
 		let info = EnvInfo::default();
 		let machine = ::ethereum::new_byzantium_test_machine();
+		let schedule = machine.schedule(info.number);
 		let mut substate = Substate::new();
 
 		let mut output = [0u8; 14];
-		let FinalizationResult { gas_left: result, .. } = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
-			ex.call(params, &mut substate, BytesRef::Fixed(&mut output), &mut NoopTracer, &mut NoopVMTracer).unwrap()
+		let FinalizationResult { gas_left: result, return_data, .. } = {
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+			ex.call(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap()
 		};
+		(&mut output).copy_from_slice(&return_data[..(cmp::min(14, return_data.len()))]);
 
 		assert_eq!(result, U256::from(1));
 		assert_eq!(output[..], returns[..]);
@@ -1609,6 +1635,7 @@ mod tests {
 
 		let info = EnvInfo::default();
 		let machine = ::ethereum::new_constantinople_test_machine();
+		let schedule = machine.schedule(info.number);
 
 		assert_eq!(state.storage_at(&operating_address, &k).unwrap(), H256::from(U256::from(0)));
 		// Test a call via top-level -> y1 -> x1
@@ -1618,15 +1645,15 @@ mod tests {
 			params.code = Some(Arc::new("6001600055600060006000600061200163fffffffff4".from_hex().unwrap()));
 			params.gas = gas;
 			let mut substate = Substate::new();
-			let mut ex = Executive::new(&mut state, &info, &machine);
-			let res = ex.call(params, &mut substate, BytesRef::Fixed(&mut []), &mut NoopTracer, &mut NoopVMTracer).unwrap();
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+			let res = ex.call(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap();
 
 			(res, substate.sstore_clears_refund, gas)
 		};
 		let gas_used = gas - gas_left;
 		// sstore: 0 -> (1) -> () -> (1 -> 0 -> 1)
 		assert_eq!(gas_used, U256::from(41860));
-		assert_eq!(refund, 19800);
+		assert_eq!(refund, U256::from(19800));
 
 		assert_eq!(state.storage_at(&operating_address, &k).unwrap(), H256::from(U256::from(1)));
 		// Test a call via top-level -> y2 -> x2
@@ -1636,15 +1663,15 @@ mod tests {
 			params.code = Some(Arc::new("6001600055600060006000600061200263fffffffff4".from_hex().unwrap()));
 			params.gas = gas;
 			let mut substate = Substate::new();
-			let mut ex = Executive::new(&mut state, &info, &machine);
-			let res = ex.call(params, &mut substate, BytesRef::Fixed(&mut []), &mut NoopTracer, &mut NoopVMTracer).unwrap();
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+			let res = ex.call(params, &mut substate, &mut NoopTracer, &mut NoopVMTracer).unwrap();
 
 			(res, substate.sstore_clears_refund, gas)
 		};
 		let gas_used = gas - gas_left;
 		// sstore: 1 -> (1) -> () -> (0 -> 1 -> 0)
 		assert_eq!(gas_used, U256::from(11860));
-		assert_eq!(refund, 19800);
+		assert_eq!(refund, U256::from(19800));
 	}
 
 	fn wasm_sample_code() -> Arc<Vec<u8>> {
@@ -1680,10 +1707,12 @@ mod tests {
 		let machine = ::ethereum::new_kovan_wasm_test_machine();
 
 		let mut output = [0u8; 20];
-		let FinalizationResult { gas_left: result, .. } = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
-			ex.call(params.clone(), &mut Substate::new(), BytesRef::Fixed(&mut output), &mut NoopTracer, &mut NoopVMTracer).unwrap()
+		let FinalizationResult { gas_left: result, return_data, .. } = {
+			let schedule = machine.schedule(info.number);
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+			ex.call(params.clone(), &mut Substate::new(), &mut NoopTracer, &mut NoopVMTracer).unwrap()
 		};
+		(&mut output).copy_from_slice(&return_data[..(cmp::min(20, return_data.len()))]);
 
 		assert_eq!(result, U256::from(18433));
 		// Transaction successfully returned sender
@@ -1693,10 +1722,12 @@ mod tests {
 		info.number = 1;
 
 		let mut output = [0u8; 20];
-		let FinalizationResult { gas_left: result, .. } = {
-			let mut ex = Executive::new(&mut state, &info, &machine);
-			ex.call(params, &mut Substate::new(), BytesRef::Fixed(&mut output), &mut NoopTracer, &mut NoopVMTracer).unwrap()
+		let FinalizationResult { gas_left: result, return_data, .. } = {
+			let schedule = machine.schedule(info.number);
+			let mut ex = Executive::new(&mut state, &info, &machine, &schedule);
+			ex.call(params, &mut Substate::new(), &mut NoopTracer, &mut NoopVMTracer).unwrap()
 		};
+		(&mut output[..((cmp::min(20, return_data.len())))]).copy_from_slice(&return_data[..(cmp::min(20, return_data.len()))]);
 
 		assert_eq!(result, U256::from(20025));
 		// Since transaction errored due to wasm was not activated, result is just empty

ethcore/src/externalities.rs

@@ -18,7 +18,7 @@
 use std::cmp;
 use std::sync::Arc;
 use ethereum_types::{H256, U256, Address};
-use bytes::{Bytes, BytesRef};
+use bytes::Bytes;
 use state::{Backend as StateBackend, State, Substate, CleanupMode};
 use machine::EthereumMachine as Machine;
 use executive::*;
@@ -32,12 +32,12 @@ use transaction::UNSIGNED_SENDER;
 use trace::{Tracer, VMTracer};
 
 /// Policy for handling output data on `RETURN` opcode.
-pub enum OutputPolicy<'a, 'b> {
+pub enum OutputPolicy {
 	/// Return reference to fixed sized output.
 	/// Used for message calls.
-	Return(BytesRef<'a>, Option<&'b mut Bytes>),
+	Return,
 	/// Init new contract as soon as `RETURN` is called.
-	InitContract(Option<&'b mut Bytes>),
+	InitContract,
 }
 
 /// Transaction properties that externalities need to know about.
@@ -66,12 +66,12 @@ impl OriginInfo {
 pub struct Externalities<'a, T: 'a, V: 'a, B: 'a> {
 	state: &'a mut State<B>,
 	env_info: &'a EnvInfo,
-	machine: &'a Machine,
 	depth: usize,
 	origin_info: OriginInfo,
 	substate: &'a mut Substate,
-	schedule: Schedule,
-	output: OutputPolicy<'a, 'a>,
+	machine: &'a Machine,
+	schedule: &'a Schedule,
+	output: OutputPolicy,
 	tracer: &'a mut T,
 	vm_tracer: &'a mut V,
 	static_flag: bool,
@@ -81,13 +81,15 @@ impl<'a, T: 'a, V: 'a, B: 'a> Externalities<'a, T, V, B>
 	where T: Tracer, V: VMTracer, B: StateBackend
 {
 	/// Basic `Externalities` constructor.
-	pub fn new(state: &'a mut State<B>,
+	pub fn new(
+		state: &'a mut State<B>,
 		env_info: &'a EnvInfo,
 		machine: &'a Machine,
+		schedule: &'a Schedule,
 		depth: usize,
 		origin_info: OriginInfo,
 		substate: &'a mut Substate,
-		output: OutputPolicy<'a, 'a>,
+		output: OutputPolicy,
 		tracer: &'a mut T,
 		vm_tracer: &'a mut V,
 		static_flag: bool,
@@ -95,11 +97,11 @@ impl<'a, T: 'a, V: 'a, B: 'a> Externalities<'a, T, V, B>
 		Externalities {
 			state: state,
 			env_info: env_info,
-			machine: machine,
 			depth: depth,
 			origin_info: origin_info,
 			substate: substate,
-			schedule: machine.schedule(env_info.number),
+			machine: machine,
+			schedule: schedule,
 			output: output,
 			tracer: tracer,
 			vm_tracer: vm_tracer,
@@ -173,9 +175,12 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
 				params_type: vm::ParamsType::Separate,
 			};
 
-			let mut output = H256::new();
-			let mut ex = Executive::new(self.state, self.env_info, self.machine);
-			let r = ex.call(params, self.substate, BytesRef::Fixed(&mut output), self.tracer, self.vm_tracer);
+			let mut ex = Executive::new(self.state, self.env_info, self.machine, self.schedule);
+			let r = ex.call(params, self.substate, self.tracer, self.vm_tracer);
+			let output = match &r {
+				Ok(ref r) => H256::from(&r.return_data[..32]),
+				_ => H256::new(),
+			};
 			trace!("ext: blockhash contract({}) -> {:?}({}) self.env_info.number={}\n", number, r, output, self.env_info.number);
 			output
 		} else {
@@ -196,7 +201,13 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
 		}
 	}
 
-	fn create(&mut self, gas: &U256, value: &U256, code: &[u8], address_scheme: CreateContractAddress) -> ContractCreateResult {
+	fn create(
+		&mut self,
+		gas: &U256,
+		value: &U256,
+		code: &[u8],
+		address_scheme: CreateContractAddress
+	) -> ContractCreateResult {
 		// create new contract address
 		let (address, code_hash) = match self.state.nonce(&self.origin_info.address) {
 			Ok(nonce) => contract_address(address_scheme, &self.origin_info.address, &nonce, &code),
@@ -230,10 +241,10 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
 				}
 			}
 		}
-		let mut ex = Executive::from_parent(self.state, self.env_info, self.machine, self.depth, self.static_flag);
+		let mut ex = Executive::from_parent(self.state, self.env_info, self.machine, self.schedule, self.depth, self.static_flag);
 
 		// TODO: handle internal error separately
-		match ex.create(params, self.substate, &mut None, self.tracer, self.vm_tracer) {
+		match ex.create(params, self.substate, self.tracer, self.vm_tracer) {
 			Ok(FinalizationResult{ gas_left, apply_state: true, .. }) => {
 				self.substate.contracts_created.push(address.clone());
 				ContractCreateResult::Created(address, gas_left)
@@ -245,14 +256,14 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
 		}
 	}
 
-	fn call(&mut self,
+	fn call(
+		&mut self,
 		gas: &U256,
 		sender_address: &Address,
 		receive_address: &Address,
 		value: Option<U256>,
 		data: &[u8],
 		code_address: &Address,
-		output: &mut [u8],
 		call_type: CallType
 	) -> MessageCallResult {
 		trace!(target: "externalities", "call");
@@ -284,9 +295,9 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
 			params.value = ActionValue::Transfer(value);
 		}
 
-		let mut ex = Executive::from_parent(self.state, self.env_info, self.machine, self.depth, self.static_flag);
+		let mut ex = Executive::from_parent(self.state, self.env_info, self.machine, self.schedule, self.depth, self.static_flag);
 
-		match ex.call(params, self.substate, BytesRef::Fixed(output), self.tracer, self.vm_tracer) {
+		match ex.call(params, self.substate, self.tracer, self.vm_tracer) {
 			Ok(FinalizationResult{ gas_left, return_data, apply_state: true }) => MessageCallResult::Success(gas_left, return_data),
 			Ok(FinalizationResult{ gas_left, return_data, apply_state: false }) => MessageCallResult::Reverted(gas_left, return_data),
 			_ => MessageCallResult::Failed
@@ -305,27 +316,13 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
 		Ok(self.state.code_size(address)?)
 	}
 
-	fn ret(mut self, gas: &U256, data: &ReturnData, apply_state: bool) -> vm::Result<U256>
+	fn ret(self, gas: &U256, data: &ReturnData, apply_state: bool) -> vm::Result<U256>
 		where Self: Sized {
-		let handle_copy = |to: &mut Option<&mut Bytes>| {
-			to.as_mut().map(|b| **b = data.to_vec());
-		};
 		match self.output {
-			OutputPolicy::Return(BytesRef::Fixed(ref mut slice), ref mut copy) => {
-				handle_copy(copy);
-
-				let len = cmp::min(slice.len(), data.len());
-				(&mut slice[..len]).copy_from_slice(&data[..len]);
+			OutputPolicy::Return => {
 				Ok(*gas)
 			},
-			OutputPolicy::Return(BytesRef::Flexible(ref mut vec), ref mut copy) => {
-				handle_copy(copy);
-
-				vec.clear();
-				vec.extend_from_slice(&*data);
-				Ok(*gas)
-			},
-			OutputPolicy::InitContract(ref mut copy) if apply_state => {
+			OutputPolicy::InitContract if apply_state => {
 				let return_cost = U256::from(data.len()) * U256::from(self.schedule.create_data_gas);
 				if return_cost > *gas || data.len() > self.schedule.create_data_limit {
 					return match self.schedule.exceptional_failed_code_deposit {
@@ -333,11 +330,10 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
 						false => Ok(*gas)
 					}
 				}
-				handle_copy(copy);
 				self.state.init_code(&self.origin_info.address, data.to_vec())?;
 				Ok(*gas - return_cost)
 			},
-			OutputPolicy::InitContract(_) => {
+			OutputPolicy::InitContract => {
 				Ok(*gas)
 			},
 		}
@@ -398,12 +394,12 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
 		self.depth
 	}
 
-	fn add_sstore_refund(&mut self, value: usize) {
-		self.substate.sstore_clears_refund += value as i128;
+	fn add_sstore_refund(&mut self, value: U256) {
+		self.substate.sstore_clears_refund = self.substate.sstore_clears_refund.saturating_add(value);
 	}
 
-	fn sub_sstore_refund(&mut self, value: usize) {
-		self.substate.sstore_clears_refund -= value as i128;
+	fn sub_sstore_refund(&mut self, value: U256) {
+		self.substate.sstore_clears_refund = self.substate.sstore_clears_refund.saturating_sub(value);
 	}
 
 	fn trace_next_instruction(&mut self, pc: usize, instruction: u8, current_gas: U256) -> bool {
@@ -452,6 +448,7 @@ mod tests {
 	struct TestSetup {
 		state: State<::state_db::StateDB>,
 		machine: ::machine::EthereumMachine,
+		schedule: Schedule,
 		sub_state: Substate,
 		env_info: EnvInfo
 	}
@@ -464,11 +461,15 @@ mod tests {
 
 	impl TestSetup {
 		fn new() -> Self {
+			let machine = ::spec::Spec::new_test_machine();
+			let env_info = get_test_env_info();
+			let schedule = machine.schedule(env_info.number);
 			TestSetup {
 				state: get_temp_state(),
-				machine: ::spec::Spec::new_test_machine(),
+				schedule: schedule,
+				machine: machine,
 				sub_state: Substate::new(),
-				env_info: get_test_env_info()
+				env_info: env_info,
 			}
 		}
 	}
@@ -480,7 +481,7 @@ mod tests {
 		let mut tracer = NoopTracer;
 		let mut vm_tracer = NoopVMTracer;
 
-		let ext = Externalities::new(state, &setup.env_info, &setup.machine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
+		let ext = Externalities::new(state, &setup.env_info, &setup.machine, &setup.schedule, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract, &mut tracer, &mut vm_tracer, false);
 
 		assert_eq!(ext.env_info().number, 100);
 	}
@@ -492,7 +493,7 @@ mod tests {
 		let mut tracer = NoopTracer;
 		let mut vm_tracer = NoopVMTracer;
 
-		let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
+		let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, &setup.schedule, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract, &mut tracer, &mut vm_tracer, false);
 
 		let hash = ext.blockhash(&"0000000000000000000000000000000000000000000000000000000000120000".parse::<U256>().unwrap());
 
@@ -516,7 +517,7 @@ mod tests {
 		let mut tracer = NoopTracer;
 		let mut vm_tracer = NoopVMTracer;
 
-		let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
+		let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, &setup.schedule, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract, &mut tracer, &mut vm_tracer, false);
 
 		let hash = ext.blockhash(&"0000000000000000000000000000000000000000000000000000000000120000".parse::<U256>().unwrap());
 
@@ -531,9 +532,7 @@ mod tests {
 		let mut tracer = NoopTracer;
 		let mut vm_tracer = NoopVMTracer;
 
-		let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
-
-		let mut output = vec![];
+		let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, &setup.schedule, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract, &mut tracer, &mut vm_tracer, false);
 
 		// this should panic because we have no balance on any account
 		ext.call(
@@ -543,7 +542,6 @@ mod tests {
 			Some("0000000000000000000000000000000000000000000000000000000000150000".parse::<U256>().unwrap()),
 			&[],
 			&Address::new(),
-			&mut output,
 			CallType::Call
 		);
 	}
@@ -559,7 +557,7 @@ mod tests {
 		let mut vm_tracer = NoopVMTracer;
 
 		{
-			let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
+			let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, &setup.schedule, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract, &mut tracer, &mut vm_tracer, false);
 			ext.log(log_topics, &log_data).unwrap();
 		}
 
@@ -576,7 +574,7 @@ mod tests {
 		let mut vm_tracer = NoopVMTracer;
 
 		{
-			let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
+			let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, &setup.schedule, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract, &mut tracer, &mut vm_tracer, false);
 			ext.suicide(refund_account).unwrap();
 		}
 
@@ -593,7 +591,7 @@ mod tests {
 		let mut vm_tracer = NoopVMTracer;
 
 		let address = {
-			let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
+			let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, &setup.schedule, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract, &mut tracer, &mut vm_tracer, false);
 			match ext.create(&U256::max_value(), &U256::zero(), &[], CreateContractAddress::FromSenderAndNonce) {
 				ContractCreateResult::Created(address, _) => address,
 				_ => panic!("Test create failed; expected Created, got Failed/Reverted."),
@@ -613,7 +611,8 @@ mod tests {
 		let mut vm_tracer = NoopVMTracer;
 
 		let address = {
-			let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract(None), &mut tracer, &mut vm_tracer, false);
+			let mut ext = Externalities::new(state, &setup.env_info, &setup.machine, &setup.schedule, 0, get_test_origin(), &mut setup.sub_state, OutputPolicy::InitContract, &mut tracer, &mut vm_tracer, false);
+
 			match ext.create(&U256::max_value(), &U256::zero(), &[], CreateContractAddress::FromSenderSaltAndCodeHash(H256::default())) {
 				ContractCreateResult::Created(address, _) => address,
 				_ => panic!("Test create failed; expected Created, got Failed/Reverted."),

ethcore/src/factory.rs

@@ -31,11 +31,11 @@ pub struct VmFactory {
 }
 
 impl VmFactory {
-	pub fn create(&self, params: &ActionParams, schedule: &Schedule) -> Box<Vm> {
+	pub fn create(&self, params: ActionParams, schedule: &Schedule, depth: usize) -> Box<Vm> {
 		if schedule.wasm.is_some() && params.code.as_ref().map_or(false, |code| code.len() > 4 && &code[0..4] == WASM_MAGIC_NUMBER) {
-			Box::new(WasmInterpreter)
+			Box::new(WasmInterpreter::new(params))
 		} else {
-			self.evm.create(&params.gas)
+			self.evm.create(params, schedule, depth)
 		}
 	}