Update Parity stable to 1.9.7 + Backports (#8456)

* Update Parity stable to 1.9.7

* Allow 32 bit pipelines to fail (#8454)

* Disable 32bit tragets for gitlab

* Rename linux pipelines

* Update wasmi (#8452)

* Revert Cargo lock update from master

* Fix Cargo.lock

.cargo/config

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

.gitlab-ci.yml

@@ -1,5 +1,6 @@
 stages:
   - test
+  - js-build
   - push-release
   - build
 variables:
@@ -11,9 +12,9 @@ variables:
 cache:
   key: "$CI_BUILD_STAGE-$CI_BUILD_REF_NAME"
   paths:
-    - target
+    - target/
   untracked: true
-linux-stable:
+linux-ubuntu:
   stage: build
   image: parity/rust:gitlab-ci
   only:
@@ -31,7 +32,7 @@ linux-stable:
     paths:
     - parity.zip
     name: "stable-x86_64-unknown-linux-gnu_parity"
-linux-stable-debian:
+linux-debian:
   stage: build
   image: parity/rust-debian:gitlab-ci
   only:
@@ -80,6 +81,7 @@ linux-i686:
     paths:
       - parity.zip
     name: "i686-unknown-linux-gnu"
+  allow_failure: true
 linux-armv7:
   stage: build
   image: parity/rust-armv7:gitlab-ci
@@ -96,6 +98,7 @@ linux-armv7:
     paths:
     - parity.zip
     name: "armv7_unknown_linux_gnueabihf_parity"
+  allow_failure: true
 linux-arm:
   stage: build
   image: parity/rust-arm:gitlab-ci
@@ -112,6 +115,7 @@ linux-arm:
     paths:
     - parity.zip
     name: "arm-unknown-linux-gnueabihf_parity"
+  allow_failure: true
 linux-aarch64:
   stage: build
   image: parity/rust-arm64:gitlab-ci
@@ -142,7 +146,7 @@ linux-snap:
     - rust-stable
   artifacts:
     paths:
-    - scripts/parity_*_amd64.snap
+    - parity.zip
     name: "stable-x86_64-unknown-snap-gnu_parity"
   allow_failure: true
 darwin:
@@ -232,6 +236,26 @@ test-rust-nightly:
     - rust
     - rust-nightly
   allow_failure: true
+js-test:
+  stage: test
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-test.sh js-test
+  tags:
+    - rust-stable
+js-release:
+  stage: js-build
+  only:
+    - master
+    - stable
+    - beta
+    - tags
+    - triggers
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-test.sh js-release
+  tags:
+    - javascript
 push-release:
   stage: push-release
   only:

CHANGELOG.md

@@ -1,347 +1,371 @@
-## Parity [v1.9.2](https://github.com/paritytech/parity/releases/tag/v1.9.2) (2018-02-02)
+## Parity [v1.8.5](https://github.com/paritytech/parity/releases/tag/v1.8.5) (2017-12-29)
 
-Parity 1.9.2 is a bug-fix release to improve performance and stability. It adds additional bootnodes for the Ropsten test network.
+Parity 1.8.5 changes the default behavior of JSON-RPC CORS setting, detects same-key engine signers in Aura networks, and updates bootnodes for the Kovan and Foundation networks.
+
+Note: The default value of `--jsonrpc-cors` option has been altered to disallow (potentially malicious) websites from accessing the low-sensitivity RPCs (viewing exposed accounts, proposing transactions for signing). Currently domains need to be whitelisted manually. To bring back previous behaviour run with `--jsonrpc-cors all` or `--jsonrpc-cors http://example.com`.
 
 The full list of included changes:
 
-- Backports beta ([#7780](https://github.com/paritytech/parity/pull/7780))
-  - Bump beta to 1.9.2
-  - Update ropsten.json ([#7776](https://github.com/paritytech/parity/pull/7776))
-- Snapcraft push beta
+- Beta Backports ([#7297](https://github.com/paritytech/parity/pull/7297))
+  - New warp enodes ([#7287](https://github.com/paritytech/parity/pull/7287))
+    - New warp enodes
+    - Added one more warp enode; replaced spaces with tabs
+    - Bump beta to 1.8.5
+    - Update kovan boot nodes
+  - Detect different node, same-key signing in aura ([#7245](https://github.com/paritytech/parity/pull/7245))
+    - Detect different node, same-key signing in aura
+    - Reduce scope of warning
+    - Fix Cargo.lock
+    - Updating mainnet bootnodes.
+  - Update bootnodes ([#7363](https://github.com/paritytech/parity/pull/7363))
+    - Updating mainnet bootnodes.
+    - Add additional parity-beta bootnodes.
+    - Restore old parity bootnodes and update foudation bootnodes
+- Fix default CORS. ([#7388](https://github.com/paritytech/parity/pull/7388))
 
-## Parity [v1.9.1](https://github.com/paritytech/parity/releases/tag/v1.9.1) (2018-02-01)
+## Parity [v1.8.4](https://github.com/paritytech/parity/releases/tag/v1.8.4) (2017-12-12)
 
-Parity 1.9.1 is a bug-fix release to improve performance and stability. It restores ERC-20 token balances, improves networking, fixes database corruptions on client shutdown, and fixes issues with the `--password` command-line flag. Happy syncing, fellow Ethereans!
+Parity 1.8.4 applies fixes for Proof-of-Authority networks and schedules the Kovan-Byzantium hard-fork.
 
-In addition, this stabilizes Kovan and other Proof-of-Authority networks. If you run a network with AuRa engine, updating is highly encouraged!
+- The Kovan testnet will fork on block `5067000` at `Thu Dec 14 2017 05:40:03 UTC`.
+  - This enables Byzantium features on Kovan.
+  - This disables uncles on Kovan for stability reasons.
+- Proof-of-Authority networks are advised to set `maximumUncleCount` to 0 in a future `maximumUncleCountTransition` for stability reasons.
+  - See the [Kovan chain spec](https://github.com/paritytech/parity/blob/master/ethcore/res/ethereum/kovan.json) for an example.
+  - New PoA networks created with Parity will have this feature enabled by default.
+
+Furthermore, this release includes the ECIP-1039 Monetary policy rounding specification for Ethereum Classic, reduces the maximum Ethash-block timestamp drift to 15 seconds, and fixes various bugs for WASM and the RPC APIs.
 
 The full list of included changes:
 
-- Beta Backports ([#7756](https://github.com/paritytech/parity/pull/7756))
-  - Filter-out nodes.json ([#7716](https://github.com/paritytech/parity/pull/7716))
-    - Filter-out nodes.json
-    - network: sort node table nodes by failure ratio
-    - network: fix node table tests
-    - network: fit node failure percentage into buckets of 5%
-    - network: consider number of attempts in sorting of node table
-    - network: fix node table grumbles
-  - Fix client not being dropped on shutdown ([#7695](https://github.com/paritytech/parity/pull/7695))
-    - parity: wait for client to drop on shutdown
-    - parity: fix grumbles in shutdown wait
-    - parity: increase shutdown timeouts
-  - Wrap --help output to 120 characters ([#7626](https://github.com/paritytech/parity/pull/7626))
-    - Update Clap dependency and remove workarounds
-    - WIP
-    - Remove line breaks in help messages for now
-    - Multiple values can only be separated by commas (closes [#7428](https://github.com/paritytech/parity/issues/7428))
-    - Grumbles; refactor repeating code; add constant
-    - Use a single Wrapper rather than allocate a new one for each call
-    - Wrap --help to 120 characters rather than 100 characte
-- Token filter balances (throttle) ([#7742](https://github.com/paritytech/parity/pull/7742))
-  - Token filter balances (throttle)
-  - Cleanups
-  - Remove unused uniq
-  - Update @parity/shared to 2.2.23
-  - Remove unused code paths
-- Bump beta to 1.9.1 ([#7751](https://github.com/paritytech/parity/pull/7751))
-- Explicitly add branch name ([#7754](https://github.com/paritytech/parity/pull/7754))
-  - Explicitly add branch name
-  - Fix cargo update branch to beta
-- Revert revert revert ([#7715](https://github.com/paritytech/parity/pull/7715))
- - This reverts commit 568dc33.
-
-## Parity [v1.9.0](https://github.com/paritytech/parity/releases/tag/v1.9.0) "Velocity" (2018-01-25)
-
-We are happy to announce our newest Parity 1.9 release. Among others, it enables the following features:
-
-- It integrates the fully reworked Parity Wallet and DApps browser (a.k.a. "UI 2.0", [#6819](https://github.com/paritytech/parity/pull/6819)).
-- It enables devp2p snappy compression ([#6683](https://github.com/paritytech/parity/pull/6683)).
-- AuRa Proof-of-Authority chains now disable uncles by default ([#7006](https://github.com/paritytech/parity/pull/7006)). Existing PoA chains can go through a "maximum uncle count transition" to achieve more stability ([#7196](https://github.com/paritytech/parity/pull/7196)).
-- Added Expanse's Byzantium hard-fork ([#7463](https://github.com/paritytech/parity/pull/7463)).
-- Added support for Ellaism chain ([#7222](https://github.com/paritytech/parity/pull/7222)).
-
-Further, users upgrading from 1.8 should acknowledge the following changes:
-
-- Fixed DELEGATECALL's from/to field ([#7568](https://github.com/paritytech/parity/pull/7568)).
-- Set zero nonce and gas price for calls by default ([#6954](https://github.com/paritytech/parity/pull/6954)).
-- Create pending blocks with all transactions from the queue ([#6942](https://github.com/paritytech/parity/pull/6942)).
-- Remove RPC parameter leniency now that Mist formats correctly ([#6651](https://github.com/paritytech/parity/pull/6651)). Parity stops accepting decimal-formatted block numbers and stops parsing the empty string as empty bytes.
-- Public nodes do not support the user interface anymore. If you are running a public node, please stay on the 1.8 branch of the stable releases.
-
-Additional noteworthy changes:
-
-- `ethstore` and `ethkey` have been significantly improved ([#6961](https://github.com/paritytech/parity/pull/6961)):
-  - `ethstore` now supports brute forcing pre-sale wallets given a password list for recovery.
-  - `ethkey` now supports multi-threaded generation of prefix-matching addresses.
-  - `ethkey` now supports prefix-matching brain wallets.
-  - `ethkey` now supports brain-wallets recovery-phrases lookup. This helps to find a correct phrase if you know the address you want to get yet you made a typo backing the phrase up, or forgot a word.
-
-Read more about Parity 1.9 in our [blog post](http://paritytech.io/velocity-the-fastest-parity-released/).
-
-The full list of included changes:
-
-- Add scroll when when too many accounts ([#7677](https://github.com/paritytech/parity/pull/7677)) ([#7679](https://github.com/paritytech/parity/pull/7679))
-- Update installer.nsi
-- Fix conditions in gitlab-test ([#7676](https://github.com/paritytech/parity/pull/7676))
-  - Fix conditions in gitlab-test
-  - Update gitlab-test.sh
-- Remove cargo cache
-- Backports to beta ([#7660](https://github.com/paritytech/parity/pull/7660))
-  - Improve handling of RocksDB corruption ([#7630](https://github.com/paritytech/parity/pull/7630))
-    - Kvdb-rocksdb: update rust-rocksdb version
-    - Kvdb-rocksdb: mark corruptions and attempt repair on db open
-    - Kvdb-rocksdb: better corruption detection on open
-    - Kvdb-rocksdb: add corruption_file_name const
-    - Kvdb-rocksdb: rename mark_corruption to check_for_corruption
-  - Hardening of CSP ([#7621](https://github.com/paritytech/parity/pull/7621))
-  - Fixed delegatecall's from/to ([#7568](https://github.com/paritytech/parity/pull/7568))
-    - Fixed delegatecall's from/to, closes [#7166](https://github.com/paritytech/parity/issues/7166)
-    - Added tests for delegatecall traces, [#7167](https://github.com/paritytech/parity/issues/7167)
-  - Light client RPCs ([#7603](https://github.com/paritytech/parity/pull/7603))
-    - Implement registrar.
-    - Implement eth_getCode
-    - Don't wait for providers.
-    - Don't wait for providers.
-    - Fix linting and wasm tests.
-  - Problem: AttachedProtocols don't get registered ([#7610](https://github.com/paritytech/parity/pull/7610))
-  - Fix Temporarily Invalid blocks handling ([#7613](https://github.com/paritytech/parity/pull/7613))
-    - Handle temporarily invalid blocks in sync.
+- Beta Backports and HF block update ([#7244](https://github.com/paritytech/parity/pull/7244))
+  - Reduce max block timestamp drift to 15 seconds ([#7240](https://github.com/paritytech/parity/pull/7240))
+    - Add test for block timestamp validation within allowed drift
+  - Update kovan HF block number.
+- Beta Kovan HF ([#7234](https://github.com/paritytech/parity/pull/7234))
+  - Kovan HF.
+  - Bump version.
+  - Fix aura difficulty race ([#7198](https://github.com/paritytech/parity/pull/7198))
+    - Fix test key
+    - Extract out score calculation
+    - Fix build
+  - Update kovan HF block number.
+  - Add missing byzantium builtins.
+  - Bump installers versions.
+  - Increase allowed time drift to 10s. ([#7238](https://github.com/paritytech/parity/pull/7238))
+- Beta Backports ([#7197](https://github.com/paritytech/parity/pull/7197))
+  - Maximum uncle count transition ([#7196](https://github.com/paritytech/parity/pull/7196))
+    - Enable delayed maximum_uncle_count activation.
     - Fix tests.
-- Add docker build for beta ([#7671](https://github.com/paritytech/parity/pull/7671))
-  - Add docker build for beta
-  - Add cargo cache
-- Fix snapcraft build for beta ([#7670](https://github.com/paritytech/parity/pull/7670))
-- Update Parity.pkgproj
-- update gitlab build from master
-- Update references to dapp sources ([#7634](https://github.com/paritytech/parity/pull/7634)) ([#7636](https://github.com/paritytech/parity/pull/7636))
-- Update tokenreg ([#7618](https://github.com/paritytech/parity/pull/7618)) ([#7619](https://github.com/paritytech/parity/pull/7619))
-- Fix cache:key ([#7598](https://github.com/paritytech/parity/pull/7598))
-- Make 1.9 beta ([#7533](https://github.com/paritytech/parity/pull/7533))
-- Trigger js-precompiled ([#7535](https://github.com/paritytech/parity/pull/7535))
-- RocksDB fix ([#7512](https://github.com/paritytech/parity/pull/7512))
-- Update js-api ([#7510](https://github.com/paritytech/parity/pull/7510))
-- Expose default gas price percentile configuration in CLI ([#7497](https://github.com/paritytech/parity/pull/7497))
-- Use https connection ([#7503](https://github.com/paritytech/parity/pull/7503))
-- More thorough changes detection ([#7472](https://github.com/paritytech/parity/pull/7472))
-- Fix small layout issues ([#7500](https://github.com/paritytech/parity/pull/7500))
-- Show all accounts on Topbar ([#7498](https://github.com/paritytech/parity/pull/7498))
-- Update Parity Mainnet Bootnodes ([#7476](https://github.com/paritytech/parity/pull/7476))
-- Fixed panic when io is not available for export block ([#7495](https://github.com/paritytech/parity/pull/7495))
-- Advance AuRa step as far as we can and prevent invalid blocks. ([#7451](https://github.com/paritytech/parity/pull/7451))
-- Update package-lock in js-old ([#7494](https://github.com/paritytech/parity/pull/7494))
-- Update issue template and readme ([#7450](https://github.com/paritytech/parity/pull/7450))
-- Update package-lock.json pinned versions  ([#7492](https://github.com/paritytech/parity/pull/7492))
-- Explicit pre-precompiled push checkout ([#7474](https://github.com/paritytech/parity/pull/7474))
-- Trigger js-precompiled ([#7473](https://github.com/paritytech/parity/pull/7473))
-- Expanse Byzantium update w/ correct metropolis difficulty increment divisor ([#7463](https://github.com/paritytech/parity/pull/7463))
-- Updated icons ([#7469](https://github.com/paritytech/parity/pull/7469))
-- Cleanup certifications ([#7454](https://github.com/paritytech/parity/pull/7454))
-- Fix css lint (updated stylelint) ([#7471](https://github.com/paritytech/parity/pull/7471))
-- Upgrade markdown-loader & marked ([#7467](https://github.com/paritytech/parity/pull/7467))
-- Remove JS test for removed code ([#7461](https://github.com/paritytech/parity/pull/7461))
-- Pull in dapp-status ([#7457](https://github.com/paritytech/parity/pull/7457))
-- Bump openssl crate ([#7455](https://github.com/paritytech/parity/pull/7455))
-- Signer updates from global Redux state ([#7452](https://github.com/paritytech/parity/pull/7452))
-- Remove expanse chain ([#7437](https://github.com/paritytech/parity/pull/7437))
-- Store tokens with repeatable id ([#7435](https://github.com/paritytech/parity/pull/7435))
-- Strict config parsing ([#7433](https://github.com/paritytech/parity/pull/7433))
-- Upgrade to RocksDB 5.8.8 and tune settings to reduce space amplification ([#7348](https://github.com/paritytech/parity/pull/7348))
-- Fix status layout ([#7432](https://github.com/paritytech/parity/pull/7432))
-- Fix tracing failed calls. ([#7412](https://github.com/paritytech/parity/pull/7412))
-- Problem: sending any Whisper message fails ([#7421](https://github.com/paritytech/parity/pull/7421))
-- Wait for future blocks in AuRa ([#7368](https://github.com/paritytech/parity/pull/7368))
-- Fix final feature. ([#7426](https://github.com/paritytech/parity/pull/7426))
-- Use RwLock for state DB ([#7425](https://github.com/paritytech/parity/pull/7425))
-- Update branding on UI ([#7370](https://github.com/paritytech/parity/pull/7370))
-- Changelog for 1.8.5 and 1.7.11 ([#7401](https://github.com/paritytech/parity/pull/7401))
-- Added checking tx-type using transactions permission contract for miners ([#7359](https://github.com/paritytech/parity/pull/7359))
-- Standalone dir crate, replaces [#7383](https://github.com/paritytech/parity/issues/7383) ([#7409](https://github.com/paritytech/parity/pull/7409))
-- SecretStore: secretstore_signRawHash method ([#7336](https://github.com/paritytech/parity/pull/7336))
-- SecretStore: return error 404 when there's no key shares for given key on all nodes ([#7331](https://github.com/paritytech/parity/pull/7331))
-- SecretStore: PoA integration initial version ([#7101](https://github.com/paritytech/parity/pull/7101))
-- Update bootnodes ([#7363](https://github.com/paritytech/parity/pull/7363))
-- Fix default CORS settings. ([#7387](https://github.com/paritytech/parity/pull/7387))
-- Fix version ([#7390](https://github.com/paritytech/parity/pull/7390))
-- Wasm runtime update ([#7356](https://github.com/paritytech/parity/pull/7356))
-- Parity-version pr reopen ([#7136](https://github.com/paritytech/parity/pull/7136))
-- Get rid of clippy remainings. ([#7355](https://github.com/paritytech/parity/pull/7355))
-- Avoid using ok_or with allocated argument ([#7357](https://github.com/paritytech/parity/pull/7357))
-- Make accounts refresh time configurable. ([#7345](https://github.com/paritytech/parity/pull/7345))
-- Enable traces for DEV chain ([#7327](https://github.com/paritytech/parity/pull/7327))
-- Problem: AuRa's unsafeties around step duration ([#7282](https://github.com/paritytech/parity/pull/7282))
-- Problem: Cargo.toml file contains [project] key ([#7346](https://github.com/paritytech/parity/pull/7346))
-- Fix broken flex modal layouts ([#7343](https://github.com/paritytech/parity/pull/7343))
-- Fix dappIcon & Fix Signer Pending ([#7338](https://github.com/paritytech/parity/pull/7338))
-- Fix wallet token/badge icons not showing up ([#7333](https://github.com/paritytech/parity/pull/7333))
-- Add Ellaism coin in chain config ([#7222](https://github.com/paritytech/parity/pull/7222))
-- Update bootnodes ([#7296](https://github.com/paritytech/parity/pull/7296))
-- Adds `personal_signTransaction` RPC method ([#6991](https://github.com/paritytech/parity/pull/6991))
-- Fix double initialization of embeded providers. ([#7326](https://github.com/paritytech/parity/pull/7326))
-- Transaction Pool re-implementation ([#6994](https://github.com/paritytech/parity/pull/6994))
-- UI package bump ([#7318](https://github.com/paritytech/parity/pull/7318))
-- Test framework and basic test for whisper ([#7011](https://github.com/paritytech/parity/pull/7011))
-- CI js-precompiled trigger ([#7316](https://github.com/paritytech/parity/pull/7316))
-- Fix inject.js & Signer store duplication ([#7299](https://github.com/paritytech/parity/pull/7299))
-- Detect different node, same-key signing in aura ([#7245](https://github.com/paritytech/parity/pull/7245))
-- New warp enodes ([#7287](https://github.com/paritytech/parity/pull/7287))
-- CSS fixes for v1 ([#7285](https://github.com/paritytech/parity/pull/7285))
-- Wallet subscriptions & refresh ([#7283](https://github.com/paritytech/parity/pull/7283))
-- Update inject web3 dependencies ([#7286](https://github.com/paritytech/parity/pull/7286))
-- Some padding around dapp image ([#7276](https://github.com/paritytech/parity/pull/7276))
-- Expand available middleware methods ([#7275](https://github.com/paritytech/parity/pull/7275))
-- Inject parity script to all dapps // Expand dapps to any ZIP file ([#7260](https://github.com/paritytech/parity/pull/7260))
-- New Homepage ([#7266](https://github.com/paritytech/parity/pull/7266))
-- Update kovan HF block number. ([#7259](https://github.com/paritytech/parity/pull/7259))
-- CHANGELOG for 1.7.10 and 1.8.4 ([#7265](https://github.com/paritytech/parity/pull/7265))
-- Remove extraneous id hashing ([#7269](https://github.com/paritytech/parity/pull/7269))
-- Simplify status + content display overlaps/page fixing ([#7264](https://github.com/paritytech/parity/pull/7264))
-- UI redirect to 127.0.0.1 when localhost requested ([#7236](https://github.com/paritytech/parity/pull/7236))
-- Usability improvements to security token Dialog [#7112](https://github.com/paritytech/parity/issues/7112) ([#7134](https://github.com/paritytech/parity/pull/7134))
-- Don't display unneeded notifications ([#7237](https://github.com/paritytech/parity/pull/7237))
-- Reduce max block timestamp drift to 15 seconds ([#7240](https://github.com/paritytech/parity/pull/7240))
-- Increase allowed time drift to 10s. ([#7238](https://github.com/paritytech/parity/pull/7238))
-- Improve building from source ([#7239](https://github.com/paritytech/parity/pull/7239))
-- Fix/Update method permissions ([#7233](https://github.com/paritytech/parity/pull/7233))
-- Fix aura difficulty race ([#7198](https://github.com/paritytech/parity/pull/7198))
-- Dependency updates ([#7226](https://github.com/paritytech/parity/pull/7226))
-- Display all dapps (shell) & wallet tabs (v1) by default ([#7213](https://github.com/paritytech/parity/pull/7213))
-- Rework dapps list ([#7206](https://github.com/paritytech/parity/pull/7206))
-- Add contributing guidelines and code of conduct. ([#7157](https://github.com/paritytech/parity/pull/7157))
-- Make Signing Requests more visible ([#7204](https://github.com/paritytech/parity/pull/7204))
-- Send each log as a separate notification ([#7175](https://github.com/paritytech/parity/pull/7175))
-- Deleting a mistake comment in calc difficulty ([#7154](https://github.com/paritytech/parity/pull/7154))
-- Maximum uncle count transition ([#7196](https://github.com/paritytech/parity/pull/7196))
-- Update FirstRun for UI-2 ([#7195](https://github.com/paritytech/parity/pull/7195))
-- Update mocha import stubs ([#7191](https://github.com/paritytech/parity/pull/7191))
-- Escape inifinite loop in estimte_gas ([#7075](https://github.com/paritytech/parity/pull/7075))
-- New account selector UI in top bar ([#7179](https://github.com/paritytech/parity/pull/7179))
-- Removed ethcore-util dependency from ethcore-network ([#7180](https://github.com/paritytech/parity/pull/7180))
-- WASM test runner utility upgrade ([#7147](https://github.com/paritytech/parity/pull/7147))
-- React 16 ([#7174](https://github.com/paritytech/parity/pull/7174))
-- Assorted improvements for ethstore and ethkey ([#6961](https://github.com/paritytech/parity/pull/6961))
-- Delete unused package.json (dist bundles) ([#7173](https://github.com/paritytech/parity/pull/7173))
-- Remove *.css.map & *.js.map ([#7168](https://github.com/paritytech/parity/pull/7168))
-- Use git flag to remove old js artifacts ([#7165](https://github.com/paritytech/parity/pull/7165))
-- Cleanup JS build artifacts ([#7164](https://github.com/paritytech/parity/pull/7164))
-- Fixes typo in user config path ([#7159](https://github.com/paritytech/parity/pull/7159))
-- Pull in new dapp-{methods,visible} dapps ([#7150](https://github.com/paritytech/parity/pull/7150))
-- WASM test runner utility ([#7142](https://github.com/paritytech/parity/pull/7142))
-- WASM Remove blockhash error ([#7121](https://github.com/paritytech/parity/pull/7121))
-- ECIP-1039: Monetary policy rounding specification ([#7067](https://github.com/paritytech/parity/pull/7067))
-- Fixed `RotatingLogger` after migrating to new arrayvec ([#7129](https://github.com/paritytech/parity/pull/7129))
-- Push to correct shell branch ([#7135](https://github.com/paritytech/parity/pull/7135))
-- Update js-precompiled ref, trigger JS build ([#7132](https://github.com/paritytech/parity/pull/7132))
-- Fixed build && test ([#7128](https://github.com/paritytech/parity/pull/7128))
-- Update packages, pull in compiled-only repos ([#7125](https://github.com/paritytech/parity/pull/7125))
-- Cleanup top bar, add Home icon for navigation ([#7118](https://github.com/paritytech/parity/pull/7118))
-- WASM storage_read and storage_write don't return anything ([#7110](https://github.com/paritytech/parity/pull/7110))
-- Local dapp development URL ([#7100](https://github.com/paritytech/parity/pull/7100))
-- Remove unused and duplicated files in js-old ([#7082](https://github.com/paritytech/parity/pull/7082))
-- Optimize & group dapp requests ([#7083](https://github.com/paritytech/parity/pull/7083))
-- WASM parse payload from panics ([#7097](https://github.com/paritytech/parity/pull/7097))
-- Fix no-default-features. ([#7096](https://github.com/paritytech/parity/pull/7096))
-- Updated eth-secp256k1 ([#7090](https://github.com/paritytech/parity/pull/7090))
-- Improve Github Issue Template ([#7099](https://github.com/paritytech/parity/pull/7099))
-- Changes necessary to upload crates to crates.io ([#7020](https://github.com/paritytech/parity/pull/7020))
-- Reopened 6860 - iterate over both buffered and unbuffered database entries ([#7048](https://github.com/paritytech/parity/pull/7048))
-- SecretStore: servers set change session api ([#6925](https://github.com/paritytech/parity/pull/6925))
-- Disable uncles by default ([#7006](https://github.com/paritytech/parity/pull/7006))
-- Squashed ethcore-network changes which introduce error-chain ([#7040](https://github.com/paritytech/parity/pull/7040))
-- Removed redundant imports ([#7057](https://github.com/paritytech/parity/pull/7057))
-- CHANGELOG for 1.7.8, 1.7.9, 1.8.2, and 1.8.3 ([#7055](https://github.com/paritytech/parity/pull/7055))
-- Properly display Signer errors (Snackbar display popup) ([#7053](https://github.com/paritytech/parity/pull/7053))
-- Add the desktop file for the snap ([#7059](https://github.com/paritytech/parity/pull/7059))
-- Small performance gain in allocations ([#7054](https://github.com/paritytech/parity/pull/7054))
-- Bump JSON-RPC version ([#7051](https://github.com/paritytech/parity/pull/7051))
-- Fix nonce reservation ([#7025](https://github.com/paritytech/parity/pull/7025))
-- Fixed ethstore-cli output ([#7052](https://github.com/paritytech/parity/pull/7052))
-- Add mui for embed compilation ([#7049](https://github.com/paritytech/parity/pull/7049))
-- Update the snap metadata to keep working strictly confined ([#6993](https://github.com/paritytech/parity/pull/6993))
-- Remove unused js packages (dapp cleanups) ([#7046](https://github.com/paritytech/parity/pull/7046))
-- Gitlog location update  ([#7042](https://github.com/paritytech/parity/pull/7042))
-- Move git logging to .git-release.log ([#7041](https://github.com/paritytech/parity/pull/7041))
-- Start from rust root in release update step ([#7039](https://github.com/paritytech/parity/pull/7039))
-- Complete token merge, remove unused files ([#7037](https://github.com/paritytech/parity/pull/7037))
-- Add missing cargo-push.sh shell variable ([#7036](https://github.com/paritytech/parity/pull/7036))
-- Fix npm start script ([#7034](https://github.com/paritytech/parity/pull/7034))
--  Update executable flags on release scripts ([#7035](https://github.com/paritytech/parity/pull/7035))
-- Fix v1 precompiled ([#7033](https://github.com/paritytech/parity/pull/7033))
-- Push precompiled to correct branch (v1) ([#7031](https://github.com/paritytech/parity/pull/7031))
-- Update v1 Wallet Dapp ([#6935](https://github.com/paritytech/parity/pull/6935))
-- WASM tests update ([#7018](https://github.com/paritytech/parity/pull/7018))
-- Events in WASM runtime ([#6967](https://github.com/paritytech/parity/pull/6967))
-- Adds validate_node_url() and refactors boot node check ([#6907](https://github.com/paritytech/parity/pull/6907)) ([#6970](https://github.com/paritytech/parity/pull/6970))
-- Fix windows build (with ui rebuild) ([#7016](https://github.com/paritytech/parity/pull/7016))
-- Make CLI arguments parsing more backwards compatible ([#7004](https://github.com/paritytech/parity/pull/7004))
-- Fixes for parity-extension ([#6990](https://github.com/paritytech/parity/pull/6990))
-- Update ethcore-bigint ([#6992](https://github.com/paritytech/parity/pull/6992))
-- Get local transactions by hash in the light client ([#6874](https://github.com/paritytech/parity/pull/6874))
-- Warn when blacklisted account present in store ([#6875](https://github.com/paritytech/parity/pull/6875))
-- Skip nonce check for gas estimation ([#6997](https://github.com/paritytech/parity/pull/6997))
-- Creating pending block with all transactions from the queue ([#6942](https://github.com/paritytech/parity/pull/6942))
-- Removes `MAX_TX_TO_IMPORT` from `ChainSync` ([#6976](https://github.com/paritytech/parity/pull/6976))
-- SecretStore: versioned keys ([#6910](https://github.com/paritytech/parity/pull/6910))
-- Removes `FUTURE_QUEUE_LIMITS_SHIFT` ([#6962](https://github.com/paritytech/parity/pull/6962))
-- Set zero nonce and gas price for calls by default ([#6954](https://github.com/paritytech/parity/pull/6954))
-- Add hint in ActionParams for splitting code/data ([#6957](https://github.com/paritytech/parity/pull/6957))
-- Return decoded seal fields. ([#6932](https://github.com/paritytech/parity/pull/6932))
-- Fix serialization of status in transaction receipts. ([#6926](https://github.com/paritytech/parity/pull/6926))
-- Reserve nonces for signing ([#6834](https://github.com/paritytech/parity/pull/6834))
-- Windows fixes ([#6921](https://github.com/paritytech/parity/pull/6921))
-- Don't add {css,js}.map from dapps ([#6931](https://github.com/paritytech/parity/pull/6931))
-- Fix JSON tracing for sub-calls. ([#6842](https://github.com/paritytech/parity/pull/6842))
-- Shell updates (bonds, updated Dapps) ([#6897](https://github.com/paritytech/parity/pull/6897))
-- Fix [#6228](https://github.com/paritytech/parity/issues/6228): do not display eth price in cli for etc ([#6877](https://github.com/paritytech/parity/pull/6877))
-- Fix mining help ([#6885](https://github.com/paritytech/parity/pull/6885))
-- Refactor static context check in CREATE. ([#6886](https://github.com/paritytech/parity/pull/6886))
-- Cleanup some configuration options ([#6878](https://github.com/paritytech/parity/pull/6878))
-- Fix serialization of non-localized transactions ([#6868](https://github.com/paritytech/parity/pull/6868))
-- Updated ntp to version 0.3 ([#6854](https://github.com/paritytech/parity/pull/6854))
-- Align README with 1.8 and prepare CHANGELOG with 1.8.1 ([#6833](https://github.com/paritytech/parity/pull/6833))
-- Return error on timed unlock ([#6777](https://github.com/paritytech/parity/pull/6777))
-- Fix dapps tests in master ([#6866](https://github.com/paritytech/parity/pull/6866))
-- Ethstore optimizations ([#6827](https://github.com/paritytech/parity/pull/6827))
-- Add ECIP1017 to Morden config ([#6810](https://github.com/paritytech/parity/pull/6810))
-- Remove all package publishing to npm ([#6838](https://github.com/paritytech/parity/pull/6838))
-- Util crates use tempdir crate instead of devtools to create temp path ([#6807](https://github.com/paritytech/parity/pull/6807))
-- Trigger js build ([#6836](https://github.com/paritytech/parity/pull/6836))
-- Clean-up scripts. ([#6832](https://github.com/paritytech/parity/pull/6832))
-- Tweaked snapshot sync threshold ([#6829](https://github.com/paritytech/parity/pull/6829))
-- Integrate UI 2 ([#6819](https://github.com/paritytech/parity/pull/6819))
-- Refresh cached tokens based on registry info & random balances ([#6818](https://github.com/paritytech/parity/pull/6818))
-- Change keypath derivation logic ([#6815](https://github.com/paritytech/parity/pull/6815))
-- Refactors journaldb as a separate crate ([#6801](https://github.com/paritytech/parity/pull/6801))
-- Trigger UI build. ([#6817](https://github.com/paritytech/parity/pull/6817))
-- Bumped more crate versions ([#6809](https://github.com/paritytech/parity/pull/6809))
-- Fix RPC compilation warnings. ([#6808](https://github.com/paritytech/parity/pull/6808))
-- Remove internal ipc ([#6795](https://github.com/paritytech/parity/pull/6795))
-- Consistent KeyValueDB errors ([#6792](https://github.com/paritytech/parity/pull/6792))
-- Squash remaining warnings ([#6789](https://github.com/paritytech/parity/pull/6789))
-- Forward-port [#6754](https://github.com/paritytech/parity/issues/6754) [#6755](https://github.com/paritytech/parity/issues/6755) ([#6785](https://github.com/paritytech/parity/pull/6785))
-- Removed duplicated versions of clippy ([#6776](https://github.com/paritytech/parity/pull/6776))
-- Updated ethabi to version 4.0 ([#6742](https://github.com/paritytech/parity/pull/6742))
-- Updated rpc_cli and parity to rpassword 1.0 ([#6774](https://github.com/paritytech/parity/pull/6774))
-- Fix sign data typo ([#6750](https://github.com/paritytech/parity/pull/6750))
-- Refactoring/cache 6693 ([#6772](https://github.com/paritytech/parity/pull/6772))
-- Fix CHANGLOG for 1.8.0 ([#6751](https://github.com/paritytech/parity/pull/6751))
-- Removes redundant `mut` in service.rs.in ([#6775](https://github.com/paritytech/parity/pull/6775))
-- Remove redundant `mut` ([#6773](https://github.com/paritytech/parity/pull/6773))
-- Fixed kovan chain validation ([#6758](https://github.com/paritytech/parity/pull/6758))
-- Removed redundant evm deps ([#6757](https://github.com/paritytech/parity/pull/6757))
-- Fixed modexp gas calculation overflow ([#6741](https://github.com/paritytech/parity/pull/6741))
-- Use cc 1.0 instead of gcc ([#6733](https://github.com/paritytech/parity/pull/6733))
-- Version bump to 1.9.0 ([#6727](https://github.com/paritytech/parity/pull/6727))
-- Fix badges not showing up ([#6730](https://github.com/paritytech/parity/pull/6730))
+    - Defer kovan HF.
+  - Disable uncles by default ([#7006](https://github.com/paritytech/parity/pull/7006))
+  - Escape inifinite loop in estimte_gas ([#7075](https://github.com/paritytech/parity/pull/7075))
+  - ECIP-1039: Monetary policy rounding specification ([#7067](https://github.com/paritytech/parity/pull/7067))
+  - WASM Remove blockhash error ([#7121](https://github.com/paritytech/parity/pull/7121))
+    - Remove blockhash error
+    - Update tests.
+  - WASM storage_read and storage_write don't return anything ([#7110](https://github.com/paritytech/parity/pull/7110))
+  - WASM parse payload from panics ([#7097](https://github.com/paritytech/parity/pull/7097))
+  - Fix no-default-features. ([#7096](https://github.com/paritytech/parity/pull/7096))
+
+## Parity [v1.8.3](https://github.com/paritytech/parity/releases/tag/v1.8.3) (2017-11-15)
+
+Parity 1.8.3 contains several bug-fixes and removes the ability to deploy built-in multi-signature wallets.
+
+The full list of included changes:
+
+- Backports to beta ([#7043](https://github.com/paritytech/parity/pull/7043))
+  - pwasm-std update ([#7018](https://github.com/paritytech/parity/pull/7018))
+  - Version 1.8.3
+  - Make CLI arguments parsing more backwards compatible ([#7004](https://github.com/paritytech/parity/pull/7004))
+  - Skip nonce check for gas estimation ([#6997](https://github.com/paritytech/parity/pull/6997))
+  - Events in WASM runtime ([#6967](https://github.com/paritytech/parity/pull/6967))
+  - Return decoded seal fields. ([#6932](https://github.com/paritytech/parity/pull/6932))
+  - Fix serialization of status in transaction receipts. ([#6926](https://github.com/paritytech/parity/pull/6926))
+  - Windows fixes ([#6921](https://github.com/paritytech/parity/pull/6921))
+- Disallow built-in multi-sig deploy (only watch) ([#7014](https://github.com/paritytech/parity/pull/7014))
+- Add hint in ActionParams for splitting code/data ([#6968](https://github.com/paritytech/parity/pull/6968))
+  - Action params and embedded params handling
+  - Fix name-spaces
+
+## Parity [v1.8.2](https://github.com/paritytech/parity/releases/tag/v1.8.2) (2017-10-26)
+
+Parity 1.8.2 fixes an important potential consensus issue and a few additional minor issues:
+
+- `blockNumber` transaction field is now returned correctly in RPC calls.
+- Possible crash when `--force-sealing` option is used.
+
+The full list of included changes:
+
+- Beta Backports ([#6891](https://github.com/paritytech/parity/pull/6891))
+  - Bump to v1.8.2
+  - Refactor static context check in CREATE. ([#6886](https://github.com/paritytech/parity/pull/6886))
+    - Refactor static context check in CREATE.
+    - Fix wasm.
+  - Fix serialization of non-localized transactions ([#6868](https://github.com/paritytech/parity/pull/6868))
+    - Fix serialization of non-localized transactions.
+    - Return proper SignedTransactions representation.
+  - Allow force sealing and reseal=0 for non-dev chains. ([#6878](https://github.com/paritytech/parity/pull/6878))
+
+## Parity [v1.8.1](https://github.com/paritytech/parity/releases/tag/v1.8.1) (2017-10-20)
+
+Parity 1.8.1 fixes several bugs with token balances, tweaks snapshot-sync, improves the performance of nodes with huge amounts of accounts and changes the Trezor account derivation path.
+
+**Important Note**: The **Trezor** account derivation path was changed in this release ([#6815](https://github.com/paritytech/parity/pull/6815)) to always use the first account (`m/44'/60'/0'/0/0` instead of `m/44'/60'/0'/0`). This way we enable compatibility with other Ethereum wallets supporting Trezor hardware-wallets. However, **action is required** before upgrading, if you have funds on your Parity Trezor wallet. If you already upgraded to 1.8.1, please downgrade to 1.8.0 first to recover the funds with the following steps:
+
+1. Make sure you have 1.8.0-beta and your Trezor plugged in.
+2. Create a new standard Parity account. Make sure you have backups of the recovery phrase and don't forget the password.
+3. Move your funds from the Trezor hardware-wallet account to the freshly generated Parity account.
+4. Upgrade to 1.8.1-beta and plug in your Trezor.
+5. Move your funds from your Parity account to the new Trezor account.
+6. Keep using Parity as normal.
+
+If you don't want to downgrade or move your funds off your Trezor-device, you can also use the official Trezor application or other wallets allowing to select the derivation path to access the funds.
+
+The full list of included changes:
+
+- Add ECIP1017 to Morden config ([#6845](https://github.com/paritytech/parity/pull/6845))
+- Ethstore optimizations ([#6844](https://github.com/paritytech/parity/pull/6844))
+- Bumb to v1.8.1 ([#6843](https://github.com/paritytech/parity/pull/6843))
+- Backport ([#6837](https://github.com/paritytech/parity/pull/6837))
+  - Tweaked snapshot sync threshold ([#6829](https://github.com/paritytech/parity/pull/6829))
+  - Change keypath derivation logic ([#6815](https://github.com/paritytech/parity/pull/6815))
+- Refresh cached tokens based on registry info & random balances ([#6824](https://github.com/paritytech/parity/pull/6824))
+  - Refresh cached tokens based on registry info & random balances ([#6818](https://github.com/paritytech/parity/pull/6818))
+  - Don't display errored token images
+
+## Parity [v1.8.0](https://github.com/paritytech/parity/releases/tag/v1.8.0) (2017-10-15)
+
+We are happy to announce our newest Parity 1.8 release. Among others, it enables the following features:
+
+- Full Whisper v6 integration
+- Trezor hardware-wallet support
+- WASM contract support
+- PICOPS KYC-certified accounts and vouching for community-dapps
+- Light client compatibility for Proof-of-Authority networks
+- Transaction permissioning and permissioned p2p-connections
+- Full Byzantium-fork compatibility
+- Full Musicoin MCIP-3 UBI-fork compatibility
+
+Further, users upgrading from 1.7 should acknowledge the following changes:
+
+- The chain-engine was further abstracted and chain-specs need to be upgraded. [#6134](https://github.com/paritytech/parity/pull/6134) [#6591](https://github.com/paritytech/parity/pull/6591)
+- `network_id` was renamed to `chain_id` where applicable. [#6345](https://github.com/paritytech/parity/pull/6345)
+- `trace_filter` RPC method now comes with pagination. [#6312](https://github.com/paritytech/parity/pull/6312)
+- Added tracing of rewards on closing blocks. [#6194](https://github.com/paritytech/parity/pull/6194)
+
+The full list of included changes:
+
+- Updated ethabi to fix auto-update ([#6771](https://github.com/paritytech/parity/pull/6771))
+- Fixed kovan chain validation ([#6760](https://github.com/paritytech/parity/pull/6760))
+  - Fixed kovan chain validation
+  - Fork detection
+  - Fixed typo
+- Bumped fork block number for auto-update ([#6755](https://github.com/paritytech/parity/pull/6755))
+- CLI: Reject invalid argument values rather than ignore them ([#6747](https://github.com/paritytech/parity/pull/6747))
+- Fixed modexp gas calculation overflow ([#6745](https://github.com/paritytech/parity/pull/6745))
+- Backport beta - Fixes Badges ([#6732](https://github.com/paritytech/parity/pull/6732))
+  - Fix badges not showing up ([#6730](https://github.com/paritytech/parity/pull/6730))
+  - Always fetch meta data first [badges]
+- Bump to v1.8.0 in beta
+- Fix tokens and badges ([#6725](https://github.com/paritytech/parity/pull/6725))
+  - Update new token fetching
+  - Working Certifications Monitoring
+  - Update on Certification / Revoke
+  - Fix none-fetched tokens value display
+  - Fix tests
+- Check vouch status on appId in addition to contentHash ([#6719](https://github.com/paritytech/parity/pull/6719))
+  - Check vouch status on appId in addition to contentHash
+  - Simplify var expansion
+- Prevent going offline when restoring or taking a snapshot [#6694](https://github.com/paritytech/parity/pull/6694)
+- Graceful exit when invalid CLI flags are passed (#6485) [#6711](https://github.com/paritytech/parity/pull/6711)
+- Fixed RETURNDATA out of bounds check [#6718](https://github.com/paritytech/parity/pull/6718)
+- Display vouched overlay on dapps [#6710](https://github.com/paritytech/parity/pull/6710)
+- Fix gas estimation if `from` is not provided. [#6714](https://github.com/paritytech/parity/pull/6714)
+- Emulate signer pubsub on public node [#6708](https://github.com/paritytech/parity/pull/6708)
+- Removes  dependency on rustc_serialize (#5988) [#6705](https://github.com/paritytech/parity/pull/6705)
+- Fixed potential modexp exp len overflow [#6686](https://github.com/paritytech/parity/pull/6686)
+- Fix asciiToHex for characters < 0x10 [#6702](https://github.com/paritytech/parity/pull/6702)
+- Fix address input [#6701](https://github.com/paritytech/parity/pull/6701)
+- Allow signer signing display of markdown [#6707](https://github.com/paritytech/parity/pull/6707)
+- Fixed build warnings [#6664](https://github.com/paritytech/parity/pull/6664)
+- Fix warp sync blockers detection [#6691](https://github.com/paritytech/parity/pull/6691)
+- Difficulty tests [#6687](https://github.com/paritytech/parity/pull/6687)
+- Separate migrations from util [#6690](https://github.com/paritytech/parity/pull/6690)
+- Changelog for 1.7.3 [#6678](https://github.com/paritytech/parity/pull/6678)
+- WASM gas schedule [#6638](https://github.com/paritytech/parity/pull/6638)
+- Fix wallet view [#6597](https://github.com/paritytech/parity/pull/6597)
+- Byzantium fork block number [#6660](https://github.com/paritytech/parity/pull/6660)
+- Fixed RETURNDATA size for built-ins [#6652](https://github.com/paritytech/parity/pull/6652)
+- Light Client: fetch transactions/receipts by transaction hash [#6641](https://github.com/paritytech/parity/pull/6641)
+- Add Musicoin and MCIP-3 UBI hardfork.  [#6621](https://github.com/paritytech/parity/pull/6621)
+- fix 1.8 backcompat: revert to manual encoding/decoding of transition proofs [#6665](https://github.com/paritytech/parity/pull/6665)
+- Tweaked block download timeouts (#6595) [#6655](https://github.com/paritytech/parity/pull/6655)
+- Renamed RPC receipt statusCode field to status [#6650](https://github.com/paritytech/parity/pull/6650)
+- SecretStore: session level timeout [#6631](https://github.com/paritytech/parity/pull/6631)
+- SecretStore: ShareRemove of 'isolated' nodes [#6630](https://github.com/paritytech/parity/pull/6630)
+- SecretStore: exclusive sessions [#6624](https://github.com/paritytech/parity/pull/6624)
+- Fixed network protocol version negotiation [#6649](https://github.com/paritytech/parity/pull/6649)
+- Updated systemd files for linux (Resolves #6592) [#6598](https://github.com/paritytech/parity/pull/6598)
+- move additional_params to machine, fixes registry on non-ethash chains [#6646](https://github.com/paritytech/parity/pull/6646)
+- Fix Token Transfer in transaction list [#6589](https://github.com/paritytech/parity/pull/6589)
+- Update jsonrpc dependencies and rewrite dapps to futures. [#6522](https://github.com/paritytech/parity/pull/6522)
+- Balance queries implemented in WASM runtime [#6639](https://github.com/paritytech/parity/pull/6639)
+- Don't expose port 80 for parity anymore [#6633](https://github.com/paritytech/parity/pull/6633)
+- WASM Runtime refactoring [#6596](https://github.com/paritytech/parity/pull/6596)
+- Fix compilation [#6625](https://github.com/paritytech/parity/pull/6625)
+- Downgrade futures to suppress warnings. [#6620](https://github.com/paritytech/parity/pull/6620)
+- Add pagination for trace_filter rpc method [#6312](https://github.com/paritytech/parity/pull/6312)
+- Disallow pasting recovery phrases on first run [#6602](https://github.com/paritytech/parity/pull/6602)
+- fix typo: Unkown => Unknown [#6559](https://github.com/paritytech/parity/pull/6559)
+- SecretStore: administrative sessions prototypes [#6605](https://github.com/paritytech/parity/pull/6605)
+- fix parity.io link 404 [#6617](https://github.com/paritytech/parity/pull/6617)
+- SecretStore: add node to existing session poc + discussion [#6480](https://github.com/paritytech/parity/pull/6480)
+- Generalize engine trait [#6591](https://github.com/paritytech/parity/pull/6591)
+- Add RPC eth_chainId for querying the current blockchain chain ID [#6329](https://github.com/paritytech/parity/pull/6329)
+- Debounce sync status. [#6572](https://github.com/paritytech/parity/pull/6572)
+- [Public Node] Disable tx scheduling and hardware wallets [#6588](https://github.com/paritytech/parity/pull/6588)
+- Use memmap for dag cache [#6193](https://github.com/paritytech/parity/pull/6193)
+- Rename Requests to Batch [#6582](https://github.com/paritytech/parity/pull/6582)
+- Use host as ws/dapps url if present. [#6566](https://github.com/paritytech/parity/pull/6566)
+- Sync progress and error handling fixes [#6560](https://github.com/paritytech/parity/pull/6560)
+- Fixed receipt serialization and RPC [#6555](https://github.com/paritytech/parity/pull/6555)
+- Fix number of confirmations for transaction [#6552](https://github.com/paritytech/parity/pull/6552)
+- Fix #6540 [#6556](https://github.com/paritytech/parity/pull/6556)
+- Fix failing hardware tests [#6553](https://github.com/paritytech/parity/pull/6553)
+- Required validators >= num owners in Wallet Creation [#6551](https://github.com/paritytech/parity/pull/6551)
+- Random cleanups / improvements to a state [#6472](https://github.com/paritytech/parity/pull/6472)
+- Changelog for 1.7.2 [#6363](https://github.com/paritytech/parity/pull/6363)
+- Ropsten fork [#6533](https://github.com/paritytech/parity/pull/6533)
+- Byzantium updates [#5855](https://github.com/paritytech/parity/pull/5855)
+- Fix extension detection [#6452](https://github.com/paritytech/parity/pull/6452)
+- Downgrade futures to supress warnings [#6521](https://github.com/paritytech/parity/pull/6521)
+- separate trie from util and make its dependencies into libs [#6478](https://github.com/paritytech/parity/pull/6478)
+- WASM sha3 test [#6512](https://github.com/paritytech/parity/pull/6512)
+- Fix broken JavaScript tests [#6498](https://github.com/paritytech/parity/pull/6498)
+- SecretStore: use random key to encrypt channel + session-level nonce [#6470](https://github.com/paritytech/parity/pull/6470)
+- Trezor Support [#6403](https://github.com/paritytech/parity/pull/6403)
+- Fix compiler warning [#6491](https://github.com/paritytech/parity/pull/6491)
+- Fix typo [#6505](https://github.com/paritytech/parity/pull/6505)
+- WASM: added math overflow test [#6474](https://github.com/paritytech/parity/pull/6474)
+- Fix slow balances [#6471](https://github.com/paritytech/parity/pull/6471)
+- WASM runtime update [#6467](https://github.com/paritytech/parity/pull/6467)
+- Compatibility with whisper v6 [#6179](https://github.com/paritytech/parity/pull/6179)
+- light-poa round 2: allow optional casting of engine client to full client [#6468](https://github.com/paritytech/parity/pull/6468)
+- Moved attributes under docs [#6475](https://github.com/paritytech/parity/pull/6475)
+- cleanup util dependencies [#6464](https://github.com/paritytech/parity/pull/6464)
+- removed redundant earlymergedb trace guards [#6463](https://github.com/paritytech/parity/pull/6463)
+- UtilError utilizes error_chain! [#6461](https://github.com/paritytech/parity/pull/6461)
+- fixed master [#6465](https://github.com/paritytech/parity/pull/6465)
+- Refactor and port CLI from Docopt to Clap (#2066) [#6356](https://github.com/paritytech/parity/pull/6356)
+- Add language selector in production [#6317](https://github.com/paritytech/parity/pull/6317)
+- eth_call returns output of contract creations [#6420](https://github.com/paritytech/parity/pull/6420)
+- Refactor: Don't reexport bigint from util [#6459](https://github.com/paritytech/parity/pull/6459)
+- Transaction permissioning [#6441](https://github.com/paritytech/parity/pull/6441)
+- Added missing SecretStore tests - signing session [#6411](https://github.com/paritytech/parity/pull/6411)
+- Light-client sync for contract-based PoA [#6370](https://github.com/paritytech/parity/pull/6370)
+- triehash is separated from util [#6428](https://github.com/paritytech/parity/pull/6428)
+- remove re-export of parking_lot in util [#6435](https://github.com/paritytech/parity/pull/6435)
+- fix modexp bug: return 0 if base is zero [#6424](https://github.com/paritytech/parity/pull/6424)
+- separate semantic_version from util [#6438](https://github.com/paritytech/parity/pull/6438)
+- move timer.rs to ethcore [#6437](https://github.com/paritytech/parity/pull/6437)
+- remove re-export of ansi_term in util [#6433](https://github.com/paritytech/parity/pull/6433)
+- Pub sub blocks [#6139](https://github.com/paritytech/parity/pull/6139)
+- replace trait Hashable with fn keccak [#6423](https://github.com/paritytech/parity/pull/6423)
+- add more hash backward compatibility test for bloom [#6425](https://github.com/paritytech/parity/pull/6425)
+- remove the redundant hasher in Bloom [#6404](https://github.com/paritytech/parity/pull/6404)
+- Remove re-export of HeapSizeOf in util (part of #6418) [#6419](https://github.com/paritytech/parity/pull/6419)
+- Rewards on closing blocks [#6194](https://github.com/paritytech/parity/pull/6194)
+- ensure balances of constructor accounts are kept [#6413](https://github.com/paritytech/parity/pull/6413)
+- removed recursion from triedbmut::lookup [#6394](https://github.com/paritytech/parity/pull/6394)
+- do not activate genesis epoch in immediate transition validator contract [#6349](https://github.com/paritytech/parity/pull/6349)
+- Use git for the snap version [#6271](https://github.com/paritytech/parity/pull/6271)
+- Permissioned p2p connections [#6359](https://github.com/paritytech/parity/pull/6359)
+- Don't accept transactions above block gas limit. [#6408](https://github.com/paritytech/parity/pull/6408)
+- Fix memory tracing. [#6399](https://github.com/paritytech/parity/pull/6399)
+- earlydb optimizations [#6393](https://github.com/paritytech/parity/pull/6393)
+- Optimized PlainHasher hashing. Trie insertions are >15 faster [#6321](https://github.com/paritytech/parity/pull/6321)
+- Trie optimizations [#6389](https://github.com/paritytech/parity/pull/6389)
+- small optimizations for triehash [#6392](https://github.com/paritytech/parity/pull/6392)
+- Bring back IPFS tests. [#6398](https://github.com/paritytech/parity/pull/6398)
+- Running state test using parity-evm [#6355](https://github.com/paritytech/parity/pull/6355)
+- Wasm math tests extended [#6354](https://github.com/paritytech/parity/pull/6354)
+- Expose health status over RPC [#6274](https://github.com/paritytech/parity/pull/6274)
+- fix bloom bitvecjournal storage allocation [#6390](https://github.com/paritytech/parity/pull/6390)
+- fixed pending block panic [#6391](https://github.com/paritytech/parity/pull/6391)
+- Infoline less opaque for UI/visibility [#6364](https://github.com/paritytech/parity/pull/6364)
+- Fix eth_call. [#6365](https://github.com/paritytech/parity/pull/6365)
+- updated bigint [#6341](https://github.com/paritytech/parity/pull/6341)
+- Optimize trie iter by avoiding redundant copying [#6347](https://github.com/paritytech/parity/pull/6347)
+- Only keep a single rocksdb debug log file [#6346](https://github.com/paritytech/parity/pull/6346)
+- Tweaked snapshot params [#6344](https://github.com/paritytech/parity/pull/6344)
+- Rename network_id to chain_id where applicable. [#6345](https://github.com/paritytech/parity/pull/6345)
+- Itertools are no longer reexported from util, optimized triedb iter [#6322](https://github.com/paritytech/parity/pull/6322)
+- Better check the created accounts before showing Startup Wizard [#6331](https://github.com/paritytech/parity/pull/6331)
+- Better error messages for invalid types in RPC [#6311](https://github.com/paritytech/parity/pull/6311)
+- fix panic in parity-evm json tracer [#6338](https://github.com/paritytech/parity/pull/6338)
+- WASM math test [#6305](https://github.com/paritytech/parity/pull/6305)
+- rlp_derive [#6125](https://github.com/paritytech/parity/pull/6125)
+- Fix --chain parsing in parity-evm. [#6314](https://github.com/paritytech/parity/pull/6314)
+- Unexpose RPC methods on :8180 [#6295](https://github.com/paritytech/parity/pull/6295)
+- Ignore errors from dappsUrl when starting UI. [#6296](https://github.com/paritytech/parity/pull/6296)
+- updated bigint with optimized mul and from_big_indian [#6323](https://github.com/paritytech/parity/pull/6323)
+- SecretStore: bunch of fixes and improvements [#6168](https://github.com/paritytech/parity/pull/6168)
+- Master requires rust 1.19 [#6308](https://github.com/paritytech/parity/pull/6308)
+- Add more descriptive error when signing/decrypting using hw wallet. [#6302](https://github.com/paritytech/parity/pull/6302)
+- Increase default gas limit for eth_call. [#6299](https://github.com/paritytech/parity/pull/6299)
+- rust-toolchain file on master [#6266](https://github.com/paritytech/parity/pull/6266)
+- Migrate wasm-tests to updated runtime [#6278](https://github.com/paritytech/parity/pull/6278)
+- Extension fixes [#6284](https://github.com/paritytech/parity/pull/6284)
+- Fix a hash displayed in tooltip when signing arbitrary data [#6283](https://github.com/paritytech/parity/pull/6283)
+- Time should not contribue to overall status. [#6276](https://github.com/paritytech/parity/pull/6276)
+- Add --to and --gas-price to evmbin [#6277](https://github.com/paritytech/parity/pull/6277)
+- Fix dapps CSP when UI is exposed externally [#6178](https://github.com/paritytech/parity/pull/6178)
+- Add warning to web browser and fix links. [#6232](https://github.com/paritytech/parity/pull/6232)
+- Update Settings/Proxy view to match entries in proxy.pac [#4771](https://github.com/paritytech/parity/pull/4771)
+- Dapp refresh [#5752](https://github.com/paritytech/parity/pull/5752)
+- Add support for ConsenSys multisig wallet [#6153](https://github.com/paritytech/parity/pull/6153)
+- updated jsonrpc [#6264](https://github.com/paritytech/parity/pull/6264)
+- SecretStore: encrypt messages using private key from key store [#6146](https://github.com/paritytech/parity/pull/6146)
+- Wasm storage read test [#6255](https://github.com/paritytech/parity/pull/6255)
+- propagate stratum submit share error upstream [#6260](https://github.com/paritytech/parity/pull/6260)
+- Using multiple NTP servers [#6173](https://github.com/paritytech/parity/pull/6173)
+- Add GitHub issue templates. [#6259](https://github.com/paritytech/parity/pull/6259)
+- format instant change proofs correctly [#6241](https://github.com/paritytech/parity/pull/6241)
+- price-info does not depend on util [#6231](https://github.com/paritytech/parity/pull/6231)
+- native-contracts crate does not depend on util any more [#6233](https://github.com/paritytech/parity/pull/6233)
+- Bump master to 1.8.0 [#6256](https://github.com/paritytech/parity/pull/6256)
+- SecretStore: do not cache ACL contract + on-chain key servers configuration [#6107](https://github.com/paritytech/parity/pull/6107)
+- Fix the README badges [#6229](https://github.com/paritytech/parity/pull/6229)
+- updated tiny-keccak to 1.3 [#6248](https://github.com/paritytech/parity/pull/6248)
+- Small grammatical error [#6244](https://github.com/paritytech/parity/pull/6244)
+- Multi-call RPC [#6195](https://github.com/paritytech/parity/pull/6195)
+- InstantSeal fix [#6223](https://github.com/paritytech/parity/pull/6223)
+- Untrusted RLP length overflow check  [#6227](https://github.com/paritytech/parity/pull/6227)
+- Chainspec validation [#6197](https://github.com/paritytech/parity/pull/6197)
+- Fix cache path when using --base-path [#6212](https://github.com/paritytech/parity/pull/6212)
+- removed std reexports from util && fixed broken tests [#6187](https://github.com/paritytech/parity/pull/6187)
+- WASM MVP continued [#6132](https://github.com/paritytech/parity/pull/6132)
+- Decouple virtual machines [#6184](https://github.com/paritytech/parity/pull/6184)
+- Realloc test added [#6177](https://github.com/paritytech/parity/pull/6177)
+- Re-enable wallets, fixed forgetting accounts [#6196](https://github.com/paritytech/parity/pull/6196)
+- Move more params to the common section. [#6134](https://github.com/paritytech/parity/pull/6134)
+- Whisper js [#6161](https://github.com/paritytech/parity/pull/6161)
+- typo in uninstaller [#6185](https://github.com/paritytech/parity/pull/6185)
+- fix #6052. honor --no-color for signer command [#6100](https://github.com/paritytech/parity/pull/6100)
+- Refactor --allow-ips to handle custom ip-ranges [#6144](https://github.com/paritytech/parity/pull/6144)
+- Update Changelog for 1.6.10 and 1.7.0 [#6183](https://github.com/paritytech/parity/pull/6183)
+- Fix unsoundness in ethash's unsafe code [#6140](https://github.com/paritytech/parity/pull/6140)
+
 
 ### Previous releases
 
-- [CHANGELOG-1.8](docs/CHANGELOG-1.8.md) (_stable_)
-- [CHANGELOG-1.7](docs/CHANGELOG-1.7.md) (EOL: 2018-01-25)
-- [CHANGELOG-1.6](docs/CHANGELOG-1.6.md) (EOL: 2017-10-15)
-- [CHANGELOG-1.5](docs/CHANGELOG-1.5.md) (EOL: 2017-07-28)
-- [CHANGELOG-1.4](docs/CHANGELOG-1.4.md) (EOL: 2017-03-13)
-- [CHANGELOG-1.3](docs/CHANGELOG-1.3.md) (EOL: 2017-01-19)
-- [CHANGELOG-1.2](docs/CHANGELOG-1.2.md) (EOL: 2016-11-07)
-- [CHANGELOG-1.1](docs/CHANGELOG-1.1.md) (EOL: 2016-08-12)
-- [CHANGELOG-1.0](docs/CHANGELOG-1.0.md) (EOL: 2016-06-24)
-- [CHANGELOG-0.9](docs/CHANGELOG-0.9.md) (EOL: 2016-05-02)
+- [CHANGELOG-1.7](docs/CHANGELOG-1.7.md)
+- [CHANGELOG-1.6](docs/CHANGELOG-1.6.md)
+- [CHANGELOG-1.5](docs/CHANGELOG-1.5.md)
+- [CHANGELOG-1.4](docs/CHANGELOG-1.4.md)
+- [CHANGELOG-1.3](docs/CHANGELOG-1.3.md)
+- [CHANGELOG-1.2](docs/CHANGELOG-1.2.md)
+- [CHANGELOG-1.1](docs/CHANGELOG-1.1.md)
+- [CHANGELOG-1.0](docs/CHANGELOG-1.0.md)
+- [CHANGELOG-0.9](docs/CHANGELOG-0.9.md)

Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 description = "Parity Ethereum client"
 name = "parity"
-# NOTE Make sure to update util/version/Cargo.toml as well
-version = "1.10.0"
+version = "1.9.7"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
+build = "build.rs"
 
 [dependencies]
 log = "0.3"
@@ -19,33 +19,31 @@ num_cpus = "1.2"
 number_prefix = "0.2"
 rpassword = "1.0"
 semver = "0.6"
-ansi_term = "0.10"
-parking_lot = "0.5"
+ansi_term = "0.9"
+parking_lot = "0.4"
 regex = "0.2"
 isatty = "0.1"
 toml = "0.4"
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
-app_dirs = "1.1.1"
 futures = "0.1"
 futures-cpupool = "0.1"
 fdlimit = "0.1"
 ws2_32-sys = "0.2"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.10" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
 ethsync = { path = "sync" }
 ethcore = { path = "ethcore" }
+ethcore-util = { path = "util" }
 ethcore-bytes = { path = "util/bytes" }
+ethcore-bigint = { path = "util/bigint" }
 ethcore-io = { path = "util/io" }
+ethcore-devtools = { path = "devtools" }
 ethcore-light = { path = "ethcore/light" }
 ethcore-logger = { path = "logger" }
-ethcore-migrations = { path = "ethcore/migrations" }
-ethcore-miner = { path = "miner" }
-ethcore-network = { path = "util/network" }
 ethcore-stratum = { path = "stratum" }
-ethcore-transaction = { path = "ethcore/transaction" }
-ethereum-types = "0.2"
+ethcore-network = { path = "util/network" }
 node-filter = { path = "ethcore/node_filter" }
 ethkey = { path = "ethkey" }
 node-health = { path = "dapps/node-health" }
@@ -62,7 +60,7 @@ parity-version = { path = "util/version" }
 parity-whisper = { path = "whisper" }
 path = { path = "util/path" }
 dir = { path = "util/dir" }
-panic_hook = { path = "util/panic_hook" }
+panic_hook = { path = "panic_hook" }
 keccak-hash = { path = "util/hash" }
 migration = { path = "util/migration" }
 kvdb = { path = "util/kvdb" }
@@ -78,7 +76,6 @@ rustc_version = "0.2"
 [dev-dependencies]
 pretty_assertions = "0.1"
 ipnetwork = "0.12.6"
-tempdir = "0.3"
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.2"
@@ -124,11 +121,9 @@ members = [
 	"chainspec",
 	"dapps/js-glue",
 	"ethcore/wasm/run",
-	"ethcore/types",
 	"ethkey/cli",
 	"ethstore/cli",
 	"evmbin",
-	"miner",
 	"transaction-pool",
 	"whisper",
 ]

README.md

@@ -1,12 +1,10 @@
-# Parity - fast, light, and robust Ethereum client
-
-## [» Download the latest release «](https://github.com/paritytech/parity/releases/latest)
+# [Parity](https://parity.io/) - fast, light, and robust Ethereum client 
 
 [![build status](https://gitlab.parity.io/parity/parity/badges/master/build.svg)](https://gitlab.parity.io/parity/parity/commits/master)
-[![codecov](https://codecov.io/gh/paritytech/parity/branch/master/graph/badge.svg)](https://codecov.io/gh/paritytech/parity)
 [![Snap Status](https://build.snapcraft.io/badge/paritytech/parity.svg)](https://build.snapcraft.io/user/paritytech/parity)
 [![GPLv3](https://img.shields.io/badge/license-GPL%20v3-green.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)
 
+- [Download the latest release here.](https://github.com/paritytech/parity/releases/latest)
 
 ### Join the chat!
 
@@ -19,8 +17,6 @@ Get in touch with us on Gitter:
 Or join our community on Matrix:
 [![Riot: +Parity](https://img.shields.io/badge/riot-%2Bparity%3Amatrix.parity.io-orange.svg)](https://riot.im/app/#/group/+parity:matrix.parity.io)
 
-Official website: https://parity.io
-
 Be sure to check out [our wiki](https://paritytech.github.io/wiki/) and the [internal documentation](https://paritytech.github.io/parity/ethcore/index.html) for more information.
 
 ----
@@ -42,13 +38,13 @@ If you run into an issue while using Parity, feel free to file one in this repos
 
 **For security-critical issues**, please refer to the security policy outlined in [SECURITY.MD](SECURITY.md).
 
-Parity's current release is 1.9. You can download it at https://github.com/paritytech/parity/releases or follow the instructions below to build from source.
+Parity's current release is 1.8. You can download it at https://github.com/paritytech/parity/releases or follow the instructions below to build from source.
 
 ----
 
 ## Build dependencies
 
-**Parity requires Rust version 1.23.0 to build**
+**Parity requires Rust version 1.21.0 to build**
 
 We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have rustup, you can install it like this:
 
@@ -81,22 +77,12 @@ Once you have rustup, install Parity or download and build from source
 
 In any of the [supported Linux distros](https://snapcraft.io/docs/core/install):
 
-```bash
-sudo snap install parity
-```
-
-Or, if you want to contribute testing the upcoming release:
-
-```bash
-sudo snap install parity --beta
-```
-
-And to test the latest code landed into the master branch:
-
 ```bash
 sudo snap install parity --edge
 ```
 
+(Note that this is an experimental and unstable release, at the moment)
+
 ----
 
 ## Build from source
@@ -130,19 +116,7 @@ Cleaning the repository will most likely solve the issue, try:
 $ cargo clean
 ```
 
-This will always compile the latest nightly builds. If you want to build stable or beta, do a
-
-```bash
-$ git checkout stable
-```
-
-or
-
-```bash
-$ git checkout beta
-```
-
-first.
+This will always compile the latest nightly builds. If you want to build stable or beta, do a `git checkout stable` or `git checkout beta` first.
 
 ----
 
@@ -152,11 +126,7 @@ first.
 bash <(curl https://get.parity.io -Lk)
 ```
 
-The one-line installer always defaults to the latest beta release. To install a stable release, run:
-
-```bash
-bash <(curl https://get.parity.io -Lk) -r stable
-```
+The one-line installer always defaults to the latest beta release.
 
 ## Start Parity
 
@@ -176,4 +146,4 @@ To start Parity as a regular user using systemd init:
 
 1. Copy `./scripts/parity.service` to your
 systemd user directory (usually `~/.config/systemd/user`).
-2. To configure Parity, write a `/etc/parity/config.toml` config file, see [Configuring Parity](https://paritytech.github.io/wiki/Configuring-Parity) for details.
+2. To configure Parity, write a `/etc/parity/config.toml` config file, see [Configuring Parity](https://github.com/paritytech/parity/wiki/Configuring-Parity) for details.

SECURITY.md

@@ -1,49 +1,13 @@
 # Security Policy
 
-Parity Technologies is committed to resolving security vulnerabilities in our software quickly and carefully. We take the necessary steps to minimize risk, provide timely information, and deliver vulnerability fixes and mitigations required to address security issues.
+For security inquiries or vulnerability reports, please send a message to security@parity.io.
 
-## Reporting a Vulnerability
+Please use a descriptive subject line so we can identify the report as such.
 
-Security vulnerabilities in Parity software should be reported by email to security@parity.io. If you think your report might be eligible for the Parity Bug Bounty Program, your email should be send to bugbounty@parity.io. 
+If you send a report, we will respond to the e-mail within 48 hours, and provide regular updates from that time onwards.
 
-Your report should include the following:
-
-- your name
-- description of the vulnerability
-- attack scenario (if any)
-- components
-- reproduction
-- other details
-
-Try to include as much information in your report as you can, including a description of the vulnerability, its potential impact, and steps for reproducing it. Be sure to use a descriptive subject line.
-
-You'll receive a response to your email within two business days indicating the next steps in handling your report. We encourage finders to use encrypted communication channels to protect the confidentiality of vulnerability reports. You can encrypt your report using our public key. This key is [on MIT's key server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73) server and reproduced below.
-
-After the initial reply to your report, our team will endeavor to keep you informed of the progress being made towards a fix. These updates will be sent at least every five business days. 
-
-Thank you for taking the time to responsibly disclose any vulnerabilities you find.
-
-## Responsible Investigation and Reporting
-
-Responsible investigation and reporting includes, but isn't limited to, the following:
-
-- Don't violate the privacy of other users, destroy data, etc.
-- Don’t defraud or harm Parity Technologies Ltd or its users during your research; you should make a good faith effort to not interrupt or degrade our services.
-- Don't target our physical security measures, or attempt to use social engineering, spam, distributed denial of service (DDOS) attacks, etc.
-- Initially report the bug only to us and not to anyone else.
-- Give us a reasonable amount of time to fix the bug before disclosing it to anyone else, and give us adequate written warning before disclosing it to anyone else.
-- In general, please investigate and report bugs in a way that makes a reasonable, good faith effort not to be disruptive or harmful to us or our users. Otherwise your actions might be interpreted as an attack rather than an effort to be helpful.
-
-## Bug Bounty Program
-
-Our Bug Bounty Program allows us to recognise and reward members of the Parity community for helping us find and address significant bugs, in accordance with the terms of the Parity Bug Bounty Program. A detailed description on eligibility, rewards, legal information and terms & conditions for contributors can be found on [our website](https://paritytech.io/bug-bounty.html). 
-
-
-
-
-
-
-## Plaintext PGP Key
+If you would like to encrypt your report, please use the PGP key provided below.
+It is also reproduced [on MIT's key server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73)
 
 ```
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -78,3 +42,13 @@ ETBD1Q==
 =K9Qw
 -----END PGP PUBLIC KEY BLOCK-----
 ```
+
+Important Legal Information:
+
+Your submission might be eligible for a bug bounty. The bug bounty program is an experimental and discretionary rewards program for the Parity community to reward those who are helping to improve the Parity software. Rewards are at the sole discretion of Parity Technologies Ltd.. 
+
+We are not able to issue rewards to individuals who are on sanctions lists or who are in countries on sanctions lists (e.g. North Korea, Iran, etc). 
+
+You are responsible for all taxes. All rewards are subject to applicable law. 
+
+Finally, your testing must not violate any law or compromise any data that is not yours.

build.rs

@@ -0,0 +1,35 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+extern crate rustc_version;
+
+const MIN_RUSTC_VERSION: &'static str = "1.15.1";
+
+fn main() {
+	let is = rustc_version::version().unwrap();
+	let required = MIN_RUSTC_VERSION.parse().unwrap();
+	assert!(is >= required, format!("
+
+It looks like you are compiling Parity with an old rustc compiler {}.
+Parity requires version {}. Please update your compiler.
+If you use rustup, try this:
+
+    rustup update stable
+
+and try building Parity again.
+
+", is, required));
+}

dapps/Cargo.toml

@@ -14,9 +14,9 @@ futures-cpupool = "0.1"
 linked-hash-map = "0.5"
 log = "0.3"
 parity-dapps-glue = "1.9"
-parking_lot = "0.5"
+parking_lot = "0.4"
 mime_guess = "2.0.0-alpha.2"
-rand = "0.4"
+rand = "0.3"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
@@ -25,11 +25,12 @@ unicase = "1.4"
 zip = { version = "0.1", default-features = false }
 itertools = "0.5"
 
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.10" }
-jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.10" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
+jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
 
+ethcore-util = { path = "../util" }
+ethcore-bigint = { path = "../util/bigint" }
 ethcore-bytes = { path = "../util/bytes" }
-ethereum-types = "0.2"
 fetch = { path = "../util/fetch" }
 node-health = { path = "./node-health" }
 parity-hash-fetch = { path = "../hash-fetch" }

dapps/node-health/Cargo.toml

@@ -10,7 +10,7 @@ futures = "0.1"
 futures-cpupool = "0.1"
 log = "0.3"
 ntp = "0.3.0"
-parking_lot = "0.5"
+parking_lot = "0.4"
 serde = "1.0"
 serde_derive = "1.0"
 time = "0.1.35"

dapps/src/apps/app.rs

@@ -14,12 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use endpoint::EndpointInfo;
-
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct App {
-	pub id: String,
+	pub id: Option<String>,
 	pub name: String,
 	pub description: String,
 	pub version: String,
@@ -28,32 +26,14 @@ pub struct App {
 	pub icon_url: String,
 	#[serde(rename="localUrl")]
 	pub local_url: Option<String>,
+	#[serde(rename="allowJsEval")]
+	pub allow_js_eval: Option<bool>,
 }
 
 impl App {
-	/// Creates `App` instance from `EndpointInfo` and `id`.
-	pub fn from_info(id: &str, info: &EndpointInfo) -> Self {
-		App {
-			id: id.to_owned(),
-			name: info.name.to_owned(),
-			description: info.description.to_owned(),
-			version: info.version.to_owned(),
-			author: info.author.to_owned(),
-			icon_url: info.icon_url.to_owned(),
-			local_url: info.local_url.to_owned(),
-		}
-	}
-}
-
-impl Into<EndpointInfo> for App {
-	fn into(self) -> EndpointInfo {
-		EndpointInfo {
-			name: self.name,
-			description: self.description,
-			version: self.version,
-			author: self.author,
-			icon_url: self.icon_url,
-			local_url: self.local_url,
-		}
+	pub fn with_id(&self, id: &str) -> Self {
+		let mut app = self.clone();
+		app.id = Some(id.into());
+		app
 	}
 }

dapps/src/apps/fetcher/installers.rs

@@ -18,7 +18,7 @@ use zip;
 use std::{fs, fmt};
 use std::io::{self, Read, Write};
 use std::path::PathBuf;
-use ethereum_types::H256;
+use bigint::hash::H256;
 use fetch::{self, Mime};
 use futures_cpupool::CpuPool;
 use hash::keccak_buffer;
@@ -178,7 +178,7 @@ impl ContentValidator for Dapp {
 			// First find manifest file
 			let (mut manifest, manifest_dir) = Self::find_manifest(&mut zip)?;
 			// Overwrite id to match hash
-			manifest.id = id;
+			manifest.id = Some(id);
 
 			// Unpack zip
 			for i in 0..zip.len() {

dapps/src/apps/fetcher/mod.rs

@@ -23,6 +23,7 @@ mod installers;
 use std::{fs, env};
 use std::path::PathBuf;
 use std::sync::Arc;
+use rustc_hex::FromHex;
 use futures::{future, Future};
 use futures_cpupool::CpuPool;
 use fetch::{Client as FetchClient, Fetch};
@@ -30,7 +31,6 @@ use hash_fetch::urlhint::{URLHintContract, URLHint, URLHintResult};
 
 use hyper::StatusCode;
 
-use ethereum_types::H256;
 use {Embeddable, SyncStatus, random_filename};
 use parking_lot::Mutex;
 use page::local;
@@ -132,7 +132,7 @@ impl<R: URLHint + 'static, F: Fetch> ContentFetcher<F, R> {
 
 	// resolve contract call synchronously.
 	// TODO: port to futures-based hyper and make it all async.
-	fn resolve(&self, content_id: H256) -> Option<URLHintResult> {
+	fn resolve(&self, content_id: Vec<u8>) -> Option<URLHintResult> {
 		self.resolver.resolve(content_id)
 			.wait()
 			.unwrap_or_else(|e| { warn!("Error resolving content-id: {}", e); None })
@@ -149,7 +149,7 @@ impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
 			}
 		}
 		// fallback to resolver
-		if let Ok(content_id) = content_id.parse() {
+		if let Ok(content_id) = content_id.from_hex() {
 			// if there is content or we are syncing return true
 			self.sync.is_major_importing() || self.resolve(content_id).is_some()
 		} else {
@@ -178,7 +178,7 @@ impl<R: URLHint + 'static, F: Fetch> Endpoint for ContentFetcher<F, R> {
 				// We need to start fetching the content
 				_ => {
 					trace!(target: "dapps", "Content unavailable. Fetching... {:?}", content_id);
-					let content_hex = content_id.parse().expect("to_handler is called only when `contains` returns true.");
+					let content_hex = content_id.from_hex().expect("to_handler is called only when `contains` returns true.");
 					let content = self.resolve(content_hex);
 
 					let cache = self.cache.clone();
@@ -280,10 +280,10 @@ impl<R: URLHint + 'static, F: Fetch> Endpoint for ContentFetcher<F, R> {
 mod tests {
 	use std::env;
 	use std::sync::Arc;
+	use bytes::Bytes;
 	use fetch::{Fetch, Client};
-	use futures::{future, Future};
-	use hash_fetch::urlhint::{URLHint, URLHintResult};
-	use ethereum_types::H256;
+	use futures::future;
+	use hash_fetch::urlhint::{URLHint, URLHintResult, BoxFuture};
 
 	use apps::cache::ContentStatus;
 	use endpoint::EndpointInfo;
@@ -294,7 +294,7 @@ mod tests {
 	#[derive(Clone)]
 	struct FakeResolver;
 	impl URLHint for FakeResolver {
-		fn resolve(&self, _id: H256) -> Box<Future<Item = Option<URLHintResult>, Error = String> + Send> {
+		fn resolve(&self, _id: Bytes) -> BoxFuture<Option<URLHintResult>, String> {
 			Box::new(future::ok(None))
 		}
 	}
@@ -319,12 +319,14 @@ mod tests {
 		).allow_dapps(true);
 
 		let handler = local::Dapp::new(pool, path, EndpointInfo {
+			id: None,
 			name: "fake".into(),
 			description: "".into(),
 			version: "".into(),
 			author: "".into(),
 			icon_url: "".into(),
 			local_url: Some("".into()),
+			allow_js_eval: None,
 		}, Default::default(), None);
 
 		// when

dapps/src/apps/fs.rs

@@ -46,17 +46,18 @@ fn read_manifest(name: &str, mut path: PathBuf) -> EndpointInfo {
 			// Try to deserialize manifest
 			deserialize_manifest(s)
 		})
-		.map(Into::into)
 		.unwrap_or_else(|e| {
 			warn!(target: "dapps", "Cannot read manifest file at: {:?}. Error: {:?}", path, e);
 
 			EndpointInfo {
+				id: None,
 				name: name.into(),
 				description: name.into(),
 				version: "0.0.0".into(),
 				author: "?".into(),
 				icon_url: "icon.png".into(),
 				local_url: None,
+				allow_js_eval: Some(false),
 			}
 		})
 }

dapps/src/apps/manifest.rs

@@ -20,8 +20,13 @@ pub use apps::App as Manifest;
 pub const MANIFEST_FILENAME: &'static str = "manifest.json";
 
 pub fn deserialize_manifest(manifest: String) -> Result<Manifest, String> {
-	serde_json::from_str::<Manifest>(&manifest).map_err(|e| format!("{:?}", e))
-	// TODO [todr] Manifest validation (especialy: id (used as path))
+	let mut manifest = serde_json::from_str::<Manifest>(&manifest).map_err(|e| format!("{:?}", e))?;
+	if manifest.id.is_none() {
+		return Err("App 'id' is missing.".into());
+	}
+	manifest.allow_js_eval = Some(manifest.allow_js_eval.unwrap_or(false));
+
+	Ok(manifest)
 }
 
 pub fn serialize_manifest(manifest: &Manifest) -> Result<String, String> {

dapps/src/apps/mod.rs

@@ -44,7 +44,7 @@ pub const WEB_PATH: &'static str = "web";
 pub const URL_REFERER: &'static str = "__referer=";
 
 pub fn utils(pool: CpuPool) -> Box<Endpoint> {
-	Box::new(page::builtin::Dapp::new(pool, parity_ui::App::default()))
+	Box::new(page::builtin::Dapp::new(pool, false, parity_ui::App::default()))
 }
 
 pub fn ui(pool: CpuPool) -> Box<Endpoint> {
@@ -76,9 +76,9 @@ pub fn all_endpoints<F: Fetch>(
 	}
 
 	// NOTE [ToDr] Dapps will be currently embeded on 8180
-	insert::<parity_ui::App>(&mut pages, "ui", Embeddable::Yes(embeddable.clone()), pool.clone());
+	insert::<parity_ui::App>(&mut pages, "ui", Embeddable::Yes(embeddable.clone()), pool.clone(), true);
 	// old version
-	insert::<parity_ui::old::App>(&mut pages, "v1", Embeddable::Yes(embeddable.clone()), pool.clone());
+	insert::<parity_ui::old::App>(&mut pages, "v1", Embeddable::Yes(embeddable.clone()), pool.clone(), true);
 
 	pages.insert("proxy".into(), ProxyPac::boxed(embeddable.clone(), dapps_domain.to_owned()));
 	pages.insert(WEB_PATH.into(), Web::boxed(embeddable.clone(), web_proxy_tokens.clone(), fetch.clone()));
@@ -86,10 +86,16 @@ pub fn all_endpoints<F: Fetch>(
 	(local_endpoints, pages)
 }
 
-fn insert<T : WebApp + Default + 'static>(pages: &mut Endpoints, id: &str, embed_at: Embeddable, pool: CpuPool) {
+fn insert<T : WebApp + Default + 'static>(
+	pages: &mut Endpoints,
+	id: &str,
+	embed_at: Embeddable,
+	pool: CpuPool,
+	allow_js_eval: bool,
+) {
 	pages.insert(id.to_owned(), Box::new(match embed_at {
-		Embeddable::Yes(address) => page::builtin::Dapp::new_safe_to_embed(pool, T::default(), address),
-		Embeddable::No => page::builtin::Dapp::new(pool, T::default()),
+		Embeddable::Yes(address) => page::builtin::Dapp::new_safe_to_embed(pool, allow_js_eval, T::default(), address),
+		Embeddable::No => page::builtin::Dapp::new(pool, allow_js_eval, T::default()),
 	}));
 }
 

dapps/src/endpoint.rs

@@ -37,16 +37,7 @@ impl EndpointPath {
 	}
 }
 
-#[derive(Debug, PartialEq, Clone)]
-pub struct EndpointInfo {
-	pub name: String,
-	pub description: String,
-	pub version: String,
-	pub author: String,
-	pub icon_url: String,
-	pub local_url: Option<String>,
-}
-
+pub type EndpointInfo = ::apps::App;
 pub type Endpoints = BTreeMap<String, Box<Endpoint>>;
 pub type Response = Box<Future<Item=hyper::Response, Error=hyper::Error> + Send>;
 pub type Request = hyper::Request;

dapps/src/handlers/content.rs

@@ -82,7 +82,7 @@ impl Into<hyper::Response> for ContentHandler {
 			.with_status(self.code)
 			.with_header(header::ContentType(self.mimetype))
 			.with_body(self.content);
-		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on);
+		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on, false);
 		res
 	}
 }

dapps/src/handlers/echo.rs

@@ -40,7 +40,7 @@ impl Into<hyper::Response> for EchoHandler {
 			.with_header(content_type.unwrap_or(header::ContentType::json()))
 			.with_body(self.request.body());
 
-		add_security_headers(res.headers_mut(), None);
+		add_security_headers(res.headers_mut(), None, false);
 		res
 	}
 }

dapps/src/handlers/mod.rs

@@ -36,7 +36,7 @@ use hyper::header;
 use {apps, address, Embeddable};
 
 /// Adds security-related headers to the Response.
-pub fn add_security_headers(headers: &mut header::Headers, embeddable_on: Embeddable) {
+pub fn add_security_headers(headers: &mut header::Headers, embeddable_on: Embeddable, allow_js_eval: bool) {
 	headers.set_raw("X-XSS-Protection", "1; mode=block");
 	headers.set_raw("X-Content-Type-Options", "nosniff");
 
@@ -75,9 +75,12 @@ pub fn add_security_headers(headers: &mut header::Headers, embeddable_on: Embedd
 					 .map(|&(ref host, port)| address(host, port))
 					 .join(" ")
 				).unwrap_or_default();
+			let eval = if allow_js_eval { " 'unsafe-eval'" } else { "" };
+
 			&format!(
-				"script-src 'self' {};",
-				script_src
+				"script-src 'self' {}{};",
+				script_src,
+				eval
 			)
 		}
 		// Same restrictions as script-src with additional

dapps/src/handlers/streaming.rs

@@ -51,7 +51,7 @@ impl<R: io::Read> StreamingHandler<R> {
 			.with_status(self.status)
 			.with_header(header::ContentType(self.mimetype))
 			.with_body(body);
-		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on);
+		add_security_headers(&mut res.headers_mut(), self.safe_to_embed_on, false);
 
 		(reader, res)
 	}

dapps/src/lib.rs

@@ -32,8 +32,9 @@ extern crate zip;
 
 extern crate jsonrpc_http_server;
 
+extern crate ethcore_util as util;
+extern crate ethcore_bigint as bigint;
 extern crate ethcore_bytes as bytes;
-extern crate ethereum_types;
 extern crate fetch;
 extern crate node_health;
 extern crate parity_dapps_glue as parity_dapps;
@@ -108,7 +109,7 @@ impl Endpoints {
 	/// Returns a current list of app endpoints.
 	pub fn list(&self) -> Vec<apps::App> {
 		self.endpoints.read().iter().filter_map(|(ref k, ref e)| {
-			e.info().map(|ref info| apps::App::from_info(k, info))
+			e.info().map(|ref info| info.with_id(k))
 		}).collect()
 	}
 

dapps/src/page/builtin.rs

@@ -38,13 +38,14 @@ pub struct Dapp<T: WebApp + 'static> {
 
 impl<T: WebApp + 'static> Dapp<T> {
 	/// Creates new `Dapp` for builtin (compile time) Dapp.
-	pub fn new(pool: CpuPool, app: T) -> Self {
-		let info = app.info();
+	pub fn new(pool: CpuPool, allow_js_eval: bool, app: T) -> Self {
+		let mut info = EndpointInfo::from(app.info());
+		info.allow_js_eval = Some(allow_js_eval);
 		Dapp {
 			pool,
 			app,
 			safe_to_embed_on: None,
-			info: EndpointInfo::from(info),
+			info,
 			fallback_to_index_html: false,
 		}
 	}
@@ -65,13 +66,14 @@ impl<T: WebApp + 'static> Dapp<T> {
 	/// Creates new `Dapp` which can be safely used in iframe
 	/// even from different origin. It might be dangerous (clickjacking).
 	/// Use wisely!
-	pub fn new_safe_to_embed(pool: CpuPool, app: T, address: Embeddable) -> Self {
-		let info = app.info();
+	pub fn new_safe_to_embed(pool: CpuPool, allow_js_eval: bool, app: T, address: Embeddable) -> Self {
+		let mut info = EndpointInfo::from(app.info());
+		info.allow_js_eval = Some(allow_js_eval);
 		Dapp {
 			pool,
 			app,
 			safe_to_embed_on: address,
-			info: EndpointInfo::from(info),
+			info,
 			fallback_to_index_html: false,
 		}
 	}
@@ -117,6 +119,7 @@ impl<T: WebApp> Endpoint for Dapp<T> {
 			file,
 			cache: PageCache::Disabled,
 			safe_to_embed_on: self.safe_to_embed_on.clone(),
+			allow_js_eval: self.info.allow_js_eval.clone().unwrap_or(false),
 		}.into_response();
 
 		self.pool.spawn(reader).forget();
@@ -128,12 +131,14 @@ impl<T: WebApp> Endpoint for Dapp<T> {
 impl From<Info> for EndpointInfo {
 	fn from(info: Info) -> Self {
 		EndpointInfo {
+			id: None,
 			name: info.name.into(),
 			description: info.description.into(),
 			author: info.author.into(),
 			icon_url: info.icon_url.into(),
 			local_url: None,
 			version: info.version.into(),
+			allow_js_eval: None,
 		}
 	}
 }

dapps/src/page/handler.rs

@@ -59,6 +59,8 @@ pub struct PageHandler<T: DappFile> {
 	pub safe_to_embed_on: Embeddable,
 	/// Cache settings for this page.
 	pub cache: PageCache,
+	/// Allow JS unsafe-eval.
+	pub allow_js_eval: bool,
 }
 
 impl<T: DappFile> PageHandler<T> {
@@ -93,7 +95,7 @@ impl<T: DappFile> PageHandler<T> {
 
 			headers.set(header::ContentType(file.content_type().to_owned()));
 
-			add_security_headers(&mut headers, self.safe_to_embed_on);
+			add_security_headers(&mut headers, self.safe_to_embed_on, self.allow_js_eval);
 		}
 
 		let initial_content = if file.content_type().to_owned() == mime::TEXT_HTML {

dapps/src/page/local.rs

@@ -98,6 +98,7 @@ impl Dapp {
 			file: self.get_file(path),
 			cache: self.cache,
 			safe_to_embed_on: self.embeddable_on.clone(),
+			allow_js_eval: self.info.as_ref().and_then(|x| x.allow_js_eval).unwrap_or(false),
 		}.into_response();
 
 		self.pool.spawn(reader).forget();

dapps/src/tests/fetch.rs

@@ -181,7 +181,7 @@ fn should_return_fetched_dapp_content() {
 	assert_security_headers_for_embed(&response2.headers);
 	assert_eq!(
 		response2.body,
-		r#"D2
+		r#"EA
 {
   "id": "9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a",
   "name": "Gavcoin",
@@ -189,7 +189,8 @@ fn should_return_fetched_dapp_content() {
   "version": "1.0.0",
   "author": "",
   "iconUrl": "icon.png",
-  "localUrl": null
+  "localUrl": null,
+  "allowJsEval": false
 }
 0
 

dapps/src/tests/helpers/registrar.rs

@@ -18,12 +18,12 @@ use std::str;
 use std::sync::Arc;
 use std::collections::HashMap;
 
-use futures::Future;
-use ethereum_types::{H256, Address};
+use bigint::hash::H256;
 use bytes::{Bytes, ToPretty};
-use hash_fetch::urlhint::ContractClient;
+use hash_fetch::urlhint::{ContractClient, BoxFuture};
 use parking_lot::Mutex;
 use rustc_hex::FromHex;
+use util::Address;
 
 const REGISTRAR: &'static str = "8e4e9b13d4b45cb0befc93c3061b1408f67316b2";
 const URLHINT: &'static str = "deadbeefcafe0000000000000000000000000000";
@@ -67,7 +67,7 @@ impl ContractClient for FakeRegistrar {
 		Ok(REGISTRAR.parse().unwrap())
 	}
 
-	fn call(&self, address: Address, data: Bytes) -> Box<Future<Item = Bytes, Error = String> + Send> {
+	fn call(&self, address: Address, data: Bytes) -> BoxFuture<Bytes, String> {
 		let call = (address.to_hex(), data.to_hex());
 		self.calls.lock().push(call.clone());
 		let res = self.responses.lock().get(&call).cloned().expect(&format!("No response for call: {:?}", call));

dapps/ui/Cargo.toml

@@ -7,13 +7,14 @@ version = "1.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [build-dependencies]
-rustc_version = "0.2"
+rustc_version = "0.1"
 
 [dependencies]
-parity-ui-dev = { git = "https://github.com/parity-js/shell.git", rev = "2f07ecec53a2319f41e5b83c01073b5386243173", optional = true }
-parity-ui-old-dev = { git = "https://github.com/parity-js/dapp-wallet.git", rev = "1a58bf4836c84e1632e27ef607b5a388abd2bf2d", optional = true }
-parity-ui-precompiled = { git = "https://github.com/js-dist-paritytech/parity-master-1-10-shell.git", rev="3fb77b61a7f30d6658f81d687e7e415657bd20bd", optional = true }
-parity-ui-old-precompiled = { git = "https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git", rev="4c067dfa1a17fe71ab2ca26b18c52dcbd0f4fc04", optional = true }
+parity-ui-dev = { path = "../../js", optional = true }
+parity-ui-old-dev = { path = "../../js-old", optional = true }
+# This is managed by the js/scripts/release.sh script on CI - keep it in a single line
+parity-ui-old-precompiled = { git = "https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git", optional = true }
+parity-ui-precompiled = { git = "https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git", optional = true }
 
 [features]
 no-precompiled-js = ["parity-ui-dev", "parity-ui-old-dev"]

devtools/Cargo.toml

@@ -5,3 +5,12 @@ license = "GPL-3.0"
 name = "ethcore-devtools"
 version = "1.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+rand = "0.3"
+
+[features]
+
+[lib]
+path = "src/lib.rs"
+test = true

devtools/src/lib.rs

@@ -16,4 +16,14 @@
 
 //! dev-tools
 
+
+extern crate rand;
+
+mod random_path;
+mod test_socket;
+mod stop_guard;
 pub mod http_client;
+
+pub use random_path::*;
+pub use test_socket::*;
+pub use stop_guard::*;

devtools/src/random_path.rs

@@ -0,0 +1,148 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Random path
+
+use std::path::*;
+use std::fs;
+use std::env;
+use std::ops::{Deref, DerefMut};
+use rand::random;
+
+pub struct RandomTempPath {
+	path: PathBuf,
+	pub panic_on_drop_failure: bool,
+}
+
+pub fn random_filename() -> String {
+	random_str(8)
+}
+
+pub fn random_str(len: usize) -> String {
+	(0..len).map(|_| ((random::<f32>() * 26.0) as u8 + 97) as char).collect()
+}
+
+impl RandomTempPath {
+	pub fn new() -> RandomTempPath {
+		let mut dir = env::temp_dir();
+		dir.push(random_filename());
+		RandomTempPath {
+			path: dir.clone(),
+			panic_on_drop_failure: true,
+		}
+	}
+
+	pub fn create_dir() -> RandomTempPath {
+		let mut dir = env::temp_dir();
+		dir.push(random_filename());
+		fs::create_dir_all(dir.as_path()).unwrap();
+		RandomTempPath {
+			path: dir.clone(),
+			panic_on_drop_failure: true,
+		}
+	}
+
+	pub fn as_path(&self) -> &PathBuf {
+		&self.path
+	}
+
+	pub fn as_str(&self) -> &str {
+		self.path.to_str().unwrap()
+	}
+
+	pub fn new_in(&self, name: &str) -> String {
+		let mut path = self.path.clone();
+		path.push(name);
+		path.to_str().unwrap().to_owned()
+	}
+}
+
+impl AsRef<Path> for RandomTempPath {
+	fn as_ref(&self) -> &Path {
+		self.as_path()
+	}
+}
+impl Deref for RandomTempPath {
+	type Target = Path;
+	fn deref(&self) -> &Self::Target {
+		self.as_path()
+	}
+}
+
+impl Drop for RandomTempPath {
+	fn drop(&mut self) {
+		if let Err(_) = fs::remove_dir_all(&self) {
+			if let Err(e) = fs::remove_file(&self) {
+				if self.panic_on_drop_failure {
+					panic!("Failed to remove temp directory. Here's what prevented this from happening:  ({})", e);
+				}
+			}
+		}
+	}
+}
+
+pub struct GuardedTempResult<T> {
+	pub result: Option<T>,
+	pub _temp: RandomTempPath,
+}
+
+impl<T> GuardedTempResult<T> {
+    pub fn reference(&self) -> &T {
+        self.result.as_ref().unwrap()
+    }
+
+    pub fn reference_mut(&mut self) -> &mut T {
+    	self.result.as_mut().unwrap()
+    }
+
+	pub fn take(&mut self) -> T {
+		self.result.take().unwrap()
+	}
+}
+
+impl<T> Deref for GuardedTempResult<T> {
+	type Target = T;
+
+	fn deref(&self) -> &T { self.result.as_ref().unwrap() }
+}
+
+impl<T> DerefMut for GuardedTempResult<T> {
+	fn deref_mut(&mut self) -> &mut T { self.result.as_mut().unwrap() }
+}
+
+#[test]
+fn creates_dir() {
+	let temp = RandomTempPath::create_dir();
+	assert!(fs::metadata(temp.as_path()).unwrap().is_dir());
+}
+
+#[test]
+fn destroys_dir() {
+	let path_buf = {
+		let temp = RandomTempPath::create_dir();
+		assert!(fs::metadata(temp.as_path()).unwrap().is_dir());
+		let path_buf = temp.as_path().to_path_buf();
+		path_buf
+	};
+
+	assert!(fs::metadata(&path_buf).is_err());
+}
+
+#[test]
+fn provides_random() {
+	let temp = RandomTempPath::create_dir();
+	assert!(temp.as_path().to_str().is_some());
+}

devtools/src/test_socket.rs

@@ -0,0 +1,95 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::io::*;
+use std::cmp;
+
+pub struct TestSocket {
+	pub read_buffer: Vec<u8>,
+	pub write_buffer: Vec<u8>,
+	pub cursor: usize,
+	pub buf_size: usize,
+}
+
+impl Default for TestSocket {
+	fn default() -> Self {
+		TestSocket::new()
+	}
+}
+
+impl TestSocket {
+	pub fn new() -> Self {
+		TestSocket {
+			read_buffer: vec![],
+			write_buffer: vec![],
+			cursor: 0,
+			buf_size: 0,
+		}
+	}
+
+	pub fn new_buf(buf_size: usize) -> TestSocket {
+		TestSocket {
+			read_buffer: vec![],
+			write_buffer: vec![],
+			cursor: 0,
+			buf_size: buf_size,
+		}
+	}
+
+	pub fn new_ready(data: Vec<u8>) -> TestSocket {
+		TestSocket {
+			read_buffer: data,
+			write_buffer: vec![],
+			cursor: 0,
+			buf_size: 0,
+		}
+	}
+}
+
+impl Read for TestSocket {
+	fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
+		let end_position = cmp::min(self.read_buffer.len(), self.cursor+buf.len());
+		if self.cursor > end_position { return Ok(0) }
+		let len = cmp::max(end_position - self.cursor, 0);
+		match len {
+			0 => Ok(0),
+			_ => {
+				for i in self.cursor..end_position {
+					buf[i-self.cursor] = self.read_buffer[i];
+				}
+				self.cursor = end_position;
+				Ok(len)
+			}
+		}
+	}
+}
+
+impl Write for TestSocket {
+	fn write(&mut self, buf: &[u8]) -> Result<usize> {
+		if self.buf_size == 0 || buf.len() < self.buf_size {
+			self.write_buffer.extend(buf.iter().cloned());
+			Ok(buf.len())
+		}
+		else {
+			self.write_buffer.extend(buf.iter().take(self.buf_size).cloned());
+			Ok(self.buf_size)
+		}
+	}
+
+	fn flush(&mut self) -> Result<()> {
+		unimplemented!();
+	}
+}

docs/CHANGELOG-0.9.md

@@ -1,4 +1,3 @@
-Note: Parity 0.9 reached End-of-Life on 2016-05-02 (EOL).
 
 ## Parity [beta-0.9.1](https://github.com/paritytech/parity/releases/tag/beta-0.9.1) (2016-02-16)
 

docs/CHANGELOG-1.0.md

@@ -1,5 +1,3 @@
-Note: Parity 1.0 reached End-of-Life on 2016-06-24 (EOL).
-
 ## Parity [v1.0.2](https://github.com/paritytech/parity/releases/tag/v1.0.2) (2016-04-11)
 
 Parity 1.0.2 release improves Json RPC compatibility and fixes a number of stability issues.

docs/CHANGELOG-1.1.md

@@ -1,5 +1,3 @@
-Note: Parity 1.1 reached End-of-Life on 2016-08-12 (EOL).
-
 ## Parity [v1.1.0](https://github.com/paritytech/parity/releases/tag/v1.1.0) (2016-05-02)
 
 Parity 1.1.0 introduces:

docs/CHANGELOG-1.2.md

@@ -1,5 +1,3 @@
-Note: Parity 1.2 reached End-of-Life on 2016-11-07 (EOL).
-
 ## Parity [v1.2.4](https://github.com/paritytech/parity/releases/tag/v1.2.4) (2016-08-09)
 
 Parity 1.2.4 Is a maintenance release that fixes a [few](https://github.com/paritytech/parity/pull/1888/commits) issues related to mining and peer synchronization.

docs/CHANGELOG-1.3.md

@@ -1,5 +1,3 @@
-Note: Parity 1.3 reached End-of-Life on 2017-01-19 (EOL).
-
 ## Parity [v1.3.15](https://github.com/paritytech/parity/releases/tag/v1.3.15) (2016-12-10)
 
 This patch release fixes an issue with syncing on the Ropsten test network.

docs/CHANGELOG-1.4.md

@@ -1,5 +1,3 @@
-Note: Parity 1.4 reached End-of-Life on 2017-03-13 (EOL).
-
 ## Parity [v1.4.12](https://github.com/paritytech/parity/releases/tag/v1.4.12) (2017-02-22)
 
 This stable release fixes an issue with block uncle validation. Parity now allows uncle headers to have timestamp set to arbitrary future value.

docs/CHANGELOG-1.5.md

@@ -1,5 +1,3 @@
-Note: Parity 1.5 reached End-of-Life on 2017-07-28 (EOL).
-
 ## Parity [v1.5.12](https://github.com/paritytech/parity/releases/tag/v1.5.12) (2017-03-27)
 
 Stable release that adds support for a new warp sync snapshot format.

docs/CHANGELOG-1.6.md

@@ -1,5 +1,3 @@
-Note: Parity 1.6 reached End-of-Life on 2017-10-15 (EOL).
-
 ## Parity [v1.6.10](https://github.com/paritytech/parity/releases/tag/v1.6.10) (2017-07-25)
 
 This is a hotfix release for the stable channel addressing the recent [multi-signature wallet vulnerability](https://blog.parity.io/security-alert-high-2/). Note, upgrading is not mandatory, and all future multi-sig wallets created by any version of Parity are secure.

docs/CHANGELOG-1.7.md

@@ -1,50 +1,3 @@
-Note: Parity 1.7 reached End-of-Life on 2018-01-25 (EOL).
-
-### Parity [v1.7.13](https://github.com/paritytech/parity/releases/tag/v1.7.13) (2018-01-23)
-
-Parity 1.7.13 is a bug-fix release to improve stability of PoA-networks. Users on Kovan or other Aura-based networks are advised to upgrade as this release fixes an issue introduced with 1.7.12 that causes Proof-of-Authority nodes to stop synchronizing the chain.
-
-The full list of included changes:
-
-- AuRa fix for 1.7.x series ([#7666](https://github.com/paritytech/parity/pull/7666))
-  - Fix Temporarily Invalid blocks handling ([#7613](https://github.com/paritytech/parity/pull/7613))
-    - Handle temporarily invalid blocks in sync.
-    - Fix tests.
-    - Bump rustc-serialize
-    - Bump version.
-    - Update .gitlab-ci.yml
-    - Fix lint
-    - Remove slash from gitlab ci script to fix builds
-    - Start build.
-
-### Parity [v1.7.12](https://github.com/paritytech/parity/releases/tag/v1.7.12) (2018-01-09)
-
-Parity 1.7.12 is a bug-fix release to improve performance and stability.
-
-The full list of included changes:
-
-- Fix stable builds for rustc 1.23.0 ([#7504](https://github.com/paritytech/parity/pull/7504))
-- Missing AuRa backports ([#7499](https://github.com/paritytech/parity/pull/7499)
-  - Wait for future blocks in AuRa ([#7368](https://github.com/paritytech/parity/pull/7368))
-    - Mark future blocks as temporarily invalid.
-    - Don't check max.
-  - Advance AuRa step as far as we can and prevent invalid blocks. ([#7451](https://github.com/paritytech/parity/pull/7451))
-    - Advance AuRa step as far as we can.
-    - Wait for future blocks.
-  -  Problem: AuRa's unsafeties around step duration ([#7282](https://github.com/paritytech/parity/pull/7282))
-  - Fix tests.
-  - Detect different node, same-key signing in aura ([#7245](https://github.com/paritytech/parity/pull/7245))
-    - Detect different node, same-key signing in aura
-    - Reduce scope of warning
-- Backports ([#7496](https://github.com/paritytech/parity/pull/7496))
-  - Advance AuRa step as far as we can. ([#7451](https://github.com/paritytech/parity/pull/7451))
-    - Advance AuRa step as far as we can.
-    - Wait for future blocks.
-  - Fixed panic when io is not available for export block, closes [#7486](https://github.com/paritytech/parity/issue/7486) ([#7495](https://github.com/paritytech/parity/pull/7495))
-  - Update Parity Mainnet Bootnodes ([#7476](https://github.com/paritytech/parity/pull/7476))
-    - Replace the Azure HDD bootnodes with the new ones :)
-  - Bump version to 1.7.12
-
 ### Parity [v1.7.11](https://github.com/paritytech/parity/releases/tag/v1.7.11) (2017-12-29)
 
 Parity 1.7.11 changes the default behavior of JSON-RPC CORS setting, and updates bootnodes for the Kovan and Foundation networks.
@@ -152,8 +105,8 @@ The full list of included changes:
   - Always fetch meta data first [badges]
 - Backport ([#6726](https://github.com/paritytech/parity/pull/6726))
   - Check vouch status on appId in addition to contentHash ([#6719](https://github.com/paritytech/parity/pull/6719))
-    - Check vouch status on appId in addition to contentHash
-    - Simplify var expansion
+	  - Check vouch status on appId in addition to contentHash
+	  - Simplify var expansion
   - Merge [#6725](https://github.com/paritytech/parity/pull/6725)
     - Update new token fetching
     - Working Certifications Monitoring

docs/CHANGELOG-1.8.md

@@ -1,537 +0,0 @@
-## Parity [v1.8.9](https://github.com/paritytech/parity/releases/tag/v1.8.9) (2018-02-02)
-
-Parity 1.8.9 is a bug-fix release to improve performance and stability. It restores ERC-20 token balances and adds additional bootnodes for the Ropsten test network.
-
-The full list of included changes:
-
-- Update gitlab-build.sh
-- Backports stable ([#7779](https://github.com/paritytech/parity/pull/7779))
-  - Bump stable to 1.8.9
-  - Update ropsten.json ([#7776](https://github.com/paritytech/parity/pull/7776))
-- Fix tokenAddress reference ([#7777](https://github.com/paritytech/parity/pull/7777))
-- Snapcraft push stable
-
-## Parity [v1.8.8](https://github.com/paritytech/parity/releases/tag/v1.8.8) (2018-02-01)
-
-Parity 1.8.8 is a bug-fix release to improve performance and stability. It restores ERC-20 token balances, improves networking, fixes database corruptions on client shutdown, and fixes issues with the `--password` command-line flag. Happy syncing!
-
-The full list of included changes:
-
-- Gitlab stable ([#7768](https://github.com/paritytech/parity/pull/7768))
-  - Fix snapcraft build for stable
-  - Initial support push snap packages to snapcraft.io
-  - Edge-devel
-- Snapcraft push ans fix build ([#7767](https://github.com/paritytech/parity/pull/7767))
-  - Fix snapcraft build for stable
-  - Initial support push snap packages to snapcraft.io
-  - Edge-devel
-- Remove snapcraft.yml from scripts
-- Resolve conflicts
-- Token filter balances (throttle) ([#7755](https://github.com/paritytech/parity/pull/7755))
-- Fix snapcraft build (stable) ([#7763](https://github.com/paritytech/parity/pull/7763))
-  - Fix snapcraft build for stable
-  - Fix snapcraft build (stable)
-- [Stable] Backports ([#7758](https://github.com/paritytech/parity/pull/7758))
-  - Filter-out nodes.json ([#7716](https://github.com/paritytech/parity/pull/7716))
-    - Filter-out nodes.json
-    - Network: sort node table nodes by failure ratio
-    - Network: fix node table tests
-    - Network: fit node failure percentage into buckets of 5%
-    - Network: consider number of attempts in sorting of node table
-    - Network: fix node table grumbles
-  - Fix client not being dropped on shutdown ([#7695](https://github.com/paritytech/parity/pull/7695))
-    - Parity: wait for client to drop on shutdown
-    - Parity: fix grumbles in shutdown wait
-    - Parity: increase shutdown timeouts
-  - Wrap --help output to 120 characters ([#7626](https://github.com/paritytech/parity/pull/7626))
-    - Update Clap dependency and remove workarounds
-    - WIP
-    - Remove line breaks in help messages for now
-    - Multiple values can only be separated by commas (closes [#7428](https://github.com/paritytech/parity/issues/7428))
-    - Grumbles; refactor repeating code; add constant
-    - Use a single Wrapper rather than allocate a new one for each call
-    - Wrap --help to 120 characters rather than 100 characters
-- Use explicit branch name in push ([#7757](https://github.com/paritytech/parity/pull/7757))
-- Bump stable to 1.8.8 ([#7752](https://github.com/paritytech/parity/pull/7752))
-- Fix js-release in stable ([#7682](https://github.com/paritytech/parity/pull/7682))
-- Update Info.plist
-- Fix conditions in gitlab-test ([#7675](https://github.com/paritytech/parity/pull/7675))
-- Remove cargo cache
-
-## Parity [v1.8.7](https://github.com/paritytech/parity/releases/tag/v1.8.7) (2018-01-24)
-
-Parity 1.8.7 is the first stable release of the 1.8 channel. It includes various bug and stability fixes. Users on Kovan or other Aura-based networks are advised to upgrade as this release fixes an issue introduced with 1.8.6 and 1.7.12 that causes Proof-of-Authority nodes to stop synchronizing the chain.
-
-The full list of included changes:
-
-- Bump stable version ([#7665](https://github.com/paritytech/parity/pull/7665))
-  - Bump stable to 1.8.7
-- Backports to stable ([#7661](https://github.com/paritytech/parity/pull/7661))
-  - Fixed delegatecall's from/to ([#7568](https://github.com/paritytech/parity/pull/7568))
-    - Fixed delegatecall's from/to, closes [#7166](https://github.com/paritytech/parity/issues/7166)
-    - Added tests for delegatecall traces, [#7167](https://github.com/paritytech/parity/issues/7167)
-  - Fix Temporarily Invalid blocks handling ([#7613](https://github.com/paritytech/parity/pull/7613))
-    - Handle temporarily invalid blocks in sync.
-    - Fix tests.
-  - Improve handling of RocksDB corruption ([#7630](https://github.com/paritytech/parity/pull/7630))
-    - Kvdb-rocksdb: update rust-rocksdb version
-    - Kvdb-rocksdb: mark corruptions and attempt repair on db open
-    - Kvdb-rocksdb: better corruption detection on open
-    - Kvdb-rocksdb: add corruption_file_name const
-    - Kvdb-rocksdb: rename mark_corruption to check_for_corruption
-- Add docker build for stable and cargo cache ([#7672](https://github.com/paritytech/parity/pull/7672))
-- Fix snapcraft build for stable ([#7669](https://github.com/paritytech/parity/pull/7669))
-- Update .gitlab-ci.yml ([#7599](https://github.com/paritytech/parity/pull/7599))
-  - Fix cache:key
-- Make 1.8 stable ([#7532](https://github.com/paritytech/parity/pull/7532))
-  - Bump 1.8 to stable
-  - Make js-precompiled stable
-
-## Parity [v1.8.6](https://github.com/paritytech/parity/releases/tag/v1.8.6) (2018-01-10)
-
-Parity 1.8.6 fixes a critical issue with the database eventually filling up user's disks. Upgrading is highly recommended as it will significantly improve your user experience. As a bonus, this release should enable users with slower hard-disk drives to catch up with the latest block again. Also, warp-sync performance was significantly improved. Please note, that the initial database compaction after upgrading might temporarily reduce the node's performance.
-
-In addition to our gas price histogram, this version now allows you to dynamically set the default gas price as percentile from the last 100 blocks (it defaults to median: `50`).
-
-    --gas-price-percentile=[PCT]        Set PCT percentile gas price value from
-                                        last 100 blocks as default gas price
-                                        when sending transactions.
-
-Last but not least, this release also fixes consensus issues with the Expanse chain enabling Byzantium. If you run Parity configured for Expanse, you might have to resync your chain after the upgrade.
-
-The full list of included changes:
-
-- RocksDB fix ([#7508](https://github.com/paritytech/parity/pull/7508))
-  - Kvdb: update rust-rocksdb version
-- Backports to beta ([#7434](https://github.com/paritytech/parity/pull/7434))
-  - Wait for future blocks in AuRa ([#7368](https://github.com/paritytech/parity/pull/7368))
-    - Mark future blocks as temporarily invalid.
-    - Don't check max.
-  - Fix tracing failed calls. ([#7412](https://github.com/paritytech/parity/pull/7412))
-  - Problem: sending any Whisper message fails ([#7421](https://github.com/paritytech/parity/pull/7421))
-  - Strict config parsing ([#7433](https://github.com/paritytech/parity/pull/7433))
-  - Problem: AuRa's unsafeties around step duration ([#7282](https://github.com/paritytech/parity/pull/7282))
-  - Remove expanse chain ([#7437](https://github.com/paritytech/parity/pull/7437))
-    - Remove expanse from available chains
-    - Remove all EXP references from old wallet
-    - Fix tests
-  - Remove expanse chain ([#7437](https://github.com/paritytech/parity/pull/7437))
-  - Expanse Byzantium update w/ correct metropolis difficulty increment divisor ([#7463](https://github.com/paritytech/parity/pull/7463))
-    - Byzantium Update for Expanse
-    - Expip2 changes - update duration limit
-    - Fix missing EXPIP-2 fields
-    - Format numbers as hex
-    - Fix compilation errors
-    - Group expanse chain spec fields together
-    - Set metropolisDifficultyIncrementDivisor for Expanse
-    - Revert #7437
-    - Add Expanse block 900_000 hash checkpoint
-  - Advance AuRa step as far as we can and prevent invalid blocks. ([#7451](https://github.com/paritytech/parity/pull/7451))
-    - Advance AuRa step as far as we can.
-    - Wait for future blocks.
-  - Fixed panic when io is not available for export block, closes [#7486](https://github.com/paritytech/parity/issues/7486) ([#7495](https://github.com/paritytech/parity/pull/7495))
-  - Update Parity Mainnet Bootnodes ([#7476](https://github.com/paritytech/parity/pull/7476))
-    - Replace the Azure HDD bootnodes with the new ones :)
-  - Expose default gas price percentile configuration in CLI ([#7497](https://github.com/paritytech/parity/pull/7497))
-    - Expose gas price percentile.
-    - Fix light eth_call.
-    - Fix gas_price in light client
-- Backport nonces reservations ([#7439](https://github.com/paritytech/parity/pull/7439))
-  - Reserve nonces for signing ([#6834](https://github.com/paritytech/parity/pull/6834))
-    - Nonce future - reserve and dispatch
-    - Single thread nonce tests
-    - Track status of reserved nonces.
-    - Initialization of nonce reservations.
-    - Prospective Signer
-    - Fix cli tests.
-  - Fix nonce reservation ([#7025](https://github.com/paritytech/parity/pull/7025))
-    - Use nonce reservation per address
-    - Create hashmap in RPC Apis
-    - Garbage collect hashmap entries.
-    - HashMap::retain
-- Bump beta to 1.8.6 ([#7442](https://github.com/paritytech/parity/pull/7442))
-- KVDB backports ([#7438](https://github.com/paritytech/parity/pull/7438))
-  - Separated kvdb into 3 crates: kvdb, kvdb-memorydb && kvdb-rocksdb ([#6720](https://github.com/paritytech/parity/pull/6720))
-    - Separated kvdb into 3 crates: kvdb, kvdb-memorydb && kvdb-rocksdb, ref [#6693](https://github.com/paritytech/parity/issues/6693)
-      - Fixed kvdb-memorydb && kvdb-rocksdb authors
-      - Fixed wrong kvdb import in json_tests
-    - Util tests use kvdb_memorydb instead of kvdb_rocksdb, closes [#6739](https://github.com/paritytech/parity/issues/6739)
-      - Renamed kvdb_memorydb::in_memory -> kvdb_memorydb::create
-      - Docs
-      - Removed redundant mut from kvdb-memorydb
-  - Upgrade to RocksDB 5.8.8 and tune settings to reduce space amplification ([#7348](https://github.com/paritytech/parity/pull/7348))
-    - kvdb-rocksdb: update to RocksDB 5.8.8
-    - kvdb-rocksdb: tune RocksDB options
-      - Switch to level-style compaction
-      - Increase default block size (16K), and use bigger blocks for HDDs (64K)
-      - Increase default file size base (64MB SSDs, 256MB HDDs)
-      - Create a single block cache shared across all column families
-      - Tune compaction settings using RocksDB helper functions, taking into account
-      - Memory budget spread across all columns
-      - Configure backgrounds jobs based on the number of CPUs
-      - Set some default recommended settings
-    - ethcore: remove unused config blockchain.db_cache_size
-    - parity: increase default value for db_cache_size
-    - kvdb-rocksdb: enable compression on all levels
-    - kvdb-rocksdb: set global db_write_bufer_size
-    - kvdb-rocksdb: reduce db_write_bufer_size to force earlier flushing
-    - kvdb-rocksdb: use master branch for rust-rocksdb dependency
-
-## Parity [v1.8.5](https://github.com/paritytech/parity/releases/tag/v1.8.5) (2017-12-29)
-
-Parity 1.8.5 changes the default behavior of JSON-RPC CORS setting, detects same-key engine signers in Aura networks, and updates bootnodes for the Kovan and Foundation networks.
-
-Note: The default value of `--jsonrpc-cors` option has been altered to disallow (potentially malicious) websites from accessing the low-sensitivity RPCs (viewing exposed accounts, proposing transactions for signing). Currently domains need to be whitelisted manually. To bring back previous behaviour run with `--jsonrpc-cors all` or `--jsonrpc-cors http://example.com`.
-
-The full list of included changes:
-
-- Beta Backports ([#7297](https://github.com/paritytech/parity/pull/7297))
-  - New warp enodes ([#7287](https://github.com/paritytech/parity/pull/7287))
-    - New warp enodes
-    - Added one more warp enode; replaced spaces with tabs
-    - Bump beta to 1.8.5
-    - Update kovan boot nodes
-  - Detect different node, same-key signing in aura ([#7245](https://github.com/paritytech/parity/pull/7245))
-    - Detect different node, same-key signing in aura
-    - Reduce scope of warning
-    - Fix Cargo.lock
-    - Updating mainnet bootnodes.
-  - Update bootnodes ([#7363](https://github.com/paritytech/parity/pull/7363))
-    - Updating mainnet bootnodes.
-    - Add additional parity-beta bootnodes.
-    - Restore old parity bootnodes and update foudation bootnodes
-- Fix default CORS. ([#7388](https://github.com/paritytech/parity/pull/7388))
-
-## Parity [v1.8.4](https://github.com/paritytech/parity/releases/tag/v1.8.4) (2017-12-12)
-
-Parity 1.8.4 applies fixes for Proof-of-Authority networks and schedules the Kovan-Byzantium hard-fork.
-
-- The Kovan testnet will fork on block `5067000` at `Thu Dec 14 2017 05:40:03 UTC`.
-  - This enables Byzantium features on Kovan.
-  - This disables uncles on Kovan for stability reasons.
-- Proof-of-Authority networks are advised to set `maximumUncleCount` to 0 in a future `maximumUncleCountTransition` for stability reasons.
-  - See the [Kovan chain spec](https://github.com/paritytech/parity/blob/master/ethcore/res/ethereum/kovan.json) for an example.
-  - New PoA networks created with Parity will have this feature enabled by default.
-
-Furthermore, this release includes the ECIP-1039 Monetary policy rounding specification for Ethereum Classic, reduces the maximum Ethash-block timestamp drift to 15 seconds, and fixes various bugs for WASM and the RPC APIs.
-
-The full list of included changes:
-
-- Beta Backports and HF block update ([#7244](https://github.com/paritytech/parity/pull/7244))
-  - Reduce max block timestamp drift to 15 seconds ([#7240](https://github.com/paritytech/parity/pull/7240))
-    - Add test for block timestamp validation within allowed drift
-  - Update kovan HF block number.
-- Beta Kovan HF ([#7234](https://github.com/paritytech/parity/pull/7234))
-  - Kovan HF.
-  - Bump version.
-  - Fix aura difficulty race ([#7198](https://github.com/paritytech/parity/pull/7198))
-    - Fix test key
-    - Extract out score calculation
-    - Fix build
-  - Update kovan HF block number.
-  - Add missing byzantium builtins.
-  - Bump installers versions.
-  - Increase allowed time drift to 10s. ([#7238](https://github.com/paritytech/parity/pull/7238))
-- Beta Backports ([#7197](https://github.com/paritytech/parity/pull/7197))
-  - Maximum uncle count transition ([#7196](https://github.com/paritytech/parity/pull/7196))
-    - Enable delayed maximum_uncle_count activation.
-    - Fix tests.
-    - Defer kovan HF.
-  - Disable uncles by default ([#7006](https://github.com/paritytech/parity/pull/7006))
-  - Escape inifinite loop in estimte_gas ([#7075](https://github.com/paritytech/parity/pull/7075))
-  - ECIP-1039: Monetary policy rounding specification ([#7067](https://github.com/paritytech/parity/pull/7067))
-  - WASM Remove blockhash error ([#7121](https://github.com/paritytech/parity/pull/7121))
-    - Remove blockhash error
-    - Update tests.
-  - WASM storage_read and storage_write don't return anything ([#7110](https://github.com/paritytech/parity/pull/7110))
-  - WASM parse payload from panics ([#7097](https://github.com/paritytech/parity/pull/7097))
-  - Fix no-default-features. ([#7096](https://github.com/paritytech/parity/pull/7096))
-
-## Parity [v1.8.3](https://github.com/paritytech/parity/releases/tag/v1.8.3) (2017-11-15)
-
-Parity 1.8.3 contains several bug-fixes and removes the ability to deploy built-in multi-signature wallets.
-
-The full list of included changes:
-
-- Backports to beta ([#7043](https://github.com/paritytech/parity/pull/7043))
-  - pwasm-std update ([#7018](https://github.com/paritytech/parity/pull/7018))
-  - Version 1.8.3
-  - Make CLI arguments parsing more backwards compatible ([#7004](https://github.com/paritytech/parity/pull/7004))
-  - Skip nonce check for gas estimation ([#6997](https://github.com/paritytech/parity/pull/6997))
-  - Events in WASM runtime ([#6967](https://github.com/paritytech/parity/pull/6967))
-  - Return decoded seal fields. ([#6932](https://github.com/paritytech/parity/pull/6932))
-  - Fix serialization of status in transaction receipts. ([#6926](https://github.com/paritytech/parity/pull/6926))
-  - Windows fixes ([#6921](https://github.com/paritytech/parity/pull/6921))
-- Disallow built-in multi-sig deploy (only watch) ([#7014](https://github.com/paritytech/parity/pull/7014))
-- Add hint in ActionParams for splitting code/data ([#6968](https://github.com/paritytech/parity/pull/6968))
-  - Action params and embedded params handling
-  - Fix name-spaces
-
-## Parity [v1.8.2](https://github.com/paritytech/parity/releases/tag/v1.8.2) (2017-10-26)
-
-Parity 1.8.2 fixes an important potential consensus issue and a few additional minor issues:
-
-- `blockNumber` transaction field is now returned correctly in RPC calls.
-- Possible crash when `--force-sealing` option is used.
-
-The full list of included changes:
-
-- Beta Backports ([#6891](https://github.com/paritytech/parity/pull/6891))
-  - Bump to v1.8.2
-  - Refactor static context check in CREATE. ([#6886](https://github.com/paritytech/parity/pull/6886))
-    - Refactor static context check in CREATE.
-    - Fix wasm.
-  - Fix serialization of non-localized transactions ([#6868](https://github.com/paritytech/parity/pull/6868))
-    - Fix serialization of non-localized transactions.
-    - Return proper SignedTransactions representation.
-  - Allow force sealing and reseal=0 for non-dev chains. ([#6878](https://github.com/paritytech/parity/pull/6878))
-
-## Parity [v1.8.1](https://github.com/paritytech/parity/releases/tag/v1.8.1) (2017-10-20)
-
-Parity 1.8.1 fixes several bugs with token balances, tweaks snapshot-sync, improves the performance of nodes with huge amounts of accounts and changes the Trezor account derivation path.
-
-**Important Note**: The **Trezor** account derivation path was changed in this release ([#6815](https://github.com/paritytech/parity/pull/6815)) to always use the first account (`m/44'/60'/0'/0/0` instead of `m/44'/60'/0'/0`). This way we enable compatibility with other Ethereum wallets supporting Trezor hardware-wallets. However, **action is required** before upgrading, if you have funds on your Parity Trezor wallet. If you already upgraded to 1.8.1, please downgrade to 1.8.0 first to recover the funds with the following steps:
-
-1. Make sure you have 1.8.0-beta and your Trezor plugged in.
-2. Create a new standard Parity account. Make sure you have backups of the recovery phrase and don't forget the password.
-3. Move your funds from the Trezor hardware-wallet account to the freshly generated Parity account.
-4. Upgrade to 1.8.1-beta and plug in your Trezor.
-5. Move your funds from your Parity account to the new Trezor account.
-6. Keep using Parity as normal.
-
-If you don't want to downgrade or move your funds off your Trezor-device, you can also use the official Trezor application or other wallets allowing to select the derivation path to access the funds.
-
-The full list of included changes:
-
-- Add ECIP1017 to Morden config ([#6845](https://github.com/paritytech/parity/pull/6845))
-- Ethstore optimizations ([#6844](https://github.com/paritytech/parity/pull/6844))
-- Bumb to v1.8.1 ([#6843](https://github.com/paritytech/parity/pull/6843))
-- Backport ([#6837](https://github.com/paritytech/parity/pull/6837))
-  - Tweaked snapshot sync threshold ([#6829](https://github.com/paritytech/parity/pull/6829))
-  - Change keypath derivation logic ([#6815](https://github.com/paritytech/parity/pull/6815))
-- Refresh cached tokens based on registry info & random balances ([#6824](https://github.com/paritytech/parity/pull/6824))
-  - Refresh cached tokens based on registry info & random balances ([#6818](https://github.com/paritytech/parity/pull/6818))
-  - Don't display errored token images
-
-## Parity [v1.8.0](https://github.com/paritytech/parity/releases/tag/v1.8.0) (2017-10-15)
-
-We are happy to announce our newest Parity 1.8 release. Among others, it enables the following features:
-
-- Full Whisper v6 integration
-- Trezor hardware-wallet support
-- WASM contract support
-- PICOPS KYC-certified accounts and vouching for community-dapps
-- Light client compatibility for Proof-of-Authority networks
-- Transaction permissioning and permissioned p2p-connections
-- Full Byzantium-fork compatibility
-- Full Musicoin MCIP-3 UBI-fork compatibility
-
-Further, users upgrading from 1.7 should acknowledge the following changes:
-
-- The chain-engine was further abstracted and chain-specs need to be upgraded. [#6134](https://github.com/paritytech/parity/pull/6134) [#6591](https://github.com/paritytech/parity/pull/6591)
-- `network_id` was renamed to `chain_id` where applicable. [#6345](https://github.com/paritytech/parity/pull/6345)
-- `trace_filter` RPC method now comes with pagination. [#6312](https://github.com/paritytech/parity/pull/6312)
-- Added tracing of rewards on closing blocks. [#6194](https://github.com/paritytech/parity/pull/6194)
-
-The full list of included changes:
-
-- Updated ethabi to fix auto-update ([#6771](https://github.com/paritytech/parity/pull/6771))
-- Fixed kovan chain validation ([#6760](https://github.com/paritytech/parity/pull/6760))
-  - Fixed kovan chain validation
-  - Fork detection
-  - Fixed typo
-- Bumped fork block number for auto-update ([#6755](https://github.com/paritytech/parity/pull/6755))
-- CLI: Reject invalid argument values rather than ignore them ([#6747](https://github.com/paritytech/parity/pull/6747))
-- Fixed modexp gas calculation overflow ([#6745](https://github.com/paritytech/parity/pull/6745))
-- Backport beta - Fixes Badges ([#6732](https://github.com/paritytech/parity/pull/6732))
-  - Fix badges not showing up ([#6730](https://github.com/paritytech/parity/pull/6730))
-  - Always fetch meta data first [badges]
-- Bump to v1.8.0 in beta
-- Fix tokens and badges ([#6725](https://github.com/paritytech/parity/pull/6725))
-  - Update new token fetching
-  - Working Certifications Monitoring
-  - Update on Certification / Revoke
-  - Fix none-fetched tokens value display
-  - Fix tests
-- Check vouch status on appId in addition to contentHash ([#6719](https://github.com/paritytech/parity/pull/6719))
-  - Check vouch status on appId in addition to contentHash
-  - Simplify var expansion
-- Prevent going offline when restoring or taking a snapshot [#6694](https://github.com/paritytech/parity/pull/6694)
-- Graceful exit when invalid CLI flags are passed (#6485) [#6711](https://github.com/paritytech/parity/pull/6711)
-- Fixed RETURNDATA out of bounds check [#6718](https://github.com/paritytech/parity/pull/6718)
-- Display vouched overlay on dapps [#6710](https://github.com/paritytech/parity/pull/6710)
-- Fix gas estimation if `from` is not provided. [#6714](https://github.com/paritytech/parity/pull/6714)
-- Emulate signer pubsub on public node [#6708](https://github.com/paritytech/parity/pull/6708)
-- Removes  dependency on rustc_serialize (#5988) [#6705](https://github.com/paritytech/parity/pull/6705)
-- Fixed potential modexp exp len overflow [#6686](https://github.com/paritytech/parity/pull/6686)
-- Fix asciiToHex for characters < 0x10 [#6702](https://github.com/paritytech/parity/pull/6702)
-- Fix address input [#6701](https://github.com/paritytech/parity/pull/6701)
-- Allow signer signing display of markdown [#6707](https://github.com/paritytech/parity/pull/6707)
-- Fixed build warnings [#6664](https://github.com/paritytech/parity/pull/6664)
-- Fix warp sync blockers detection [#6691](https://github.com/paritytech/parity/pull/6691)
-- Difficulty tests [#6687](https://github.com/paritytech/parity/pull/6687)
-- Separate migrations from util [#6690](https://github.com/paritytech/parity/pull/6690)
-- Changelog for 1.7.3 [#6678](https://github.com/paritytech/parity/pull/6678)
-- WASM gas schedule [#6638](https://github.com/paritytech/parity/pull/6638)
-- Fix wallet view [#6597](https://github.com/paritytech/parity/pull/6597)
-- Byzantium fork block number [#6660](https://github.com/paritytech/parity/pull/6660)
-- Fixed RETURNDATA size for built-ins [#6652](https://github.com/paritytech/parity/pull/6652)
-- Light Client: fetch transactions/receipts by transaction hash [#6641](https://github.com/paritytech/parity/pull/6641)
-- Add Musicoin and MCIP-3 UBI hardfork.  [#6621](https://github.com/paritytech/parity/pull/6621)
-- fix 1.8 backcompat: revert to manual encoding/decoding of transition proofs [#6665](https://github.com/paritytech/parity/pull/6665)
-- Tweaked block download timeouts (#6595) [#6655](https://github.com/paritytech/parity/pull/6655)
-- Renamed RPC receipt statusCode field to status [#6650](https://github.com/paritytech/parity/pull/6650)
-- SecretStore: session level timeout [#6631](https://github.com/paritytech/parity/pull/6631)
-- SecretStore: ShareRemove of 'isolated' nodes [#6630](https://github.com/paritytech/parity/pull/6630)
-- SecretStore: exclusive sessions [#6624](https://github.com/paritytech/parity/pull/6624)
-- Fixed network protocol version negotiation [#6649](https://github.com/paritytech/parity/pull/6649)
-- Updated systemd files for linux (Resolves #6592) [#6598](https://github.com/paritytech/parity/pull/6598)
-- move additional_params to machine, fixes registry on non-ethash chains [#6646](https://github.com/paritytech/parity/pull/6646)
-- Fix Token Transfer in transaction list [#6589](https://github.com/paritytech/parity/pull/6589)
-- Update jsonrpc dependencies and rewrite dapps to futures. [#6522](https://github.com/paritytech/parity/pull/6522)
-- Balance queries implemented in WASM runtime [#6639](https://github.com/paritytech/parity/pull/6639)
-- Don't expose port 80 for parity anymore [#6633](https://github.com/paritytech/parity/pull/6633)
-- WASM Runtime refactoring [#6596](https://github.com/paritytech/parity/pull/6596)
-- Fix compilation [#6625](https://github.com/paritytech/parity/pull/6625)
-- Downgrade futures to suppress warnings. [#6620](https://github.com/paritytech/parity/pull/6620)
-- Add pagination for trace_filter rpc method [#6312](https://github.com/paritytech/parity/pull/6312)
-- Disallow pasting recovery phrases on first run [#6602](https://github.com/paritytech/parity/pull/6602)
-- fix typo: Unkown => Unknown [#6559](https://github.com/paritytech/parity/pull/6559)
-- SecretStore: administrative sessions prototypes [#6605](https://github.com/paritytech/parity/pull/6605)
-- fix parity.io link 404 [#6617](https://github.com/paritytech/parity/pull/6617)
-- SecretStore: add node to existing session poc + discussion [#6480](https://github.com/paritytech/parity/pull/6480)
-- Generalize engine trait [#6591](https://github.com/paritytech/parity/pull/6591)
-- Add RPC eth_chainId for querying the current blockchain chain ID [#6329](https://github.com/paritytech/parity/pull/6329)
-- Debounce sync status. [#6572](https://github.com/paritytech/parity/pull/6572)
-- [Public Node] Disable tx scheduling and hardware wallets [#6588](https://github.com/paritytech/parity/pull/6588)
-- Use memmap for dag cache [#6193](https://github.com/paritytech/parity/pull/6193)
-- Rename Requests to Batch [#6582](https://github.com/paritytech/parity/pull/6582)
-- Use host as ws/dapps url if present. [#6566](https://github.com/paritytech/parity/pull/6566)
-- Sync progress and error handling fixes [#6560](https://github.com/paritytech/parity/pull/6560)
-- Fixed receipt serialization and RPC [#6555](https://github.com/paritytech/parity/pull/6555)
-- Fix number of confirmations for transaction [#6552](https://github.com/paritytech/parity/pull/6552)
-- Fix #6540 [#6556](https://github.com/paritytech/parity/pull/6556)
-- Fix failing hardware tests [#6553](https://github.com/paritytech/parity/pull/6553)
-- Required validators >= num owners in Wallet Creation [#6551](https://github.com/paritytech/parity/pull/6551)
-- Random cleanups / improvements to a state [#6472](https://github.com/paritytech/parity/pull/6472)
-- Changelog for 1.7.2 [#6363](https://github.com/paritytech/parity/pull/6363)
-- Ropsten fork [#6533](https://github.com/paritytech/parity/pull/6533)
-- Byzantium updates [#5855](https://github.com/paritytech/parity/pull/5855)
-- Fix extension detection [#6452](https://github.com/paritytech/parity/pull/6452)
-- Downgrade futures to supress warnings [#6521](https://github.com/paritytech/parity/pull/6521)
-- separate trie from util and make its dependencies into libs [#6478](https://github.com/paritytech/parity/pull/6478)
-- WASM sha3 test [#6512](https://github.com/paritytech/parity/pull/6512)
-- Fix broken JavaScript tests [#6498](https://github.com/paritytech/parity/pull/6498)
-- SecretStore: use random key to encrypt channel + session-level nonce [#6470](https://github.com/paritytech/parity/pull/6470)
-- Trezor Support [#6403](https://github.com/paritytech/parity/pull/6403)
-- Fix compiler warning [#6491](https://github.com/paritytech/parity/pull/6491)
-- Fix typo [#6505](https://github.com/paritytech/parity/pull/6505)
-- WASM: added math overflow test [#6474](https://github.com/paritytech/parity/pull/6474)
-- Fix slow balances [#6471](https://github.com/paritytech/parity/pull/6471)
-- WASM runtime update [#6467](https://github.com/paritytech/parity/pull/6467)
-- Compatibility with whisper v6 [#6179](https://github.com/paritytech/parity/pull/6179)
-- light-poa round 2: allow optional casting of engine client to full client [#6468](https://github.com/paritytech/parity/pull/6468)
-- Moved attributes under docs [#6475](https://github.com/paritytech/parity/pull/6475)
-- cleanup util dependencies [#6464](https://github.com/paritytech/parity/pull/6464)
-- removed redundant earlymergedb trace guards [#6463](https://github.com/paritytech/parity/pull/6463)
-- UtilError utilizes error_chain! [#6461](https://github.com/paritytech/parity/pull/6461)
-- fixed master [#6465](https://github.com/paritytech/parity/pull/6465)
-- Refactor and port CLI from Docopt to Clap (#2066) [#6356](https://github.com/paritytech/parity/pull/6356)
-- Add language selector in production [#6317](https://github.com/paritytech/parity/pull/6317)
-- eth_call returns output of contract creations [#6420](https://github.com/paritytech/parity/pull/6420)
-- Refactor: Don't reexport bigint from util [#6459](https://github.com/paritytech/parity/pull/6459)
-- Transaction permissioning [#6441](https://github.com/paritytech/parity/pull/6441)
-- Added missing SecretStore tests - signing session [#6411](https://github.com/paritytech/parity/pull/6411)
-- Light-client sync for contract-based PoA [#6370](https://github.com/paritytech/parity/pull/6370)
-- triehash is separated from util [#6428](https://github.com/paritytech/parity/pull/6428)
-- remove re-export of parking_lot in util [#6435](https://github.com/paritytech/parity/pull/6435)
-- fix modexp bug: return 0 if base is zero [#6424](https://github.com/paritytech/parity/pull/6424)
-- separate semantic_version from util [#6438](https://github.com/paritytech/parity/pull/6438)
-- move timer.rs to ethcore [#6437](https://github.com/paritytech/parity/pull/6437)
-- remove re-export of ansi_term in util [#6433](https://github.com/paritytech/parity/pull/6433)
-- Pub sub blocks [#6139](https://github.com/paritytech/parity/pull/6139)
-- replace trait Hashable with fn keccak [#6423](https://github.com/paritytech/parity/pull/6423)
-- add more hash backward compatibility test for bloom [#6425](https://github.com/paritytech/parity/pull/6425)
-- remove the redundant hasher in Bloom [#6404](https://github.com/paritytech/parity/pull/6404)
-- Remove re-export of HeapSizeOf in util (part of #6418) [#6419](https://github.com/paritytech/parity/pull/6419)
-- Rewards on closing blocks [#6194](https://github.com/paritytech/parity/pull/6194)
-- ensure balances of constructor accounts are kept [#6413](https://github.com/paritytech/parity/pull/6413)
-- removed recursion from triedbmut::lookup [#6394](https://github.com/paritytech/parity/pull/6394)
-- do not activate genesis epoch in immediate transition validator contract [#6349](https://github.com/paritytech/parity/pull/6349)
-- Use git for the snap version [#6271](https://github.com/paritytech/parity/pull/6271)
-- Permissioned p2p connections [#6359](https://github.com/paritytech/parity/pull/6359)
-- Don't accept transactions above block gas limit. [#6408](https://github.com/paritytech/parity/pull/6408)
-- Fix memory tracing. [#6399](https://github.com/paritytech/parity/pull/6399)
-- earlydb optimizations [#6393](https://github.com/paritytech/parity/pull/6393)
-- Optimized PlainHasher hashing. Trie insertions are >15 faster [#6321](https://github.com/paritytech/parity/pull/6321)
-- Trie optimizations [#6389](https://github.com/paritytech/parity/pull/6389)
-- small optimizations for triehash [#6392](https://github.com/paritytech/parity/pull/6392)
-- Bring back IPFS tests. [#6398](https://github.com/paritytech/parity/pull/6398)
-- Running state test using parity-evm [#6355](https://github.com/paritytech/parity/pull/6355)
-- Wasm math tests extended [#6354](https://github.com/paritytech/parity/pull/6354)
-- Expose health status over RPC [#6274](https://github.com/paritytech/parity/pull/6274)
-- fix bloom bitvecjournal storage allocation [#6390](https://github.com/paritytech/parity/pull/6390)
-- fixed pending block panic [#6391](https://github.com/paritytech/parity/pull/6391)
-- Infoline less opaque for UI/visibility [#6364](https://github.com/paritytech/parity/pull/6364)
-- Fix eth_call. [#6365](https://github.com/paritytech/parity/pull/6365)
-- updated bigint [#6341](https://github.com/paritytech/parity/pull/6341)
-- Optimize trie iter by avoiding redundant copying [#6347](https://github.com/paritytech/parity/pull/6347)
-- Only keep a single rocksdb debug log file [#6346](https://github.com/paritytech/parity/pull/6346)
-- Tweaked snapshot params [#6344](https://github.com/paritytech/parity/pull/6344)
-- Rename network_id to chain_id where applicable. [#6345](https://github.com/paritytech/parity/pull/6345)
-- Itertools are no longer reexported from util, optimized triedb iter [#6322](https://github.com/paritytech/parity/pull/6322)
-- Better check the created accounts before showing Startup Wizard [#6331](https://github.com/paritytech/parity/pull/6331)
-- Better error messages for invalid types in RPC [#6311](https://github.com/paritytech/parity/pull/6311)
-- fix panic in parity-evm json tracer [#6338](https://github.com/paritytech/parity/pull/6338)
-- WASM math test [#6305](https://github.com/paritytech/parity/pull/6305)
-- rlp_derive [#6125](https://github.com/paritytech/parity/pull/6125)
-- Fix --chain parsing in parity-evm. [#6314](https://github.com/paritytech/parity/pull/6314)
-- Unexpose RPC methods on :8180 [#6295](https://github.com/paritytech/parity/pull/6295)
-- Ignore errors from dappsUrl when starting UI. [#6296](https://github.com/paritytech/parity/pull/6296)
-- updated bigint with optimized mul and from_big_indian [#6323](https://github.com/paritytech/parity/pull/6323)
-- SecretStore: bunch of fixes and improvements [#6168](https://github.com/paritytech/parity/pull/6168)
-- Master requires rust 1.19 [#6308](https://github.com/paritytech/parity/pull/6308)
-- Add more descriptive error when signing/decrypting using hw wallet. [#6302](https://github.com/paritytech/parity/pull/6302)
-- Increase default gas limit for eth_call. [#6299](https://github.com/paritytech/parity/pull/6299)
-- rust-toolchain file on master [#6266](https://github.com/paritytech/parity/pull/6266)
-- Migrate wasm-tests to updated runtime [#6278](https://github.com/paritytech/parity/pull/6278)
-- Extension fixes [#6284](https://github.com/paritytech/parity/pull/6284)
-- Fix a hash displayed in tooltip when signing arbitrary data [#6283](https://github.com/paritytech/parity/pull/6283)
-- Time should not contribue to overall status. [#6276](https://github.com/paritytech/parity/pull/6276)
-- Add --to and --gas-price to evmbin [#6277](https://github.com/paritytech/parity/pull/6277)
-- Fix dapps CSP when UI is exposed externally [#6178](https://github.com/paritytech/parity/pull/6178)
-- Add warning to web browser and fix links. [#6232](https://github.com/paritytech/parity/pull/6232)
-- Update Settings/Proxy view to match entries in proxy.pac [#4771](https://github.com/paritytech/parity/pull/4771)
-- Dapp refresh [#5752](https://github.com/paritytech/parity/pull/5752)
-- Add support for ConsenSys multisig wallet [#6153](https://github.com/paritytech/parity/pull/6153)
-- updated jsonrpc [#6264](https://github.com/paritytech/parity/pull/6264)
-- SecretStore: encrypt messages using private key from key store [#6146](https://github.com/paritytech/parity/pull/6146)
-- Wasm storage read test [#6255](https://github.com/paritytech/parity/pull/6255)
-- propagate stratum submit share error upstream [#6260](https://github.com/paritytech/parity/pull/6260)
-- Using multiple NTP servers [#6173](https://github.com/paritytech/parity/pull/6173)
-- Add GitHub issue templates. [#6259](https://github.com/paritytech/parity/pull/6259)
-- format instant change proofs correctly [#6241](https://github.com/paritytech/parity/pull/6241)
-- price-info does not depend on util [#6231](https://github.com/paritytech/parity/pull/6231)
-- native-contracts crate does not depend on util any more [#6233](https://github.com/paritytech/parity/pull/6233)
-- Bump master to 1.8.0 [#6256](https://github.com/paritytech/parity/pull/6256)
-- SecretStore: do not cache ACL contract + on-chain key servers configuration [#6107](https://github.com/paritytech/parity/pull/6107)
-- Fix the README badges [#6229](https://github.com/paritytech/parity/pull/6229)
-- updated tiny-keccak to 1.3 [#6248](https://github.com/paritytech/parity/pull/6248)
-- Small grammatical error [#6244](https://github.com/paritytech/parity/pull/6244)
-- Multi-call RPC [#6195](https://github.com/paritytech/parity/pull/6195)
-- InstantSeal fix [#6223](https://github.com/paritytech/parity/pull/6223)
-- Untrusted RLP length overflow check  [#6227](https://github.com/paritytech/parity/pull/6227)
-- Chainspec validation [#6197](https://github.com/paritytech/parity/pull/6197)
-- Fix cache path when using --base-path [#6212](https://github.com/paritytech/parity/pull/6212)
-- removed std reexports from util && fixed broken tests [#6187](https://github.com/paritytech/parity/pull/6187)
-- WASM MVP continued [#6132](https://github.com/paritytech/parity/pull/6132)
-- Decouple virtual machines [#6184](https://github.com/paritytech/parity/pull/6184)
-- Realloc test added [#6177](https://github.com/paritytech/parity/pull/6177)
-- Re-enable wallets, fixed forgetting accounts [#6196](https://github.com/paritytech/parity/pull/6196)
-- Move more params to the common section. [#6134](https://github.com/paritytech/parity/pull/6134)
-- Whisper js [#6161](https://github.com/paritytech/parity/pull/6161)
-- typo in uninstaller [#6185](https://github.com/paritytech/parity/pull/6185)
-- fix #6052. honor --no-color for signer command [#6100](https://github.com/paritytech/parity/pull/6100)
-- Refactor --allow-ips to handle custom ip-ranges [#6144](https://github.com/paritytech/parity/pull/6144)
-- Update Changelog for 1.6.10 and 1.7.0 [#6183](https://github.com/paritytech/parity/pull/6183)
-- Fix unsoundness in ethash's unsafe code [#6140](https://github.com/paritytech/parity/pull/6140)

ethash/Cargo.toml

@@ -9,9 +9,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
 log = "0.3"
 keccak-hash = { path = "../util/hash" }
 primal = "0.2.3"
-parking_lot = "0.5"
+parking_lot = "0.4"
 crunchy = "0.1.0"
-memmap = "0.6"
+memmap = "0.5.2"
 either = "1.0.0"
 
 [features]

ethash/src/cache.rs

@@ -17,7 +17,7 @@
 use compute::Light;
 use either::Either;
 use keccak::{H256, keccak_512};
-use memmap::MmapMut;
+use memmap::{Mmap, Protection};
 use parking_lot::Mutex;
 use seed_compute::SeedHashCompute;
 
@@ -30,7 +30,7 @@ use std::path::{Path, PathBuf};
 use std::slice;
 use std::sync::Arc;
 
-type Cache = Either<Vec<Node>, MmapMut>;
+type Cache = Either<Vec<Node>, Mmap>;
 
 #[derive(PartialEq, Eq, Debug, Clone, Copy)]
 pub enum OptimizeFor {
@@ -181,7 +181,7 @@ impl NodeCache {
 	}
 }
 
-fn make_memmapped_cache(path: &Path, num_nodes: usize, ident: &H256) -> io::Result<MmapMut> {
+fn make_memmapped_cache(path: &Path, num_nodes: usize, ident: &H256) -> io::Result<Mmap> {
 	use std::fs::OpenOptions;
 
 	let file = OpenOptions::new()
@@ -191,9 +191,9 @@ fn make_memmapped_cache(path: &Path, num_nodes: usize, ident: &H256) -> io::Resu
 		.open(&path)?;
 	file.set_len((num_nodes * NODE_BYTES) as _)?;
 
-	let mut memmap = unsafe { MmapMut::map_mut(&file)? };
+	let mut memmap = Mmap::open(&file, Protection::ReadWrite)?;
 
-	unsafe { initialize_memory(memmap.as_mut_ptr() as *mut Node, num_nodes, ident) };
+	unsafe { initialize_memory(memmap.mut_ptr() as *mut Node, num_nodes, ident) };
 
 	Ok(memmap)
 }
@@ -241,10 +241,7 @@ fn consume_cache(cache: &mut Cache, path: &Path) -> io::Result<()> {
 fn cache_from_path(path: &Path, optimize_for: OptimizeFor) -> io::Result<Cache> {
 	let memmap = match optimize_for {
 		OptimizeFor::Cpu => None,
-		OptimizeFor::Memory => {
-			let file = fs::OpenOptions::new().read(true).write(true).create(true).open(path)?;
-			unsafe { MmapMut::map_mut(&file).ok() }
-		},
+		OptimizeFor::Memory => Mmap::open_path(path, Protection::ReadWrite).ok(),
 	};
 
 	memmap.map(Either::Right).ok_or(()).or_else(|_| {
@@ -290,7 +287,7 @@ impl AsRef<[Node]> for NodeCache {
 		match self.cache {
 			Either::Left(ref vec) => vec,
 			Either::Right(ref mmap) => unsafe {
-				let bytes = mmap.as_ptr();
+				let bytes = mmap.ptr();
 				// This isn't a safety issue, so we can keep this a debug lint. We don't care about
 				// people manually messing with the files unless it can cause unsafety, but if we're
 				// generating incorrect files then we want to catch that in CI.

ethash/src/lib.rs

@@ -105,14 +105,16 @@ impl EthashManager {
 			};
 			match light {
 				None => {
-					let light = match self.nodecache_builder.light_from_file(
+					let light = match Light::from_file_with_builder(
+						&self.nodecache_builder,
 						&self.cache_dir,
 						block_number,
 					) {
 						Ok(light) => Arc::new(light),
 						Err(e) => {
 							debug!("Light cache file not found for {}:{}", block_number, e);
-							let mut light = self.nodecache_builder.light(
+							let mut light = Light::new_with_builder(
+								&self.nodecache_builder,
 								&self.cache_dir,
 								block_number,
 							);
@@ -167,7 +169,7 @@ mod benchmarks {
 		use std::env;
 
 		let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
-		let light = builder.light(&env::temp_dir(), 486382);
+		let light = Light::new_with_builder(&builder, &env::temp_dir(), 486382);
 
 		b.iter(|| light_compute(&light, &HASH, NONCE));
 	}
@@ -176,8 +178,7 @@ mod benchmarks {
 	fn bench_light_compute_memory(b: &mut Bencher) {
 		use std::env;
 
-		let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
-		let light = builder.light(&env::temp_dir(), 486382);
+		let light = Light::new(&env::temp_dir(), 486382);
 
 		b.iter(|| light_compute(&light, &HASH, NONCE));
 	}
@@ -189,7 +190,7 @@ mod benchmarks {
 
 		b.iter(|| {
 			let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
-			let light = builder.light(&env::temp_dir(), 486382);
+			let light = Light::new_with_builder(&builder, &env::temp_dir(), 486382);
 			light_compute(&light, &HASH, NONCE);
 		});
 	}
@@ -198,10 +199,8 @@ mod benchmarks {
 	#[ignore]
 	fn bench_light_new_round_trip_memory(b: &mut Bencher) {
 		use std::env;
-
 		b.iter(|| {
-			let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
-			let light = builder.light(&env::temp_dir(), 486382);
+			let light = Light::new(&env::temp_dir(), 486382);
 			light_compute(&light, &HASH, NONCE);
 		});
 	}
@@ -213,14 +212,12 @@ mod benchmarks {
 		let dir = env::temp_dir();
 		let height = 486382;
 		{
-			let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
-			let mut dummy = builder.light(&dir, height);
+			let mut dummy = Light::new(&dir, height);
 			dummy.to_file().unwrap();
 		}
 
 		b.iter(|| {
-			let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
-			let light = builder.light_from_file(&dir, 486382).unwrap();
+			let light = Light::from_file(&dir, 486382).unwrap();
 			light_compute(&light, &HASH, NONCE);
 		});
 	}
@@ -231,16 +228,15 @@ mod benchmarks {
 
 		let dir = env::temp_dir();
 		let height = 486382;
-
 		{
 			let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
-			let mut dummy = builder.light(&dir, height);
+			let mut dummy = Light::new_with_builder(&builder, &dir, height);
 			dummy.to_file().unwrap();
 		}
 
 		b.iter(|| {
 			let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
-			let light = builder.light_from_file(&dir, 486382).unwrap();
+			let light = Light::from_file_with_builder(&builder, &dir, 486382).unwrap();
 			light_compute(&light, &HASH, NONCE);
 		});
 	}

ethcore/Cargo.toml

@@ -7,7 +7,7 @@ version = "1.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-ansi_term = "0.10"
+ansi_term = "0.9"
 bloomchain = { path = "../util/bloomchain" }
 bn = { git = "https://github.com/paritytech/bn" }
 byteorder = "1.0"
@@ -19,33 +19,34 @@ ethcore-bytes = { path = "../util/bytes" }
 hashdb = { path = "../util/hashdb" }
 memorydb = { path = "../util/memorydb" }
 patricia-trie = { path = "../util/patricia_trie" }
+ethcore-devtools = { path = "../devtools" }
 ethcore-io = { path = "../util/io" }
 ethcore-logger = { path = "../logger" }
-ethcore-miner = { path = "../miner" }
 ethcore-stratum = { path = "../stratum" }
-ethcore-transaction = { path = "./transaction" }
-ethereum-types = "0.2"
+ethcore-util = { path = "../util" }
+ethcore-bigint = { path = "../util/bigint" }
 memory-cache = { path = "../util/memory_cache" }
-ethabi = "5.1"
-ethabi-derive = "5.0"
-ethabi-contract = "5.0"
 ethjson = { path = "../json" }
 ethkey = { path = "../ethkey" }
 ethstore = { path = "../ethstore" }
 evm = { path = "evm" }
+futures = "0.1"
 hardware-wallet = { path = "../hw" }
 heapsize = "0.4"
+hyper = { git = "https://github.com/paritytech/hyper", default-features = false }
 itertools = "0.5"
-lazy_static = "1.0"
+lazy_static = "0.2"
+linked-hash-map = "0.5"
 log = "0.3"
 lru-cache = "0.1"
+native-contracts = { path = "native_contracts" }
 num = "0.1"
 num_cpus = "1.2"
 parity-machine = { path = "../machine" }
-parking_lot = "0.5"
+parking_lot = "0.4"
 price-info = { path = "../price-info" }
 rayon = "0.8"
-rand = "0.4"
+rand = "0.3"
 rlp = { path = "../util/rlp" }
 rlp_derive = { path = "../util/rlp_derive" }
 kvdb = { path = "../util/kvdb" }
@@ -53,29 +54,33 @@ kvdb-rocksdb = { path = "../util/kvdb-rocksdb" }
 kvdb-memorydb = { path = "../util/kvdb-memorydb" }
 util-error = { path = "../util/error" }
 snappy = { git = "https://github.com/paritytech/rust-snappy" }
-stop-guard = { path = "../util/stop-guard" }
 migration = { path = "../util/migration" }
 macros = { path = "../util/macros" }
 rust-crypto = "0.2.34"
 rustc-hex = "1.0"
 stats = { path = "../util/stats" }
 time = "0.1"
+transient-hashmap = "0.4"
 using_queue = { path = "../util/using_queue" }
 table = { path = "../util/table" }
+bloomable = { path = "../util/bloomable" }
 vm = { path = "vm" }
 wasm = { path = "wasm" }
 keccak-hash = { path = "../util/hash" }
 triehash = { path = "../util/triehash" }
+semantic_version = { path = "../util/semantic_version" }
 unexpected = { path = "../util/unexpected" }
 journaldb = { path = "../util/journaldb" }
-tempdir = "0.3"
+
+[dev-dependencies]
+native-contracts = { path = "native_contracts", features = ["test_contracts"] }
 
 [features]
 jit = ["evm/jit"]
 evm-debug = ["slow-blocks"]
 evm-debug-tests = ["evm-debug", "evm/evm-debug-tests"]
 slow-blocks = [] # Use SLOW_TX_DURATION="50" (compile time!) to track transactions over 50ms
-json-tests = ["ethcore-transaction/json-tests"]
+json-tests = []
 test-heavy = []
 default = []
 benches = []

ethcore/evm/Cargo.toml

@@ -5,14 +5,15 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 bit-set = "0.4"
-ethereum-types = "0.2"
+ethcore-util = { path = "../../util" }
+ethcore-bigint = { path = "../../util/bigint" }
 evmjit = { path = "../../evmjit", optional = true }
 heapsize = "0.4"
-lazy_static = "1.0"
+lazy_static = "0.2"
 log = "0.3"
 vm = { path = "../vm" }
 keccak-hash = { path = "../../util/hash" }
-parking_lot = "0.5"
+parking_lot = "0.4"
 memory-cache = { path = "../../util/memory_cache" }
 
 [dev-dependencies]

ethcore/evm/src/evm.rs

@@ -17,7 +17,7 @@
 //! Evm interface.
 
 use std::{ops, cmp, fmt};
-use ethereum_types::{U128, U256, U512};
+use bigint::prelude::{U128, U256, U512};
 use vm::{Ext, Result, ReturnData, GasLeft, Error};
 
 /// Finalization result. Gas Left: either it is a known value, or it needs to be computed by processing
@@ -149,7 +149,7 @@ impl CostType for usize {
 
 #[cfg(test)]
 mod tests {
-	use ethereum_types::U256;
+	use bigint::prelude::U256;
 	use super::CostType;
 
 	#[test]

ethcore/evm/src/factory.rs

@@ -18,7 +18,7 @@
 //!
 use std::sync::Arc;
 use vm::Vm;
-use ethereum_types::U256;
+use bigint::prelude::U256;
 use super::interpreter::SharedCache;
 use super::vmtype::VMType;
 
@@ -33,7 +33,7 @@ impl Factory {
 	/// Create fresh instance of VM
 	/// Might choose implementation depending on supplied gas.
 	#[cfg(feature = "jit")]
-	pub fn create(&self, gas: U256) -> Box<Vm> {
+	pub fn create(&self, gas: &U256) -> Box<Vm> {
 		match self.evm {
 			VMType::Jit => {
 				Box::new(super::jit::JitEvm::default())
@@ -49,7 +49,7 @@ impl Factory {
 	/// Create fresh instance of VM
 	/// Might choose implementation depending on supplied gas.
 	#[cfg(not(feature = "jit"))]
-	pub fn create(&self, gas: U256) -> Box<Vm> {
+	pub fn create(&self, gas: &U256) -> 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()))
@@ -68,8 +68,8 @@ impl Factory {
 		}
 	}
 
-	fn can_fit_in_usize(gas: U256) -> bool {
-		gas == U256::from(gas.low_u64() as usize)
+	fn can_fit_in_usize(gas: &U256) -> bool {
+		gas == &U256::from(gas.low_u64() as usize)
 	}
 }
 
@@ -95,7 +95,7 @@ impl Default for Factory {
 
 #[test]
 fn test_create_vm() {
-	let _vm = Factory::default().create(U256::zero());
+	let _vm = Factory::default().create(&U256::zero());
 }
 
 /// Create tests by injecting different VM factories

ethcore/evm/src/interpreter/gasometer.rs

@@ -15,7 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::cmp;
-use ethereum_types::{U256, H256};
+use bigint::prelude::U256;
+use bigint::hash::H256;
 use super::u256_to_address;
 
 use {evm, vm};

ethcore/evm/src/interpreter/memory.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use ethereum_types::U256;
+use bigint::prelude::U256;
 use vm::ReturnData;
 
 const MAX_RETURN_WASTE_BYTES: usize = 16384;
@@ -134,7 +134,7 @@ impl Memory for Vec<u8> {
 
 #[cfg(test)]
 mod tests {
-	use ethereum_types::U256;
+	use bigint::prelude::U256;
 	use super::Memory;
 
 	#[test]

ethcore/evm/src/interpreter/mod.rs

@@ -27,7 +27,8 @@ use std::marker::PhantomData;
 use std::{cmp, mem};
 use std::sync::Arc;
 use hash::keccak;
-use ethereum_types::{U256, U512, H256, Address};
+use bigint::prelude::{U256, U512};
+use bigint::hash::H256;
 
 use vm::{
 	self, ActionParams, ActionValue, CallType, MessageCallResult,
@@ -44,6 +45,8 @@ pub use self::shared_cache::SharedCache;
 
 use bit_set::BitSet;
 
+use util::*;
+
 type ProgramCounter = usize;
 
 const ONE: U256 = U256([1, 0, 0, 0]);
@@ -132,9 +135,7 @@ impl<Cost: CostType> vm::Vm for Interpreter<Cost> {
 			reader.position += 1;
 
 			// TODO: make compile-time removable if too much of a performance hit.
-			do_trace = do_trace && ext.trace_next_instruction(
-				reader.position - 1, instruction, gasometer.current_gas.as_u256(),
-			);
+			do_trace = do_trace && ext.trace_next_instruction(reader.position - 1, instruction);
 
 			let info = &infos[instruction as usize];
 			self.verify_instruction(ext, instruction, info, &stack)?;
@@ -913,8 +914,13 @@ mod tests {
 	use rustc_hex::FromHex;
 	use vmtype::VMType;
 	use factory::Factory;
-	use vm::{ActionParams, ActionValue};
+	use vm::{Vm, ActionParams, ActionValue};
 	use vm::tests::{FakeExt, test_finalize};
+	use bigint::prelude::U256;
+
+	fn interpreter(gas: &U256) -> Box<Vm> {
+		Factory::new(VMType::Interpreter, 1).create(gas)
+	}
 
 	#[test]
 	fn should_not_fail_on_tracing_mem() {
@@ -931,7 +937,7 @@ mod tests {
 		ext.tracing = true;
 
 		let gas_left = {
-			let mut vm = Factory::new(VMType::Interpreter, 1).create(params.gas);
+			let mut vm = interpreter(&params.gas);
 			test_finalize(vm.exec(params, &mut ext)).unwrap()
 		};
 
@@ -953,7 +959,7 @@ mod tests {
 		ext.tracing = true;
 
 		let err = {
-			let mut vm = Factory::new(VMType::Interpreter, 1).create(params.gas);
+			let mut vm = interpreter(&params.gas);
 			test_finalize(vm.exec(params, &mut ext)).err().unwrap()
 		};
 

ethcore/evm/src/interpreter/shared_cache.rs

@@ -17,7 +17,7 @@
 use std::sync::Arc;
 use hash::KECCAK_EMPTY;
 use heapsize::HeapSizeOf;
-use ethereum_types::H256;
+use bigint::hash::H256;
 use parking_lot::Mutex;
 use memory_cache::MemoryLruCache;
 use bit_set::BitSet;

ethcore/evm/src/lib.rs

@@ -17,7 +17,8 @@
 //! Ethereum virtual machine.
 
 extern crate bit_set;
-extern crate ethereum_types;
+extern crate ethcore_util as util;
+extern crate ethcore_bigint as bigint;
 extern crate parking_lot;
 extern crate heapsize;
 extern crate vm;

ethcore/evm/src/tests.rs

@@ -20,7 +20,9 @@ use std::hash::Hash;
 use std::sync::Arc;
 use std::collections::{HashMap, HashSet};
 use rustc_hex::FromHex;
-use ethereum_types::{U256, H256, Address};
+use bigint::prelude::U256;
+use bigint::hash::H256;
+use util::*;
 use vm::{self, ActionParams, ActionValue};
 use vm::tests::{FakeExt, FakeCall, FakeCallType, test_finalize};
 use factory::Factory;
@@ -38,7 +40,7 @@ fn test_add(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -58,7 +60,7 @@ fn test_sha3(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -78,7 +80,7 @@ fn test_address(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -100,7 +102,7 @@ fn test_origin(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -122,7 +124,7 @@ fn test_sender(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -157,7 +159,7 @@ fn test_extcodecopy(factory: super::Factory) {
 	ext.codes.insert(sender, Arc::new(sender_code));
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -177,7 +179,7 @@ fn test_log_empty(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -209,7 +211,7 @@ fn test_log_sender(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -234,7 +236,7 @@ fn test_blockhash(factory: super::Factory) {
 	ext.blockhashes.insert(U256::zero(), blockhash.clone());
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -256,7 +258,7 @@ fn test_calldataload(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -277,7 +279,7 @@ fn test_author(factory: super::Factory) {
 	ext.info.author = author;
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -297,7 +299,7 @@ fn test_timestamp(factory: super::Factory) {
 	ext.info.timestamp = timestamp;
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -317,7 +319,7 @@ fn test_number(factory: super::Factory) {
 	ext.info.number = number;
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -337,7 +339,7 @@ fn test_difficulty(factory: super::Factory) {
 	ext.info.difficulty = difficulty;
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -357,7 +359,7 @@ fn test_gas_limit(factory: super::Factory) {
 	ext.info.gas_limit = gas_limit;
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -375,7 +377,7 @@ fn test_mul(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -393,7 +395,7 @@ fn test_sub(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -411,7 +413,7 @@ fn test_div(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -429,7 +431,7 @@ fn test_div_zero(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -447,7 +449,7 @@ fn test_mod(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -466,7 +468,7 @@ fn test_smod(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -485,7 +487,7 @@ fn test_sdiv(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -504,7 +506,7 @@ fn test_exp(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -524,7 +526,7 @@ fn test_comparison(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -545,7 +547,7 @@ fn test_signed_comparison(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -566,7 +568,7 @@ fn test_bitops(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -589,7 +591,7 @@ fn test_addmod_mulmod(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -610,7 +612,7 @@ fn test_byte(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -629,7 +631,7 @@ fn test_signextend(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -649,7 +651,7 @@ fn test_badinstruction_int() {
 	let mut ext = FakeExt::new();
 
 	let err = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap_err()
 	};
 
@@ -669,7 +671,7 @@ fn test_pop(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -689,7 +691,7 @@ fn test_extops(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -712,7 +714,7 @@ fn test_jumps(factory: super::Factory) {
 	let mut ext = FakeExt::new();
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -740,7 +742,7 @@ fn test_calls(factory: super::Factory) {
 	};
 
 	let gas_left = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap()
 	};
 
@@ -779,7 +781,7 @@ fn test_create_in_staticcall(factory: super::Factory) {
 	ext.is_static = true;
 
 	let err = {
-		let mut vm = factory.create(params.gas);
+		let mut vm = factory.create(&params.gas);
 		test_finalize(vm.exec(params, &mut ext)).unwrap_err()
 	};
 

ethcore/light/Cargo.toml

@@ -9,29 +9,26 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 log = "0.3"
 ethcore = { path = ".."}
+ethcore-util = { path = "../../util" }
+ethcore-bigint = { path = "../../util/bigint" }
 ethcore-bytes = { path = "../../util/bytes" }
-ethcore-transaction = { path = "../transaction" }
-ethereum-types = "0.2"
 memorydb = { path = "../../util/memorydb" }
 patricia-trie = { path = "../../util/patricia_trie" }
 ethcore-network = { path = "../../util/network" }
 ethcore-io = { path = "../../util/io" }
-evm = { path = "../evm" }
-hashdb = { path = "../../util/hashdb" }
 heapsize = "0.4"
 vm = { path = "../vm" }
-plain_hasher = { path = "../../util/plain_hasher" }
 rlp = { path = "../../util/rlp" }
 rlp_derive = { path = "../../util/rlp_derive" }
 time = "0.1"
 smallvec = "0.4"
 futures = "0.1"
-rand = "0.4"
+rand = "0.3"
 itertools = "0.5"
 bincode = "0.8.0"
 serde = "1.0"
 serde_derive = "1.0"
-parking_lot = "0.5"
+parking_lot = "0.4"
 stats = { path = "../../util/stats" }
 keccak-hash = { path = "../../util/hash" }
 triehash = { path = "../../util/triehash" }

ethcore/light/src/cache.rs

@@ -27,7 +27,8 @@ use ethcore::receipt::Receipt;
 use stats::Corpus;
 use time::{SteadyTime, Duration};
 use heapsize::HeapSizeOf;
-use ethereum_types::{H256, U256};
+use bigint::prelude::U256;
+use bigint::hash::H256;
 use memory_cache::MemoryLruCache;
 
 /// Configuration for how much data to cache.

ethcore/light/src/cht.rs

@@ -21,9 +21,9 @@
 //! we discarded.
 
 use ethcore::ids::BlockId;
-use ethereum_types::{H256, U256};
-use hashdb::HashDB;
-use memorydb::MemoryDB;
+use bigint::prelude::U256;
+use bigint::hash::H256;
+use util::{HashDB, MemoryDB};
 use bytes::Bytes;
 use trie::{self, TrieMut, TrieDBMut, Trie, TrieDB, Recorder};
 use rlp::{RlpStream, UntrustedRlp};

ethcore/light/src/client/fetch.rs

@@ -24,7 +24,7 @@ use ethcore::machine::EthereumMachine;
 use ethcore::header::Header;
 use ethcore::receipt::Receipt;
 use futures::future::IntoFuture;
-use ethereum_types::H256;
+use bigint::hash::H256;
 
 /// Provides full chain data.
 pub trait ChainDataFetcher: Send + Sync + 'static {

ethcore/light/src/client/header_chain.rs

@@ -43,8 +43,8 @@ use ethcore::engines::epoch::{
 
 use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp, UntrustedRlp};
 use heapsize::HeapSizeOf;
-use ethereum_types::{H256, H264, U256};
-use plain_hasher::H256FastMap;
+use bigint::prelude::U256;
+use bigint::hash::{H256, H256FastMap, H264};
 use kvdb::{self, DBTransaction, KeyValueDB};
 
 use cache::Cache;
@@ -724,7 +724,6 @@ mod tests {
 	use super::HeaderChain;
 	use std::sync::Arc;
 
-	use ethereum_types::U256;
 	use ethcore::ids::BlockId;
 	use ethcore::header::Header;
 	use ethcore::spec::Spec;
@@ -756,7 +755,7 @@ mod tests {
 			header.set_parent_hash(parent_hash);
 			header.set_number(i);
 			header.set_timestamp(rolling_timestamp);
-			header.set_difficulty(*genesis_header.difficulty() * i as u32);
+			header.set_difficulty(*genesis_header.difficulty() * i.into());
 			parent_hash = header.hash();
 
 			let mut tx = db.transaction();
@@ -789,7 +788,7 @@ mod tests {
 			header.set_parent_hash(parent_hash);
 			header.set_number(i);
 			header.set_timestamp(rolling_timestamp);
-			header.set_difficulty(*genesis_header.difficulty() * i as u32);
+			header.set_difficulty(*genesis_header.difficulty() * i.into());
 			parent_hash = header.hash();
 
 			let mut tx = db.transaction();
@@ -808,7 +807,7 @@ mod tests {
 				header.set_parent_hash(parent_hash);
 				header.set_number(i);
 				header.set_timestamp(rolling_timestamp);
-				header.set_difficulty(*genesis_header.difficulty() * i as u32);
+				header.set_difficulty(*genesis_header.difficulty() * i.into());
 				parent_hash = header.hash();
 
 				let mut tx = db.transaction();
@@ -832,7 +831,7 @@ mod tests {
 				header.set_parent_hash(parent_hash);
 				header.set_number(i);
 				header.set_timestamp(rolling_timestamp);
-				header.set_difficulty(*genesis_header.difficulty() * U256::from(i * i));
+				header.set_difficulty(*genesis_header.difficulty() * (i * i).into());
 				parent_hash = header.hash();
 
 				let mut tx = db.transaction();
@@ -885,7 +884,7 @@ mod tests {
 				header.set_parent_hash(parent_hash);
 				header.set_number(i);
 				header.set_timestamp(rolling_timestamp);
-				header.set_difficulty(*genesis_header.difficulty() * i as u32);
+				header.set_difficulty(*genesis_header.difficulty() * i.into());
 				parent_hash = header.hash();
 
 				let mut tx = db.transaction();
@@ -923,7 +922,7 @@ mod tests {
 				header.set_parent_hash(parent_hash);
 				header.set_number(i);
 				header.set_timestamp(rolling_timestamp);
-				header.set_difficulty(*genesis_header.difficulty() * i as u32);
+				header.set_difficulty(*genesis_header.difficulty() * i.into());
 				parent_hash = header.hash();
 
 				let mut tx = db.transaction();
@@ -940,7 +939,7 @@ mod tests {
 				header.set_parent_hash(parent_hash);
 				header.set_number(i);
 				header.set_timestamp(rolling_timestamp);
-				header.set_difficulty(*genesis_header.difficulty() * U256::from(i as u32 * 1000u32));
+				header.set_difficulty(*genesis_header.difficulty() * i.into() * 1000.into());
 				parent_hash = header.hash();
 
 				let mut tx = db.transaction();
@@ -990,7 +989,7 @@ mod tests {
 			header.set_parent_hash(parent_hash);
 			header.set_number(i);
 			header.set_timestamp(rolling_timestamp);
-			header.set_difficulty(*genesis_header.difficulty() * i as u32);
+			header.set_difficulty(*genesis_header.difficulty() * i.into());
 			parent_hash = header.hash();
 
 			let mut tx = db.transaction();
@@ -1024,7 +1023,7 @@ mod tests {
 			header.set_parent_hash(parent_hash);
 			header.set_number(i);
 			header.set_timestamp(rolling_timestamp);
-			header.set_difficulty(*genesis_header.difficulty() * i as u32);
+			header.set_difficulty(*genesis_header.difficulty() * i.into());
 			parent_hash = header.hash();
 
 			let mut tx = db.transaction();

ethcore/light/src/client/mod.rs

@@ -32,7 +32,8 @@ use ethcore::service::ClientIoMessage;
 use ethcore::encoded;
 use io::IoChannel;
 use parking_lot::{Mutex, RwLock};
-use ethereum_types::{H256, U256};
+use bigint::prelude::U256;
+use bigint::hash::H256;
 use futures::{IntoFuture, Future};
 
 use kvdb::{self, KeyValueDB};

ethcore/light/src/lib.rs

@@ -56,18 +56,15 @@ extern crate log;
 extern crate bincode;
 extern crate ethcore_io as io;
 extern crate ethcore_network as network;
+extern crate ethcore_util as util;
+extern crate ethcore_bigint as bigint;
 extern crate ethcore_bytes as bytes;
-extern crate ethcore_transaction as transaction;
-extern crate ethereum_types;
 extern crate ethcore;
-extern crate evm;
-extern crate hashdb;
 extern crate heapsize;
 extern crate futures;
 extern crate itertools;
 extern crate memorydb;
 extern crate patricia_trie as trie;
-extern crate plain_hasher;
 extern crate rand;
 extern crate rlp;
 extern crate parking_lot;

ethcore/light/src/net/mod.rs

@@ -18,13 +18,14 @@
 //!
 //! This uses a "Provider" to answer requests.
 
-use transaction::UnverifiedTransaction;
+use ethcore::transaction::UnverifiedTransaction;
 
 use io::TimerToken;
 use network::{HostInfo, NetworkProtocolHandler, NetworkContext, PeerId};
 use rlp::{RlpStream, UntrustedRlp};
-use ethereum_types::{H256, U256};
-use kvdb::DBValue;
+use bigint::prelude::U256;
+use bigint::hash::H256;
+use util::DBValue;
 use parking_lot::{Mutex, RwLock};
 use time::{Duration, SteadyTime};
 

ethcore/light/src/net/request_credits.rs

@@ -30,7 +30,7 @@ use request::{self, Request};
 use super::error::Error;
 
 use rlp::*;
-use ethereum_types::U256;
+use bigint::prelude::U256;
 use time::{Duration, SteadyTime};
 
 /// Credits value.
@@ -320,7 +320,7 @@ impl FlowParams {
 	/// and number of requests made.
 	pub fn compute_cost(&self, request: &Request) -> Option<U256> {
 		match *request {
-			Request::Headers(ref req) => self.costs.headers.map(|c| c * U256::from(req.max)),
+			Request::Headers(ref req) => self.costs.headers.map(|c| c * req.max.into()),
 			Request::HeaderProof(_) => self.costs.header_proof,
 			Request::TransactionIndex(_) => self.costs.transaction_index,
 			Request::Body(_) => self.costs.body,
@@ -444,6 +444,6 @@ mod tests {
 		);
 
 		assert_eq!(flow_params2.costs, flow_params3.costs);
-		assert_eq!(flow_params.costs.headers.unwrap(), flow_params2.costs.headers.unwrap() * 2u32);
+		assert_eq!(flow_params.costs.headers.unwrap(), flow_params2.costs.headers.unwrap() * 2.into());
 	}
 }

ethcore/light/src/net/request_set.rs

@@ -27,7 +27,7 @@ use std::iter::FromIterator;
 use request::Request;
 use request::NetworkRequests as Requests;
 use net::{timeout, ReqId};
-use ethereum_types::U256;
+use bigint::prelude::U256;
 
 use time::{Duration, SteadyTime};
 

ethcore/light/src/net/status.rs

@@ -17,7 +17,8 @@
 //! Peer status and capabilities.
 
 use rlp::{DecoderError, Encodable, Decodable, RlpStream, UntrustedRlp};
-use ethereum_types::{H256, U256};
+use bigint::prelude::U256;
+use bigint::hash::H256;
 
 use super::request_credits::FlowParams;
 
@@ -373,7 +374,8 @@ pub fn write_announcement(announcement: &Announcement) -> Vec<u8> {
 mod tests {
 	use super::*;
 	use super::super::request_credits::FlowParams;
-	use ethereum_types::{U256, H256};
+	use bigint::prelude::U256;
+	use bigint::hash::H256;
 	use rlp::{RlpStream, UntrustedRlp};
 
 	#[test]

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

@@ -20,9 +20,9 @@
 use ethcore::blockchain_info::BlockChainInfo;
 use ethcore::client::{EachBlockWith, TestBlockChainClient};
 use ethcore::ids::BlockId;
+use ethcore::transaction::{Action, PendingTransaction};
 use ethcore::encoded;
 use network::{PeerId, NodeId};
-use transaction::{Action, PendingTransaction};
 
 use net::context::IoContext;
 use net::status::{Capabilities, Status};
@@ -32,7 +32,9 @@ use request;
 use request::*;
 
 use rlp::*;
-use ethereum_types::{H256, U256, Address};
+use bigint::prelude::U256;
+use bigint::hash::H256;
+use util::Address;
 
 use std::sync::Arc;
 

ethcore/light/src/on_demand/mod.rs

@@ -18,14 +18,15 @@
 //! The request service is implemented using Futures. Higher level request handlers
 //! will take the raw data received here and extract meaningful results from it.
 
+use std::cmp;
 use std::collections::HashMap;
 use std::marker::PhantomData;
 use std::sync::Arc;
 
 use ethcore::executed::{Executed, ExecutionError};
 
-use futures::{Poll, Future};
-use futures::sync::oneshot::{self, Receiver, Canceled};
+use futures::{Async, Poll, Future};
+use futures::sync::oneshot::{self, Sender, Receiver, Canceled};
 use network::PeerId;
 use parking_lot::{RwLock, Mutex};
 use rand;
@@ -353,6 +354,29 @@ impl OnDemand {
 	// dispatch pending requests, and discard those for which the corresponding
 	// receiver has been dropped.
 	fn dispatch_pending(&self, ctx: &BasicContext) {
+
+		// wrapper future for calling `poll_cancel` on our `Senders` to preserve
+		// the invariant that it's always within a task.
+		struct CheckHangup<'a, T: 'a>(&'a mut Sender<T>);
+
+		impl<'a, T: 'a> Future for CheckHangup<'a, T> {
+			type Item = bool;
+			type Error = ();
+
+			fn poll(&mut self) -> Poll<bool, ()> {
+				Ok(Async::Ready(match self.0.poll_cancel() {
+					Ok(Async::NotReady) => false, // hasn't hung up.
+					_ => true, // has hung up.
+				}))
+			}
+		}
+
+		// check whether a sender's hung up (using `wait` to preserve the task invariant)
+		// returns true if has hung up, false otherwise.
+		fn check_hangup<T>(send: &mut Sender<T>) -> bool {
+			CheckHangup(send).wait().expect("CheckHangup always returns ok; qed")
+		}
+
 		if self.pending.read().is_empty() { return }
 		let mut pending = self.pending.write();
 
@@ -362,11 +386,14 @@ impl OnDemand {
 		// then, try and find a peer who can serve it.
 		let peers = self.peers.read();
 		*pending = ::std::mem::replace(&mut *pending, Vec::new()).into_iter()
-			.filter(|pending| !pending.sender.is_canceled())
+			.filter_map(|mut pending| match check_hangup(&mut pending.sender) {
+				false => Some(pending),
+				true => None,
+			})
 			.filter_map(|pending| {
 				// the peer we dispatch to is chosen randomly
 				let num_peers = peers.len();
-				let rng = rand::random::<usize>() % num_peers;
+				let rng = rand::random::<usize>() % cmp::max(num_peers, 1);
 				for (peer_id, peer) in peers.iter().chain(peers.iter()).skip(rng).take(num_peers) {
 					// TODO: see which requests can be answered by the cache?
 

ethcore/light/src/on_demand/request.rs

@@ -24,17 +24,17 @@ use ethcore::engines::{EthEngine, StateDependentProof};
 use ethcore::machine::EthereumMachine;
 use ethcore::receipt::Receipt;
 use ethcore::state::{self, ProvedExecution};
-use transaction::SignedTransaction;
+use ethcore::transaction::SignedTransaction;
 use vm::EnvInfo;
 use hash::{KECCAK_NULL_RLP, KECCAK_EMPTY, KECCAK_EMPTY_LIST_RLP, keccak};
 
 use request::{self as net_request, IncompleteRequest, CompleteRequest, Output, OutputKind, Field};
 
 use rlp::{RlpStream, UntrustedRlp};
-use ethereum_types::{H256, U256, Address};
+use bigint::prelude::U256;
+use bigint::hash::H256;
 use parking_lot::Mutex;
-use hashdb::HashDB;
-use kvdb::DBValue;
+use util::{Address, DBValue, HashDB};
 use bytes::Bytes;
 use memorydb::MemoryDB;
 use trie::{Trie, TrieDB, TrieError};
@@ -941,8 +941,8 @@ impl Signal {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use ethereum_types::{H256, Address};
-	use memorydb::MemoryDB;
+	use bigint::hash::H256;
+	use util::{MemoryDB, Address};
 	use parking_lot::Mutex;
 	use trie::{Trie, TrieMut, SecTrieDB, SecTrieDBMut};
 	use trie::recorder::Recorder;

ethcore/light/src/on_demand/tests.rs

@@ -22,7 +22,7 @@ use ethcore::header::{Header, Seal};
 use futures::Future;
 use network::{PeerId, NodeId};
 use net::*;
-use ethereum_types::H256;
+use bigint::hash::H256;
 use parking_lot::Mutex;
 use time::Duration;
 use ::request::{self as basic_request, Response};

ethcore/light/src/provider.rs

@@ -21,11 +21,11 @@ use std::sync::Arc;
 
 use ethcore::blockchain_info::BlockChainInfo;
 use ethcore::client::{BlockChainClient, ProvingBlockChainClient};
-use ethcore::encoded;
+use ethcore::transaction::PendingTransaction;
 use ethcore::ids::BlockId;
-use ethereum_types::H256;
+use ethcore::encoded;
+use bigint::hash::H256;
 use parking_lot::RwLock;
-use transaction::PendingTransaction;
 
 use cht::{self, BlockInfo};
 use client::{LightChainClient, AsLightClient};
@@ -260,7 +260,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 	}
 
 	fn transaction_proof(&self, req: request::CompleteExecutionRequest) -> Option<request::ExecutionResponse> {
-		use transaction::Transaction;
+		use ethcore::transaction::Transaction;
 
 		let id = BlockId::Hash(req.block_hash);
 		let nonce = match self.nonce(&req.from, id.clone()) {

ethcore/light/src/transaction_queue.rs

@@ -26,9 +26,11 @@
 use std::collections::{BTreeMap, HashMap};
 use std::collections::hash_map::Entry;
 
-use transaction::{self, Condition, PendingTransaction, SignedTransaction};
-use ethereum_types::{H256, U256, Address};
-use plain_hasher::H256FastMap;
+use ethcore::error::{TransactionError, TransactionImportResult};
+use ethcore::transaction::{Condition, PendingTransaction, SignedTransaction};
+use bigint::prelude::U256;
+use bigint::hash::{H256, H256FastMap};
+use util::Address;
 
 // Knowledge of an account's current nonce.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -122,13 +124,13 @@ pub struct TransactionQueue {
 
 impl TransactionQueue {
 	/// Import a pending transaction to be queued.
-	pub fn import(&mut self, tx: PendingTransaction) -> Result<transaction::ImportResult, transaction::Error>  {
+	pub fn import(&mut self, tx: PendingTransaction) -> Result<TransactionImportResult, TransactionError>  {
 		let sender = tx.sender();
 		let hash = tx.hash();
 		let nonce = tx.nonce;
 		let tx_info = TransactionInfo::from(&tx);
 
-		if self.by_hash.contains_key(&hash) { return Err(transaction::Error::AlreadyImported) }
+		if self.by_hash.contains_key(&hash) { return Err(TransactionError::AlreadyImported) }
 
 		let res = match self.by_account.entry(sender) {
 			Entry::Vacant(entry) => {
@@ -138,14 +140,14 @@ impl TransactionQueue {
 					future: BTreeMap::new(),
 				});
 
-				transaction::ImportResult::Current
+				TransactionImportResult::Current
 			}
 			Entry::Occupied(mut entry) => {
 				let acct_txs = entry.get_mut();
 				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)
+						return Err(TransactionError::Old)
 					}
 
 					// lower our assumption until corrected later.
@@ -160,7 +162,7 @@ impl TransactionQueue {
 						let old = ::std::mem::replace(&mut acct_txs.current[idx], tx_info);
 						self.by_hash.remove(&old.hash);
 
-						transaction::ImportResult::Current
+						TransactionImportResult::Current
 					}
 					Err(idx) => {
 						let cur_len = acct_txs.current.len();
@@ -182,13 +184,13 @@ impl TransactionQueue {
 								acct_txs.future.insert(future_nonce, future);
 							}
 
-							transaction::ImportResult::Current
+							TransactionImportResult::Current
 						} else if idx == cur_len && acct_txs.current.last().map_or(false, |f| f.nonce + 1.into() != nonce) {
 							trace!(target: "txqueue", "Queued future transaction for {}, nonce={}", sender, nonce);
 							let future_nonce = nonce;
 							acct_txs.future.insert(future_nonce, tx_info);
 
-							transaction::ImportResult::Future
+							TransactionImportResult::Future
 						} else {
 							trace!(target: "txqueue", "Queued current transaction for {}, nonce={}", sender, nonce);
 
@@ -196,7 +198,7 @@ impl TransactionQueue {
 							acct_txs.current.insert(idx, tx_info);
 							acct_txs.adjust_future();
 
-							transaction::ImportResult::Current
+							TransactionImportResult::Current
 						}
 					}
 				}
@@ -329,8 +331,8 @@ impl TransactionQueue {
 #[cfg(test)]
 mod tests {
 	use super::TransactionQueue;
-	use ethereum_types::Address;
-	use transaction::{Transaction, PendingTransaction, Condition};
+	use util::Address;
+	use ethcore::transaction::{Transaction, PendingTransaction, Condition};
 
 	#[test]
 	fn queued_senders() {

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

@@ -211,7 +211,7 @@ impl<T: IncompleteRequest> DerefMut for Batch<T> {
 mod tests {
 	use request::*;
 	use super::Builder;
-	use ethereum_types::H256;
+	use bigint::hash::H256;
 
 	#[test]
 	fn all_scalar() {

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

@@ -17,7 +17,7 @@
 //! Light protocol request types.
 
 use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
-use ethereum_types::H256;
+use bigint::hash::H256;
 
 mod batch;
 
@@ -786,7 +786,8 @@ pub mod header {
 pub mod header_proof {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
 	use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
-	use ethereum_types::{H256, U256};
+	use bigint::prelude::U256;
+	use bigint::hash::H256;
 	use bytes::Bytes;
 
 	/// Potentially incomplete header proof request.
@@ -881,7 +882,7 @@ pub mod header_proof {
 /// Request and response for transaction index.
 pub mod transaction_index {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use ethereum_types::H256;
+	use bigint::hash::H256;
 
 	/// Potentially incomplete transaction index request.
 	#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@@ -959,7 +960,7 @@ pub mod transaction_index {
 pub mod block_receipts {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
 	use ethcore::receipt::Receipt;
-	use ethereum_types::H256;
+	use bigint::hash::H256;
 
 	/// Potentially incomplete block receipts request.
 	#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@@ -1028,7 +1029,7 @@ pub mod block_body {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
 	use ethcore::encoded;
 	use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
-	use ethereum_types::H256;
+	use bigint::hash::H256;
 
 	/// Potentially incomplete block body request.
 	#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@@ -1094,7 +1095,7 @@ pub mod block_body {
 	impl Decodable for Response {
 		fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
 			use ethcore::header::Header as FullHeader;
-			use transaction::UnverifiedTransaction;
+			use ethcore::transaction::UnverifiedTransaction;
 
 			// check body validity.
 			let _: Vec<UnverifiedTransaction> = rlp.list_at(0)?;
@@ -1116,7 +1117,8 @@ pub mod block_body {
 /// A request for an account proof.
 pub mod account {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use ethereum_types::{H256, U256};
+	use bigint::prelude::U256;
+	use bigint::hash::H256;
 	use bytes::Bytes;
 
 	/// Potentially incomplete request for an account proof.
@@ -1216,7 +1218,7 @@ pub mod account {
 /// A request for a storage proof.
 pub mod storage {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use ethereum_types::H256;
+	use bigint::hash::H256;
 	use bytes::Bytes;
 
 	/// Potentially incomplete request for an storage proof.
@@ -1325,7 +1327,7 @@ pub mod storage {
 /// A request for contract code.
 pub mod contract_code {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use ethereum_types::H256;
+	use bigint::hash::H256;
 	use bytes::Bytes;
 
 	/// Potentially incomplete contract code request.
@@ -1410,10 +1412,11 @@ pub mod contract_code {
 /// A request for proof of execution.
 pub mod execution {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use transaction::Action;
+	use ethcore::transaction::Action;
 	use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
-	use ethereum_types::{H256, U256, Address};
-	use kvdb::DBValue;
+	use bigint::prelude::U256;
+	use bigint::hash::H256;
+	use util::{Address, DBValue};
 	use bytes::Bytes;
 
 	/// Potentially incomplete execution proof request.
@@ -1537,7 +1540,7 @@ pub mod execution {
 pub mod epoch_signal {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
 	use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
-	use ethereum_types::H256;
+	use bigint::hash::H256;
 	use bytes::Bytes;
 
 	/// Potentially incomplete epoch signal request.
@@ -1722,7 +1725,7 @@ mod tests {
 		let full_req = Request::TransactionIndex(req.clone());
 		let res = TransactionIndexResponse {
 			num: 1000,
-			hash: ::ethereum_types::H256::random(),
+			hash: ::bigint::hash::H256::random(),
 			index: 4,
 		};
 		let full_res = Response::TransactionIndex(res.clone());
@@ -1755,7 +1758,7 @@ mod tests {
 
 	#[test]
 	fn body_roundtrip() {
-		use transaction::{Transaction, UnverifiedTransaction};
+		use ethcore::transaction::{Transaction, UnverifiedTransaction};
 		let req = IncompleteBodyRequest {
 			hash: Field::Scalar(Default::default()),
 		};
@@ -1845,12 +1848,12 @@ mod tests {
 
 	#[test]
 	fn execution_roundtrip() {
-		use kvdb::DBValue;
+		use util::DBValue;
 
 		let req = IncompleteExecutionRequest {
 			block_hash: Field::Scalar(Default::default()),
 			from: Default::default(),
-			action: ::transaction::Action::Create,
+			action: ::ethcore::transaction::Action::Create,
 			gas: 100_000.into(),
 			gas_price: 0.into(),
 			value: 100_000_001.into(),
@@ -1880,7 +1883,7 @@ mod tests {
 		let reqs: Vec<_> = (0..10).map(|_| IncompleteExecutionRequest {
 			block_hash: Field::Scalar(Default::default()),
 			from: Default::default(),
-			action: ::transaction::Action::Create,
+			action: ::ethcore::transaction::Action::Create,
 			gas: 100_000.into(),
 			gas_price: 0.into(),
 			value: 100_000_001.into(),

ethcore/migrations/Cargo.toml

@@ -1,19 +0,0 @@
-[package]
-name = "ethcore-migrations"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-ethcore-bytes = { path = "../../util/bytes" }
-ethereum-types = "0.2"
-keccak-hash = { path = "../../util/hash" }
-kvdb = { path = "../../util/kvdb" }
-kvdb-rocksdb = { path = "../../util/kvdb-rocksdb" }
-log = "0.3"
-macros = { path = "../../util/macros" }
-migration = { path = "../../util/migration" }
-rlp = { path = "../../util/rlp" }
-patricia-trie = { path = "../../util/patricia_trie" }
-journaldb = { path = "../../util/journaldb" }
-ethcore-bloom-journal = { path = "../../util/bloom" }
-ethcore = { path = ".." }

ethcore/native_contracts/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "native-contracts"
+description = "Generated Rust code for Ethereum contract ABIs"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+build = "build.rs"
+
+[dependencies]
+ethabi = "4.0"
+futures = "0.1"
+byteorder = "1.0"
+ethcore-bigint = { path = "../../util/bigint" }
+
+[build-dependencies]
+native-contract-generator = { path = "generator" }
+
+[features]
+default = []
+test_contracts = []

ethcore/native_contracts/build.rs

@@ -0,0 +1,64 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+extern crate native_contract_generator;
+
+use std::path::Path;
+use std::fs::File;
+use std::io::Write;
+
+// TODO: just walk the "res" directory and generate whole crate automatically.
+const KEY_SERVER_SET_ABI: &'static str = include_str!("res/key_server_set.json");
+const REGISTRY_ABI: &'static str = include_str!("res/registrar.json");
+const URLHINT_ABI: &'static str = include_str!("res/urlhint.json");
+const SERVICE_TRANSACTION_ABI: &'static str = include_str!("res/service_transaction.json");
+const SECRETSTORE_ACL_STORAGE_ABI: &'static str = include_str!("res/secretstore_acl_storage.json");
+const SECRETSTORE_SERVICE_ABI: &'static str = include_str!("res/secretstore_service.json");
+const VALIDATOR_SET_ABI: &'static str = include_str!("res/validator_set.json");
+const VALIDATOR_REPORT_ABI: &'static str = include_str!("res/validator_report.json");
+const PEER_SET_ABI: &'static str = include_str!("res/peer_set.json");
+const TX_ACL_ABI: &'static str = include_str!("res/tx_acl.json");
+
+const TEST_VALIDATOR_SET_ABI: &'static str = include_str!("res/test_validator_set.json");
+
+fn build_file(name: &str, abi: &str, filename: &str) {
+	let code = ::native_contract_generator::generate_module(name, abi).unwrap();
+
+	let out_dir = ::std::env::var("OUT_DIR").unwrap();
+	let dest_path = Path::new(&out_dir).join(filename);
+	let mut f = File::create(&dest_path).unwrap();
+
+	f.write_all(code.as_bytes()).unwrap();
+}
+
+fn build_test_contracts() {
+	build_file("ValidatorSet", TEST_VALIDATOR_SET_ABI, "test_validator_set.rs");
+}
+
+fn main() {
+	build_file("KeyServerSet", KEY_SERVER_SET_ABI, "key_server_set.rs");
+	build_file("Registry", REGISTRY_ABI, "registry.rs");
+	build_file("Urlhint", URLHINT_ABI, "urlhint.rs");
+	build_file("ServiceTransactionChecker", SERVICE_TRANSACTION_ABI, "service_transaction.rs");
+	build_file("SecretStoreAclStorage", SECRETSTORE_ACL_STORAGE_ABI, "secretstore_acl_storage.rs");
+	build_file("SecretStoreService", SECRETSTORE_SERVICE_ABI, "secretstore_service.rs");
+	build_file("ValidatorSet", VALIDATOR_SET_ABI, "validator_set.rs");
+	build_file("ValidatorReport", VALIDATOR_REPORT_ABI, "validator_report.rs");
+	build_file("PeerSet", PEER_SET_ABI, "peer_set.rs");
+	build_file("TransactAcl", TX_ACL_ABI, "tx_acl.rs");
+
+	build_test_contracts();
+}

ethcore/native_contracts/generator/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "native-contract-generator"
+description = "Generates Rust code for ethereum contract ABIs"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+ethabi = "4.0"
+heck = "0.2"

ethcore/native_contracts/generator/src/lib.rs

@@ -0,0 +1,373 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Rust code contract generator.
+//! The code generated will require a dependence on the `ethcore-bigint::prelude`,
+//! `ethabi`, `byteorder`, and `futures` crates.
+//! This currently isn't hygienic, so compilation of generated code may fail
+//! due to missing crates or name collisions. This will change when
+//! it can be ported to a procedural macro.
+
+extern crate ethabi;
+extern crate heck;
+
+use ethabi::{Contract, ParamType};
+use heck::SnakeCase;
+
+/// Errors in generation.
+#[derive(Debug)]
+pub enum Error {
+	/// Bad ABI.
+	Abi(ethabi::Error),
+	/// Unsupported parameter type in given function.
+	UnsupportedType(String, ParamType),
+}
+
+/// Given an ABI string, generate code for a a Rust module containing
+/// a struct which can be used to call it.
+// TODO: make this a proc macro when that's possible.
+pub fn generate_module(struct_name: &str, abi: &str) -> Result<String, Error> {
+	let contract = Contract::load(abi.as_bytes()).map_err(Error::Abi)?;
+	let functions = generate_functions(&contract)?;
+
+	Ok(format!(r##"
+use byteorder::{{BigEndian, ByteOrder}};
+use futures::{{future, Future, IntoFuture}};
+use ethabi::{{Bytes, Contract, Token, Event}};
+use bigint;
+
+type BoxFuture<A, B> = Box<Future<Item = A, Error = B> + Send>;
+
+/// Generated Rust bindings to an Ethereum contract.
+#[derive(Clone, Debug)]
+pub struct {name} {{
+	contract: Contract,
+	/// Address to make calls to.
+	pub address: bigint::prelude::H160,
+}}
+
+const ABI: &'static str = r#"{abi_str}"#;
+
+impl {name} {{
+	/// Create a new instance of `{name}` with an address.
+	/// Calls can be made, given a callback for dispatching calls asynchronously.
+	pub fn new(address: bigint::prelude::H160) -> Self {{
+		let contract = Contract::load(ABI.as_bytes())
+			.expect("ABI checked at generation-time; qed");
+		{name} {{
+			contract: contract,
+			address: address,
+		}}
+	}}
+
+	/// Access the underlying `ethabi` contract.
+	pub fn contract(this: &Self) -> &Contract {{
+		&this.contract
+	}}
+
+	{functions}
+}}
+"##,
+		name = struct_name,
+		abi_str = abi,
+		functions = functions,
+	))
+}
+
+// generate function bodies from the ABI.
+fn generate_functions(contract: &Contract) -> Result<String, Error> {
+	let mut functions = String::new();
+	for function in contract.functions() {
+		let name = &function.name;
+		let snake_name = name.to_snake_case();
+		let inputs: Vec<_> = function.inputs.iter().map(|i| i.kind.clone()).collect();
+		let outputs: Vec<_> = function.outputs.iter().map(|i| i.kind.clone()).collect();
+
+		let (input_params, input_names, to_tokens) = input_params_codegen(&inputs)
+			.map_err(|bad_type| Error::UnsupportedType(name.clone(), bad_type))?;
+
+		let (output_type, decode_outputs) = output_params_codegen(&outputs)
+			.map_err(|bad_type| Error::UnsupportedType(name.clone(), bad_type))?;
+
+		functions.push_str(&format!(r##"
+/// Call the function "{abi_name}" on the contract.
+///
+/// Inputs: {abi_inputs:?}
+/// Outputs: {abi_outputs:?}
+pub fn {snake_name}<F, U>(&self, call: F, {params}) -> BoxFuture<{output_type}, String>
+	where
+	    F: FnOnce(bigint::prelude::H160, Vec<u8>) -> U,
+	    U: IntoFuture<Item=Vec<u8>, Error=String>,
+		U::Future: Send + 'static
+{{
+	let call_addr = self.address;
+	let call_future = match self.encode_{snake_name}_input({params_names}) {{
+		Ok(call_data) => (call)(call_addr, call_data),
+		Err(e) => return Box::new(future::err(e)),
+	}};
+
+	let function = self.contract.function(r#"{abi_name}"#)
+		.expect("function existence checked at compile-time; qed").clone();
+
+	Box::new(call_future
+		.into_future()
+		.and_then(move |out| function.decode_output(&out).map_err(|e| format!("{{:?}}", e)))
+		.map(Vec::into_iter)
+		.and_then(|mut outputs| {decode_outputs}))
+}}
+
+/// Encode "{abi_name}" function arguments.
+/// Arguments: {abi_inputs:?}
+pub fn encode_{snake_name}_input(&self, {params}) -> Result<Vec<u8>, String> {{
+	self.contract.function(r#"{abi_name}"#)
+		.expect("function existence checked at compile-time; qed")
+		.encode_input(&{to_tokens})
+		.map_err(|e| format!("Error encoding call: {{:?}}", e))
+}}
+	"##,
+		abi_name = name,
+		abi_inputs = inputs,
+		abi_outputs = outputs,
+		snake_name = snake_name,
+		params = input_params,
+		params_names = input_names,
+		output_type = output_type,
+		to_tokens = to_tokens,
+		decode_outputs = decode_outputs,
+		))
+	}
+
+	Ok(functions)
+}
+
+// generate code for params in function signature and turning them into tokens.
+//
+// three pieces of code are generated: the first gives input types for the function signature,
+// the second one gives input parameter names to pass to another method,
+// and the third gives code to tokenize those inputs.
+//
+// params of form `param_0: type_0, param_1: type_1, ...`
+// tokenizing code of form `{let mut tokens = Vec::new(); tokens.push({param_X}); tokens }`
+//
+// returns any unsupported param type encountered.
+fn input_params_codegen(inputs: &[ParamType]) -> Result<(String, String, String), ParamType> {
+	let mut params = String::new();
+	let mut params_names = String::new();
+	let mut to_tokens = "{ let mut tokens = Vec::new();".to_string();
+
+	for (index, param_type) in inputs.iter().enumerate() {
+		let param_name = format!("param_{}", index);
+		let rust_type = rust_type(param_type.clone())?;
+		let (needs_mut, tokenize_code) = tokenize(&param_name, param_type.clone());
+
+		params.push_str(&format!("{}{}: {}, ",
+			if needs_mut { "mut " } else { "" }, param_name, rust_type));
+
+		params_names.push_str(&format!("{}, ", param_name));
+
+		to_tokens.push_str(&format!("tokens.push({{ {} }});", tokenize_code));
+	}
+
+	to_tokens.push_str(" tokens }");
+	Ok((params, params_names, to_tokens))
+}
+
+// generate code for outputs of the function and detokenizing them.
+//
+// two pieces of code are generated: the first gives an output type for the function signature
+// as a tuple, and the second gives code to get that tuple from a deque of tokens.
+//
+// produce output type of the form (type_1, type_2, ...) without trailing comma.
+// produce code for getting this output type from `outputs: Vec<Token>::IntoIter`, where
+// an `Err(String)` can be returned.
+//
+// returns any unsupported param type encountered.
+fn output_params_codegen(outputs: &[ParamType]) -> Result<(String, String), ParamType> {
+	let mut output_type = "(".to_string();
+	let mut decode_outputs = "Ok((".to_string();
+
+	for (index, output) in outputs.iter().cloned().enumerate() {
+		let rust_type = rust_type(output.clone())?;
+
+		output_type.push_str(&rust_type);
+
+		decode_outputs.push_str(&format!(
+			r#"
+				outputs
+					.next()
+					.and_then(|output| {{ {} }})
+					.ok_or_else(|| "Wrong output type".to_string())?
+			"#,
+			detokenize("output", output)
+		));
+
+		// don't append trailing commas for the last element
+		// so we can reuse the same code for single-output contracts,
+		// since T == (T) != (T,)
+		if index < outputs.len() - 1 {
+			output_type.push_str(", ");
+			decode_outputs.push_str(", ");
+		}
+	}
+
+	output_type.push_str(")");
+	decode_outputs.push_str("))");
+	Ok((output_type, decode_outputs))
+}
+
+// create code for an argument type from param type.
+fn rust_type(input: ParamType) -> Result<String, ParamType> {
+	Ok(match input {
+		ParamType::Address => "bigint::prelude::H160".into(),
+		ParamType::FixedBytes(len) if len <= 32 => format!("bigint::prelude::H{}", len * 8),
+		ParamType::Bytes | ParamType::FixedBytes(_) => "Vec<u8>".into(),
+		ParamType::Int(width) => match width {
+			8 | 16 | 32 | 64 => format!("i{}", width),
+			_ => return Err(ParamType::Int(width)),
+		},
+		ParamType::Uint(width) => match width {
+			8 | 16 | 32 | 64 => format!("u{}", width),
+			128 | 160 | 256 => format!("bigint::prelude::U{}", width),
+			_ => return Err(ParamType::Uint(width)),
+		},
+		ParamType::Bool => "bool".into(),
+		ParamType::String => "String".into(),
+		ParamType::Array(kind) => format!("Vec<{}>", rust_type(*kind)?),
+		other => return Err(other),
+	})
+}
+
+// create code for tokenizing this parameter.
+// returns (needs_mut, code), where needs_mut indicates mutability required.
+// panics on unsupported types.
+fn tokenize(name: &str, input: ParamType) -> (bool, String) {
+	let mut needs_mut = false;
+	let code = match input {
+		ParamType::Address => format!("Token::Address({}.0)", name),
+		ParamType::Bytes => format!("Token::Bytes({})", name),
+		ParamType::FixedBytes(len) if len <= 32 =>
+			format!("Token::FixedBytes({}.0.to_vec())", name),
+		ParamType::FixedBytes(len) => {
+			needs_mut = true;
+			format!("{}.resize({}, 0); Token::FixedBytes({})", name, len, name)
+		}
+		ParamType::Int(width) => match width {
+			8 => format!("let mut r = [0xff; 32]; r[31] = {}; Token::Int(r)", name),
+			16 | 32 | 64 =>
+				format!("let mut r = [0xff; 32]; BigEndian::write_i{}(&mut r[{}..], {}); Token::Int(r))",
+					width, 32 - (width / 8), name),
+			_ => panic!("Signed int with more than 64 bits not supported."),
+		},
+		ParamType::Uint(width) => format!(
+			"let mut r = [0; 32]; {}.to_big_endian(&mut r); Token::Uint(r)",
+			if width <= 64 { format!("bigint::prelude::U256::from({} as u64)", name) }
+			else { format!("bigint::prelude::U256::from({})", name) }
+		),
+		ParamType::Bool => format!("Token::Bool({})", name),
+		ParamType::String => format!("Token::String({})", name),
+		ParamType::Array(kind) => {
+			let (needs_mut, code) = tokenize("i", *kind);
+			format!("Token::Array({}.into_iter().map(|{}i| {{ {} }}).collect())",
+				name, if needs_mut { "mut " } else { "" }, code)
+		}
+		ParamType::FixedArray(_, _) => panic!("Fixed-length arrays not supported."),
+	};
+
+	(needs_mut, code)
+}
+
+// create code for detokenizing this parameter.
+// takes an output type and the identifier of a token.
+// expands to code that evaluates to a Option<concrete type>
+// panics on unsupported types.
+fn detokenize(name: &str, output_type: ParamType) -> String {
+	match output_type {
+		ParamType::Address => format!("{}.to_address().map(bigint::prelude::H160)", name),
+		ParamType::Bytes => format!("{}.to_bytes()", name),
+		ParamType::FixedBytes(len) if len <= 32 => {
+			// ensure no panic on slice too small.
+			let read_hash = format!("b.resize({}, 0); bigint::prelude::H{}::from_slice(&b[..{}])",
+				len, len * 8, len);
+
+			format!("{}.to_fixed_bytes().map(|mut b| {{ {} }})",
+				name, read_hash)
+		}
+		ParamType::FixedBytes(_) => format!("{}.to_fixed_bytes()", name),
+		ParamType::Int(width) => {
+			let read_int = match width {
+				8 => "i[31] as i8".into(),
+				16 | 32 | 64 => format!("BigEndian::read_i{}(&i[{}..])", width, 32 - (width / 8)),
+				_ => panic!("Signed integers over 64 bytes not allowed."),
+			};
+			format!("{}.to_int().map(|i| {})", name, read_int)
+		}
+		ParamType::Uint(width) => {
+			let read_uint = match width {
+				8 => "u[31] as u8".into(),
+				16 | 32 | 64 => format!("BigEndian::read_u{}(&u[{}..])", width, 32 - (width / 8)),
+				_ => format!("bigint::prelude::U{}::from(&u[..])", width),
+			};
+
+			format!("{}.to_uint().map(|u| {})", name, read_uint)
+		}
+		ParamType::Bool => format!("{}.to_bool()", name),
+		ParamType::String => format!("{}.to_string()", name),
+		ParamType::Array(kind) => {
+			let read_array = format!("x.into_iter().map(|a| {{ {} }}).collect::<Option<Vec<_>>>()",
+				detokenize("a", *kind));
+
+			format!("{}.to_array().and_then(|x| {{ {} }})",
+				name, read_array)
+		}
+		ParamType::FixedArray(_, _) => panic!("Fixed-length arrays not supported.")
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use ethabi::ParamType;
+
+	#[test]
+	fn input_types() {
+		assert_eq!(::input_params_codegen(&[]).unwrap().0, "");
+		assert_eq!(::input_params_codegen(&[ParamType::Address]).unwrap().0, "param_0: bigint::prelude::H160, ");
+		assert_eq!(::input_params_codegen(&[ParamType::Address, ParamType::Bytes]).unwrap().0,
+			"param_0: bigint::prelude::H160, param_1: Vec<u8>, ");
+	}
+
+	#[test]
+	fn output_types() {
+		assert_eq!(::output_params_codegen(&[]).unwrap().0, "()");
+		assert_eq!(::output_params_codegen(&[ParamType::Address]).unwrap().0, "(bigint::prelude::H160)");
+		assert_eq!(::output_params_codegen(&[ParamType::Address, ParamType::Array(Box::new(ParamType::Bytes))]).unwrap().0,
+			"(bigint::prelude::H160, Vec<Vec<u8>>)");
+	}
+
+	#[test]
+	fn rust_type() {
+		assert_eq!(::rust_type(ParamType::FixedBytes(32)).unwrap(), "bigint::prelude::H256");
+		assert_eq!(::rust_type(ParamType::Array(Box::new(ParamType::FixedBytes(32)))).unwrap(),
+			"Vec<bigint::prelude::H256>");
+
+		assert_eq!(::rust_type(ParamType::Uint(64)).unwrap(), "u64");
+		assert!(::rust_type(ParamType::Uint(63)).is_err());
+
+		assert_eq!(::rust_type(ParamType::Int(32)).unwrap(), "i32");
+		assert_eq!(::rust_type(ParamType::Uint(256)).unwrap(), "bigint::prelude::U256");
+	}
+
+	// codegen tests will need bootstrapping of some kind.
+}

ethcore/native_contracts/res/key_server_set.json

@@ -0,0 +1 @@
+[{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"keyServersList","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"keyServer","type":"address"}],"name":"getKeyServerPublic","outputs":[{"name":"","type":"bytes"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"getKeyServers","outputs":[{"name":"","type":"address[]"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"keyServer","type":"address"}],"name":"getKeyServerAddress","outputs":[{"name":"","type":"string"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"keyServer","type":"address"}],"name":"removeKeyServer","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"keyServerPublic","type":"bytes"},{"name":"keyServerIp","type":"string"}],"name":"addKeyServer","outputs":[],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"keyServer","type":"address"}],"name":"KeyServerAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"keyServer","type":"address"}],"name":"KeyServerRemoved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]

ethcore/native_contracts/res/tx_acl.json

@@ -0,0 +1 @@
+[{"constant":false,"inputs":[{"name":"sender","type":"address"}],"name":"allowedTxTypes","outputs":[{"name":"","type":"uint32"}],"payable":false,"stateMutability":"nonpayable","type":"function"}]

ethcore/native_contracts/res/urlhint.json

@@ -0,0 +1,6 @@
+[
+	{"constant":false,"inputs":[{"name":"_content","type":"bytes32"},{"name":"_url","type":"string"}],"name":"hintURL","outputs":[],"type":"function"},
+	{"constant":false,"inputs":[{"name":"_content","type":"bytes32"},{"name":"_accountSlashRepo","type":"string"},{"name":"_commit","type":"bytes20"}],"name":"hint","outputs":[],"type":"function"},
+	{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"entries","outputs":[{"name":"accountSlashRepo","type":"string"},{"name":"commit","type":"bytes20"},{"name":"owner","type":"address"}],"type":"function"},
+	{"constant":false,"inputs":[{"name":"_content","type":"bytes32"}],"name":"unhint","outputs":[],"type":"function"}
+]

ethcore/native_contracts/src/key_server_set.rs

@@ -0,0 +1,21 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+#![allow(unused_mut, unused_variables, unused_imports)]
+
+//! Secret store Key Server set contract.
+
+include!(concat!(env!("OUT_DIR"), "/key_server_set.rs"));

ethcore/native_contracts/src/lib.rs

@@ -0,0 +1,48 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Native contracts useful for Parity. These are type-safe wrappers
+//! autogenerated at compile-time from Ethereum ABIs, and can be instantiated
+//! given any closure which can dispatch calls to them asynchronously.
+
+extern crate futures;
+extern crate byteorder;
+extern crate ethabi;
+extern crate ethcore_bigint as bigint;
+
+mod key_server_set;
+mod registry;
+mod urlhint;
+mod service_transaction;
+mod secretstore_acl_storage;
+mod secretstore_service;
+mod validator_set;
+mod validator_report;
+mod peer_set;
+mod tx_acl;
+
+pub mod test_contracts;
+
+pub use self::key_server_set::KeyServerSet;
+pub use self::registry::Registry;
+pub use self::urlhint::Urlhint;
+pub use self::service_transaction::ServiceTransactionChecker;
+pub use self::secretstore_acl_storage::SecretStoreAclStorage;
+pub use self::secretstore_service::SecretStoreService;
+pub use self::validator_set::ValidatorSet;
+pub use self::validator_report::ValidatorReport;
+pub use self::peer_set::PeerSet;
+pub use self::tx_acl::TransactAcl;

ethcore/native_contracts/src/peer_set.rs

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

ethcore/native_contracts/src/registry.rs

@@ -0,0 +1,22 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+#![allow(unused_mut, unused_variables, unused_imports)]
+
+//! Registrar contract: maps names to addresses and data.
+// TODO: testing.
+
+include!(concat!(env!("OUT_DIR"), "/registry.rs"));

ethcore/native_contracts/src/secretstore_acl_storage.rs

@@ -0,0 +1,22 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+#![allow(unused_mut, unused_variables, unused_imports)]
+
+//! Secret store ACL storage contract.
+// TODO: testing.
+
+include!(concat!(env!("OUT_DIR"), "/secretstore_acl_storage.rs"));

ethcore/native_contracts/src/secretstore_service.rs

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

ethcore/native_contracts/src/service_transaction.rs

@@ -0,0 +1,22 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+#![allow(unused_mut, unused_variables, unused_imports)]
+
+//! Service transaction contract.
+// TODO: testing.
+
+include!(concat!(env!("OUT_DIR"), "/service_transaction.rs"));

ethcore/native_contracts/src/test_contracts/mod.rs

@@ -14,14 +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/>.
 
-//! Blockchain generator for tests.
+//! Contracts used for testing.
 
-mod bloom;
-mod block;
-mod complete;
-mod fork;
-pub mod generator;
-mod transaction;
+pub mod validator_set;
 
-pub use self::complete::BlockFinalizer;
-pub use self::generator::{ChainIterator, ChainGenerator};
+pub use self::validator_set::ValidatorSet;

ethcore/native_contracts/src/test_contracts/validator_set.rs

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