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

.editorconfig

@@ -9,7 +9,7 @@ trim_trailing_whitespace=true
 max_line_length=120
 insert_final_newline=true
 
-[.travis.yml]
+[*.{yml,sh}]
 indent_style=space
 indent_size=2
 tab_width=8

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,84 @@
+# Code of Conduct
+
+## 1. Purpose
+
+A primary goal of Parity is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
+
+This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
+
+We invite all those who participate in Parity to help us create safe and positive experiences for everyone.
+
+## 2. Open Source Citizenship
+
+A supplemental goal of this Code of Conduct is to increase open source citizenship by encouraging participants to recognize and strengthen the relationships between our actions and their effects on our community.
+
+Communities mirror the societies in which they exist and positive action is essential to counteract the many forms of inequality and abuses of power that exist in society.
+
+If you see someone who is making an extra effort to ensure our community is welcoming, friendly, and encourages all participants to contribute to the fullest extent, we want to know.
+
+## 3. Expected Behavior
+
+The following behaviors are expected and requested of all community members:
+
+*   Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
+*   Exercise consideration and respect in your speech and actions.
+*   Attempt collaboration before conflict.
+*   Refrain from demeaning, discriminatory, or harassing behavior and speech.
+*   Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
+*   Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
+
+## 4. Unacceptable Behavior
+
+The following behaviors are considered harassment and are unacceptable within our community:
+
+*   Violence, threats of violence or violent language directed against another person.
+*   Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
+*   Posting or displaying sexually explicit or violent material.
+*   Posting or threatening to post other people’s personally identifying information ("doxing").
+*   Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
+*   Inappropriate photography or recording.
+*   Inappropriate physical contact. You should have someone’s consent before touching them.
+*   Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
+*   Deliberate intimidation, stalking or following (online or in person).
+*   Advocating for, or encouraging, any of the above behavior.
+*   Sustained disruption of community events, including talks and presentations.
+
+## 5. Consequences of Unacceptable Behavior
+
+Unacceptable behavior from any community member, including sponsors and those with decision-making authority, will not be tolerated.
+
+Anyone asked to stop unacceptable behavior is expected to comply immediately.
+
+If a community member engages in unacceptable behavior, the community organizers may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from the community without warning (and without refund in the case of a paid event).
+
+## 6. Reporting Guidelines
+
+If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. community@parity.io.
+
+Link to reporting guidelines: [CONTRIBUTING.md](CONTRIBUTING.md)
+
+Link to security policy: [SECURITY.md](../SECURITY.md)
+
+Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behavior feel safe. In the context of in-person events, organizers will also provide escorts as desired by the person experiencing distress.
+
+## 7. Addressing Grievances
+
+If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify Parity Technologies with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.
+
+## 8. Scope
+
+We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues–online and in-person–as well as in all one-on-one communications pertaining to community business.
+
+This code of conduct and its related procedures also applies to unacceptable behavior occurring outside the scope of community activities when such behavior has the potential to adversely affect the safety and well-being of community members.
+
+## 9. Contact info
+
+You can contact Parity via Email: community@parity.io
+
+## 10. License and attribution
+
+This Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).
+
+Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).
+
+Retrieved on November 22, 2016 from [http://citizencodeofconduct.org/](http://citizencodeofconduct.org/)

.github/CONTRIBUTING.md

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

.github/ISSUE_TEMPLATE.md

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

.gitignore

@@ -24,6 +24,9 @@
 npm-debug.log
 node_modules
 
+# js build artifacts
+.git-release.log
+
 # gdb files
 .gdb_history
 

.gitlab-ci.yml

@@ -4,16 +4,17 @@ stages:
   - push-release
   - build
 variables:
-  GIT_DEPTH: "3"
-  SIMPLECOV: "true"
   RUST_BACKTRACE: "1"
   RUSTFLAGS: ""
   CARGOFLAGS: ""
   CI_SERVER_NAME: "GitLab CI"
+  LIBSSL: "libssl1.0.0 (>=1.0.0)"
 cache:
-  key: "$CI_BUILD_STAGE/$CI_BUILD_REF_NAME"
+  key: "$CI_BUILD_STAGE-$CI_BUILD_REF_NAME"
+  paths:
+    - target/
   untracked: true
-linux-stable:
+linux-ubuntu:
   stage: build
   image: parity/rust:gitlab-ci
   only:
@@ -23,78 +24,15 @@ linux-stable:
     - triggers
   script:
     - rustup default stable
-    - cargo build -j $(nproc) --release --features final $CARGOFLAGS
-    - cargo build -j $(nproc) --release -p evmbin
-    - cargo build -j $(nproc) --release -p ethstore-cli
-    - cargo build -j $(nproc) --release -p ethkey-cli
-    - strip target/release/parity
-    - strip target/release/parity-evm
-    - strip target/release/ethstore
-    - strip target/release/ethkey
-    - export SHA3=$(target/release/parity tools hash target/release/parity)
-    - md5sum target/release/parity > parity.md5
-    - sh scripts/deb-build.sh amd64
-    - cp target/release/parity deb/usr/bin/parity
-    - cp target/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/release/ethstore deb/usr/bin/ethstore
-    - cp target/release/ethkey deb/usr/bin/ethkey
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_amd64.deb"
-    - md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity --body target/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.deb" --body "parity_"$VER"_amd64.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.deb.md5" --body "parity_"$VER"_amd64.deb.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
+    # ARGUMENTS: 1. BUILD_PLATFORM (target for binaries) 2. PLATFORM (target for cargo) 3. ARC (architecture) 4. & 5. CC & CXX flags 6. binary identifier
+    - scripts/gitlab-build.sh x86_64-unknown-linux-gnu x86_64-unknown-linux-gnu amd64 gcc g++ ubuntu
   tags:
-    - rust
     - rust-stable
   artifacts:
     paths:
-    - target/release/parity
-    - target/release/parity-evm
-    - target/release/ethstore
-    - target/release/ethkey
+    - parity.zip
     name: "stable-x86_64-unknown-linux-gnu_parity"
-linux-snap:
-  stage: build
-  image: parity/snapcraft:gitlab-ci
-  only:
-    - snap
-    - beta
-    - tags
-    - triggers
-  script:
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - cd snap
-    - rm -rf *snap
-    - sed -i 's/master/'"$VER"'/g' snapcraft.yaml
-    - echo "Version:"$VER
-    - snapcraft
-    - ls
-    - cp "parity_"$CI_BUILD"_REF_NAME_amd64.snap" "parity_"$VER"_amd64.snap"
-    - md5sum "parity_"$VER"_amd64.snap" > "parity_"$VER"_amd64.snap.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.snap" --body "parity_"$VER"_amd64.snap"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.snap.md5" --body "parity_"$VER"_amd64.snap.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
-  tags:
-    - rust
-    - rust-stable
-  artifacts:
-    paths:
-    - scripts/parity_*_amd64.snap
-    name: "stable-x86_64-unknown-snap-gnu_parity"
-  allow_failure: true  
-linux-stable-debian:
+linux-debian:
   stage: build
   image: parity/rust-debian:gitlab-ci
   only:
@@ -103,81 +41,14 @@ linux-stable-debian:
     - stable
     - triggers
   script:
-    - cargo build -j $(nproc) --release --features final $CARGOFLAGS
-    - cargo build -j $(nproc) --release -p evmbin
-    - cargo build -j $(nproc) --release -p ethstore-cli
-    - cargo build -j $(nproc) --release -p ethkey-cli
-    - strip target/release/parity
-    - strip target/release/parity-evm
-    - strip target/release/ethstore
-    - strip target/release/ethkey
-    - export SHA3=$(target/release/parity tools hash target/release/parity)
-    - md5sum target/release/parity > parity.md5
-    - sh scripts/deb-build.sh amd64
-    - cp target/release/parity deb/usr/bin/parity
-    - cp target/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/release/ethstore deb/usr/bin/ethstore
-    - cp target/release/ethkey deb/usr/bin/ethkey
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_amd64.deb"
-    - md5sum "parity_"$VER"_amd64.deb" > "parity_"$VER"_amd64.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/parity --body target/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/"parity_"$VER"_amd64.deb" --body "parity_"$VER"_amd64.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu/"parity_"$VER"_amd64.deb.md5" --body "parity_"$VER"_amd64.deb.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-debian-gnu
+    - export LIBSSL="libssl1.1 (>=1.1.0)"
+    - scripts/gitlab-build.sh x86_64-unknown-debian-gnu x86_64-unknown-linux-gnu amd64 gcc g++ debian
   tags:
-    - rust
     - rust-debian
   artifacts:
     paths:
-    - target/release/parity
+    - parity.zip
     name: "stable-x86_64-unknown-debian-gnu_parity"
-linux-beta:
-  stage: build
-  image: parity/rust:gitlab-ci
-  only:
-    - beta
-    - tags
-    - stable
-    - triggers
-  script:
-    - rustup default beta
-    - cargo build -j $(nproc) --release $CARGOFLAGS
-    - strip target/release/parity
-  tags:
-    - rust
-    - rust-beta
-  artifacts:
-    paths:
-    - target/release/parity
-    name: "beta-x86_64-unknown-linux-gnu_parity"
-  allow_failure: true
-linux-nightly:
-  stage: build
-  image: parity/rust:gitlab-ci
-  only:
-    - beta
-    - tags
-    - stable
-    - triggers
-  script:
-    - rustup default nightly
-    - cargo build -j $(nproc) --release $CARGOFLAGS
-    - strip target/release/parity
-  tags:
-    - rust
-    - rust-nightly
-  artifacts:
-    paths:
-    - target/release/parity
-    name: "nigthly-x86_64-unknown-linux-gnu_parity"
-  allow_failure: true
 linux-centos:
   stage: build
   image: parity/rust-centos:gitlab-ci
@@ -187,42 +58,12 @@ linux-centos:
     - stable
     - triggers
   script:
-    - export CXX="g++"
-    - export CC="gcc"
-    - export PLATFORM=x86_64-unknown-centos-gnu
-    - cargo build -j $(nproc) --release --features final $CARGOFLAGS
-    - cargo build -j $(nproc) --release -p evmbin
-    - cargo build -j $(nproc) --release -p ethstore-cli
-    - cargo build -j $(nproc) --release -p ethkey-cli
-    - strip target/release/parity
-    - strip target/release/parity-evm
-    - strip target/release/ethstore
-    - strip target/release/ethkey
-    - md5sum target/release/parity > parity.md5
-    - md5sum target/release/parity-evm > parity-evm.md5
-    - md5sum target/release/ethstore > ethstore.md5
-    - md5sum target/release/ethkey > ethkey.md5
-    - export SHA3=$(target/release/parity tools hash target/release/parity)
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity --body target/release/parity
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity-evm --body target/release/parity-evm
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity-evm.md5 --body parity-evm.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethstore --body target/release/ethstore
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethstore.md5 --body ethstore.md5
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethkey --body target/release/ethkey
-    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/ethkey.md5 --body ethkey.md5
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - scripts/gitlab-build.sh x86_64-unknown-centos-gnu x86_64-unknown-linux-gnu x86_64 gcc g++ centos
   tags:
-    - rust
     - rust-centos
   artifacts:
     paths:
-    - target/release/parity
+    - parity.zip
     name: "x86_64-unknown-centos-gnu_parity"
 linux-i686:
   stage: build
@@ -233,45 +74,12 @@ linux-i686:
     - stable
     - triggers
   script:
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
-    - export COMMIT=$(git rev-parse HEAD)
-    - export PLATFORM=i686-unknown-linux-gnu
-    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
-    - strip target/$PLATFORM/release/parity
-    - strip target/$PLATFORM/release/parity-evm
-    - strip target/$PLATFORM/release/ethstore
-    - strip target/$PLATFORM/release/ethkey   
-    - strip target/$PLATFORM/release/parity
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - export SHA3=$(target/$PLATFORM/release/parity tools hash target/$PLATFORM/release/parity)
-    - sh scripts/deb-build.sh i386
-    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
-    - cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_i386.deb"
-    - md5sum "parity_"$VER"_i386.deb" > "parity_"$VER"_i386.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_i386.deb" --body "parity_"$VER"_i386.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_i386.deb.md5" --body "parity_"$VER"_i386.deb.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - scripts/gitlab-build.sh i686-unknown-linux-gnu i686-unknown-linux-gnu i386 gcc g++ ubuntu
   tags:
-    - rust
     - rust-i686
   artifacts:
     paths:
-      - target/i686-unknown-linux-gnu/release/parity
+      - parity.zip
     name: "i686-unknown-linux-gnu"
   allow_failure: true
 linux-armv7:
@@ -283,53 +91,12 @@ linux-armv7:
     - stable
     - triggers
   script:
-    - export CC=arm-linux-gnueabihf-gcc
-    - export CXX=arm-linux-gnueabihf-g++
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
-    - export PLATFORM=armv7-unknown-linux-gnueabihf
-    - rm -rf .cargo
-    - mkdir -p .cargo
-    - echo "[target.$PLATFORM]" >> .cargo/config
-    - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
-    - cat .cargo/config
-    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - export SHA3=$(target/$PLATFORM/release/parity tools hash target/$PLATFORM/release/parity)
-    - sh scripts/deb-build.sh i386
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity-evm
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/ethstore
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/ethkey
-    - export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - sh scripts/deb-build.sh armhf
-    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
-    - cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
-    - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - scripts/gitlab-build.sh armv7-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ ubuntu
   tags:
-    - rust
     - rust-arm
   artifacts:
     paths:
-    - target/armv7-unknown-linux-gnueabihf/release/parity
+    - parity.zip
     name: "armv7_unknown_linux_gnueabihf_parity"
   allow_failure: true
 linux-arm:
@@ -341,50 +108,12 @@ linux-arm:
     - stable
     - triggers
   script:
-    - export CC=arm-linux-gnueabihf-gcc
-    - export CXX=arm-linux-gnueabihf-g++
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
-    - export PLATFORM=arm-unknown-linux-gnueabihf
-    - rm -rf .cargo
-    - mkdir -p .cargo
-    - echo "[target.$PLATFORM]" >> .cargo/config
-    - echo "linker= \"arm-linux-gnueabihf-gcc\"" >> .cargo/config
-    - cat .cargo/config
-    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/parity-evm
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/ethstore
-    - arm-linux-gnueabihf-strip target/$PLATFORM/release/ethkey
-    - export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - sh scripts/deb-build.sh armhf
-    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
-    - cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
-    - md5sum "parity_"$VER"_armhf.deb" > "parity_"$VER"_armhf.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/$PLATFORM/release/parity
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - scripts/gitlab-build.sh arm-unknown-linux-gnueabihf arm-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ ubuntu
   tags:
-    - rust
     - rust-arm
   artifacts:
     paths:
-    - target/arm-unknown-linux-gnueabihf/release/parity
+    - parity.zip
     name: "arm-unknown-linux-gnueabihf_parity"
   allow_failure: true
 linux-aarch64:
@@ -396,50 +125,29 @@ linux-aarch64:
     - stable
     - triggers
   script:
-    - export CC=aarch64-linux-gnu-gcc
-    - export CXX=aarch64-linux-gnu-g++
-    - export HOST_CC=gcc
-    - export HOST_CXX=g++
-    - export PLATFORM=aarch64-unknown-linux-gnu
-    - rm -rf .cargo
-    - mkdir -p .cargo
-    - echo "[target.$PLATFORM]" >> .cargo/config
-    - echo "linker= \"aarch64-linux-gnu-gcc\"" >> .cargo/config
-    - cat .cargo/config
-    - cargo build -j $(nproc) --target $PLATFORM --features final --release $CARGOFLAGS
-    - cargo build -j $(nproc) --target $PLATFORM --release -p evmbin
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethstore-cli
-    - cargo build -j $(nproc) --target $PLATFORM --release -p ethkey-cli
-    - aarch64-linux-gnu-strip target/$PLATFORM/release/parity
-    - aarch64-linux-gnu-strip target/$PLATFORM/release/parity-evm
-    - aarch64-linux-gnu-strip target/$PLATFORM/release/ethstore
-    - aarch64-linux-gnu-strip target/$PLATFORM/release/ethkey
-    - export SHA3=$(rhash --sha3-256 target/$PLATFORM/release/parity -p %h)
-    - md5sum target/$PLATFORM/release/parity > parity.md5
-    - sh scripts/deb-build.sh arm64
-    - cp target/$PLATFORM/release/parity deb/usr/bin/parity
-    - cp target/$PLATFORM/release/parity-evm deb/usr/bin/parity-evm
-    - cp target/$PLATFORM/release/ethstore deb/usr/bin/ethstore
-    - cp target/$PLATFORM/release/ethkey deb/usr/bin/ethkey
-    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-    - dpkg-deb -b deb "parity_"$VER"_arm64.deb"
-    - md5sum "parity_"$VER"_arm64.deb" > "parity_"$VER"_arm64.deb.md5"
-    - aws configure set aws_access_key_id $s3_key
-    - aws configure set aws_secret_access_key $s3_secret
-    - if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-    - aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_arm64.deb" --body "parity_"$VER"_arm64.deb"
-    - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_arm64.deb.md5" --body "parity_"$VER"_arm64.deb.md5"
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-    - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+    - scripts/gitlab-build.sh aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu arm64 aarch64-linux-gnu-gcc aarch64-linux-gnu-g++ ubuntu
   tags:
-    - rust
     - rust-arm
   artifacts:
     paths:
-    - target/aarch64-unknown-linux-gnu/release/parity
+    - parity.zip
     name: "aarch64-unknown-linux-gnu_parity"
+linux-snap:
+  stage: build
+  image: parity/snapcraft:gitlab-ci
+  only:
+    - stable
+    - beta
+    - tags
+    - triggers
+  script:
+    - scripts/gitlab-build.sh x86_64-unknown-snap-gnu x86_64-unknown-linux-gnu amd64 gcc g++ snap
+  tags:
+    - rust-stable
+  artifacts:
+    paths:
+    - parity.zip
+    name: "stable-x86_64-unknown-snap-gnu_parity"
   allow_failure: true
 darwin:
   stage: build
@@ -448,45 +156,17 @@ darwin:
     - tags
     - stable
     - triggers
-  script: |
-      export COMMIT=$(git rev-parse HEAD)
-      export PLATFORM=x86_64-apple-darwin
-      rustup default stable
-      cargo clean
-      cargo build -j 8 --features final --release #$CARGOFLAGS
-      cargo build -j 8 --release -p ethstore-cli #$CARGOFLAGS
-      cargo build -j 8 --release -p ethkey-cli #$CARGOFLAGS
-      cargo build -j 8 --release -p evmbin #$CARGOFLAGS
-      rm -rf parity.md5
-      md5sum target/release/parity > parity.md5
-      export SHA3=$(target/release/parity tools hash target/release/parity)
-      cd mac
-      xcodebuild -configuration Release
-      cd ..
-      packagesbuild -v mac/Parity.pkgproj
-      productsign --sign 'Developer ID Installer: PARITY TECHNOLOGIES LIMITED (P2PX3JU8FT)' target/release/Parity\ Ethereum.pkg target/release/Parity\ Ethereum-signed.pkg
-      export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
-      mv target/release/Parity\ Ethereum-signed.pkg "parity-"$VER"-macos-installer.pkg"
-      md5sum "parity-"$VER"-macos-installer.pkg" >> "parity-"$VER"-macos-installer.pkg.md5"
-      aws configure set aws_access_key_id $s3_key
-      aws configure set aws_secret_access_key $s3_secret
-      if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
-      aws s3 rm --recursive s3://$S3_BUCKET/$CI_BUILD_REF_NAME/$PLATFORM
-      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity --body target/release/parity
-      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5
-      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity-"$VER"-macos-installer.pkg" --body "parity-"$VER"-macos-installer.pkg"
-      aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity-"$VER"-macos-installer.pkg.md5" --body "parity-"$VER"-macos-installer.pkg.md5"
-      curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM
-      curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM
+  script:
+    - scripts/gitlab-build.sh x86_64-apple-darwin x86_64-apple-darwin macos gcc g++ macos
   tags:
     - osx
   artifacts:
     paths:
-    - target/release/parity
+    - parity.zip
     name: "x86_64-apple-darwin_parity"
 windows:
   cache:
-    key: "%CI_BUILD_STAGE%/%CI_BUILD_REF_NAME%"
+    key: "%CI_BUILD_STAGE%-%CI_BUILD_REF_NAME%"
     untracked: true
   stage: build
   only:
@@ -495,62 +175,12 @@ windows:
     - stable
     - triggers
   script:
-    - set PLATFORM=x86_64-pc-windows-msvc
-    - set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt
-    - set LIB=C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64
-    - set RUST_BACKTRACE=1
-    - set RUSTFLAGS=%RUSTFLAGS%
-    - rustup default stable-x86_64-pc-windows-msvc
-    - cargo clean
-    - cargo build --features final --release #%CARGOFLAGS%
-    - cargo build --release -p ethstore-cli #%CARGOFLAGS%
-    - cargo build --release -p ethkey-cli #%CARGOFLAGS%
-    - cargo build --release -p evmbin #%CARGOFLAGS%
-    - signtool sign /f %keyfile% /p %certpass% target\release\parity.exe
-    - target\release\parity.exe tools hash target\release\parity.exe > parity.sha3
-    - set /P SHA3=<parity.sha3
-    - curl -sL --url "https://github.com/paritytech/win-build/raw/master/SimpleFC.dll" -o nsis\SimpleFC.dll
-    - curl -sL --url "https://github.com/paritytech/win-build/raw/master/vc_redist.x64.exe" -o nsis\vc_redist.x64.exe
-    - msbuild windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release
-    - signtool sign /f %keyfile% /p %certpass% windows\ptray\x64\release\ptray.exe
-    - cd nsis
-    - makensis.exe installer.nsi
-    - copy installer.exe InstallParity.exe
-    - signtool sign /f %keyfile% /p %certpass% InstallParity.exe
-    - md5sums InstallParity.exe > InstallParity.exe.md5
-    - zip win-installer.zip InstallParity.exe InstallParity.exe.md5
-    - md5sums win-installer.zip > win-installer.zip.md5
-    - cd ..\target\release\
-    - md5sums parity.exe > parity.exe.md5
-    - zip parity.zip parity.exe parity.md5
-    - md5sums parity.zip > parity.zip.md5
-    - cd ..\..
-    - aws configure set aws_access_key_id %s3_key%
-    - aws configure set aws_secret_access_key %s3_secret%
-    - echo %CI_BUILD_REF_NAME%
-    - echo %CI_BUILD_REF_NAME% | findstr /R "master" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
-    - echo %CI_BUILD_REF_NAME% | findstr /R "beta" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
-    - echo %CI_BUILD_REF_NAME% | findstr /R "stable" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
-    - echo %CI_BUILD_REF_NAME% | findstr /R "nightly" >nul 2>&1 && set S3_BUCKET=builds-parity-published|| set S3_BUCKET=builds-parity
-    - echo %S3_BUCKET%
-    - aws s3 rm --recursive s3://%S3_BUCKET%/%CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe --body target\release\parity.exe
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.exe.md5 --body target\release\parity.exe.md5
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip --body target\release\parity.zip
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/parity.zip.md5 --body target\release\parity.zip.md5
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe --body nsis\InstallParity.exe
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/InstallParity.exe.md5 --body nsis\InstallParity.exe.md5
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip --body nsis\win-installer.zip
-    - aws s3api put-object --bucket %S3_BUCKET% --key %CI_BUILD_REF_NAME%/x86_64-pc-windows-msvc/win-installer.zip.md5 --body nsis\win-installer.zip.md5
-    - curl --data "commit=%CI_BUILD_REF%&sha3=%SHA3%&filename=parity.exe&secret=%RELEASES_SECRET%" http://update.parity.io:1337/push-build/%CI_BUILD_REF_NAME%/%PLATFORM%
-    - curl --data "commit=%CI_BUILD_REF%&sha3=%SHA3%&filename=parity.exe&secret=%RELEASES_SECRET%" http://update.parity.io:1338/push-build/%CI_BUILD_REF_NAME%/%PLATFORM%
+    - sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc installer "" "" windows
   tags:
    - rust-windows
   artifacts:
     paths:
-    - target/release/parity.exe
-    - target/release/parity.pdb
-    - nsis/InstallParity.exe
+    - parity.zip
     name: "x86_64-pc-windows-msvc_parity"
 docker-build:
   stage: build
@@ -563,7 +193,7 @@ docker-build:
     - if [ "$CI_BUILD_REF_NAME" == "beta-release" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
     - echo "Tag:" $DOCKER_TAG
     - docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
-    - sh scripts/docker-build.sh $DOCKER_TAG
+    - scripts/docker-build.sh $DOCKER_TAG
     - docker logout
   tags:
     - docker
@@ -572,65 +202,16 @@ test-coverage:
   only:
     - master
   script:
-    - git submodule update --init --recursive
-    - rm -rf target/*
-    - rm -rf js/.coverage
-    - scripts/cov.sh
- #   - COVERAGE=$(grep -Po 'covered":.*?[^\\]"' target/cov/index.json | grep "[0-9]*\.[0-9]" -o)
- #   - echo "Coverage:" $COVERAGE
+    - scripts/gitlab-test.sh test-coverage
   tags:
     - kcov
   allow_failure: true
-test-darwin:
-  stage: test
-  only:
-    - triggers
-  before_script:
-    - git submodule update --init --recursive
-    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e "^js/" -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
-  script:
-    - export RUST_BACKTRACE=1
-    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
-  tags:
-    - osx
-  allow_failure: true
-test-windows:
-  stage: test
-  only:
-    - triggers
-  before_script:
-    - git submodule update --init --recursive
-  script:
-    - set RUST_BACKTRACE=1
-    - echo cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p parity-dapps -p parity-rpc -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity-rpc-client -p parity %CARGOFLAGS% --verbose --release
-  tags:
-    - rust-windows
-  allow_failure: true
 test-rust-stable:
   stage: test
   image: parity/rust:gitlab-ci
-  before_script:
-    - git submodule update --init --recursive
-    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
   script:
-    - rustup show
-    - export RUST_BACKTRACE=1
-    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
-    - if [ "$CI_BUILD_REF_NAME" == "nightly" ]; then sh scripts/aura-test.sh; fi
+    - scripts/gitlab-test.sh stable
   tags:
-    - rust
-    - rust-stable
-js-test:
-  stage: test
-  image: parity/rust:gitlab-ci
-  before_script:
-    - git submodule update --init --recursive
-    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
-    - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS deps install since no JS files modified."; else ./js/scripts/install-deps.sh;fi
-  script:
-    - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS lint since no JS files modified."; else ./js/scripts/lint.sh && ./js/scripts/test.sh && ./js/scripts/build.sh; fi
-  tags:
-    - rust
     - rust-stable
 test-rust-beta:
   stage: test
@@ -638,15 +219,9 @@ test-rust-beta:
     - triggers
     - master
   image: parity/rust:gitlab-ci
-  before_script:
-    - git submodule update --init --recursive
-    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
   script:
-    - rustup default beta
-    - export RUST_BACKTRACE=1
-    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
+    - scripts/gitlab-test.sh beta
   tags:
-    - rust
     - rust-beta
   allow_failure: true
 test-rust-nightly:
@@ -655,34 +230,30 @@ test-rust-nightly:
     - triggers
     - master
   image: parity/rust:gitlab-ci
-  before_script:
-    - git submodule update --init --recursive
-    - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l)
   script:
-    - rustup default nightly
-    - export RUST_BACKTRACE=1
-    - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi
+    - scripts/gitlab-test.sh nightly
   tags:
     - 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
-    - beta
     - stable
+    - beta
     - tags
     - triggers
   image: parity/rust:gitlab-ci
-  before_script:
-    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l)
-    - echo $JS_FILES_MODIFIED
-    - if [ $JS_FILES_MODIFIED -eq 0  ]; then echo "Skipping JS deps install since no JS files modified."; else ./js/scripts/install-deps.sh;fi
   script:
-    - rustup default stable
-    - echo $JS_FILES_MODIFIED
-    - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS rebuild since no JS files modified."; else ./js/scripts/build.sh && ./js/scripts/release.sh; fi
+    - scripts/gitlab-test.sh js-release
   tags:
     - javascript
 push-release:
@@ -692,8 +263,6 @@ push-release:
     - triggers
   image: parity/rust:gitlab-ci
   script:
-    - rustup default stable
-    - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1337/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
-    - curl --data "secret=$RELEASES_SECRET" http://update.parity.io:1338/push-release/$CI_BUILD_REF_NAME/$CI_BUILD_REF
+    - scripts/gitlab-push-release.sh
   tags:
     - curl

CHANGELOG.md

@@ -1,647 +1,366 @@
-## Parity [v1.7.3](https://github.com/paritytech/parity/releases/tag/v1.7.3) (2017-10-09)
+## Parity [v1.8.5](https://github.com/paritytech/parity/releases/tag/v1.8.5) (2017-12-29)
 
-Parity 1.7.3 enables the Byzantium fork for Ethereum main network on Block 4_370_000 and offers a variety of bug fixes and stability improvements. Among them:
+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.
 
-- Fixed network protocol version negotiation with Geth nodes v1.7.1+.
-- Fixed `RETURNDATA` size for built-ins. (Built-ins in some cases overwrite only a portion of the output memory slice.)
-- Multisig Wallet View now loads if multiple transactions happened within one block.
-- Improved stability of snapshot-sycns (warp).
-- Revised timeout and batch size constants for bigger blocks.
-- Renamed RPC receipt `statusCode` field to `status`.
+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`.
 
-Full list of included changes:
+The full list of included changes:
 
-- Backporting ([#6676](https://github.com/paritytech/parity/pull/6676))
-  - Fix wallet view ([#6597](https://github.com/paritytech/parity/pull/6597))
-    - Add safe fail for empty logs
-    - Filter transactions
-    - Add more logging
-    - Fix Wallet Creation and wallet tx list
-    - Remove logs
-    - Prevent selecting twice same wallet owner
-    - Fix tests
-    - Remove unused props
-  - Disallow pasting recovery phrases on first run ([#6602](https://github.com/paritytech/parity/pull/6602))
-    - Fix disallowing paste of recovery phrase on first run, ref [#6581](https://github.com/paritytech/parity/issues/6581)
-    - Allow the leader of CATS pasting recovery phrases.
-  - Updated systemd files for linux ([#6592](https://github.com/paritytech/parity/pull/6592))
-    - Previous version put $BASE directory in root directory.
-    - This version clearly explains how to run as root or as specific user.
-    - Additional configuration:
-      - send SIGHUP for clean exit,
-      - restart on fail.
-    - Tested on Ubuntu 16.04.3 LTS with 4.10.0-33-generic x86_64 kernel
-  - Don't expose port 80 for parity anymore ([#6633](https://github.com/paritytech/parity/pull/6633))
-- Backporting ([#6675](https://github.com/paritytech/parity/pull/6675))
-  - Required validators >= num owners ([#6551](https://github.com/paritytech/parity/pull/6551))
-  - Debounce sync status. ([#6572](https://github.com/paritytech/parity/pull/6572))
-  - Fixed network protocol version negotiation ([#6649](https://github.com/paritytech/parity/pull/6649))
-  - Renamed RPC receipt statusCode field to status ([#6650](https://github.com/paritytech/parity/pull/6650))
-  - Fixed RETURNDATA size for built-ins ([#6652](https://github.com/paritytech/parity/pull/6652))
-- Byzantium fork block number ([#6661](https://github.com/paritytech/parity/pull/6661))
-- Refreshing block number on status view ([#6610](https://github.com/paritytech/parity/pull/6610))
-- Tweaked block download timeouts ([#6595](https://github.com/paritytech/parity/pull/6595))
-- Backports ([#6563](https://github.com/paritytech/parity/pull/6563))
-  - 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))
-- Bump to v1.7.3
+- 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.7.2](https://github.com/paritytech/parity/releases/tag/v1.7.2) (2017-09-18)
+## Parity [v1.8.4](https://github.com/paritytech/parity/releases/tag/v1.8.4) (2017-12-12)
 
-Parity 1.7.2 is a bug-fix release to improve performance and stability. Among others, it addresses the following:
+Parity 1.8.4 applies fixes for Proof-of-Authority networks and schedules the Kovan-Byzantium hard-fork.
 
-- Byzantium fork support for the Ropsten and Foundation networks.
-- Added support for the ConsenSys and Gnosis multi-signature wallets.
-- Significantly increased token registry and token balance lookup performance.
-- Fixed issues with the health status indicator in the wallet.
-- Tweaked warp-sync to quickly catch up with chains fallen back more than 10,000 blocks.
-- Fixes to the Chrome extension and macOS installer upgrades.
+- 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.
 
-Full list of included changes:
+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.
 
-- Fix output from eth_call. ([#6538](https://github.com/paritytech/parity/pull/6538))
-- Ropsten fork ([#6532](https://github.com/paritytech/parity/pull/6532))
-- Byzantium updates ([#6529](https://github.com/paritytech/parity/pull/6529))
-  - Fix modexp bug: return 0 if base=0 ([#6424](https://github.com/paritytech/parity/pull/6424))
-  - Running state test using parity-evm ([#6355](https://github.com/paritytech/parity/pull/6355))
-    - Initial version of state tests.
-    - Refactor state to support tracing.
-    - Unify TransactResult.
-    - Add test.
-  - Byzantium updates ([#5855](https://github.com/paritytech/parity/pull/5855))
-    - EIP-211 updates
-    - Benchmarks
-    - Blockhash instruction gas cost updated
-    - More benches
-    - EIP-684
-    - EIP-649
-    - EIP-658
-    - Updated some tests
-    - Modexp fixes
-    - STATICCALL fixes
-    - Pairing fixes
-    - More STATICALL fixes
-    - Use paritytech/bn
-    - Fixed REVERTing of contract creation
-    - Fixed more tests
-    - Fixed more tests
-    - Blockchain tests
-    - Enable previously broken tests
-    - Transition test
-    - Updated tests
-    - Fixed modexp reading huge numbers
-    - Enabled max_code_size test
-    - Review fixes
-    - Updated pairing pricing
-    - Missing commas (style)
-    - Update test.rs
-    - Small improvements
-    - Eip161abc
-- Fix extension detection ([#6452](https://github.com/paritytech/parity/pull/6452)) ([#6524](https://github.com/paritytech/parity/pull/6524))
-  - Fix extension detection.
-  - Fix mobx quirks.
-  - Update submodule.
-- Fix detecting hardware wallets. ([#6509](https://github.com/paritytech/parity/pull/6509))
-- Allow hardware device reads without lock. ([#6517](https://github.com/paritytech/parity/pull/6517))
-- Backports [#6497](https://github.com/paritytech/parity/pull/6497)
-  - Fix slow balances ([#6471](https://github.com/paritytech/parity/pull/6471))
-    - Update token updates
-    - Update token info fetching
-    - Update logger
-    - Minor fixes to updates and notifications for balances
-    - Use Pubsub
-    - Fix timeout.
-    - Use pubsub for status.
-    - Fix signer subscription.
-    - Process tokens in chunks.
-    - Fix tokens loaded by chunks
-    - Dispatch tokens asap
-    - Fix chunks processing.
-    - Better filter options
-    - Parallel log fetching.
-    - Fix signer polling.
-    - Fix initial block query.
-    - Token balances updates : the right(er) way
-    - Better tokens info fetching
-    - Fixes in token data fetching
-    - Only fetch what's needed (tokens)
-    - Fix linting issues
-    - Update wasm-tests.
-    - Fixing balances fetching
-    - Fix requests tracking in UI
-    - Fix request watching
-    - Update the Logger
-    - PR Grumbles Fixes
-  - Eth_call returns output of contract creations ([#6420](https://github.com/paritytech/parity/pull/6420))
-    - Eth_call returns output of contract creations
-    - Fix parameters order.
-    - Save outputs for light client as well.
-  - Don't accept transactions above block gas limit.
-  - Expose health status over RPC ([#6274](https://github.com/paritytech/parity/pull/6274))
-     - Node-health to a separate crate.
-     - Initialize node_health outside of dapps.
-     - Expose health over RPC.
-     - Bring back 412 and fix JS.
-     - Add health to workspace and tests.
-     - Fix compilation without default features.
-     - Fix borked merge.
-     - Revert to generics to avoid virtual calls.
-     - Fix node-health tests.
-     - Add missing trailing comma.
-  - Fixing/removing failing JS tests.
-  - Do not activate genesis epoch in immediate transition validator contract ([#6349](https://github.com/paritytech/parity/pull/6349))
-  - Fix memory tracing.
-  - Add test to cover that.
-  - Ensure balances of constructor accounts are kept
-  - Test balance of spec-constructed account is kept
-- Fix warning spam. [#6369](https://github.com/paritytech/parity/pull/6369)
-- Bump to 1.7.2
-- Fix eth_call [#6366](https://github.com/paritytech/parity/pull/6366)
-- Backporting [#6352](https://github.com/paritytech/parity/pull/6352)
-  - Better check the created accounts before showing Startup Wizard [#6331](https://github.com/paritytech/parity/pull/6331)
-  - Tweaked snapshot params [#6344](https://github.com/paritytech/parity/pull/6344)
-- Increase default gas limit for eth_call [#6337](https://github.com/paritytech/parity/pull/6337)
-  - Fix balance increase.
-  - Cap gas limit for dapp-originating requests.
-- Backports [#6333](https://github.com/paritytech/parity/pull/6333)
-  - Overflow check in addition
-  - Unexpose methods on UI RPC. [#6295](https://github.com/paritytech/parity/pull/6295)
-  - Add more descriptive error when signing/decrypting using hw wallet.
-  - Format instant change proofs correctly
-  - Propagate stratum submit share error upstream [#6260](https://github.com/paritytech/parity/pull/6260)
-  - Updated jsonrpc [#6264](https://github.com/paritytech/parity/pull/6264)
-  - Using multiple NTP servers [#6173](https://github.com/paritytech/parity/pull/6173)
-    - Small improvements to time estimation.
-    - Allow multiple NTP servers to be used.
-    - Removing boxing.
-    - Update list of servers and add reference.
-  - Fix dapps CSP when UI is exposed externally [#6178](https://github.com/paritytech/parity/pull/6178)
-    - Allow embeding on any page when ui-hosts=all and fix dev_ui
-  - Fix cache path when using --base-path [#6212](https://github.com/paritytech/parity/pull/6212)
-  - Bump to v1.7.1
-- UI backports [#6332](https://github.com/paritytech/parity/pull/6332)
-  - Time should not contribue to overall status. [#6276](https://github.com/paritytech/parity/pull/6276)
-  - Add warning to web browser and fix links. [#6232](https://github.com/paritytech/parity/pull/6232)
-  - Extension fixes [#6284](https://github.com/paritytech/parity/pull/6284)
-    - Fix token symbols in extension.
-    - Allow connections from firefox extension.
-  - Add support for ConsenSys multisig wallet [#6153](https://github.com/paritytech/parity/pull/6153)
-    - First draft of ConsenSys wallet
-    - Fix transfer store // WIP Consensys Wallet
-    - Rename walletABI JSON file
-    - Fix wrong daylimit in wallet modal
-    - Confirm/Revoke ConsensysWallet txs
-    - Change of settings for the Multisig Wallet
-- Update README for beta [#6270](https://github.com/paritytech/parity/pull/6270)
-- Fixed macOS installer upgrade [#6221](https://github.com/paritytech/parity/pull/6221)
+The full list of included changes:
 
-## Parity [v1.7.0](https://github.com/paritytech/parity/releases/tag/v1.7.0) (2017-07-28)
+- 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 1.7.0 is a major release introducing several important features:
+## Parity [v1.8.3](https://github.com/paritytech/parity/releases/tag/v1.8.3) (2017-11-15)
 
-- **Experimental [Light client](https://github.com/paritytech/parity/wiki/The-Parity-Light-Protocol-(PIP)) support**. Start Parity with `--light` to enable light mode. Please, note: The wallet UI integration for the light client is not included, yet.
-- **Experimental web wallet**. A hosted version of Parity that keeps the keys and signs transactions using your browser storage. Try it at https://wallet.parity.io or run your own with `--public-node`.
-- **WASM contract support**. Private networks can run contracts compiled into WASM bytecode. _More information and documentation to follow_.
-- **DApps and RPC server merge**. DApp and RPC are now available through a single API endpoint. DApp server related settings are deprecated.
-- **Export accounts from the wallet**. Backing up your keys can now simply be managed through the wallet interface.
-- **PoA/Kovan validator set contract**. The PoA network validator-set management via smart contract is now supported by warp and, in the near future, light sync.
-- **PubSub API**. https://github.com/paritytech/parity/wiki/JSONRPC-Parity-Pub-Sub-module
-- **Signer apps for IOS and Android**.
+Parity 1.8.3 contains several bug-fixes and removes the ability to deploy built-in multi-signature wallets.
 
-Full list of included changes:
+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)
 
-- Backports [#6163](https://github.com/paritytech/parity/pull/6163)
-  - Light client improvements ([#6156](https://github.com/paritytech/parity/pull/6156))
-    - No seal checking
-    - Import command and --no-seal-check for light client
-    - Fix eth_call
-    - Tweak registry dapps lookup
-    - Ignore failed requests to non-server peers
-  - Fix connecting to wildcard addresses. ([#6167](https://github.com/paritytech/parity/pull/6167))
-  - Don't display an overlay in case the time sync check fails. ([#6164](https://github.com/paritytech/parity/pull/6164))
-    - Small improvements to time estimation.
-    - Temporarily disable NTP time check by default.
-- Light client fixes ([#6148](https://github.com/paritytech/parity/pull/6148)) [#6151](https://github.com/paritytech/parity/pull/6151)
-  - Light client fixes
-  - Fix memory-lru-cache
-  - Clear pending reqs on disconnect
-- Filter tokens logs from current block, not genesis ([#6128](https://github.com/paritytech/parity/pull/6128)) [#6141](https://github.com/paritytech/parity/pull/6141)
-- Fix QR scanner returning null on confirm [#6122](https://github.com/paritytech/parity/pull/6122)
-- Check QR before lowercase ([#6119](https://github.com/paritytech/parity/pull/6119)) [#6120](https://github.com/paritytech/parity/pull/6120)
-- Remove chunk to restore from pending set only upon successful import [#6117](https://github.com/paritytech/parity/pull/6117)
-- Fixed node address detection on incoming connection [#6094](https://github.com/paritytech/parity/pull/6094)
-- Place RETURNDATA behind block number gate [#6095](https://github.com/paritytech/parity/pull/6095)
-- Update wallet library binaries [#6108](https://github.com/paritytech/parity/pull/6108)
-- Backported wallet fix [#6105](https://github.com/paritytech/parity/pull/6105)
-  - Fix initialisation bug. ([#6102](https://github.com/paritytech/parity/pull/6102))
-  - Update wallet library modifiers ([#6103](https://github.com/paritytech/parity/pull/6103))
-- Place RETURNDATA behind block number gate [#6095](https://github.com/paritytech/parity/pull/6095)
-- Fixed node address detection on incoming connection [#6094](https://github.com/paritytech/parity/pull/6094)
-- Bump snap version and tweak importing detection logic ([#6079](https://github.com/paritytech/parity/pull/6079)) [#6081](https://github.com/paritytech/parity/pull/6081)
-  - bump last tick just before printing info and restore sync detection
-  - bump kovan snapshot version
-  - Fixed sync tests
-  - Fixed rpc tests
-- Acquire client report under lock in informant [#6071](https://github.com/paritytech/parity/pull/6071)
-- Show busy indicator on Address forget [#6069](https://github.com/paritytech/parity/pull/6069)
-- Add CSP for worker-src ([#6059](https://github.com/paritytech/parity/pull/6059)) [#6064](https://github.com/paritytech/parity/pull/6064)
-  - Specify worker-src seperately, add blob
-  - Upgrade react-qr-scan to latest version
-- Set release channel to beta
-- Limit transaction queue memory & limit future queue [#6038](https://github.com/paritytech/parity/pull/6038)
-- Fix CI build issue [#6050](https://github.com/paritytech/parity/pull/6050)
-- New contract PoA sync fixes [#5991](https://github.com/paritytech/parity/pull/5991)
-- Fixed link to Multisig Contract Wallet on master [#5984](https://github.com/paritytech/parity/pull/5984)
-- Ethcore crate split part 1 [#6041](https://github.com/paritytech/parity/pull/6041)
-- Fix status icon [#6039](https://github.com/paritytech/parity/pull/6039)
-- Errors & warnings for inappropriate RPCs [#6029](https://github.com/paritytech/parity/pull/6029)
-- Add missing CSP for web3.site [#5992](https://github.com/paritytech/parity/pull/5992)
-- Remove cargo install --git from README.md [#6037](https://github.com/paritytech/parity/pull/6037)
-- Node Health warnings [#5951](https://github.com/paritytech/parity/pull/5951)
-- RPC cpu pool [#6023](https://github.com/paritytech/parity/pull/6023)
-- Use crates.io dependencies for parity-wasm [#6036](https://github.com/paritytech/parity/pull/6036)
-- Add test for loading the chain specs [#6028](https://github.com/paritytech/parity/pull/6028)
-- Whitelist APIs for generic Pub-Sub [#5840](https://github.com/paritytech/parity/pull/5840)
-- WASM contracts MVP [#5679](https://github.com/paritytech/parity/pull/5679)
-- Fix valid QR scan not advancing [#6033](https://github.com/paritytech/parity/pull/6033)
-- --reseal-on-uncle [#5940](https://github.com/paritytech/parity/pull/5940)
-- Support comments in reserved peers file ([#6004](https://github.com/paritytech/parity/pull/6004)) [#6012](https://github.com/paritytech/parity/pull/6012)
-- Add new md tnc [#5937](https://github.com/paritytech/parity/pull/5937)
-- Fix output of parity-evm in case of bad instruction [#5955](https://github.com/paritytech/parity/pull/5955)
-- Don't send notifications to unsubscribed clients of PubSub [#5960](https://github.com/paritytech/parity/pull/5960)
-- Proper light client informant and more verification of imported headers [#5897](https://github.com/paritytech/parity/pull/5897)
-- New Kovan bootnodes [#6017](https://github.com/paritytech/parity/pull/6017)
-- Use standard paths for Ethash cache [#5881](https://github.com/paritytech/parity/pull/5881)
-- Defer code hash calculation. [#5959](https://github.com/paritytech/parity/pull/5959)
-- Fix first run wizard. [#6000](https://github.com/paritytech/parity/pull/6000)
-- migration to serde 1.0 [#5996](https://github.com/paritytech/parity/pull/5996)
-- SecretStore: generating signatures [#5764](https://github.com/paritytech/parity/pull/5764)
-- bigint upgraded to version 3.0 [#5986](https://github.com/paritytech/parity/pull/5986)
-- config: don't allow dev chain with force sealing option [#5965](https://github.com/paritytech/parity/pull/5965)
-- Update lockfile for miniz-sys and gcc [#5969](https://github.com/paritytech/parity/pull/5969)
-- Clean up function naming in RPC error module [#5995](https://github.com/paritytech/parity/pull/5995)
-- Fix underflow in gas calculation [#5975](https://github.com/paritytech/parity/pull/5975)
-- PubSub for parity-js [#5830](https://github.com/paritytech/parity/pull/5830)
-- Report whether a peer was kept from `Handler::on_connect` [#5958](https://github.com/paritytech/parity/pull/5958)
-- Implement skeleton for transaction index and epoch transition proof PIP messages [#5908](https://github.com/paritytech/parity/pull/5908)
-- TransactionQueue improvements [#5917](https://github.com/paritytech/parity/pull/5917)
-- constant time HMAC comparison and clarify docs in ethkey [#5952](https://github.com/paritytech/parity/pull/5952)
-- Avoid pre-computing jump destinations [#5954](https://github.com/paritytech/parity/pull/5954)
-- Upgrade elastic array [#5949](https://github.com/paritytech/parity/pull/5949)
-- PoA: Wait for transition finality before applying [#5774](https://github.com/paritytech/parity/pull/5774)
-- Logs Pub-Sub [#5705](https://github.com/paritytech/parity/pull/5705)
-- Add the command to install the parity snap [#5945](https://github.com/paritytech/parity/pull/5945)
-- Reduce unnecessary allocations [#5944](https://github.com/paritytech/parity/pull/5944)
-- Clarify confusing messages. [#5935](https://github.com/paritytech/parity/pull/5935)
-- Content Security Policy [#5790](https://github.com/paritytech/parity/pull/5790)
-- CLI: Export error message and less verbose peer counter. [#5870](https://github.com/paritytech/parity/pull/5870)
-- network: make it more explicit about StreamToken and TimerToken [#5939](https://github.com/paritytech/parity/pull/5939)
-- sync: make it more idiomatic rust [#5938](https://github.com/paritytech/parity/pull/5938)
-- Prioritize accounts over address book [#5909](https://github.com/paritytech/parity/pull/5909)
-- Fixing failing compilation of RPC test on master. [#5916](https://github.com/paritytech/parity/pull/5916)
-- Empty local middleware, until explicitly requested [#5912](https://github.com/paritytech/parity/pull/5912)
-- Cancel propagated TX [#5899](https://github.com/paritytech/parity/pull/5899)
-- fix minor race condition in aura seal generation [#5910](https://github.com/paritytech/parity/pull/5910)
-- Docs for Pub-Sub, optional parameter for parity_subscribe [#5833](https://github.com/paritytech/parity/pull/5833)
-- Fix gas editor doubling-up on gas [#5820](https://github.com/paritytech/parity/pull/5820)
-- Information about used paths added to general output block [#5904](https://github.com/paritytech/parity/pull/5904)
-- Domain-locked web tokens. [#5894](https://github.com/paritytech/parity/pull/5894)
-- Removed panic handlers [#5895](https://github.com/paritytech/parity/pull/5895)
-- Latest changes from Rust RocksDB binding merged [#5905](https://github.com/paritytech/parity/pull/5905)
-- Adjust keyethereum/secp256 aliasses [#5903](https://github.com/paritytech/parity/pull/5903)
-- Keyethereum fs dependency [#5902](https://github.com/paritytech/parity/pull/5902)
-- Ethereum Classic Monetary Policy [#5741](https://github.com/paritytech/parity/pull/5741)
-- Initial token should allow full access. [#5873](https://github.com/paritytech/parity/pull/5873)
-- Fixed account selection for Dapps on public node [#5856](https://github.com/paritytech/parity/pull/5856)
-- blacklist bad snapshot manifest hashes upon failure [#5874](https://github.com/paritytech/parity/pull/5874)
-- Fix wrongly called timeouts [#5838](https://github.com/paritytech/parity/pull/5838)
-- ArchiveDB and other small fixes [#5867](https://github.com/paritytech/parity/pull/5867)
-- convert try!() to ? [#5866](https://github.com/paritytech/parity/pull/5866)
-- Make config file optional in systemd [#5847](https://github.com/paritytech/parity/pull/5847)
-- EIP-116 (214), [#4833](https://github.com/paritytech/parity/issues/4833) [#4851](https://github.com/paritytech/parity/pull/4851)
-- all executables are workspace members [#5865](https://github.com/paritytech/parity/pull/5865)
-- minor optimizations of the modexp builtin [#5860](https://github.com/paritytech/parity/pull/5860)
-- three small commits for HashDB and MemoryDB [#5766](https://github.com/paritytech/parity/pull/5766)
-- use rust 1.18's retain to boost the purge performance [#5801](https://github.com/paritytech/parity/pull/5801)
-- Allow IPFS server to accept POST requests [#5858](https://github.com/paritytech/parity/pull/5858)
-- Dutch i18n from [#5802](https://github.com/paritytech/parity/issues/5802) for master [#5836](https://github.com/paritytech/parity/pull/5836)
-- Typos in token deploy dapp ui [#5851](https://github.com/paritytech/parity/pull/5851)
-- A CLI flag to allow fast transaction signing when account is unlocked. [#5778](https://github.com/paritytech/parity/pull/5778)
-- Removing `additional` field from EVM instructions [#5821](https://github.com/paritytech/parity/pull/5821)
-- Don't fail on wrong log decoding [#5813](https://github.com/paritytech/parity/pull/5813)
-- Use randomized subscription ids for PubSub [#5756](https://github.com/paritytech/parity/pull/5756)
-- Fixed mem write for empty slice [#5827](https://github.com/paritytech/parity/pull/5827)
-- Fix party technologies [#5810](https://github.com/paritytech/parity/pull/5810)
-- Revert "Fixed mem write for empty slice" [#5826](https://github.com/paritytech/parity/pull/5826)
-- Fixed mem write for empty slice [#5825](https://github.com/paritytech/parity/pull/5825)
-- Fix JS tests [#5822](https://github.com/paritytech/parity/pull/5822)
-- Bump native-tls and openssl crates. [#5817](https://github.com/paritytech/parity/pull/5817)
-- Public node using WASM [#5734](https://github.com/paritytech/parity/pull/5734)
-- enforce block signer == author field in PoA [#5808](https://github.com/paritytech/parity/pull/5808)
-- Fix stack display in evmbin. [#5733](https://github.com/paritytech/parity/pull/5733)
-- Disable UI if it's not compiled in. [#5773](https://github.com/paritytech/parity/pull/5773)
-- Require phrase confirmation. [#5731](https://github.com/paritytech/parity/pull/5731)
-- Duration limit made optional for EthashParams [#5777](https://github.com/paritytech/parity/pull/5777)
-- Update Changelog for 1.6.8 [#5798](https://github.com/paritytech/parity/pull/5798)
-- Replace Ethcore comany name in T&C and some other places [#5796](https://github.com/paritytech/parity/pull/5796)
-- PubSub for IPC. [#5800](https://github.com/paritytech/parity/pull/5800)
-- Fix terminology distributed -> decentralized applications [#5797](https://github.com/paritytech/parity/pull/5797)
-- Disable compression for RLP strings [#5786](https://github.com/paritytech/parity/pull/5786)
-- update the source for the snapcraft package [#5781](https://github.com/paritytech/parity/pull/5781)
-- Fixed default UI port for mac installer [#5782](https://github.com/paritytech/parity/pull/5782)
-- Block invalid account name creation [#5784](https://github.com/paritytech/parity/pull/5784)
-- Update Cid/multihash/ring/tinykeccak [#5785](https://github.com/paritytech/parity/pull/5785)
-- use NULL_RLP, remove NULL_RLP_STATIC [#5742](https://github.com/paritytech/parity/pull/5742)
-- Blacklist empty phrase account. [#5730](https://github.com/paritytech/parity/pull/5730)
-- EIP-211 RETURNDATACOPY and RETURNDATASIZE [#5678](https://github.com/paritytech/parity/pull/5678)
-- Bump mio [#5763](https://github.com/paritytech/parity/pull/5763)
-- Fixing UI issues after UI server refactor [#5710](https://github.com/paritytech/parity/pull/5710)
-- Fix WS server expose issue. [#5728](https://github.com/paritytech/parity/pull/5728)
-- Fix local transactions without condition. [#5716](https://github.com/paritytech/parity/pull/5716)
-- Bump parity-wordlist. [#5748](https://github.com/paritytech/parity/pull/5748)
-- two small changes in evm [#5700](https://github.com/paritytech/parity/pull/5700)
-- Evmbin: JSON format printing pre-state. [#5712](https://github.com/paritytech/parity/pull/5712)
-- Recover from empty phrase in dev mode [#5698](https://github.com/paritytech/parity/pull/5698)
-- EIP-210 BLOCKHASH changes [#5505](https://github.com/paritytech/parity/pull/5505)
-- fixes typo [#5708](https://github.com/paritytech/parity/pull/5708)
-- Bump rocksdb [#5707](https://github.com/paritytech/parity/pull/5707)
-- Fixed --datadir option [#5697](https://github.com/paritytech/parity/pull/5697)
-- rpc -> weak to arc [#5688](https://github.com/paritytech/parity/pull/5688)
-- typo fix [#5699](https://github.com/paritytech/parity/pull/5699)
-- Revamping parity-evmbin [#5696](https://github.com/paritytech/parity/pull/5696)
-- Update dependencies and bigint api [#5685](https://github.com/paritytech/parity/pull/5685)
-- UI server refactoring [#5580](https://github.com/paritytech/parity/pull/5580)
-- Fix from/into electrum in ethkey [#5686](https://github.com/paritytech/parity/pull/5686)
-- Add unit tests [#5668](https://github.com/paritytech/parity/pull/5668)
-- Guanqun add unit tests [#5671](https://github.com/paritytech/parity/pull/5671)
-- Parity-PubSub as a separate API. [#5676](https://github.com/paritytech/parity/pull/5676)
-- EIP-140 REVERT opcode [#5477](https://github.com/paritytech/parity/pull/5477)
-- Update CHANGELOG for 1.6.7 [#5683](https://github.com/paritytech/parity/pull/5683)
-- Updated docs slightly. [#5674](https://github.com/paritytech/parity/pull/5674)
-- Fix build [#5684](https://github.com/paritytech/parity/pull/5684)
-- Back-references for the on-demand service [#5573](https://github.com/paritytech/parity/pull/5573)
-- Dynamically adjust PIP request costs based on gathered data [#5603](https://github.com/paritytech/parity/pull/5603)
-- use cargo workspace [#5601](https://github.com/paritytech/parity/pull/5601)
-- Latest headers Pub-Sub [#5655](https://github.com/paritytech/parity/pull/5655)
-- improved dockerfile builds [#5659](https://github.com/paritytech/parity/pull/5659)
-- Adding CLI options: port shift and unsafe expose. [#5677](https://github.com/paritytech/parity/pull/5677)
-- Report missing author in Aura [#5583](https://github.com/paritytech/parity/pull/5583)
-- typo fix [#5669](https://github.com/paritytech/parity/pull/5669)
-- Remove public middleware (temporary) [#5665](https://github.com/paritytech/parity/pull/5665)
-- Remove additional polyfill [#5663](https://github.com/paritytech/parity/pull/5663)
-- Importing accounts from files. [#5644](https://github.com/paritytech/parity/pull/5644)
-- remove the deprecated options in rustfmt.toml [#5616](https://github.com/paritytech/parity/pull/5616)
-- Update the Console dapp [#5602](https://github.com/paritytech/parity/pull/5602)
-- Create an account for chain=dev [#5612](https://github.com/paritytech/parity/pull/5612)
-- Use babel-runtime as opposed to babel-polyfill [#5662](https://github.com/paritytech/parity/pull/5662)
-- Connection dialog timestamp info [#5554](https://github.com/paritytech/parity/pull/5554)
-- use copy_from_slice instead of for loop [#5647](https://github.com/paritytech/parity/pull/5647)
-- Light friendly dapps [#5634](https://github.com/paritytech/parity/pull/5634)
-- Add Recover button to Accounts and warnings [#5645](https://github.com/paritytech/parity/pull/5645)
-- Update eth_sign docs. [#5631](https://github.com/paritytech/parity/pull/5631)
-- Proper signer Pub-Sub for pending requests. [#5594](https://github.com/paritytech/parity/pull/5594)
-- Bump bigint to 1.0.5 [#5641](https://github.com/paritytech/parity/pull/5641)
-- PoA warp implementation [#5488](https://github.com/paritytech/parity/pull/5488)
-- Improve on-demand dispatch and add support for batch requests [#5419](https://github.com/paritytech/parity/pull/5419)
-- Use default account for sending transactions [#5588](https://github.com/paritytech/parity/pull/5588)
-- Add peer management to the Status tab [#5566](https://github.com/paritytech/parity/pull/5566)
-- Add monotonic step transition [#5587](https://github.com/paritytech/parity/pull/5587)
-- Decrypting for external accounts. [#5581](https://github.com/paritytech/parity/pull/5581)
-- only enable warp sync when engine supports it [#5595](https://github.com/paritytech/parity/pull/5595)
-- fix the doc of installing rust [#5586](https://github.com/paritytech/parity/pull/5586)
-- Small fixes [#5584](https://github.com/paritytech/parity/pull/5584)
-- SecretStore: remove session on master node [#5545](https://github.com/paritytech/parity/pull/5545)
-- run-clean [#5607](https://github.com/paritytech/parity/pull/5607)
-- relicense RLP to MIT/Apache2 [#5591](https://github.com/paritytech/parity/pull/5591)
-- Fix eth_sign signature encoding. [#5597](https://github.com/paritytech/parity/pull/5597)
-- Check pending request on Node local transactions [#5564](https://github.com/paritytech/parity/pull/5564)
-- Add tooltips on ActionBar [#5562](https://github.com/paritytech/parity/pull/5562)
-- Can't deploy without compiling Contract [#5593](https://github.com/paritytech/parity/pull/5593)
-- Add a warning when node is syncing [#5565](https://github.com/paritytech/parity/pull/5565)
-- Update registry middleware [#5585](https://github.com/paritytech/parity/pull/5585)
-- Set block condition to BigNumber in MethodDecoding [#5592](https://github.com/paritytech/parity/pull/5592)
-- Load the sources immediately in Contract Dev [#5575](https://github.com/paritytech/parity/pull/5575)
-- Remove formal verification messages in Dev Contract [#5574](https://github.com/paritytech/parity/pull/5574)
-- Fix event params decoding when no names for parameters [#5567](https://github.com/paritytech/parity/pull/5567)
-- Do not convert to Dates twice [#5563](https://github.com/paritytech/parity/pull/5563)
-- Fix Multisig wallet settings [#5560](https://github.com/paritytech/parity/pull/5560)
-- Typo [#5547](https://github.com/paritytech/parity/pull/5547)
-- Generic PubSub implementation [#5456](https://github.com/paritytech/parity/pull/5456)
-- Fix CI paths. [#5570](https://github.com/paritytech/parity/pull/5570)
-- reorg into blocks before minimum history [#5558](https://github.com/paritytech/parity/pull/5558)
-- EIP-86 update [#5506](https://github.com/paritytech/parity/pull/5506)
-- Secretstore RPCs + integration [#5439](https://github.com/paritytech/parity/pull/5439)
-- Fixes Parity Bar position [#5557](https://github.com/paritytech/parity/pull/5557)
-- Fixes invalid log in BadgeReg events [#5556](https://github.com/paritytech/parity/pull/5556)
-- Fix issues in Contract Development view [#5555](https://github.com/paritytech/parity/pull/5555)
-- Added missing methods [#5542](https://github.com/paritytech/parity/pull/5542)
-- option to disable persistent txqueue [#5544](https://github.com/paritytech/parity/pull/5544)
-- Bump jsonrpc [#5552](https://github.com/paritytech/parity/pull/5552)
-- Retrieve block headers only for header-only info [#5480](https://github.com/paritytech/parity/pull/5480)
-- add snap to CI [#5519](https://github.com/paritytech/parity/pull/5519)
-- Pass additional data when reporting [#5527](https://github.com/paritytech/parity/pull/5527)
-- Calculate post-constructors state root in spec at load time [#5523](https://github.com/paritytech/parity/pull/5523)
-- Fix utf8 decoding [#5533](https://github.com/paritytech/parity/pull/5533)
-- Add CHANGELOG.md [#5513](https://github.com/paritytech/parity/pull/5513)
-- Change all occurrences of ethcore.io into parity.io [#5528](https://github.com/paritytech/parity/pull/5528)
-- Memory usage optimization [#5526](https://github.com/paritytech/parity/pull/5526)
-- Compose transaction RPC. [#5524](https://github.com/paritytech/parity/pull/5524)
-- Support external eth_sign  [#5481](https://github.com/paritytech/parity/pull/5481)
-- Treat block numbers as strings, not BigNums. [#5449](https://github.com/paritytech/parity/pull/5449)
-- npm cleanups [#5512](https://github.com/paritytech/parity/pull/5512)
-- Export acc js [#4973](https://github.com/paritytech/parity/pull/4973)
-- YARN [#5395](https://github.com/paritytech/parity/pull/5395)
-- Fix linting issues [#5511](https://github.com/paritytech/parity/pull/5511)
-- Chinese Translation [#5460](https://github.com/paritytech/parity/pull/5460)
-- Fixing secretstore TODOs - part 2 [#5416](https://github.com/paritytech/parity/pull/5416)
-- fix json format of state snapshot [#5504](https://github.com/paritytech/parity/pull/5504)
-- Bump jsonrpc version [#5489](https://github.com/paritytech/parity/pull/5489)
-- Groundwork for generalized warp sync [#5454](https://github.com/paritytech/parity/pull/5454)
-- Add the packaging metadata to build the parity snap [#5496](https://github.com/paritytech/parity/pull/5496)
-- Cancel tx JS [#4958](https://github.com/paritytech/parity/pull/4958)
-- EIP-212 (bn128 curve pairing) [#5307](https://github.com/paritytech/parity/pull/5307)
-- fix panickers in tree-route [#5479](https://github.com/paritytech/parity/pull/5479)
-- Update links to etherscan.io [#5455](https://github.com/paritytech/parity/pull/5455)
-- Refresh UI on nodeKind changes, e.g. personal -> public [#5312](https://github.com/paritytech/parity/pull/5312)
-- Correct contract address for EIP-86 [#5473](https://github.com/paritytech/parity/pull/5473)
-- Force two decimals for USD conversion rate [#5471](https://github.com/paritytech/parity/pull/5471)
-- Refactoring of Tokens & Balances [#5372](https://github.com/paritytech/parity/pull/5372)
-- Background-repeat round [#5475](https://github.com/paritytech/parity/pull/5475)
-- nl i18n updated [#5461](https://github.com/paritytech/parity/pull/5461)
-- Show ETH value (even 0) if ETH transfer in transaction list [#5406](https://github.com/paritytech/parity/pull/5406)
-- Store the pending requests per network version [#5405](https://github.com/paritytech/parity/pull/5405)
-- Use in-memory database for tests [#5451](https://github.com/paritytech/parity/pull/5451)
-- WebSockets RPC server [#5425](https://github.com/paritytech/parity/pull/5425)
-- Added missing docs [#5452](https://github.com/paritytech/parity/pull/5452)
-- Tests and tweaks for public node middleware [#5417](https://github.com/paritytech/parity/pull/5417)
-- Fix removal of hash-mismatched files. [#5440](https://github.com/paritytech/parity/pull/5440)
-- parity_getBlockHeaderByNumber and LightFetch utility [#5383](https://github.com/paritytech/parity/pull/5383)
-- New state tests [#5418](https://github.com/paritytech/parity/pull/5418)
-- Fix buffer length for QR code gen. [#5447](https://github.com/paritytech/parity/pull/5447)
-- Add raw hash signing [#5423](https://github.com/paritytech/parity/pull/5423)
-- Filters and block RPCs for the light client [#5320](https://github.com/paritytech/parity/pull/5320)
-- Work around mismatch for QR checksum [#5374](https://github.com/paritytech/parity/pull/5374)
-- easy to use conversion from and to string for ethstore::Crypto [#5437](https://github.com/paritytech/parity/pull/5437)
-- Tendermint fixes [#5415](https://github.com/paritytech/parity/pull/5415)
-- Adrianbrink lightclientcache branch. [#5428](https://github.com/paritytech/parity/pull/5428)
-- Add caching to HeaderChain struct [#5403](https://github.com/paritytech/parity/pull/5403)
-- Add decryption to the UI (in the Signer) [#5422](https://github.com/paritytech/parity/pull/5422)
-- Add CIDv0 RPC [#5414](https://github.com/paritytech/parity/pull/5414)
-- Updating documentation for RPCs [#5392](https://github.com/paritytech/parity/pull/5392)
-- Fixing secretstore TODOs - part 1 [#5386](https://github.com/paritytech/parity/pull/5386)
-- Fixing disappearing content. [#5399](https://github.com/paritytech/parity/pull/5399)
-- Snapshot chunks packed by size [#5318](https://github.com/paritytech/parity/pull/5318)
-- APIs wildcards and simple arithmetic. [#5402](https://github.com/paritytech/parity/pull/5402)
-- Fixing compilation without dapps. [#5410](https://github.com/paritytech/parity/pull/5410)
-- Don't use port 8080 anymore [#5397](https://github.com/paritytech/parity/pull/5397)
-- Quick'n'dirty CLI for the light client [#5002](https://github.com/paritytech/parity/pull/5002)
-- set gas limit before proving transactions [#5401](https://github.com/paritytech/parity/pull/5401)
-- Public node: perf and fixes [#5390](https://github.com/paritytech/parity/pull/5390)
-- Straight download path in the readme [#5393](https://github.com/paritytech/parity/pull/5393)
-- On-chain ACL checker for secretstore [#5015](https://github.com/paritytech/parity/pull/5015)
-- Allow empty-encoded values from QR encoding [#5385](https://github.com/paritytech/parity/pull/5385)
-- Update npm build for new inclusions [#5381](https://github.com/paritytech/parity/pull/5381)
-- Fix for Ubuntu Dockerfile [#5356](https://github.com/paritytech/parity/pull/5356)
-- Secretstore over network [#4974](https://github.com/paritytech/parity/pull/4974)
-- Dapps and RPC server merge [#5365](https://github.com/paritytech/parity/pull/5365)
-- trigger js build release [#5379](https://github.com/paritytech/parity/pull/5379)
-- Update expanse json with fork at block 600000 [#5351](https://github.com/paritytech/parity/pull/5351)
-- Futures-based native wrappers for contract ABIs [#5341](https://github.com/paritytech/parity/pull/5341)
-- Kovan warp sync fixed [#5337](https://github.com/paritytech/parity/pull/5337)
-- Aura eip155 validation transition [#5362](https://github.com/paritytech/parity/pull/5362)
-- Shared wordlist for brain wallets [#5331](https://github.com/paritytech/parity/pull/5331)
-- Allow signing via Qr [#4881](https://github.com/paritytech/parity/pull/4881)
-- Allow entry of url or hash for DappReg meta [#5360](https://github.com/paritytech/parity/pull/5360)
-- Adjust tx overlay colours [#5353](https://github.com/paritytech/parity/pull/5353)
-- Add ability to disallow API subscriptions [#5366](https://github.com/paritytech/parity/pull/5366)
-- EIP-213 (bn128 curve operations) [#4999](https://github.com/paritytech/parity/pull/4999)
-- Fix analize output file name [#5357](https://github.com/paritytech/parity/pull/5357)
-- Add default eip155 validation [#5346](https://github.com/paritytech/parity/pull/5346)
-- Add new seed nodes for Classic chain [#5345](https://github.com/paritytech/parity/pull/5345)
-- Shared wordlist for frontend [#5336](https://github.com/paritytech/parity/pull/5336)
-- fix rpc tests [#5338](https://github.com/paritytech/parity/pull/5338)
-- Public node with accounts and signing in Frontend [#5304](https://github.com/paritytech/parity/pull/5304)
-- Rename Status/Status -> Status/NodeStatus [#5332](https://github.com/paritytech/parity/pull/5332)
-- Updating paths to repos. [#5330](https://github.com/paritytech/parity/pull/5330)
-- Separate status for canceled local transactions. [#5319](https://github.com/paritytech/parity/pull/5319)
-- Cleanup the Status View [#5317](https://github.com/paritytech/parity/pull/5317)
-- Update UI minimised requests [#5324](https://github.com/paritytech/parity/pull/5324)
-- Order signer transactions FIFO [#5321](https://github.com/paritytech/parity/pull/5321)
-- updating dependencies [#5028](https://github.com/paritytech/parity/pull/5028)
-- Minimise transactions progress [#4942](https://github.com/paritytech/parity/pull/4942)
-- Fix eth_sign showing as wallet account [#5309](https://github.com/paritytech/parity/pull/5309)
-- Ropsten revival [#5302](https://github.com/paritytech/parity/pull/5302)
-- Strict validation transitions [#4988](https://github.com/paritytech/parity/pull/4988)
-- Fix default list sorting [#5303](https://github.com/paritytech/parity/pull/5303)
-- Use unique owners for multisig wallets [#5298](https://github.com/paritytech/parity/pull/5298)
-- Copy all existing i18n strings into zh (as-is translation aid) [#5305](https://github.com/paritytech/parity/pull/5305)
-- Fix booleans in Typedinput [#5295](https://github.com/paritytech/parity/pull/5295)
-- node kind RPC [#5025](https://github.com/paritytech/parity/pull/5025)
-- Fix the use of MobX in playground [#5294](https://github.com/paritytech/parity/pull/5294)
-- Fine grained snapshot chunking [#5019](https://github.com/paritytech/parity/pull/5019)
-- Add lint:i18n to find missing & extra keys [#5290](https://github.com/paritytech/parity/pull/5290)
-- Scaffolding for zh translations, including first-round by @btceth [#5289](https://github.com/paritytech/parity/pull/5289)
-- JS package bumps [#5287](https://github.com/paritytech/parity/pull/5287)
-- Auto-extract new i18n strings (update) [#5288](https://github.com/paritytech/parity/pull/5288)
-- eip100b [#5027](https://github.com/paritytech/parity/pull/5027)
-- Set earliest era in snapshot restoration [#5021](https://github.com/paritytech/parity/pull/5021)
-- Avoid clogging up tmp when updater dir has bad permissions. [#5024](https://github.com/paritytech/parity/pull/5024)
-- Resilient warp sync [#5018](https://github.com/paritytech/parity/pull/5018)
-- Create webpack analysis files (size) [#5009](https://github.com/paritytech/parity/pull/5009)
-- Dispatch an open event on drag of Parity Bar [#4987](https://github.com/paritytech/parity/pull/4987)
-- Various installer and tray apps fixes [#4970](https://github.com/paritytech/parity/pull/4970)
-- Export account RPC [#4967](https://github.com/paritytech/parity/pull/4967)
-- Switching ValidatorSet [#4961](https://github.com/paritytech/parity/pull/4961)
-- Implement PIP messages, request builder, and handlers [#4945](https://github.com/paritytech/parity/pull/4945)
-- auto lint [#5003](https://github.com/paritytech/parity/pull/5003)
-- Fix FireFox overflows [#5000](https://github.com/paritytech/parity/pull/5000)
-- Show busy indicator, focus first field in password change [#4997](https://github.com/paritytech/parity/pull/4997)
-- Consistent store naming in the Signer components [#4996](https://github.com/paritytech/parity/pull/4996)
-- second (and last) part of rlp refactor [#4901](https://github.com/paritytech/parity/pull/4901)
-- Double click to select account creation type [#4986](https://github.com/paritytech/parity/pull/4986)
-- Fixes to the Registry dapp [#4984](https://github.com/paritytech/parity/pull/4984)
-- Extend api.util [#4979](https://github.com/paritytech/parity/pull/4979)
-- Updating JSON-RPC crates [#4934](https://github.com/paritytech/parity/pull/4934)
-- splitting part of util into smaller crates [#4956](https://github.com/paritytech/parity/pull/4956)
-- Updating syntex et al [#4983](https://github.com/paritytech/parity/pull/4983)
-- EIP198 and built-in activation [#4926](https://github.com/paritytech/parity/pull/4926)
-- Fix MethodDecoding for Arrays [#4977](https://github.com/paritytech/parity/pull/4977)
-- Try to fix WS race condition connection [#4976](https://github.com/paritytech/parity/pull/4976)
-- eth_sign where account === undefined [#4964](https://github.com/paritytech/parity/pull/4964)
-- Fix references to api outside of `parity.js` [#4981](https://github.com/paritytech/parity/pull/4981)
-- Fix Password Dialog form overflow [#4968](https://github.com/paritytech/parity/pull/4968)
-- Changing Mutex into RwLock for transaction queue [#4951](https://github.com/paritytech/parity/pull/4951)
-- Disable max seal period for external sealing [#4927](https://github.com/paritytech/parity/pull/4927)
-- Attach hardware wallets already in addressbook [#4912](https://github.com/paritytech/parity/pull/4912)
-- rlp serialization refactor [#4873](https://github.com/paritytech/parity/pull/4873)
-- Bump nanomsg [#4965](https://github.com/paritytech/parity/pull/4965)
-- Fixed multi-chunk ledger transactions on windows [#4960](https://github.com/paritytech/parity/pull/4960)
-- Fix outputs in Contract Constant Queries [#4953](https://github.com/paritytech/parity/pull/4953)
-- systemd: Start parity after network.target [#4952](https://github.com/paritytech/parity/pull/4952)
-- Remove transaction RPC [#4949](https://github.com/paritytech/parity/pull/4949)
-- Swap out ethcore.io url for parity.io [#4947](https://github.com/paritytech/parity/pull/4947)
-- Don't remove confirmed requests to early. [#4933](https://github.com/paritytech/parity/pull/4933)
-- Ensure sealing work enabled in miner once subscribers added [#4930](https://github.com/paritytech/parity/pull/4930)
-- Add z-index to small modals as well [#4923](https://github.com/paritytech/parity/pull/4923)
-- Bump nanomsg [#4946](https://github.com/paritytech/parity/pull/4946)
-- Bumping multihash and libc [#4943](https://github.com/paritytech/parity/pull/4943)
-- Edit ETH value, gas and gas price in Contract Deployment [#4919](https://github.com/paritytech/parity/pull/4919)
-- Add ability to configure Secure API [#4922](https://github.com/paritytech/parity/pull/4922)
-- Add Token image from URL [#4916](https://github.com/paritytech/parity/pull/4916)
-- Use the registry fee in Token Deployment dapp [#4915](https://github.com/paritytech/parity/pull/4915)
-- Add reseal max period [#4903](https://github.com/paritytech/parity/pull/4903)
-- Detect rust compiler version in Parity build script, closes 4742 [#4907](https://github.com/paritytech/parity/pull/4907)
-- Add Vaults logic to First Run [#4914](https://github.com/paritytech/parity/pull/4914)
-- Updated gcc and rayon crates to remove outdated num_cpus dependency [#4909](https://github.com/paritytech/parity/pull/4909)
-- Renaming evm binary to avoid conflicts. [#4899](https://github.com/paritytech/parity/pull/4899)
-- Better error handling for traces RPC [#4849](https://github.com/paritytech/parity/pull/4849)
-- Safari SectionList fix [#4895](https://github.com/paritytech/parity/pull/4895)
-- Safari Dialog scrolling fix [#4893](https://github.com/paritytech/parity/pull/4893)
-- Spelling :) [#4900](https://github.com/paritytech/parity/pull/4900)
-- Additional kovan params [#4892](https://github.com/paritytech/parity/pull/4892)
-- trigger js-precompiled build [#4898](https://github.com/paritytech/parity/pull/4898)
-- Recalculate receipt roots in close_and_lock [#4884](https://github.com/paritytech/parity/pull/4884)
-- Reload UI on network switch [#4864](https://github.com/paritytech/parity/pull/4864)
-- Update parity-ui-precompiled with branch [#4850](https://github.com/paritytech/parity/pull/4850)
-- OSX Installer is no longer experimental [#4882](https://github.com/paritytech/parity/pull/4882)
-- Chain-selection from UI [#4859](https://github.com/paritytech/parity/pull/4859)
-- removed redundant (and unused) FromJson trait [#4871](https://github.com/paritytech/parity/pull/4871)
-- fix typos and grammar [#4880](https://github.com/paritytech/parity/pull/4880)
-- Remove old experimental remote-db code [#4872](https://github.com/paritytech/parity/pull/4872)
-- removed redundant FixedHash trait, fixes [#4029](https://github.com/paritytech/parity/issues/4029) [#4866](https://github.com/paritytech/parity/pull/4866)
-- Reference JSON-RPC more changes-friendly [#4870](https://github.com/paritytech/parity/pull/4870)
-- Better handling of Solidity compliation [#4860](https://github.com/paritytech/parity/pull/4860)
-- Go through contract links in Transaction List display [#4863](https://github.com/paritytech/parity/pull/4863)
-- Fix Gas Price Selector Tooltips [#4865](https://github.com/paritytech/parity/pull/4865)
-- Fix auto-updater [#4867](https://github.com/paritytech/parity/pull/4867)
-- Make the UI work offline [#4861](https://github.com/paritytech/parity/pull/4861)
-- Subscribe to accounts info in Signer / ParityBar [#4856](https://github.com/paritytech/parity/pull/4856)
-- Don't link libsnappy explicitly [#4841](https://github.com/paritytech/parity/pull/4841)
-- Fix paste in Inputs [#4854](https://github.com/paritytech/parity/pull/4854)
-- Extract i18n from shared UI components [#4834](https://github.com/paritytech/parity/pull/4834)
-- Fix paste in Inputs [#4844](https://github.com/paritytech/parity/pull/4844)
-- Pull contract deployment title from available steps [#4848](https://github.com/paritytech/parity/pull/4848)
-- Supress USB error message [#4839](https://github.com/paritytech/parity/pull/4839)
-- Fix getTransactionCount in --geth mode [#4837](https://github.com/paritytech/parity/pull/4837)
-- CI: test coverage (for core and js) [#4832](https://github.com/paritytech/parity/pull/4832)
-- Lowering threshold for transactions above gas limit [#4831](https://github.com/paritytech/parity/pull/4831)
-- Fix TxViewer when no `to` (contract deployment) [#4847](https://github.com/paritytech/parity/pull/4847)
-- Fix method decoding [#4845](https://github.com/paritytech/parity/pull/4845)
-- Add React Hot Reload to dapps + TokenDeploy fix [#4846](https://github.com/paritytech/parity/pull/4846)
-- Dapps show multiple times in some cases [#4843](https://github.com/paritytech/parity/pull/4843)
-- Fixes to the Registry dapp [#4838](https://github.com/paritytech/parity/pull/4838)
-- Show token icons on list summary pages [#4826](https://github.com/paritytech/parity/pull/4826)
-- Calibrate step before rejection [#4800](https://github.com/paritytech/parity/pull/4800)
-- Add replay protection [#4808](https://github.com/paritytech/parity/pull/4808)
-- Better icon on windows [#4804](https://github.com/paritytech/parity/pull/4804)
-- Better logic for contract deployments detection [#4821](https://github.com/paritytech/parity/pull/4821)
-- Fix wrong default values for contract queries inputs [#4819](https://github.com/paritytech/parity/pull/4819)
-- Adjust selection colours/display [#4811](https://github.com/paritytech/parity/pull/4811)
-- Update the Wallet Library Registry key [#4817](https://github.com/paritytech/parity/pull/4817)
-- Update Wallet to new Wallet Code [#4805](https://github.com/paritytech/parity/pull/4805)
 
 ### Previous releases
 
+- [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)

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Parity Ethereum client"
 name = "parity"
-version = "1.8.0"
+version = "1.9.7"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
@@ -12,10 +12,12 @@ env_logger = "0.4"
 rustc-hex = "1.0"
 docopt = "0.8"
 clap = "2"
+term_size = "0.3"
+textwrap = "0.9"
 time = "0.1"
 num_cpus = "1.2"
 number_prefix = "0.2"
-rpassword = "0.2.1"
+rpassword = "1.0"
 semver = "0.6"
 ansi_term = "0.9"
 parking_lot = "0.4"
@@ -25,13 +27,12 @@ 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.8" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
 ethsync = { path = "sync" }
 ethcore = { path = "ethcore" }
 ethcore-util = { path = "util" }
@@ -39,9 +40,6 @@ ethcore-bytes = { path = "util/bytes" }
 ethcore-bigint = { path = "util/bigint" }
 ethcore-io = { path = "util/io" }
 ethcore-devtools = { path = "devtools" }
-ethcore-ipc = { path = "ipc/rpc" }
-ethcore-ipc-nano = { path = "ipc/nano" }
-ethcore-ipc-hypervisor = { path = "ipc/hypervisor" }
 ethcore-light = { path = "ethcore/light" }
 ethcore-logger = { path = "logger" }
 ethcore-stratum = { path = "stratum" }
@@ -58,22 +56,24 @@ parity-reactor = { path = "util/reactor" }
 parity-rpc = { path = "rpc" }
 parity-rpc-client = { path = "rpc_client" }
 parity-updater = { path = "updater" }
+parity-version = { path = "util/version" }
 parity-whisper = { path = "whisper" }
 path = { path = "util/path" }
+dir = { path = "util/dir" }
 panic_hook = { path = "panic_hook" }
-hash = { path = "util/hash" }
+keccak-hash = { path = "util/hash" }
 migration = { path = "util/migration" }
 kvdb = { path = "util/kvdb" }
+kvdb-rocksdb = { path = "util/kvdb-rocksdb" }
+journaldb = { path = "util/journaldb" }
 
 parity-dapps = { path = "dapps", optional = true }
-clippy = { version = "0.0.103", optional = true}
 ethcore-secretstore = { path = "secret_store", optional = true }
 
 [build-dependencies]
 rustc_version = "0.2"
 
 [dev-dependencies]
-ethcore-ipc-tests = { path = "ipc/tests" }
 pretty_assertions = "0.1"
 ipnetwork = "0.12.6"
 
@@ -95,16 +95,14 @@ ui-precompiled = [
 ]
 ui-enabled = ["dapps"]
 dapps = ["parity-dapps"]
-ipc = ["ethcore/ipc", "ethsync/ipc"]
 jit = ["ethcore/jit"]
-dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "parity-rpc/dev", "parity-dapps/dev"]
 json-tests = ["ethcore/json-tests"]
 test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
-final = ["ethcore-util/final"]
 secretstore = ["ethcore-secretstore"]
+final = ["parity-version/final"]
 
 [[bin]]
 path = "parity/main.rs"
@@ -119,4 +117,13 @@ lto = false
 panic = "abort"
 
 [workspace]
-members = ["ethstore/cli", "ethkey/cli", "evmbin", "whisper", "chainspec", "dapps/js-glue"]
+members = [
+	"chainspec",
+	"dapps/js-glue",
+	"ethcore/wasm/run",
+	"ethkey/cli",
+	"ethstore/cli",
+	"evmbin",
+	"transaction-pool",
+	"whisper",
+]

README.md

@@ -1,10 +1,10 @@
-# [Parity](https://parity.io/) - fast, light, and robust Ethereum client
+# [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)
 [![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)
+- [Download the latest release here.](https://github.com/paritytech/parity/releases/latest)
 
 ### Join the chat!
 
@@ -14,7 +14,10 @@ Get in touch with us on Gitter:
 [![Gitter: Parity/Miners](https://img.shields.io/badge/gitter-parity/miners-4AB495.svg)](https://gitter.im/paritytech/parity/miners)
 [![Gitter: Parity-PoA](https://img.shields.io/badge/gitter-parity--poa-4AB495.svg)](https://gitter.im/paritytech/parity-poa)
 
-Be sure to check out [our wiki](https://github.com/paritytech/parity/wiki) and the [internal documentation](https://paritytech.github.io/parity/ethcore/index.html) for more information.
+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)
+
+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.
 
 ----
 
@@ -29,19 +32,19 @@ Parity comes with a built-in wallet. To access [Parity Wallet](http://web3.site/
 - create and register your own tokens;
 - and much more.
 
-By default, Parity will also run a JSONRPC server on `127.0.0.1:8545`. This is fully configurable and supports a number of RPC APIs.
+By default, Parity will also run a JSONRPC server on `127.0.0.1:8545` and a websockets server on `127.0.0.1:8546`. This is fully configurable and supports a number of APIs.
 
-If you run into an issue while using parity, feel free to file one in this repository or hop on our [gitter chat room](https://gitter.im/paritytech/parity) to ask a question. We are glad to help!
+If you run into an issue while using Parity, feel free to file one in this repository or hop on our [Gitter](https://gitter.im/paritytech/parity) or [Riot](https://riot.im/app/#/group/+parity:matrix.parity.io) chat room to ask a question. We are glad to help!
 
-**For security-critical issues**, please refer to the security policy outlined in `SECURITY.MD`.
+**For security-critical issues**, please refer to the security policy outlined in [SECURITY.MD](SECURITY.md).
 
-Parity's current release is 1.7. 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.19.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:
 
@@ -51,21 +54,22 @@ We recommend installing Rust through [rustup](https://www.rustup.rs/). If you do
 	```
 
 	Parity also requires `gcc`, `g++`, `libssl-dev`/`openssl`, `libudev-dev` and `pkg-config` packages to be installed.
+
 - OSX:
 	```bash
 	$ curl https://sh.rustup.rs -sSf | sh
 	```
 
 	`clang` is required. It comes with Xcode command line tools or can be installed with homebrew.
+
 - Windows
-
-    Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the rustup installer from
+  Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the rustup installer from
 	https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe, start "VS2015 x64 Native Tools Command Prompt", and use the following command to install and set up the msvc toolchain:
-    ```
+  ```bash
 	$ rustup default stable-x86_64-pc-windows-msvc
-    ```
+  ```
 
-Once you have rustup, install parity or download and build from source
+Once you have rustup, install Parity or download and build from source
 
 ----
 
@@ -93,11 +97,27 @@ $ cargo build --release
 ```
 
 This will produce an executable in the `./target/release` subdirectory.
+
 Note: if cargo fails to parse manifest try:
 
 ```bash
 $ ~/.cargo/bin/cargo build --release
 ```
+
+Note: When compiling a crate and you receive the following error:
+
+```
+error: the crate is compiled with the panic strategy `abort` which is incompatible with this crate's strategy of `unwind`
+```
+
+Cleaning the repository will most likely solve the issue, try:
+
+```bash
+$ cargo clean
+```
+
+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.
+
 ----
 
 ## Simple one-line installer for Mac and Ubuntu
@@ -106,9 +126,14 @@ $ ~/.cargo/bin/cargo build --release
 bash <(curl https://get.parity.io -Lk)
 ```
 
+The one-line installer always defaults to the latest beta release.
+
 ## Start Parity
+
 ### Manually
+
 To start Parity manually, just run
+
 ```bash
 $ ./target/release/parity
 ```
@@ -116,11 +141,9 @@ $ ./target/release/parity
 and Parity will begin syncing the Ethereum blockchain.
 
 ### Using systemd service file
+
 To start Parity as a regular user using systemd init:
 
-1. Copy `parity/scripts/parity.service` to your
+1. Copy `./scripts/parity.service` to your
 systemd user directory (usually `~/.config/systemd/user`).
-2. To pass any argument to Parity, write a `~/.parity/parity.conf` file this way:
-`ARGS="ARG1 ARG2 ARG3"`.
-
-	Example: `ARGS="ui --identity MyMachine"`.
+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.

dapps/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Parity Dapps crate"
 name = "parity-dapps"
-version = "1.8.0"
+version = "1.9.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
@@ -13,7 +13,7 @@ futures = "0.1"
 futures-cpupool = "0.1"
 linked-hash-map = "0.5"
 log = "0.3"
-parity-dapps-glue = "1.8"
+parity-dapps-glue = "1.9"
 parking_lot = "0.4"
 mime_guess = "2.0.0-alpha.2"
 rand = "0.3"
@@ -25,8 +25,8 @@ 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.8" }
-jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.8" }
+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" }
@@ -36,16 +36,13 @@ node-health = { path = "./node-health" }
 parity-hash-fetch = { path = "../hash-fetch" }
 parity-reactor = { path = "../util/reactor" }
 parity-ui = { path = "./ui" }
-hash = { path = "../util/hash" }
-
-clippy = { version = "0.0.103", optional = true}
+keccak-hash = { path = "../util/hash" }
+parity-version = { path = "../util/version" }
 
 [dev-dependencies]
 env_logger = "0.4"
 ethcore-devtools = { path = "../devtools" }
 
 [features]
-dev = ["clippy", "ethcore-util/dev"]
-
 ui = ["parity-ui/no-precompiled-js"]
 ui-precompiled = ["parity-ui/use-precompiled-js"]

dapps/js-glue/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 description = "Base Package for all Parity built-in dapps"
 name = "parity-dapps-glue"
-version = "1.8.0"
+version = "1.9.1"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
@@ -18,13 +18,10 @@ quasi = { version = "0.32", default-features = false }
 quasi_macros = { version = "0.32", optional = true }
 syntex = { version = "0.58", optional = true }
 syntex_syntax = { version = "0.58", optional = true }
-clippy = { version = "0.0.90", optional = true }
 
 [features]
-dev = ["clippy"]
 default = ["with-syntex"]
 nightly = ["quasi_macros"]
-nightly-testing = ["clippy"]
 with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
 use-precompiled-js = []
 

dapps/js-glue/src/js.rs

@@ -25,7 +25,7 @@ mod platform {
 	use std::process::Command;
 
 	pub static NPM_CMD: &'static str = "npm";
-	pub fn handle_fd(cmd: &mut Command) -> &mut Command {
+	pub fn handle_cmd(cmd: &mut Command) -> &mut Command {
 		cmd
 	}
 }
@@ -34,14 +34,14 @@ mod platform {
 mod platform {
 	use std::process::{Command, Stdio};
 
-	pub static NPM_CMD: &'static str = "npm.cmd";
+	pub static NPM_CMD: &'static str = "cmd.exe";
 	// NOTE [ToDr] For some reason on windows
-	// We cannot have any file descriptors open when running a child process
-	// during build phase.
-	pub fn handle_fd(cmd: &mut Command) -> &mut Command {
+	// The command doesn't have %~dp0 set properly
+	// and it cannot load globally installed node.exe
+	pub fn handle_cmd(cmd: &mut Command) -> &mut Command {
 		cmd.stdin(Stdio::null())
-			.stdout(Stdio::null())
-			.stderr(Stdio::null())
+			.arg("/c")
+			.arg("npm.cmd")
 	}
 }
 
@@ -58,7 +58,7 @@ pub fn build(_path: &str, _dest: &str) {
 
 #[cfg(not(feature = "use-precompiled-js"))]
 pub fn build(path: &str, dest: &str) {
-	let child = platform::handle_fd(&mut Command::new(platform::NPM_CMD))
+	let child = platform::handle_cmd(&mut Command::new(platform::NPM_CMD))
 		.arg("install")
 		.arg("--no-progress")
 		.current_dir(path)
@@ -66,7 +66,7 @@ pub fn build(path: &str, dest: &str) {
 		.unwrap_or_else(|e| die("Installing node.js dependencies with npm", e));
 	assert!(child.success(), "There was an error installing dependencies.");
 
-	let child = platform::handle_fd(&mut Command::new(platform::NPM_CMD))
+	let child = platform::handle_cmd(&mut Command::new(platform::NPM_CMD))
 		.arg("run")
 		.arg("build")
 		.env("NODE_ENV", "production")

dapps/node-health/Cargo.toml

@@ -9,7 +9,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 futures = "0.1"
 futures-cpupool = "0.1"
 log = "0.3"
-ntp = "0.2.0"
+ntp = "0.3.0"
 parking_lot = "0.4"
 serde = "1.0"
 serde_derive = "1.0"

dapps/node-health/src/time.rs

@@ -193,7 +193,7 @@ const UPDATE_TIMEOUT_ERR_SECS: u64 = 60;
 const UPDATE_TIMEOUT_INCOMPLETE_SECS: u64 = 10;
 
 /// Maximal valid time drift.
-pub const MAX_DRIFT: i64 = 500;
+pub const MAX_DRIFT: i64 = 10_000;
 
 type BoxFuture<A, B> = Box<Future<Item = A, Error = B> + Send>;
 

dapps/src/apps/app.rs

@@ -14,42 +14,26 @@
 // 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,
 	pub author: String,
 	#[serde(rename="iconUrl")]
 	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(),
-		}
-	}
-}
-
-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,
-		}
+	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

@@ -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

@@ -200,39 +200,57 @@ impl<R: URLHint + 'static, F: Fetch> Endpoint for ContentFetcher<F, R> {
 						Some(URLHintResult::Dapp(_)) if self.only_content => {
 							(None, Self::dapps_disabled(self.embeddable_on.clone()))
 						},
-						Some(URLHintResult::Dapp(dapp)) => {
-							let handler = ContentFetcherHandler::new(
-								req.method(),
-								&dapp.url(),
-								path,
-								installers::Dapp::new(
-									content_id.clone(),
-									self.cache_path.clone(),
-									Box::new(on_done),
-									self.embeddable_on.clone(),
-									self.pool.clone(),
-								),
-								self.embeddable_on.clone(),
-								self.fetch.clone(),
-							);
-
-							(Some(ContentStatus::Fetching(handler.fetch_control())), Box::new(handler) as endpoint::Response)
-						},
-						Some(URLHintResult::Content(content)) => {
-							let handler = ContentFetcherHandler::new(
-								req.method(),
-								&content.url,
-								path,
-								installers::Content::new(
-									content_id.clone(),
-									content.mime,
-									self.cache_path.clone(),
-									Box::new(on_done),
-									self.pool.clone(),
-								),
-								self.embeddable_on.clone(),
-								self.fetch.clone(),
-							);
+						Some(content) => {
+							let handler = match content {
+								URLHintResult::Dapp(dapp) => {
+									ContentFetcherHandler::new(
+										req.method(),
+										&dapp.url(),
+										path,
+										installers::Dapp::new(
+											content_id.clone(),
+											self.cache_path.clone(),
+											Box::new(on_done),
+											self.embeddable_on.clone(),
+											self.pool.clone(),
+										),
+										self.embeddable_on.clone(),
+										self.fetch.clone(),
+									)
+								},
+							    URLHintResult::GithubDapp(content) => {
+									ContentFetcherHandler::new(
+										req.method(),
+										&content.url,
+										path,
+										installers::Dapp::new(
+											content_id.clone(),
+											self.cache_path.clone(),
+											Box::new(on_done),
+											self.embeddable_on.clone(),
+											self.pool.clone(),
+										),
+										self.embeddable_on.clone(),
+										self.fetch.clone(),
+									)
+							    },
+								URLHintResult::Content(content) => {
+									ContentFetcherHandler::new(
+										req.method(),
+										&content.url,
+										path,
+										installers::Content::new(
+											content_id.clone(),
+											content.mime,
+											self.cache_path.clone(),
+											Box::new(on_done),
+											self.pool.clone(),
+										),
+										self.embeddable_on.clone(),
+										self.fetch.clone(),
+									)
+								},
+							};
 
 							(Some(ContentStatus::Fetching(handler.fetch_control())), Box::new(handler) as endpoint::Response)
 						},
@@ -301,11 +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,16 +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,17 +76,26 @@ 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(), 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()));
 
 	(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

@@ -18,7 +18,7 @@
 
 use std::collections::BTreeMap;
 
-use jsonrpc_core::BoxFuture;
+use futures::Future;
 use hyper;
 
 #[derive(Debug, PartialEq, Default, Clone)]
@@ -37,17 +37,9 @@ 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 type EndpointInfo = ::apps::App;
 pub type Endpoints = BTreeMap<String, Box<Endpoint>>;
-pub type Response = BoxFuture<hyper::Response, hyper::Error>;
+pub type Response = Box<Future<Item=hyper::Response, Error=hyper::Error> + Send>;
 pub type Request = hyper::Request;
 
 pub trait Endpoint : Send + Sync {

dapps/src/handlers/content.rs

@@ -19,7 +19,7 @@
 use hyper::{self, mime, header};
 use hyper::StatusCode;
 
-use util::version;
+use parity_version::version;
 
 use handlers::add_security_headers;
 use Embeddable;
@@ -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/fetch.rs

@@ -24,7 +24,6 @@ use fetch::{self, Fetch};
 use futures::sync::oneshot;
 use futures::{self, Future};
 use hyper::{self, Method, StatusCode};
-use jsonrpc_core::BoxFuture;
 use parking_lot::Mutex;
 
 use endpoint::{self, EndpointPath};
@@ -212,7 +211,7 @@ impl Errors {
 
 enum FetchState {
 	Error(ContentHandler),
-	InProgress(BoxFuture<FetchState, ()>),
+	InProgress(Box<Future<Item=FetchState, Error=()> + Send>),
 	Streaming(hyper::Response),
 	Done(local::Dapp, endpoint::Response),
 	Empty,
@@ -289,7 +288,7 @@ impl ContentFetcherHandler {
 		path: EndpointPath,
 		errors: Errors,
 		installer: H,
-	) -> BoxFuture<FetchState, ()> {
+	) -> Box<Future<Item=FetchState, Error=()> + Send> {
 		// Start fetching the content
 		let fetch2 = fetch.clone();
 		let future = fetch.fetch_with_abort(url, abort.into()).then(move |result| {

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");
 
@@ -47,6 +47,8 @@ pub fn add_security_headers(headers: &mut header::Headers, embeddable_on: Embedd
 
 	// Content Security Policy headers
 	headers.set_raw("Content-Security-Policy", String::new()
+		// Restrict everything to the same origin by default.
+		+ "default-src 'self';"
 		// Allow connecting to WS servers and HTTP(S) servers.
 		// We could be more restrictive and allow only RPC server URL.
 		+ "connect-src http: https: ws: wss:;"
@@ -64,26 +66,29 @@ pub fn add_security_headers(headers: &mut header::Headers, embeddable_on: Embedd
 		+ "style-src 'self' 'unsafe-inline' data: blob: https:;"
 		// Allow fonts from data: and HTTPS.
 		+ "font-src 'self' data: https:;"
-		// Allow inline scripts and scripts eval (webpack/jsconsole)
+		// Disallow objects
+		+ "object-src 'none';"
+		// Allow scripts
 		+ {
 			let script_src = embeddable_on.as_ref()
 				.map(|e| e.extra_script_src.iter()
 					 .map(|&(ref host, port)| address(host, port))
 					 .join(" ")
 				).unwrap_or_default();
+			let eval = if allow_js_eval { " 'unsafe-eval'" } else { "" };
+
 			&format!(
-				"script-src 'self' 'unsafe-inline' 'unsafe-eval' {};",
-				script_src
+				"script-src 'self' {}{};",
+				script_src,
+				eval
 			)
 		}
 		// Same restrictions as script-src with additional
 		// blob: that is required for camera access (worker)
-		+ "worker-src 'self' 'unsafe-inline' 'unsafe-eval' https: blob:;"
-		// Restrict everything else to the same origin.
-		+ "default-src 'self';"
+		+ "worker-src 'self' https: blob:;"
 		// Run in sandbox mode (although it's not fully safe since we allow same-origin and script)
 		+ "sandbox allow-same-origin allow-forms allow-modals allow-popups allow-presentation allow-scripts;"
-		// Disallow subitting forms from any dapps
+		// Disallow submitting forms from any dapps
 		+ "form-action 'none';"
 		// Never allow mixed content
 		+ "block-all-mixed-content;"

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

@@ -16,8 +16,6 @@
 
 //! Ethcore Webapplications for Parity
 #![warn(missing_docs)]
-#![cfg_attr(feature="nightly", feature(plugin))]
-#![cfg_attr(feature="nightly", plugin(clippy))]
 
 extern crate base32;
 extern crate futures_cpupool;
@@ -32,7 +30,6 @@ extern crate serde_json;
 extern crate unicase;
 extern crate zip;
 
-extern crate jsonrpc_core;
 extern crate jsonrpc_http_server;
 
 extern crate ethcore_util as util;
@@ -43,7 +40,8 @@ extern crate node_health;
 extern crate parity_dapps_glue as parity_dapps;
 extern crate parity_hash_fetch as hash_fetch;
 extern crate parity_ui;
-extern crate hash;
+extern crate keccak_hash as hash;
+extern crate parity_version;
 
 #[macro_use]
 extern crate futures;
@@ -52,10 +50,12 @@ extern crate log;
 #[macro_use]
 extern crate serde_derive;
 
+#[cfg(test)]
+extern crate env_logger;
 #[cfg(test)]
 extern crate ethcore_devtools as devtools;
 #[cfg(test)]
-extern crate env_logger;
+extern crate jsonrpc_core;
 #[cfg(test)]
 extern crate parity_reactor;
 
@@ -109,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,11 +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

@@ -17,8 +17,9 @@
 use std::io;
 use std::time::{Duration, SystemTime};
 use hyper::{self, header, StatusCode};
-use hyper::mime::Mime;
+use hyper::mime::{self, Mime};
 
+use apps;
 use handlers::{Reader, ContentHandler, add_security_headers};
 use {Embeddable};
 
@@ -58,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> {
@@ -92,10 +95,21 @@ 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 (reader, body) = Reader::pair(file.into_reader(), Vec::new());
+		let initial_content = if file.content_type().to_owned() == mime::TEXT_HTML {
+			let content = &format!(
+				r#"<script src="/{}/inject.js"></script>"#,
+				apps::UTILS_PATH,
+			);
+
+			content.as_bytes().to_vec()
+		} else {
+			Vec::new()
+		};
+
+		let (reader, body) = Reader::pair(file.into_reader(), initial_content);
 		res.set_body(body);
 		(Some(reader), res)
 	}

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/router.rs

@@ -138,6 +138,7 @@ impl Router {
 			},
 			// Any other GET|HEAD requests to home page.
 			_ if (is_get_request || is_head_request) && self.special.contains_key(&SpecialEndpoint::Home) => {
+				trace!(target: "dapps", "Resolving to home page.");
 				let special = self.special.get(&SpecialEndpoint::Home).expect("special known to contain key; qed");
 				match *special {
 					Some(ref special) => {

dapps/src/tests/fetch.rs

@@ -166,28 +166,31 @@ fn should_return_fetched_dapp_content() {
 
 	response1.assert_status("HTTP/1.1 200 OK");
 	assert_security_headers_for_embed(&response1.headers);
-	assert_eq!(
-		response1.body,
-		r#"18
+	assert!(
+		response1.body.contains(r#"18
 <h1>Hello Gavcoin!</h1>
 
 0
 
-"#
+"#),
+		"Expected Gavcoin body: {}",
+		response1.body
 	);
 
 	response2.assert_status("HTTP/1.1 200 OK");
 	assert_security_headers_for_embed(&response2.headers);
 	assert_eq!(
 		response2.body,
-		r#"BE
+		r#"EA
 {
   "id": "9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a",
   "name": "Gavcoin",
   "description": "Gavcoin",
   "version": "1.0.0",
   "author": "",
-  "iconUrl": "icon.png"
+  "iconUrl": "icon.png",
+  "localUrl": null,
+  "allowJsEval": false
 }
 0
 

dapps/src/tests/helpers/mod.rs

@@ -14,8 +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 std::env;
-use std::str;
+use std::{env, io, str};
 use std::net::SocketAddr;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
@@ -187,7 +186,7 @@ impl<T: Fetch> ServerBuilder<T> {
 
 	/// Asynchronously start server with no authentication,
 	/// returns result with `Server` handle on success or an error.
-	pub fn start_unsecured_http(self, addr: &SocketAddr, io: IoHandler) -> Result<Server, http::Error> {
+	pub fn start_unsecured_http(self, addr: &SocketAddr, io: IoHandler) -> io::Result<Server> {
 		let fetch = self.fetch_client();
 		Server::start_http(
 			addr,
@@ -234,7 +233,7 @@ impl Server {
 		remote: Remote,
 		fetch: F,
 		serve_ui: bool,
-	) -> Result<Server, http::Error> {
+	) -> io::Result<Server> {
 		let health = NodeHealth::new(
 			sync_status.clone(),
 			TimeChecker::new::<String>(&[], CpuPool::new(1)),
@@ -268,7 +267,7 @@ impl Server {
 		};
 
 		let mut allowed_hosts: Option<Vec<Host>> = allowed_hosts.into();
-		allowed_hosts.as_mut().map(|mut hosts| {
+		allowed_hosts.as_mut().map(|hosts| {
 			hosts.push(format!("http://*.{}:*", DAPPS_DOMAIN).into());
 			hosts.push(format!("http://*.{}", DAPPS_DOMAIN).into());
 		});

dapps/src/tests/home.rs

@@ -60,3 +60,32 @@ fn should_serve_home() {
 	response.assert_header("Content-Type", "text/html");
 	assert_security_headers(&response.headers);
 }
+
+
+#[test]
+fn should_inject_js() {
+	// given
+	let server = serve_ui();
+
+	// when
+	let response = request(server,
+		"\
+			GET / HTTP/1.1\r\n\
+			Host: 127.0.0.1:8080\r\n\
+			Connection: close\r\n\
+			\r\n\
+			{}
+		"
+	);
+
+	// then
+	response.assert_status("HTTP/1.1 200 OK");
+	response.assert_header("Content-Type", "text/html");
+	assert_eq!(
+		response.body.contains(r#"/inject.js"></script>"#),
+		true,
+		"Expected inject script tag in: {}",
+		response.body
+	);
+	assert_security_headers(&response.headers);
+}

dapps/ui/Cargo.toml

@@ -3,7 +3,7 @@ description = "Ethcore Parity UI"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "parity-ui"
-version = "1.8.0"
+version = "1.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [build-dependencies]
@@ -11,9 +11,11 @@ rustc_version = "0.1"
 
 [dependencies]
 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-precompiled = { git = "https://github.com/paritytech/js-precompiled.git", optional = true, branch = "master" }
+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"]
-use-precompiled-js = ["parity-ui-precompiled"]
+no-precompiled-js = ["parity-ui-dev", "parity-ui-old-dev"]
+use-precompiled-js = ["parity-ui-precompiled", "parity-ui-old-precompiled"]

dapps/ui/src/lib.rs

@@ -29,5 +29,18 @@ mod inner {
 	pub use self::parity_ui_precompiled::*;
 }
 
+#[cfg(feature = "parity-ui-old-dev")]
+pub mod old {
+	extern crate parity_ui_old_dev;
+
+	pub use self::parity_ui_old_dev::*;
+}
+
+#[cfg(feature = "parity-ui-old-precompiled")]
+pub mod old {
+	extern crate parity_ui_old_precompiled;
+
+	pub use self::parity_ui_old_precompiled::*;
+}
 
 pub use self::inner::*;

devtools/Cargo.toml

@@ -3,7 +3,7 @@ description = "Ethcore development/test/build tools"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-devtools"
-version = "1.8.0"
+version = "1.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]

devtools/src/http_client.rs

@@ -16,7 +16,7 @@
 
 use std::thread;
 use std::time::Duration;
-use std::io::{Read, Write};
+use std::io::{self, Read, Write};
 use std::str::{self, Lines};
 use std::net::{TcpStream, SocketAddr};
 
@@ -83,9 +83,18 @@ pub fn request(address: &SocketAddr, request: &str) -> Response {
 	req.set_read_timeout(Some(Duration::from_secs(2))).unwrap();
 	req.write_all(request.as_bytes()).unwrap();
 
-	let mut response = String::new();
-	let _ = req.read_to_string(&mut response);
+	let mut response = Vec::new();
+	loop {
+		let mut chunk = [0; 32 *1024];
+		match req.read(&mut chunk) {
+			Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => break,
+			Err(err) => panic!("Unable to read response: {:?}", err),
+			Ok(0) => break,
+			Ok(read) => response.extend_from_slice(&chunk[..read]),
+		}
+	}
 
+	let response = String::from_utf8_lossy(&response).into_owned();
 	let mut lines = response.lines();
 	let status = lines.next().expect("Expected a response").to_owned();
 	let headers_raw = read_block(&mut lines, false);

docs/CHANGELOG-1.7.md

@@ -0,0 +1,785 @@
+### 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.
+
+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:
+
+- Stable Bootnodes and Warpnodes ([#7298](https://github.com/paritytech/parity/pull/7298))
+  - New warp enodes ([#7287](https://github.com/paritytech/parity/pull/7287))
+    - New warp enodes
+    - Added one more warp enode; replaced spaces with tabs
+    - Bump stable to 1.7.11
+  - Update kovan boot nodes ([#7296](https://github.com/paritytech/parity/pull/7296))
+  - 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
+- Ethstore optimizations ([#6827](https://github.com/paritytech/parity/pull/6827)) ([#6844](https://github.com/paritytech/parity/pull/6844)) ([#7347](https://github.com/paritytech/parity/pull/7347))
+- Fix default CORS. ([#7389](https://github.com/paritytech/parity/pull/7389))
+
+### Parity [v1.7.10](https://github.com/paritytech/parity/releases/tag/v1.7.10) (2017-12-11)
+
+Parity 1.7.10 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.
+
+The full list of included changes:
+
+- Backports and HF block update ([#7243](https://github.com/paritytech/parity/pull/7243))
+  - 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. ([#7259](https://github.com/paritytech/parity/pull/7259))
+- [stable] Backports and Kovan HF ([#7235](https://github.com/paritytech/parity/pull/7235))
+  - Escape inifinite loop in estimte_gas ([#7075](https://github.com/paritytech/parity/pull/7075))
+  - Disable uncles by default ([#7006](https://github.com/paritytech/parity/pull/7006))
+  - Maximum uncle count transition ([#7196](https://github.com/paritytech/parity/pull/7196))
+    - Enable delayed maximum_uncle_count activation.
+    - Fix tests.
+    - Defer kovan HF.
+  - Bump version.
+  - Kovan HF.
+  - Update Kovan HF block.
+  - Fix compilation issues.
+  - Fix aura test.
+  - Add missing byzantium builtins.
+  - Fix tests.
+  - Bump version for installers.
+  - Increase allowed time drift to 10s. ([#7238](https://github.com/paritytech/parity/pull/7238))
+
+### Parity [v1.7.9](https://github.com/paritytech/parity/releases/tag/v1.7.9) (2017-11-14)
+
+Parity 1.7.9 removes the ability to deploy built-in multi-signature wallets.
+
+The full list of included changes:
+
+- Bump to v1.7.9 ([#7047](https://github.com/paritytech/parity/pull/7047))
+- Disallow built-in multi-sig deploy (only watch) ([#7017](https://github.com/paritytech/parity/pull/7017))
+
+### Parity [v1.7.8](https://github.com/paritytech/parity/releases/tag/v1.7.8) (2017-10-26)
+
+Parity 1.7.8 fixes a critical Byzantium consensus issue. Update is highly recommended.
+
+The full list of included changes:
+
+- Refactor static context check in CREATE ([#6889](https://github.com/paritytech/parity/pull/6889))
+- Bump to v1.7.8 ([#6890](https://github.com/paritytech/parity/pull/6890))
+
+## Parity [v1.7.7](https://github.com/paritytech/parity/releases/tag/v1.7.7) (2017-10-15)
+
+Parity 1.7.7 fixes an issue with auto-update system. Updating is recommended, but not required for Byzantium.
+
+The full list of included changes:
+
+- Fix auto-update ([#6769](https://github.com/paritytech/parity/pull/6759))
+  - Bump to v1.7.7
+  - Updated ethabi to fix auto-update
+- Bumped fork block number for auto-update ([#6754](https://github.com/paritytech/parity/pull/6754))
+
+## Parity [v1.7.6](https://github.com/paritytech/parity/releases/tag/v1.7.6) (2017-10-13)
+
+Parity 1.7.6 includes a critical consensus-relevant fix for the Byzantium hard-fork. Please upgrade your Ethereum client before block number `4_370_000`.
+
+The full list of included changes:
+
+- Fixed modexp gas calculation overflow ([#6746](https://github.com/paritytech/parity/pull/6746))
+ - Fixed modexp gas calculation overflow ([#6741](https://github.com/paritytech/parity/pull/6741))
+ - Bump to v1.7.6
+
+## Parity [v1.7.5](https://github.com/paritytech/parity/releases/tag/v1.7.5) (2017-10-12)
+
+Parity 1.7.5 includes a critical consensus-relevant fix for the Byzantium hard-fork. Please upgrade your Ethereum client before block number `4_370_000`.
+
+Parity 1.7.5 is the first stable release of the 1.7 branch. With this release the support for 1.6 releases ends. Please upgrade your stable nodes to 1.7.5.
+
+The full list of included changes:
+
+- Backport stable - Fixes Badges ([#6731](https://github.com/paritytech/parity/pull/6731))
+  - Fix badges not showing up ([#6730](https://github.com/paritytech/parity/pull/6730))
+  - 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
+  - Merge [#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
+  - Add updated MethodDecoding from master
+- v1.7.5 stabilized
+- Backport ([#6724](https://github.com/paritytech/parity/pull/6724))
+  - Fixed RETURNDATA out of bounds check ([#6718](https://github.com/paritytech/parity/pull/6718))
+  - Prevent going offline when restoring or taking snapshot ([#6694](https://github.com/paritytech/parity/pull/6694))
+- Bump to v1.7.5
+- Trigger beta js build & release ([#6721](https://github.com/paritytech/parity/pull/6721))
+
+## Parity [v1.7.4](https://github.com/paritytech/parity/releases/tag/v1.7.4) (2017-10-11)
+
+Parity 1.7.4 includes a critical consensus-relevant fix for the Byzantium hard-fork. Please upgrade your Ethereum client before block number `4_370_000`.
+
+The full list of included changes:
+
+- Backport ([#6715](https://github.com/paritytech/parity/pull/6715))
+  - Fix estimate gas if from is not provided. ([#6714](https://github.com/paritytech/parity/pull/6714))
+  - Display vouched overlay on dapps ([#6710](https://github.com/paritytech/parity/pull/6710))
+    - Add vouch overlays to dapps
+    - Cleanup address
+    - Only run where we have a contentHash
+- Backporting ([#6712](https://github.com/paritytech/parity/pull/6712))
+  - Bump to v1.7.4
+  - Fixed potential exp len overflow ([#6686](https://github.com/paritytech/parity/pull/6686))
+  - Fix warp sync blockers detection ([#6691](https://github.com/paritytech/parity/pull/6691))
+- Backport ([#6713](https://github.com/paritytech/parity/pull/6713))
+  - Allow signer signing display of markdown ([#6707](https://github.com/paritytech/parity/pull/6707))
+  - Fix default values for address input ([#6701](https://github.com/paritytech/parity/pull/6701))
+  - Fix asciiToHex for characters < 0x10 ([#6702](https://github.com/paritytech/parity/pull/6702))
+
+## Parity [v1.7.3](https://github.com/paritytech/parity/releases/tag/v1.7.3) (2017-10-09)
+
+Parity 1.7.3 enables the Byzantium fork for Ethereum main network on Block 4_370_000 and offers a variety of bug fixes and stability improvements. Among them:
+
+- Fixed network protocol version negotiation with Geth nodes v1.7.1+.
+- Fixed `RETURNDATA` size for built-ins. (Built-ins in some cases overwrite only a portion of the output memory slice.)
+- Multisig Wallet View now loads if multiple transactions happened within one block.
+- Improved stability of snapshot-sycns (warp).
+- Revised timeout and batch size constants for bigger blocks.
+- Renamed RPC receipt `statusCode` field to `status`.
+
+The full list of included changes:
+
+- Backporting ([#6676](https://github.com/paritytech/parity/pull/6676))
+  - Fix wallet view ([#6597](https://github.com/paritytech/parity/pull/6597))
+    - Add safe fail for empty logs
+    - Filter transactions
+    - Add more logging
+    - Fix Wallet Creation and wallet tx list
+    - Remove logs
+    - Prevent selecting twice same wallet owner
+    - Fix tests
+    - Remove unused props
+  - Disallow pasting recovery phrases on first run ([#6602](https://github.com/paritytech/parity/pull/6602))
+    - Fix disallowing paste of recovery phrase on first run, ref [#6581](https://github.com/paritytech/parity/issues/6581)
+    - Allow the leader of CATS pasting recovery phrases.
+  - Updated systemd files for linux ([#6592](https://github.com/paritytech/parity/pull/6592))
+    - Previous version put $BASE directory in root directory.
+    - This version clearly explains how to run as root or as specific user.
+    - Additional configuration:
+      - send SIGHUP for clean exit,
+      - restart on fail.
+    - Tested on Ubuntu 16.04.3 LTS with 4.10.0-33-generic x86_64 kernel
+  - Don't expose port 80 for parity anymore ([#6633](https://github.com/paritytech/parity/pull/6633))
+- Backporting ([#6675](https://github.com/paritytech/parity/pull/6675))
+  - Required validators >= num owners ([#6551](https://github.com/paritytech/parity/pull/6551))
+  - Debounce sync status. ([#6572](https://github.com/paritytech/parity/pull/6572))
+  - Fixed network protocol version negotiation ([#6649](https://github.com/paritytech/parity/pull/6649))
+  - Renamed RPC receipt statusCode field to status ([#6650](https://github.com/paritytech/parity/pull/6650))
+  - Fixed RETURNDATA size for built-ins ([#6652](https://github.com/paritytech/parity/pull/6652))
+- Byzantium fork block number ([#6661](https://github.com/paritytech/parity/pull/6661))
+- Refreshing block number on status view ([#6610](https://github.com/paritytech/parity/pull/6610))
+- Tweaked block download timeouts ([#6595](https://github.com/paritytech/parity/pull/6595))
+- Backports ([#6563](https://github.com/paritytech/parity/pull/6563))
+  - 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))
+- Bump to v1.7.3
+
+## Parity [v1.7.2](https://github.com/paritytech/parity/releases/tag/v1.7.2) (2017-09-18)
+
+Parity 1.7.2 is a bug-fix release to improve performance and stability. Among others, it addresses the following:
+
+- Byzantium fork support for the Ropsten and Foundation networks.
+- Added support for the ConsenSys and Gnosis multi-signature wallets.
+- Significantly increased token registry and token balance lookup performance.
+- Fixed issues with the health status indicator in the wallet.
+- Tweaked warp-sync to quickly catch up with chains fallen back more than 10,000 blocks.
+- Fixes to the Chrome extension and macOS installer upgrades.
+
+The full list of included changes:
+
+- Fix output from eth_call. ([#6538](https://github.com/paritytech/parity/pull/6538))
+- Ropsten fork ([#6532](https://github.com/paritytech/parity/pull/6532))
+- Byzantium updates ([#6529](https://github.com/paritytech/parity/pull/6529))
+  - Fix modexp bug: return 0 if base=0 ([#6424](https://github.com/paritytech/parity/pull/6424))
+  - Running state test using parity-evm ([#6355](https://github.com/paritytech/parity/pull/6355))
+    - Initial version of state tests.
+    - Refactor state to support tracing.
+    - Unify TransactResult.
+    - Add test.
+  - Byzantium updates ([#5855](https://github.com/paritytech/parity/pull/5855))
+    - EIP-211 updates
+    - Benchmarks
+    - Blockhash instruction gas cost updated
+    - More benches
+    - EIP-684
+    - EIP-649
+    - EIP-658
+    - Updated some tests
+    - Modexp fixes
+    - STATICCALL fixes
+    - Pairing fixes
+    - More STATICALL fixes
+    - Use paritytech/bn
+    - Fixed REVERTing of contract creation
+    - Fixed more tests
+    - Fixed more tests
+    - Blockchain tests
+    - Enable previously broken tests
+    - Transition test
+    - Updated tests
+    - Fixed modexp reading huge numbers
+    - Enabled max_code_size test
+    - Review fixes
+    - Updated pairing pricing
+    - Missing commas (style)
+    - Update test.rs
+    - Small improvements
+    - Eip161abc
+- Fix extension detection ([#6452](https://github.com/paritytech/parity/pull/6452)) ([#6524](https://github.com/paritytech/parity/pull/6524))
+  - Fix extension detection.
+  - Fix mobx quirks.
+  - Update submodule.
+- Fix detecting hardware wallets. ([#6509](https://github.com/paritytech/parity/pull/6509))
+- Allow hardware device reads without lock. ([#6517](https://github.com/paritytech/parity/pull/6517))
+- Backports [#6497](https://github.com/paritytech/parity/pull/6497)
+  - Fix slow balances ([#6471](https://github.com/paritytech/parity/pull/6471))
+    - Update token updates
+    - Update token info fetching
+    - Update logger
+    - Minor fixes to updates and notifications for balances
+    - Use Pubsub
+    - Fix timeout.
+    - Use pubsub for status.
+    - Fix signer subscription.
+    - Process tokens in chunks.
+    - Fix tokens loaded by chunks
+    - Dispatch tokens asap
+    - Fix chunks processing.
+    - Better filter options
+    - Parallel log fetching.
+    - Fix signer polling.
+    - Fix initial block query.
+    - Token balances updates : the right(er) way
+    - Better tokens info fetching
+    - Fixes in token data fetching
+    - Only fetch what's needed (tokens)
+    - Fix linting issues
+    - Update wasm-tests.
+    - Fixing balances fetching
+    - Fix requests tracking in UI
+    - Fix request watching
+    - Update the Logger
+    - PR Grumbles Fixes
+  - Eth_call returns output of contract creations ([#6420](https://github.com/paritytech/parity/pull/6420))
+    - Eth_call returns output of contract creations
+    - Fix parameters order.
+    - Save outputs for light client as well.
+  - Don't accept transactions above block gas limit.
+  - Expose health status over RPC ([#6274](https://github.com/paritytech/parity/pull/6274))
+     - Node-health to a separate crate.
+     - Initialize node_health outside of dapps.
+     - Expose health over RPC.
+     - Bring back 412 and fix JS.
+     - Add health to workspace and tests.
+     - Fix compilation without default features.
+     - Fix borked merge.
+     - Revert to generics to avoid virtual calls.
+     - Fix node-health tests.
+     - Add missing trailing comma.
+  - Fixing/removing failing JS tests.
+  - Do not activate genesis epoch in immediate transition validator contract ([#6349](https://github.com/paritytech/parity/pull/6349))
+  - Fix memory tracing.
+  - Add test to cover that.
+  - Ensure balances of constructor accounts are kept
+  - Test balance of spec-constructed account is kept
+- Fix warning spam. [#6369](https://github.com/paritytech/parity/pull/6369)
+- Bump to 1.7.2
+- Fix eth_call [#6366](https://github.com/paritytech/parity/pull/6366)
+- Backporting [#6352](https://github.com/paritytech/parity/pull/6352)
+  - Better check the created accounts before showing Startup Wizard [#6331](https://github.com/paritytech/parity/pull/6331)
+  - Tweaked snapshot params [#6344](https://github.com/paritytech/parity/pull/6344)
+- Increase default gas limit for eth_call [#6337](https://github.com/paritytech/parity/pull/6337)
+  - Fix balance increase.
+  - Cap gas limit for dapp-originating requests.
+- Backports [#6333](https://github.com/paritytech/parity/pull/6333)
+  - Overflow check in addition
+  - Unexpose methods on UI RPC. [#6295](https://github.com/paritytech/parity/pull/6295)
+  - Add more descriptive error when signing/decrypting using hw wallet.
+  - Format instant change proofs correctly
+  - Propagate stratum submit share error upstream [#6260](https://github.com/paritytech/parity/pull/6260)
+  - Updated jsonrpc [#6264](https://github.com/paritytech/parity/pull/6264)
+  - Using multiple NTP servers [#6173](https://github.com/paritytech/parity/pull/6173)
+    - Small improvements to time estimation.
+    - Allow multiple NTP servers to be used.
+    - Removing boxing.
+    - Update list of servers and add reference.
+  - Fix dapps CSP when UI is exposed externally [#6178](https://github.com/paritytech/parity/pull/6178)
+    - Allow embeding on any page when ui-hosts=all and fix dev_ui
+  - Fix cache path when using --base-path [#6212](https://github.com/paritytech/parity/pull/6212)
+  - Bump to v1.7.1
+- UI backports [#6332](https://github.com/paritytech/parity/pull/6332)
+  - Time should not contribue to overall status. [#6276](https://github.com/paritytech/parity/pull/6276)
+  - Add warning to web browser and fix links. [#6232](https://github.com/paritytech/parity/pull/6232)
+  - Extension fixes [#6284](https://github.com/paritytech/parity/pull/6284)
+    - Fix token symbols in extension.
+    - Allow connections from firefox extension.
+  - Add support for ConsenSys multisig wallet [#6153](https://github.com/paritytech/parity/pull/6153)
+    - First draft of ConsenSys wallet
+    - Fix transfer store // WIP Consensys Wallet
+    - Rename walletABI JSON file
+    - Fix wrong daylimit in wallet modal
+    - Confirm/Revoke ConsensysWallet txs
+    - Change of settings for the Multisig Wallet
+- Update README for beta [#6270](https://github.com/paritytech/parity/pull/6270)
+- Fixed macOS installer upgrade [#6221](https://github.com/paritytech/parity/pull/6221)
+
+## Parity [v1.7.0](https://github.com/paritytech/parity/releases/tag/v1.7.0) (2017-07-28)
+
+Parity 1.7.0 is a major release introducing several important features:
+
+- **Experimental [Light client](https://github.com/paritytech/parity/wiki/The-Parity-Light-Protocol-(PIP)) support**. Start Parity with `--light` to enable light mode. Please, note: The wallet UI integration for the light client is not included, yet.
+- **Experimental web wallet**. A hosted version of Parity that keeps the keys and signs transactions using your browser storage. Try it at https://wallet.parity.io or run your own with `--public-node`.
+- **WASM contract support**. Private networks can run contracts compiled into WASM bytecode. _More information and documentation to follow_.
+- **DApps and RPC server merge**. DApp and RPC are now available through a single API endpoint. DApp server related settings are deprecated.
+- **Export accounts from the wallet**. Backing up your keys can now simply be managed through the wallet interface.
+- **PoA/Kovan validator set contract**. The PoA network validator-set management via smart contract is now supported by warp and, in the near future, light sync.
+- **PubSub API**. https://github.com/paritytech/parity/wiki/JSONRPC-Parity-Pub-Sub-module
+- **Signer apps for IOS and Android**.
+
+The full list of included changes:
+
+- Backports [#6163](https://github.com/paritytech/parity/pull/6163)
+  - Light client improvements ([#6156](https://github.com/paritytech/parity/pull/6156))
+    - No seal checking
+    - Import command and --no-seal-check for light client
+    - Fix eth_call
+    - Tweak registry dapps lookup
+    - Ignore failed requests to non-server peers
+  - Fix connecting to wildcard addresses. ([#6167](https://github.com/paritytech/parity/pull/6167))
+  - Don't display an overlay in case the time sync check fails. ([#6164](https://github.com/paritytech/parity/pull/6164))
+    - Small improvements to time estimation.
+    - Temporarily disable NTP time check by default.
+- Light client fixes ([#6148](https://github.com/paritytech/parity/pull/6148)) [#6151](https://github.com/paritytech/parity/pull/6151)
+  - Light client fixes
+  - Fix memory-lru-cache
+  - Clear pending reqs on disconnect
+- Filter tokens logs from current block, not genesis ([#6128](https://github.com/paritytech/parity/pull/6128)) [#6141](https://github.com/paritytech/parity/pull/6141)
+- Fix QR scanner returning null on confirm [#6122](https://github.com/paritytech/parity/pull/6122)
+- Check QR before lowercase ([#6119](https://github.com/paritytech/parity/pull/6119)) [#6120](https://github.com/paritytech/parity/pull/6120)
+- Remove chunk to restore from pending set only upon successful import [#6117](https://github.com/paritytech/parity/pull/6117)
+- Fixed node address detection on incoming connection [#6094](https://github.com/paritytech/parity/pull/6094)
+- Place RETURNDATA behind block number gate [#6095](https://github.com/paritytech/parity/pull/6095)
+- Update wallet library binaries [#6108](https://github.com/paritytech/parity/pull/6108)
+- Backported wallet fix [#6105](https://github.com/paritytech/parity/pull/6105)
+  - Fix initialisation bug. ([#6102](https://github.com/paritytech/parity/pull/6102))
+  - Update wallet library modifiers ([#6103](https://github.com/paritytech/parity/pull/6103))
+- Place RETURNDATA behind block number gate [#6095](https://github.com/paritytech/parity/pull/6095)
+- Fixed node address detection on incoming connection [#6094](https://github.com/paritytech/parity/pull/6094)
+- Bump snap version and tweak importing detection logic ([#6079](https://github.com/paritytech/parity/pull/6079)) [#6081](https://github.com/paritytech/parity/pull/6081)
+  - bump last tick just before printing info and restore sync detection
+  - bump kovan snapshot version
+  - Fixed sync tests
+  - Fixed rpc tests
+- Acquire client report under lock in informant [#6071](https://github.com/paritytech/parity/pull/6071)
+- Show busy indicator on Address forget [#6069](https://github.com/paritytech/parity/pull/6069)
+- Add CSP for worker-src ([#6059](https://github.com/paritytech/parity/pull/6059)) [#6064](https://github.com/paritytech/parity/pull/6064)
+  - Specify worker-src seperately, add blob
+  - Upgrade react-qr-scan to latest version
+- Set release channel to beta
+- Limit transaction queue memory & limit future queue [#6038](https://github.com/paritytech/parity/pull/6038)
+- Fix CI build issue [#6050](https://github.com/paritytech/parity/pull/6050)
+- New contract PoA sync fixes [#5991](https://github.com/paritytech/parity/pull/5991)
+- Fixed link to Multisig Contract Wallet on master [#5984](https://github.com/paritytech/parity/pull/5984)
+- Ethcore crate split part 1 [#6041](https://github.com/paritytech/parity/pull/6041)
+- Fix status icon [#6039](https://github.com/paritytech/parity/pull/6039)
+- Errors & warnings for inappropriate RPCs [#6029](https://github.com/paritytech/parity/pull/6029)
+- Add missing CSP for web3.site [#5992](https://github.com/paritytech/parity/pull/5992)
+- Remove cargo install --git from README.md [#6037](https://github.com/paritytech/parity/pull/6037)
+- Node Health warnings [#5951](https://github.com/paritytech/parity/pull/5951)
+- RPC cpu pool [#6023](https://github.com/paritytech/parity/pull/6023)
+- Use crates.io dependencies for parity-wasm [#6036](https://github.com/paritytech/parity/pull/6036)
+- Add test for loading the chain specs [#6028](https://github.com/paritytech/parity/pull/6028)
+- Whitelist APIs for generic Pub-Sub [#5840](https://github.com/paritytech/parity/pull/5840)
+- WASM contracts MVP [#5679](https://github.com/paritytech/parity/pull/5679)
+- Fix valid QR scan not advancing [#6033](https://github.com/paritytech/parity/pull/6033)
+- --reseal-on-uncle [#5940](https://github.com/paritytech/parity/pull/5940)
+- Support comments in reserved peers file ([#6004](https://github.com/paritytech/parity/pull/6004)) [#6012](https://github.com/paritytech/parity/pull/6012)
+- Add new md tnc [#5937](https://github.com/paritytech/parity/pull/5937)
+- Fix output of parity-evm in case of bad instruction [#5955](https://github.com/paritytech/parity/pull/5955)
+- Don't send notifications to unsubscribed clients of PubSub [#5960](https://github.com/paritytech/parity/pull/5960)
+- Proper light client informant and more verification of imported headers [#5897](https://github.com/paritytech/parity/pull/5897)
+- New Kovan bootnodes [#6017](https://github.com/paritytech/parity/pull/6017)
+- Use standard paths for Ethash cache [#5881](https://github.com/paritytech/parity/pull/5881)
+- Defer code hash calculation. [#5959](https://github.com/paritytech/parity/pull/5959)
+- Fix first run wizard. [#6000](https://github.com/paritytech/parity/pull/6000)
+- migration to serde 1.0 [#5996](https://github.com/paritytech/parity/pull/5996)
+- SecretStore: generating signatures [#5764](https://github.com/paritytech/parity/pull/5764)
+- bigint upgraded to version 3.0 [#5986](https://github.com/paritytech/parity/pull/5986)
+- config: don't allow dev chain with force sealing option [#5965](https://github.com/paritytech/parity/pull/5965)
+- Update lockfile for miniz-sys and gcc [#5969](https://github.com/paritytech/parity/pull/5969)
+- Clean up function naming in RPC error module [#5995](https://github.com/paritytech/parity/pull/5995)
+- Fix underflow in gas calculation [#5975](https://github.com/paritytech/parity/pull/5975)
+- PubSub for parity-js [#5830](https://github.com/paritytech/parity/pull/5830)
+- Report whether a peer was kept from `Handler::on_connect` [#5958](https://github.com/paritytech/parity/pull/5958)
+- Implement skeleton for transaction index and epoch transition proof PIP messages [#5908](https://github.com/paritytech/parity/pull/5908)
+- TransactionQueue improvements [#5917](https://github.com/paritytech/parity/pull/5917)
+- constant time HMAC comparison and clarify docs in ethkey [#5952](https://github.com/paritytech/parity/pull/5952)
+- Avoid pre-computing jump destinations [#5954](https://github.com/paritytech/parity/pull/5954)
+- Upgrade elastic array [#5949](https://github.com/paritytech/parity/pull/5949)
+- PoA: Wait for transition finality before applying [#5774](https://github.com/paritytech/parity/pull/5774)
+- Logs Pub-Sub [#5705](https://github.com/paritytech/parity/pull/5705)
+- Add the command to install the parity snap [#5945](https://github.com/paritytech/parity/pull/5945)
+- Reduce unnecessary allocations [#5944](https://github.com/paritytech/parity/pull/5944)
+- Clarify confusing messages. [#5935](https://github.com/paritytech/parity/pull/5935)
+- Content Security Policy [#5790](https://github.com/paritytech/parity/pull/5790)
+- CLI: Export error message and less verbose peer counter. [#5870](https://github.com/paritytech/parity/pull/5870)
+- network: make it more explicit about StreamToken and TimerToken [#5939](https://github.com/paritytech/parity/pull/5939)
+- sync: make it more idiomatic rust [#5938](https://github.com/paritytech/parity/pull/5938)
+- Prioritize accounts over address book [#5909](https://github.com/paritytech/parity/pull/5909)
+- Fixing failing compilation of RPC test on master. [#5916](https://github.com/paritytech/parity/pull/5916)
+- Empty local middleware, until explicitly requested [#5912](https://github.com/paritytech/parity/pull/5912)
+- Cancel propagated TX [#5899](https://github.com/paritytech/parity/pull/5899)
+- fix minor race condition in aura seal generation [#5910](https://github.com/paritytech/parity/pull/5910)
+- Docs for Pub-Sub, optional parameter for parity_subscribe [#5833](https://github.com/paritytech/parity/pull/5833)
+- Fix gas editor doubling-up on gas [#5820](https://github.com/paritytech/parity/pull/5820)
+- Information about used paths added to general output block [#5904](https://github.com/paritytech/parity/pull/5904)
+- Domain-locked web tokens. [#5894](https://github.com/paritytech/parity/pull/5894)
+- Removed panic handlers [#5895](https://github.com/paritytech/parity/pull/5895)
+- Latest changes from Rust RocksDB binding merged [#5905](https://github.com/paritytech/parity/pull/5905)
+- Adjust keyethereum/secp256 aliasses [#5903](https://github.com/paritytech/parity/pull/5903)
+- Keyethereum fs dependency [#5902](https://github.com/paritytech/parity/pull/5902)
+- Ethereum Classic Monetary Policy [#5741](https://github.com/paritytech/parity/pull/5741)
+- Initial token should allow full access. [#5873](https://github.com/paritytech/parity/pull/5873)
+- Fixed account selection for Dapps on public node [#5856](https://github.com/paritytech/parity/pull/5856)
+- blacklist bad snapshot manifest hashes upon failure [#5874](https://github.com/paritytech/parity/pull/5874)
+- Fix wrongly called timeouts [#5838](https://github.com/paritytech/parity/pull/5838)
+- ArchiveDB and other small fixes [#5867](https://github.com/paritytech/parity/pull/5867)
+- convert try!() to ? [#5866](https://github.com/paritytech/parity/pull/5866)
+- Make config file optional in systemd [#5847](https://github.com/paritytech/parity/pull/5847)
+- EIP-116 (214), [#4833](https://github.com/paritytech/parity/issues/4833) [#4851](https://github.com/paritytech/parity/pull/4851)
+- all executables are workspace members [#5865](https://github.com/paritytech/parity/pull/5865)
+- minor optimizations of the modexp builtin [#5860](https://github.com/paritytech/parity/pull/5860)
+- three small commits for HashDB and MemoryDB [#5766](https://github.com/paritytech/parity/pull/5766)
+- use rust 1.18's retain to boost the purge performance [#5801](https://github.com/paritytech/parity/pull/5801)
+- Allow IPFS server to accept POST requests [#5858](https://github.com/paritytech/parity/pull/5858)
+- Dutch i18n from [#5802](https://github.com/paritytech/parity/issues/5802) for master [#5836](https://github.com/paritytech/parity/pull/5836)
+- Typos in token deploy dapp ui [#5851](https://github.com/paritytech/parity/pull/5851)
+- A CLI flag to allow fast transaction signing when account is unlocked. [#5778](https://github.com/paritytech/parity/pull/5778)
+- Removing `additional` field from EVM instructions [#5821](https://github.com/paritytech/parity/pull/5821)
+- Don't fail on wrong log decoding [#5813](https://github.com/paritytech/parity/pull/5813)
+- Use randomized subscription ids for PubSub [#5756](https://github.com/paritytech/parity/pull/5756)
+- Fixed mem write for empty slice [#5827](https://github.com/paritytech/parity/pull/5827)
+- Fix party technologies [#5810](https://github.com/paritytech/parity/pull/5810)
+- Revert "Fixed mem write for empty slice" [#5826](https://github.com/paritytech/parity/pull/5826)
+- Fixed mem write for empty slice [#5825](https://github.com/paritytech/parity/pull/5825)
+- Fix JS tests [#5822](https://github.com/paritytech/parity/pull/5822)
+- Bump native-tls and openssl crates. [#5817](https://github.com/paritytech/parity/pull/5817)
+- Public node using WASM [#5734](https://github.com/paritytech/parity/pull/5734)
+- enforce block signer == author field in PoA [#5808](https://github.com/paritytech/parity/pull/5808)
+- Fix stack display in evmbin. [#5733](https://github.com/paritytech/parity/pull/5733)
+- Disable UI if it's not compiled in. [#5773](https://github.com/paritytech/parity/pull/5773)
+- Require phrase confirmation. [#5731](https://github.com/paritytech/parity/pull/5731)
+- Duration limit made optional for EthashParams [#5777](https://github.com/paritytech/parity/pull/5777)
+- Update Changelog for 1.6.8 [#5798](https://github.com/paritytech/parity/pull/5798)
+- Replace Ethcore comany name in T&C and some other places [#5796](https://github.com/paritytech/parity/pull/5796)
+- PubSub for IPC. [#5800](https://github.com/paritytech/parity/pull/5800)
+- Fix terminology distributed -> decentralized applications [#5797](https://github.com/paritytech/parity/pull/5797)
+- Disable compression for RLP strings [#5786](https://github.com/paritytech/parity/pull/5786)
+- update the source for the snapcraft package [#5781](https://github.com/paritytech/parity/pull/5781)
+- Fixed default UI port for mac installer [#5782](https://github.com/paritytech/parity/pull/5782)
+- Block invalid account name creation [#5784](https://github.com/paritytech/parity/pull/5784)
+- Update Cid/multihash/ring/tinykeccak [#5785](https://github.com/paritytech/parity/pull/5785)
+- use NULL_RLP, remove NULL_RLP_STATIC [#5742](https://github.com/paritytech/parity/pull/5742)
+- Blacklist empty phrase account. [#5730](https://github.com/paritytech/parity/pull/5730)
+- EIP-211 RETURNDATACOPY and RETURNDATASIZE [#5678](https://github.com/paritytech/parity/pull/5678)
+- Bump mio [#5763](https://github.com/paritytech/parity/pull/5763)
+- Fixing UI issues after UI server refactor [#5710](https://github.com/paritytech/parity/pull/5710)
+- Fix WS server expose issue. [#5728](https://github.com/paritytech/parity/pull/5728)
+- Fix local transactions without condition. [#5716](https://github.com/paritytech/parity/pull/5716)
+- Bump parity-wordlist. [#5748](https://github.com/paritytech/parity/pull/5748)
+- two small changes in evm [#5700](https://github.com/paritytech/parity/pull/5700)
+- Evmbin: JSON format printing pre-state. [#5712](https://github.com/paritytech/parity/pull/5712)
+- Recover from empty phrase in dev mode [#5698](https://github.com/paritytech/parity/pull/5698)
+- EIP-210 BLOCKHASH changes [#5505](https://github.com/paritytech/parity/pull/5505)
+- fixes typo [#5708](https://github.com/paritytech/parity/pull/5708)
+- Bump rocksdb [#5707](https://github.com/paritytech/parity/pull/5707)
+- Fixed --datadir option [#5697](https://github.com/paritytech/parity/pull/5697)
+- rpc -> weak to arc [#5688](https://github.com/paritytech/parity/pull/5688)
+- typo fix [#5699](https://github.com/paritytech/parity/pull/5699)
+- Revamping parity-evmbin [#5696](https://github.com/paritytech/parity/pull/5696)
+- Update dependencies and bigint api [#5685](https://github.com/paritytech/parity/pull/5685)
+- UI server refactoring [#5580](https://github.com/paritytech/parity/pull/5580)
+- Fix from/into electrum in ethkey [#5686](https://github.com/paritytech/parity/pull/5686)
+- Add unit tests [#5668](https://github.com/paritytech/parity/pull/5668)
+- Guanqun add unit tests [#5671](https://github.com/paritytech/parity/pull/5671)
+- Parity-PubSub as a separate API. [#5676](https://github.com/paritytech/parity/pull/5676)
+- EIP-140 REVERT opcode [#5477](https://github.com/paritytech/parity/pull/5477)
+- Update CHANGELOG for 1.6.7 [#5683](https://github.com/paritytech/parity/pull/5683)
+- Updated docs slightly. [#5674](https://github.com/paritytech/parity/pull/5674)
+- Fix build [#5684](https://github.com/paritytech/parity/pull/5684)
+- Back-references for the on-demand service [#5573](https://github.com/paritytech/parity/pull/5573)
+- Dynamically adjust PIP request costs based on gathered data [#5603](https://github.com/paritytech/parity/pull/5603)
+- use cargo workspace [#5601](https://github.com/paritytech/parity/pull/5601)
+- Latest headers Pub-Sub [#5655](https://github.com/paritytech/parity/pull/5655)
+- improved dockerfile builds [#5659](https://github.com/paritytech/parity/pull/5659)
+- Adding CLI options: port shift and unsafe expose. [#5677](https://github.com/paritytech/parity/pull/5677)
+- Report missing author in Aura [#5583](https://github.com/paritytech/parity/pull/5583)
+- typo fix [#5669](https://github.com/paritytech/parity/pull/5669)
+- Remove public middleware (temporary) [#5665](https://github.com/paritytech/parity/pull/5665)
+- Remove additional polyfill [#5663](https://github.com/paritytech/parity/pull/5663)
+- Importing accounts from files. [#5644](https://github.com/paritytech/parity/pull/5644)
+- remove the deprecated options in rustfmt.toml [#5616](https://github.com/paritytech/parity/pull/5616)
+- Update the Console dapp [#5602](https://github.com/paritytech/parity/pull/5602)
+- Create an account for chain=dev [#5612](https://github.com/paritytech/parity/pull/5612)
+- Use babel-runtime as opposed to babel-polyfill [#5662](https://github.com/paritytech/parity/pull/5662)
+- Connection dialog timestamp info [#5554](https://github.com/paritytech/parity/pull/5554)
+- use copy_from_slice instead of for loop [#5647](https://github.com/paritytech/parity/pull/5647)
+- Light friendly dapps [#5634](https://github.com/paritytech/parity/pull/5634)
+- Add Recover button to Accounts and warnings [#5645](https://github.com/paritytech/parity/pull/5645)
+- Update eth_sign docs. [#5631](https://github.com/paritytech/parity/pull/5631)
+- Proper signer Pub-Sub for pending requests. [#5594](https://github.com/paritytech/parity/pull/5594)
+- Bump bigint to 1.0.5 [#5641](https://github.com/paritytech/parity/pull/5641)
+- PoA warp implementation [#5488](https://github.com/paritytech/parity/pull/5488)
+- Improve on-demand dispatch and add support for batch requests [#5419](https://github.com/paritytech/parity/pull/5419)
+- Use default account for sending transactions [#5588](https://github.com/paritytech/parity/pull/5588)
+- Add peer management to the Status tab [#5566](https://github.com/paritytech/parity/pull/5566)
+- Add monotonic step transition [#5587](https://github.com/paritytech/parity/pull/5587)
+- Decrypting for external accounts. [#5581](https://github.com/paritytech/parity/pull/5581)
+- only enable warp sync when engine supports it [#5595](https://github.com/paritytech/parity/pull/5595)
+- fix the doc of installing rust [#5586](https://github.com/paritytech/parity/pull/5586)
+- Small fixes [#5584](https://github.com/paritytech/parity/pull/5584)
+- SecretStore: remove session on master node [#5545](https://github.com/paritytech/parity/pull/5545)
+- run-clean [#5607](https://github.com/paritytech/parity/pull/5607)
+- relicense RLP to MIT/Apache2 [#5591](https://github.com/paritytech/parity/pull/5591)
+- Fix eth_sign signature encoding. [#5597](https://github.com/paritytech/parity/pull/5597)
+- Check pending request on Node local transactions [#5564](https://github.com/paritytech/parity/pull/5564)
+- Add tooltips on ActionBar [#5562](https://github.com/paritytech/parity/pull/5562)
+- Can't deploy without compiling Contract [#5593](https://github.com/paritytech/parity/pull/5593)
+- Add a warning when node is syncing [#5565](https://github.com/paritytech/parity/pull/5565)
+- Update registry middleware [#5585](https://github.com/paritytech/parity/pull/5585)
+- Set block condition to BigNumber in MethodDecoding [#5592](https://github.com/paritytech/parity/pull/5592)
+- Load the sources immediately in Contract Dev [#5575](https://github.com/paritytech/parity/pull/5575)
+- Remove formal verification messages in Dev Contract [#5574](https://github.com/paritytech/parity/pull/5574)
+- Fix event params decoding when no names for parameters [#5567](https://github.com/paritytech/parity/pull/5567)
+- Do not convert to Dates twice [#5563](https://github.com/paritytech/parity/pull/5563)
+- Fix Multisig wallet settings [#5560](https://github.com/paritytech/parity/pull/5560)
+- Typo [#5547](https://github.com/paritytech/parity/pull/5547)
+- Generic PubSub implementation [#5456](https://github.com/paritytech/parity/pull/5456)
+- Fix CI paths. [#5570](https://github.com/paritytech/parity/pull/5570)
+- reorg into blocks before minimum history [#5558](https://github.com/paritytech/parity/pull/5558)
+- EIP-86 update [#5506](https://github.com/paritytech/parity/pull/5506)
+- Secretstore RPCs + integration [#5439](https://github.com/paritytech/parity/pull/5439)
+- Fixes Parity Bar position [#5557](https://github.com/paritytech/parity/pull/5557)
+- Fixes invalid log in BadgeReg events [#5556](https://github.com/paritytech/parity/pull/5556)
+- Fix issues in Contract Development view [#5555](https://github.com/paritytech/parity/pull/5555)
+- Added missing methods [#5542](https://github.com/paritytech/parity/pull/5542)
+- option to disable persistent txqueue [#5544](https://github.com/paritytech/parity/pull/5544)
+- Bump jsonrpc [#5552](https://github.com/paritytech/parity/pull/5552)
+- Retrieve block headers only for header-only info [#5480](https://github.com/paritytech/parity/pull/5480)
+- add snap to CI [#5519](https://github.com/paritytech/parity/pull/5519)
+- Pass additional data when reporting [#5527](https://github.com/paritytech/parity/pull/5527)
+- Calculate post-constructors state root in spec at load time [#5523](https://github.com/paritytech/parity/pull/5523)
+- Fix utf8 decoding [#5533](https://github.com/paritytech/parity/pull/5533)
+- Add CHANGELOG.md [#5513](https://github.com/paritytech/parity/pull/5513)
+- Change all occurrences of ethcore.io into parity.io [#5528](https://github.com/paritytech/parity/pull/5528)
+- Memory usage optimization [#5526](https://github.com/paritytech/parity/pull/5526)
+- Compose transaction RPC. [#5524](https://github.com/paritytech/parity/pull/5524)
+- Support external eth_sign  [#5481](https://github.com/paritytech/parity/pull/5481)
+- Treat block numbers as strings, not BigNums. [#5449](https://github.com/paritytech/parity/pull/5449)
+- npm cleanups [#5512](https://github.com/paritytech/parity/pull/5512)
+- Export acc js [#4973](https://github.com/paritytech/parity/pull/4973)
+- YARN [#5395](https://github.com/paritytech/parity/pull/5395)
+- Fix linting issues [#5511](https://github.com/paritytech/parity/pull/5511)
+- Chinese Translation [#5460](https://github.com/paritytech/parity/pull/5460)
+- Fixing secretstore TODOs - part 2 [#5416](https://github.com/paritytech/parity/pull/5416)
+- fix json format of state snapshot [#5504](https://github.com/paritytech/parity/pull/5504)
+- Bump jsonrpc version [#5489](https://github.com/paritytech/parity/pull/5489)
+- Groundwork for generalized warp sync [#5454](https://github.com/paritytech/parity/pull/5454)
+- Add the packaging metadata to build the parity snap [#5496](https://github.com/paritytech/parity/pull/5496)
+- Cancel tx JS [#4958](https://github.com/paritytech/parity/pull/4958)
+- EIP-212 (bn128 curve pairing) [#5307](https://github.com/paritytech/parity/pull/5307)
+- fix panickers in tree-route [#5479](https://github.com/paritytech/parity/pull/5479)
+- Update links to etherscan.io [#5455](https://github.com/paritytech/parity/pull/5455)
+- Refresh UI on nodeKind changes, e.g. personal -> public [#5312](https://github.com/paritytech/parity/pull/5312)
+- Correct contract address for EIP-86 [#5473](https://github.com/paritytech/parity/pull/5473)
+- Force two decimals for USD conversion rate [#5471](https://github.com/paritytech/parity/pull/5471)
+- Refactoring of Tokens & Balances [#5372](https://github.com/paritytech/parity/pull/5372)
+- Background-repeat round [#5475](https://github.com/paritytech/parity/pull/5475)
+- nl i18n updated [#5461](https://github.com/paritytech/parity/pull/5461)
+- Show ETH value (even 0) if ETH transfer in transaction list [#5406](https://github.com/paritytech/parity/pull/5406)
+- Store the pending requests per network version [#5405](https://github.com/paritytech/parity/pull/5405)
+- Use in-memory database for tests [#5451](https://github.com/paritytech/parity/pull/5451)
+- WebSockets RPC server [#5425](https://github.com/paritytech/parity/pull/5425)
+- Added missing docs [#5452](https://github.com/paritytech/parity/pull/5452)
+- Tests and tweaks for public node middleware [#5417](https://github.com/paritytech/parity/pull/5417)
+- Fix removal of hash-mismatched files. [#5440](https://github.com/paritytech/parity/pull/5440)
+- parity_getBlockHeaderByNumber and LightFetch utility [#5383](https://github.com/paritytech/parity/pull/5383)
+- New state tests [#5418](https://github.com/paritytech/parity/pull/5418)
+- Fix buffer length for QR code gen. [#5447](https://github.com/paritytech/parity/pull/5447)
+- Add raw hash signing [#5423](https://github.com/paritytech/parity/pull/5423)
+- Filters and block RPCs for the light client [#5320](https://github.com/paritytech/parity/pull/5320)
+- Work around mismatch for QR checksum [#5374](https://github.com/paritytech/parity/pull/5374)
+- easy to use conversion from and to string for ethstore::Crypto [#5437](https://github.com/paritytech/parity/pull/5437)
+- Tendermint fixes [#5415](https://github.com/paritytech/parity/pull/5415)
+- Adrianbrink lightclientcache branch. [#5428](https://github.com/paritytech/parity/pull/5428)
+- Add caching to HeaderChain struct [#5403](https://github.com/paritytech/parity/pull/5403)
+- Add decryption to the UI (in the Signer) [#5422](https://github.com/paritytech/parity/pull/5422)
+- Add CIDv0 RPC [#5414](https://github.com/paritytech/parity/pull/5414)
+- Updating documentation for RPCs [#5392](https://github.com/paritytech/parity/pull/5392)
+- Fixing secretstore TODOs - part 1 [#5386](https://github.com/paritytech/parity/pull/5386)
+- Fixing disappearing content. [#5399](https://github.com/paritytech/parity/pull/5399)
+- Snapshot chunks packed by size [#5318](https://github.com/paritytech/parity/pull/5318)
+- APIs wildcards and simple arithmetic. [#5402](https://github.com/paritytech/parity/pull/5402)
+- Fixing compilation without dapps. [#5410](https://github.com/paritytech/parity/pull/5410)
+- Don't use port 8080 anymore [#5397](https://github.com/paritytech/parity/pull/5397)
+- Quick'n'dirty CLI for the light client [#5002](https://github.com/paritytech/parity/pull/5002)
+- set gas limit before proving transactions [#5401](https://github.com/paritytech/parity/pull/5401)
+- Public node: perf and fixes [#5390](https://github.com/paritytech/parity/pull/5390)
+- Straight download path in the readme [#5393](https://github.com/paritytech/parity/pull/5393)
+- On-chain ACL checker for secretstore [#5015](https://github.com/paritytech/parity/pull/5015)
+- Allow empty-encoded values from QR encoding [#5385](https://github.com/paritytech/parity/pull/5385)
+- Update npm build for new inclusions [#5381](https://github.com/paritytech/parity/pull/5381)
+- Fix for Ubuntu Dockerfile [#5356](https://github.com/paritytech/parity/pull/5356)
+- Secretstore over network [#4974](https://github.com/paritytech/parity/pull/4974)
+- Dapps and RPC server merge [#5365](https://github.com/paritytech/parity/pull/5365)
+- trigger js build release [#5379](https://github.com/paritytech/parity/pull/5379)
+- Update expanse json with fork at block 600000 [#5351](https://github.com/paritytech/parity/pull/5351)
+- Futures-based native wrappers for contract ABIs [#5341](https://github.com/paritytech/parity/pull/5341)
+- Kovan warp sync fixed [#5337](https://github.com/paritytech/parity/pull/5337)
+- Aura eip155 validation transition [#5362](https://github.com/paritytech/parity/pull/5362)
+- Shared wordlist for brain wallets [#5331](https://github.com/paritytech/parity/pull/5331)
+- Allow signing via Qr [#4881](https://github.com/paritytech/parity/pull/4881)
+- Allow entry of url or hash for DappReg meta [#5360](https://github.com/paritytech/parity/pull/5360)
+- Adjust tx overlay colours [#5353](https://github.com/paritytech/parity/pull/5353)
+- Add ability to disallow API subscriptions [#5366](https://github.com/paritytech/parity/pull/5366)
+- EIP-213 (bn128 curve operations) [#4999](https://github.com/paritytech/parity/pull/4999)
+- Fix analize output file name [#5357](https://github.com/paritytech/parity/pull/5357)
+- Add default eip155 validation [#5346](https://github.com/paritytech/parity/pull/5346)
+- Add new seed nodes for Classic chain [#5345](https://github.com/paritytech/parity/pull/5345)
+- Shared wordlist for frontend [#5336](https://github.com/paritytech/parity/pull/5336)
+- fix rpc tests [#5338](https://github.com/paritytech/parity/pull/5338)
+- Public node with accounts and signing in Frontend [#5304](https://github.com/paritytech/parity/pull/5304)
+- Rename Status/Status -> Status/NodeStatus [#5332](https://github.com/paritytech/parity/pull/5332)
+- Updating paths to repos. [#5330](https://github.com/paritytech/parity/pull/5330)
+- Separate status for canceled local transactions. [#5319](https://github.com/paritytech/parity/pull/5319)
+- Cleanup the Status View [#5317](https://github.com/paritytech/parity/pull/5317)
+- Update UI minimised requests [#5324](https://github.com/paritytech/parity/pull/5324)
+- Order signer transactions FIFO [#5321](https://github.com/paritytech/parity/pull/5321)
+- updating dependencies [#5028](https://github.com/paritytech/parity/pull/5028)
+- Minimise transactions progress [#4942](https://github.com/paritytech/parity/pull/4942)
+- Fix eth_sign showing as wallet account [#5309](https://github.com/paritytech/parity/pull/5309)
+- Ropsten revival [#5302](https://github.com/paritytech/parity/pull/5302)
+- Strict validation transitions [#4988](https://github.com/paritytech/parity/pull/4988)
+- Fix default list sorting [#5303](https://github.com/paritytech/parity/pull/5303)
+- Use unique owners for multisig wallets [#5298](https://github.com/paritytech/parity/pull/5298)
+- Copy all existing i18n strings into zh (as-is translation aid) [#5305](https://github.com/paritytech/parity/pull/5305)
+- Fix booleans in Typedinput [#5295](https://github.com/paritytech/parity/pull/5295)
+- node kind RPC [#5025](https://github.com/paritytech/parity/pull/5025)
+- Fix the use of MobX in playground [#5294](https://github.com/paritytech/parity/pull/5294)
+- Fine grained snapshot chunking [#5019](https://github.com/paritytech/parity/pull/5019)
+- Add lint:i18n to find missing & extra keys [#5290](https://github.com/paritytech/parity/pull/5290)
+- Scaffolding for zh translations, including first-round by @btceth [#5289](https://github.com/paritytech/parity/pull/5289)
+- JS package bumps [#5287](https://github.com/paritytech/parity/pull/5287)
+- Auto-extract new i18n strings (update) [#5288](https://github.com/paritytech/parity/pull/5288)
+- eip100b [#5027](https://github.com/paritytech/parity/pull/5027)
+- Set earliest era in snapshot restoration [#5021](https://github.com/paritytech/parity/pull/5021)
+- Avoid clogging up tmp when updater dir has bad permissions. [#5024](https://github.com/paritytech/parity/pull/5024)
+- Resilient warp sync [#5018](https://github.com/paritytech/parity/pull/5018)
+- Create webpack analysis files (size) [#5009](https://github.com/paritytech/parity/pull/5009)
+- Dispatch an open event on drag of Parity Bar [#4987](https://github.com/paritytech/parity/pull/4987)
+- Various installer and tray apps fixes [#4970](https://github.com/paritytech/parity/pull/4970)
+- Export account RPC [#4967](https://github.com/paritytech/parity/pull/4967)
+- Switching ValidatorSet [#4961](https://github.com/paritytech/parity/pull/4961)
+- Implement PIP messages, request builder, and handlers [#4945](https://github.com/paritytech/parity/pull/4945)
+- auto lint [#5003](https://github.com/paritytech/parity/pull/5003)
+- Fix FireFox overflows [#5000](https://github.com/paritytech/parity/pull/5000)
+- Show busy indicator, focus first field in password change [#4997](https://github.com/paritytech/parity/pull/4997)
+- Consistent store naming in the Signer components [#4996](https://github.com/paritytech/parity/pull/4996)
+- second (and last) part of rlp refactor [#4901](https://github.com/paritytech/parity/pull/4901)
+- Double click to select account creation type [#4986](https://github.com/paritytech/parity/pull/4986)
+- Fixes to the Registry dapp [#4984](https://github.com/paritytech/parity/pull/4984)
+- Extend api.util [#4979](https://github.com/paritytech/parity/pull/4979)
+- Updating JSON-RPC crates [#4934](https://github.com/paritytech/parity/pull/4934)
+- splitting part of util into smaller crates [#4956](https://github.com/paritytech/parity/pull/4956)
+- Updating syntex et al [#4983](https://github.com/paritytech/parity/pull/4983)
+- EIP198 and built-in activation [#4926](https://github.com/paritytech/parity/pull/4926)
+- Fix MethodDecoding for Arrays [#4977](https://github.com/paritytech/parity/pull/4977)
+- Try to fix WS race condition connection [#4976](https://github.com/paritytech/parity/pull/4976)
+- eth_sign where account === undefined [#4964](https://github.com/paritytech/parity/pull/4964)
+- Fix references to api outside of `parity.js` [#4981](https://github.com/paritytech/parity/pull/4981)
+- Fix Password Dialog form overflow [#4968](https://github.com/paritytech/parity/pull/4968)
+- Changing Mutex into RwLock for transaction queue [#4951](https://github.com/paritytech/parity/pull/4951)
+- Disable max seal period for external sealing [#4927](https://github.com/paritytech/parity/pull/4927)
+- Attach hardware wallets already in addressbook [#4912](https://github.com/paritytech/parity/pull/4912)
+- rlp serialization refactor [#4873](https://github.com/paritytech/parity/pull/4873)
+- Bump nanomsg [#4965](https://github.com/paritytech/parity/pull/4965)
+- Fixed multi-chunk ledger transactions on windows [#4960](https://github.com/paritytech/parity/pull/4960)
+- Fix outputs in Contract Constant Queries [#4953](https://github.com/paritytech/parity/pull/4953)
+- systemd: Start parity after network.target [#4952](https://github.com/paritytech/parity/pull/4952)
+- Remove transaction RPC [#4949](https://github.com/paritytech/parity/pull/4949)
+- Swap out ethcore.io url for parity.io [#4947](https://github.com/paritytech/parity/pull/4947)
+- Don't remove confirmed requests to early. [#4933](https://github.com/paritytech/parity/pull/4933)
+- Ensure sealing work enabled in miner once subscribers added [#4930](https://github.com/paritytech/parity/pull/4930)
+- Add z-index to small modals as well [#4923](https://github.com/paritytech/parity/pull/4923)
+- Bump nanomsg [#4946](https://github.com/paritytech/parity/pull/4946)
+- Bumping multihash and libc [#4943](https://github.com/paritytech/parity/pull/4943)
+- Edit ETH value, gas and gas price in Contract Deployment [#4919](https://github.com/paritytech/parity/pull/4919)
+- Add ability to configure Secure API [#4922](https://github.com/paritytech/parity/pull/4922)
+- Add Token image from URL [#4916](https://github.com/paritytech/parity/pull/4916)
+- Use the registry fee in Token Deployment dapp [#4915](https://github.com/paritytech/parity/pull/4915)
+- Add reseal max period [#4903](https://github.com/paritytech/parity/pull/4903)
+- Detect rust compiler version in Parity build script, closes 4742 [#4907](https://github.com/paritytech/parity/pull/4907)
+- Add Vaults logic to First Run [#4914](https://github.com/paritytech/parity/pull/4914)
+- Updated gcc and rayon crates to remove outdated num_cpus dependency [#4909](https://github.com/paritytech/parity/pull/4909)
+- Renaming evm binary to avoid conflicts. [#4899](https://github.com/paritytech/parity/pull/4899)
+- Better error handling for traces RPC [#4849](https://github.com/paritytech/parity/pull/4849)
+- Safari SectionList fix [#4895](https://github.com/paritytech/parity/pull/4895)
+- Safari Dialog scrolling fix [#4893](https://github.com/paritytech/parity/pull/4893)
+- Spelling :) [#4900](https://github.com/paritytech/parity/pull/4900)
+- Additional kovan params [#4892](https://github.com/paritytech/parity/pull/4892)
+- trigger js-precompiled build [#4898](https://github.com/paritytech/parity/pull/4898)
+- Recalculate receipt roots in close_and_lock [#4884](https://github.com/paritytech/parity/pull/4884)
+- Reload UI on network switch [#4864](https://github.com/paritytech/parity/pull/4864)
+- Update parity-ui-precompiled with branch [#4850](https://github.com/paritytech/parity/pull/4850)
+- OSX Installer is no longer experimental [#4882](https://github.com/paritytech/parity/pull/4882)
+- Chain-selection from UI [#4859](https://github.com/paritytech/parity/pull/4859)
+- removed redundant (and unused) FromJson trait [#4871](https://github.com/paritytech/parity/pull/4871)
+- fix typos and grammar [#4880](https://github.com/paritytech/parity/pull/4880)
+- Remove old experimental remote-db code [#4872](https://github.com/paritytech/parity/pull/4872)
+- removed redundant FixedHash trait, fixes [#4029](https://github.com/paritytech/parity/issues/4029) [#4866](https://github.com/paritytech/parity/pull/4866)
+- Reference JSON-RPC more changes-friendly [#4870](https://github.com/paritytech/parity/pull/4870)
+- Better handling of Solidity compliation [#4860](https://github.com/paritytech/parity/pull/4860)
+- Go through contract links in Transaction List display [#4863](https://github.com/paritytech/parity/pull/4863)
+- Fix Gas Price Selector Tooltips [#4865](https://github.com/paritytech/parity/pull/4865)
+- Fix auto-updater [#4867](https://github.com/paritytech/parity/pull/4867)
+- Make the UI work offline [#4861](https://github.com/paritytech/parity/pull/4861)
+- Subscribe to accounts info in Signer / ParityBar [#4856](https://github.com/paritytech/parity/pull/4856)
+- Don't link libsnappy explicitly [#4841](https://github.com/paritytech/parity/pull/4841)
+- Fix paste in Inputs [#4854](https://github.com/paritytech/parity/pull/4854)
+- Extract i18n from shared UI components [#4834](https://github.com/paritytech/parity/pull/4834)
+- Fix paste in Inputs [#4844](https://github.com/paritytech/parity/pull/4844)
+- Pull contract deployment title from available steps [#4848](https://github.com/paritytech/parity/pull/4848)
+- Supress USB error message [#4839](https://github.com/paritytech/parity/pull/4839)
+- Fix getTransactionCount in --geth mode [#4837](https://github.com/paritytech/parity/pull/4837)
+- CI: test coverage (for core and js) [#4832](https://github.com/paritytech/parity/pull/4832)
+- Lowering threshold for transactions above gas limit [#4831](https://github.com/paritytech/parity/pull/4831)
+- Fix TxViewer when no `to` (contract deployment) [#4847](https://github.com/paritytech/parity/pull/4847)
+- Fix method decoding [#4845](https://github.com/paritytech/parity/pull/4845)
+- Add React Hot Reload to dapps + TokenDeploy fix [#4846](https://github.com/paritytech/parity/pull/4846)
+- Dapps show multiple times in some cases [#4843](https://github.com/paritytech/parity/pull/4843)
+- Fixes to the Registry dapp [#4838](https://github.com/paritytech/parity/pull/4838)
+- Show token icons on list summary pages [#4826](https://github.com/paritytech/parity/pull/4826)
+- Calibrate step before rejection [#4800](https://github.com/paritytech/parity/pull/4800)
+- Add replay protection [#4808](https://github.com/paritytech/parity/pull/4808)
+- Better icon on windows [#4804](https://github.com/paritytech/parity/pull/4804)
+- Better logic for contract deployments detection [#4821](https://github.com/paritytech/parity/pull/4821)
+- Fix wrong default values for contract queries inputs [#4819](https://github.com/paritytech/parity/pull/4819)
+- Adjust selection colours/display [#4811](https://github.com/paritytech/parity/pull/4811)
+- Update the Wallet Library Registry key [#4817](https://github.com/paritytech/parity/pull/4817)
+- Update Wallet to new Wallet Code [#4805](https://github.com/paritytech/parity/pull/4805)

ethash/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "ethash"
-version = "1.8.0"
+version = "1.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [lib]
 
 [dependencies]
 log = "0.3"
-hash = { path = "../util/hash" }
+keccak-hash = { path = "../util/hash" }
 primal = "0.2.3"
 parking_lot = "0.4"
 crunchy = "0.1.0"

ethash/src/keccak.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/>.
 
-extern crate hash;
+extern crate keccak_hash as hash;
 
 pub type H256 = [u8; 32];
 

ethcore/Cargo.toml

@@ -3,35 +3,29 @@ description = "Ethcore library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore"
-version = "1.8.0"
+version = "1.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
-
-[build-dependencies]
-"ethcore-ipc-codegen" = { path = "../ipc/codegen" }
 
 [dependencies]
 ansi_term = "0.9"
-bloomchain = "0.1"
+bloomchain = { path = "../util/bloomchain" }
 bn = { git = "https://github.com/paritytech/bn" }
 byteorder = "1.0"
-clippy = { version = "0.0.103", optional = true}
 common-types = { path = "types" }
-crossbeam = "0.2.9"
+crossbeam = "0.3"
 ethash = { path = "../ethash" }
 ethcore-bloom-journal = { path = "../util/bloom" }
 ethcore-bytes = { path = "../util/bytes" }
 hashdb = { path = "../util/hashdb" }
 memorydb = { path = "../util/memorydb" }
-patricia_trie = { path = "../util/patricia_trie" }
+patricia-trie = { path = "../util/patricia_trie" }
 ethcore-devtools = { path = "../devtools" }
 ethcore-io = { path = "../util/io" }
-ethcore-ipc = { path = "../ipc/rpc" }
-ethcore-ipc-nano = { path = "../ipc/nano" }
 ethcore-logger = { path = "../logger" }
 ethcore-stratum = { path = "../stratum" }
 ethcore-util = { path = "../util" }
 ethcore-bigint = { path = "../util/bigint" }
+memory-cache = { path = "../util/memory_cache" }
 ethjson = { path = "../json" }
 ethkey = { path = "../ethkey" }
 ethstore = { path = "../ethstore" }
@@ -56,8 +50,10 @@ rand = "0.3"
 rlp = { path = "../util/rlp" }
 rlp_derive = { path = "../util/rlp_derive" }
 kvdb = { path = "../util/kvdb" }
+kvdb-rocksdb = { path = "../util/kvdb-rocksdb" }
+kvdb-memorydb = { path = "../util/kvdb-memorydb" }
 util-error = { path = "../util/error" }
-snappy = { path = "../util/snappy" }
+snappy = { git = "https://github.com/paritytech/rust-snappy" }
 migration = { path = "../util/migration" }
 macros = { path = "../util/macros" }
 rust-crypto = "0.2.34"
@@ -70,10 +66,11 @@ table = { path = "../util/table" }
 bloomable = { path = "../util/bloomable" }
 vm = { path = "vm" }
 wasm = { path = "wasm" }
-hash = { path = "../util/hash" }
+keccak-hash = { path = "../util/hash" }
 triehash = { path = "../util/triehash" }
 semantic_version = { path = "../util/semantic_version" }
 unexpected = { path = "../util/unexpected" }
+journaldb = { path = "../util/journaldb" }
 
 [dev-dependencies]
 native-contracts = { path = "native_contracts", features = ["test_contracts"] }
@@ -81,11 +78,9 @@ native-contracts = { path = "native_contracts", features = ["test_contracts"] }
 [features]
 jit = ["evm/jit"]
 evm-debug = ["slow-blocks"]
-evm-debug-tests = ["evm-debug"]
+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 = []
 test-heavy = []
-dev = ["clippy"]
 default = []
 benches = []
-ipc = []

ethcore/evm/Cargo.toml

@@ -5,24 +5,21 @@ authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 bit-set = "0.4"
-byteorder = "1.0"
-common-types = { path = "../types" }
 ethcore-util = { path = "../../util" }
 ethcore-bigint = { path = "../../util/bigint" }
 evmjit = { path = "../../evmjit", optional = true }
-ethjson = { path = "../../json" }
 heapsize = "0.4"
 lazy_static = "0.2"
 log = "0.3"
-rlp = { path = "../../util/rlp" }
 vm = { path = "../vm" }
-ethcore-logger = { path = "../../logger" }
-wasm-utils = { git = "https://github.com/paritytech/wasm-utils" }
-hash = { path = "../../util/hash" }
+keccak-hash = { path = "../../util/hash" }
 parking_lot = "0.4"
+memory-cache = { path = "../../util/memory_cache" }
 
 [dev-dependencies]
 rustc-hex = "1.0"
 
 [features]
 jit = ["evmjit"]
+evm-debug = []
+evm-debug-tests = ["evm-debug"]

ethcore/evm/src/factory.rs

@@ -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

@@ -32,7 +32,6 @@ macro_rules! overflowing {
 	}}
 }
 
-#[cfg_attr(feature="dev", allow(enum_variant_names))]
 enum Request<Cost: ::evm::CostType> {
 	Gas(Cost),
 	GasMem(Cost, Cost),
@@ -101,7 +100,6 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 		}
 	}
 
-	#[cfg_attr(feature="dev", allow(cyclomatic_complexity))]
 	/// Determine how much gas is used by the given instruction, given the machine's state.
 	///
 	/// We guarantee that the final element of the returned tuple (`provided`) will be `Some`

ethcore/evm/src/interpreter/informant.rs

@@ -39,12 +39,12 @@ mod inner {
 	use std::collections::HashMap;
 	use std::time::{Instant, Duration};
 
-	use evm::interpreter::stack::Stack;
-	use evm::instructions::{Instruction, InstructionInfo, INSTRUCTIONS};
-	use evm::{CostType};
-
 	use bigint::prelude::U256;
 
+	use interpreter::stack::Stack;
+	use instructions::{Instruction, InstructionInfo, INSTRUCTIONS};
+	use CostType;
+
 	macro_rules! evm_debug {
 		($x: expr) => {
 			$x
@@ -110,7 +110,7 @@ mod inner {
 		}
 
 		pub fn after_instruction(&mut self, instruction: Instruction) {
-			let mut stats = self.stats.entry(instruction).or_insert_with(|| Stats::default());
+			let stats = self.stats.entry(instruction).or_insert_with(|| Stats::default());
 			let took = self.last_instruction.elapsed();
 			stats.note(took);
 		}

ethcore/evm/src/interpreter/mod.rs

@@ -66,7 +66,6 @@ struct CodeReader<'a> {
 	code: &'a [u8]
 }
 
-#[cfg_attr(feature="dev", allow(len_without_is_empty))]
 impl<'a> CodeReader<'a> {
 
 	/// Create new code reader - starting at position 0.
@@ -287,7 +286,6 @@ impl<Cost: CostType> Interpreter<Cost> {
 		}
 	}
 
-	#[cfg_attr(feature="dev", allow(too_many_arguments))]
 	fn exec_instruction(
 		&mut self,
 		gas: Cost,
@@ -322,20 +320,24 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let init_off = stack.pop_back();
 				let init_size = stack.pop_back();
 
-				let address_scheme = if instruction == instructions::CREATE { CreateContractAddress::FromSenderAndNonce } else { CreateContractAddress::FromSenderAndCodeHash };
 				let create_gas = provided.expect("`provided` comes through Self::exec from `Gasometer::get_gas_cost_mem`; `gas_gas_mem_cost` guarantees `Some` when instruction is `CALL`/`CALLCODE`/`DELEGATECALL`/`CREATE`; this is `CREATE`; qed");
 
-				let contract_code = self.mem.read_slice(init_off, init_size);
-				let can_create = ext.balance(&params.address)? >= endowment && ext.depth() < ext.schedule().max_depth;
+				if ext.is_static() {
+					return Err(vm::Error::MutableCallInStaticContext);
+				}
 
 				// clear return data buffer before creating new call frame.
 				self.return_data = ReturnData::empty();
 
+				let can_create = ext.balance(&params.address)? >= endowment && ext.depth() < ext.schedule().max_depth;
 				if !can_create {
 					stack.push(U256::zero());
 					return Ok(InstructionResult::UnusedGas(create_gas));
 				}
 
+				let contract_code = self.mem.read_slice(init_off, init_size);
+				let address_scheme = if instruction == instructions::CREATE { CreateContractAddress::FromSenderAndNonce } else { CreateContractAddress::FromSenderAndCodeHash };
+
 				let create_result = ext.create(&create_gas.as_u256(), &endowment, contract_code, address_scheme);
 				return match create_result {
 					ContractCreateResult::Created(address, gas_left) => {
@@ -351,9 +353,6 @@ impl<Cost: CostType> Interpreter<Cost> {
 						stack.push(U256::zero());
 						Ok(InstructionResult::Ok)
 					},
-					ContractCreateResult::FailedInStaticCall => {
-						Err(vm::Error::MutableCallInStaticContext)
-					},
 				};
 			},
 			instructions::CALL | instructions::CALLCODE | instructions::DELEGATECALL | instructions::STATICCALL => {
@@ -915,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() {
@@ -933,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()
 		};
 
@@ -955,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

@@ -19,7 +19,7 @@ use hash::KECCAK_EMPTY;
 use heapsize::HeapSizeOf;
 use bigint::hash::H256;
 use parking_lot::Mutex;
-use util::cache::MemoryLruCache;
+use memory_cache::MemoryLruCache;
 use bit_set::BitSet;
 use super::super::instructions;
 

ethcore/evm/src/lib.rs

@@ -16,23 +16,19 @@
 
 //! Ethereum virtual machine.
 
-extern crate byteorder;
 extern crate bit_set;
-extern crate common_types as types;
 extern crate ethcore_util as util;
 extern crate ethcore_bigint as bigint;
-extern crate ethjson;
-extern crate rlp;
 extern crate parking_lot;
-extern crate wasm_utils;
-extern crate ethcore_logger;
 extern crate heapsize;
 extern crate vm;
-extern crate hash;
+extern crate keccak_hash as hash;
+extern crate memory_cache;
 
 #[macro_use]
 extern crate lazy_static;
 
+#[cfg_attr(feature = "evm-debug", macro_use)]
 extern crate log;
 
 #[cfg(feature = "jit")]

ethcore/evm/src/tests.rs

@@ -40,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()
 	};
 
@@ -60,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()
 	};
 
@@ -80,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()
 	};
 
@@ -102,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()
 	};
 
@@ -124,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()
 	};
 
@@ -159,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()
 	};
 
@@ -179,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()
 	};
 
@@ -211,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()
 	};
 
@@ -236,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()
 	};
 
@@ -258,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()
 	};
 
@@ -279,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()
 	};
 
@@ -299,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()
 	};
 
@@ -319,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()
 	};
 
@@ -339,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()
 	};
 
@@ -359,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()
 	};
 
@@ -377,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()
 	};
 
@@ -395,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()
 	};
 
@@ -413,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()
 	};
 
@@ -431,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()
 	};
 
@@ -449,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()
 	};
 
@@ -468,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()
 	};
 
@@ -487,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()
 	};
 
@@ -506,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()
 	};
 
@@ -526,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()
 	};
 
@@ -547,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()
 	};
 
@@ -568,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()
 	};
 
@@ -591,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()
 	};
 
@@ -612,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()
 	};
 
@@ -631,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()
 	};
 
@@ -651,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()
 	};
 
@@ -671,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()
 	};
 
@@ -691,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()
 	};
 
@@ -714,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()
 	};
 
@@ -724,7 +724,6 @@ fn test_jumps(factory: super::Factory) {
 	assert_eq!(gas_left, U256::from(54_117));
 }
 
-
 evm_test!{test_calls: test_calls_jit, test_calls_int}
 fn test_calls(factory: super::Factory) {
 	let code = "600054602d57600160005560006000600060006050610998610100f160006000600060006050610998610100f25b".from_hex().unwrap();
@@ -743,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()
 	};
 
@@ -769,6 +768,27 @@ fn test_calls(factory: super::Factory) {
 	assert_eq!(ext.calls.len(), 2);
 }
 
+evm_test!{test_create_in_staticcall: test_create_in_staticcall_jit, test_create_in_staticcall_int}
+fn test_create_in_staticcall(factory: super::Factory) {
+	let code = "600060006064f000".from_hex().unwrap();
+
+	let address = Address::from(0x155);
+	let mut params = ActionParams::default();
+	params.gas = U256::from(100_000);
+	params.code = Some(Arc::new(code));
+	params.address = address.clone();
+	let mut ext = FakeExt::new_byzantium();
+	ext.is_static = true;
+
+	let err = {
+		let mut vm = factory.create(&params.gas);
+		test_finalize(vm.exec(params, &mut ext)).unwrap_err()
+	};
+
+	assert_eq!(err, vm::Error::MutableCallInStaticContext);
+	assert_eq!(ext.calls.len(), 0);
+}
+
 fn assert_set_contains<T : Debug + Eq + PartialEq + Hash>(set: &HashSet<T>, val: &T) {
 	let contains = set.contains(val);
 	if !contains {

ethcore/light/Cargo.toml

@@ -3,12 +3,8 @@ description = "Parity Light Client Implementation"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-light"
-version = "1.8.0"
+version = "1.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-build = "build.rs"
-
-[build-dependencies]
-"ethcore-ipc-codegen" = { path = "../../ipc/codegen", optional = true }
 
 [dependencies]
 log = "0.3"
@@ -17,12 +13,9 @@ ethcore-util = { path = "../../util" }
 ethcore-bigint = { path = "../../util/bigint" }
 ethcore-bytes = { path = "../../util/bytes" }
 memorydb = { path = "../../util/memorydb" }
-patricia_trie = { path = "../../util/patricia_trie" }
+patricia-trie = { path = "../../util/patricia_trie" }
 ethcore-network = { path = "../../util/network" }
 ethcore-io = { path = "../../util/io" }
-ethcore-ipc = { path = "../../ipc/rpc", optional = true }
-ethcore-devtools = { path = "../../devtools" }
-evm = { path = "../evm" }
 heapsize = "0.4"
 vm = { path = "../vm" }
 rlp = { path = "../../util/rlp" }
@@ -37,10 +30,15 @@ serde = "1.0"
 serde_derive = "1.0"
 parking_lot = "0.4"
 stats = { path = "../../util/stats" }
-hash = { path = "../../util/hash" }
+keccak-hash = { path = "../../util/hash" }
 triehash = { path = "../../util/triehash" }
 kvdb = { path = "../../util/kvdb" }
+kvdb-rocksdb = { path = "../../util/kvdb-rocksdb" }
+kvdb-memorydb = { path = "../../util/kvdb-memorydb" }
+memory-cache = { path = "../../util/memory_cache" }
+
+[dev-dependencies]
+tempdir = "0.3"
 
 [features]
 default = []
-ipc = ["ethcore-ipc", "ethcore-ipc-codegen"]

ethcore/light/src/cache.rs

@@ -29,7 +29,7 @@ use time::{SteadyTime, Duration};
 use heapsize::HeapSizeOf;
 use bigint::prelude::U256;
 use bigint::hash::H256;
-use util::cache::MemoryLruCache;
+use memory_cache::MemoryLruCache;
 
 /// Configuration for how much data to cache.
 #[derive(Debug, Clone, PartialEq, Eq)]

ethcore/light/src/client/header_chain.rs

@@ -45,7 +45,7 @@ use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp, UntrustedRlp};
 use heapsize::HeapSizeOf;
 use bigint::prelude::U256;
 use bigint::hash::{H256, H256FastMap, H264};
-use kvdb::{DBTransaction, KeyValueDB};
+use kvdb::{self, DBTransaction, KeyValueDB};
 
 use cache::Cache;
 use parking_lot::{Mutex, RwLock};
@@ -198,7 +198,7 @@ impl HeaderChain {
 		col: Option<u32>,
 		spec: &Spec,
 		cache: Arc<Mutex<Cache>>,
-	) -> Result<Self, String> {
+	) -> Result<Self, kvdb::Error> {
 		let mut live_epoch_proofs = ::std::collections::HashMap::default();
 
 		let genesis = ::rlp::encode(&spec.genesis_header()).into_vec();
@@ -240,7 +240,7 @@ impl HeaderChain {
 			let best_block = {
 				let era = match candidates.get(&best_number) {
 					Some(era) => era,
-					None => return Err(format!("Database corrupt: highest block referenced but no data.")),
+					None => return Err("Database corrupt: highest block referenced but no data.".into()),
 				};
 
 				let best = &era.candidates[0];
@@ -728,13 +728,14 @@ mod tests {
 	use ethcore::header::Header;
 	use ethcore::spec::Spec;
   	use cache::Cache;
-	use kvdb::{in_memory, KeyValueDB};
+	use kvdb::KeyValueDB;
+	use kvdb_memorydb;
 
 	use time::Duration;
 	use parking_lot::Mutex;
 
 	fn make_db() -> Arc<KeyValueDB> {
-		Arc::new(in_memory(0))
+		Arc::new(kvdb_memorydb::create(0))
 	}
 
 	#[test]

ethcore/light/src/client/mod.rs

@@ -36,7 +36,8 @@ use bigint::prelude::U256;
 use bigint::hash::H256;
 use futures::{IntoFuture, Future};
 
-use kvdb::{KeyValueDB, CompactionProfile};
+use kvdb::{self, KeyValueDB};
+use kvdb_rocksdb::CompactionProfile;
 
 use self::fetch::ChainDataFetcher;
 use self::header_chain::{AncestryIter, HeaderChain};
@@ -186,7 +187,7 @@ impl<T: ChainDataFetcher> Client<T> {
 		fetcher: T,
 		io_channel: IoChannel<ClientIoMessage>,
 		cache: Arc<Mutex<Cache>>
-	) -> Result<Self, String> {
+	) -> Result<Self, kvdb::Error> {
 		Ok(Client {
 			queue: HeaderQueue::new(config.queue, spec.engine.clone(), io_channel, config.check_seal),
 			engine: spec.engine.clone(),
@@ -214,7 +215,7 @@ impl<T: ChainDataFetcher> Client<T> {
 		io_channel: IoChannel<ClientIoMessage>,
 		cache: Arc<Mutex<Cache>>
 	) -> Self {
-		let db = ::kvdb::in_memory(0);
+		let db = ::kvdb_memorydb::create(0);
 
 		Client::new(
 			config,

ethcore/light/src/client/service.rs

@@ -25,7 +25,8 @@ use ethcore::db;
 use ethcore::service::ClientIoMessage;
 use ethcore::spec::Spec;
 use io::{IoContext, IoError, IoHandler, IoService};
-use kvdb::{Database, DatabaseConfig};
+use kvdb;
+use kvdb_rocksdb::{Database, DatabaseConfig};
 
 use cache::Cache;
 use parking_lot::Mutex;
@@ -36,7 +37,7 @@ use super::{ChainDataFetcher, Client, Config as ClientConfig};
 #[derive(Debug)]
 pub enum Error {
 	/// Database error.
-	Database(String),
+	Database(kvdb::Error),
 	/// I/O service error.
 	Io(IoError),
 }
@@ -63,11 +64,7 @@ impl<T: ChainDataFetcher> Service<T> {
 		// initialize database.
 		let mut db_config = DatabaseConfig::with_columns(db::NUM_COLUMNS);
 
-		// give all rocksdb cache to the header chain column.
-		if let Some(size) = config.db_cache_size {
-			db_config.set_cache(db::COL_LIGHT_CHAIN, size);
-		}
-
+		db_config.memory_budget = config.db_cache_size;
 		db_config.compaction = config.db_compaction;
 		db_config.wal = config.db_wal;
 
@@ -119,7 +116,6 @@ impl<T: ChainDataFetcher> IoHandler<ClientIoMessage> for ImportBlocks<T> {
 #[cfg(test)]
 mod tests {
 	use super::Service;
-	use devtools::RandomTempPath;
 	use ethcore::spec::Spec;
 
 	use std::sync::Arc;
@@ -127,13 +123,14 @@ mod tests {
 	use client::fetch;
 	use time::Duration;
 	use parking_lot::Mutex;
+	use tempdir::TempDir;
 
 	#[test]
 	fn it_works() {
+		let tempdir = TempDir::new("").unwrap();
 		let spec = Spec::new_test();
-		let temp_path = RandomTempPath::new();
 		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::hours(6))));
 
-		Service::start(Default::default(), &spec, fetch::unavailable(), temp_path.as_path(), cache).unwrap();
+		Service::start(Default::default(), &spec, fetch::unavailable(), tempdir.path(), cache).unwrap();
 	}
 }

ethcore/light/src/lib.rs

@@ -38,21 +38,8 @@ pub mod net;
 pub mod on_demand;
 pub mod transaction_queue;
 pub mod cache;
-
-#[cfg(not(feature = "ipc"))]
 pub mod provider;
 
-#[cfg(feature = "ipc")]
-pub mod provider {
-	#![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues
-	include!(concat!(env!("OUT_DIR"), "/provider.rs"));
-}
-
-#[cfg(feature = "ipc")]
-pub mod remote {
-	pub use provider::LightProviderClient;
-}
-
 mod types;
 
 pub use self::cache::Cache;
@@ -73,7 +60,6 @@ extern crate ethcore_util as util;
 extern crate ethcore_bigint as bigint;
 extern crate ethcore_bytes as bytes;
 extern crate ethcore;
-extern crate evm;
 extern crate heapsize;
 extern crate futures;
 extern crate itertools;
@@ -89,12 +75,12 @@ extern crate smallvec;
 extern crate stats;
 extern crate time;
 extern crate vm;
-extern crate hash;
+extern crate keccak_hash as hash;
 extern crate triehash;
 extern crate kvdb;
-
-#[cfg(feature = "ipc")]
-extern crate ethcore_ipc as ipc;
+extern crate kvdb_memorydb;
+extern crate kvdb_rocksdb;
+extern crate memory_cache;
 
 #[cfg(test)]
-extern crate ethcore_devtools as devtools;
+extern crate tempdir;

ethcore/light/src/net/error.rs

@@ -17,10 +17,8 @@
 //! Defines error types and levels of punishment to use upon
 //! encountering.
 
-use rlp::DecoderError;
-use network::NetworkError;
-
 use std::fmt;
+use {rlp, network};
 
 /// Levels of punishment.
 ///
@@ -41,9 +39,9 @@ pub enum Punishment {
 #[derive(Debug)]
 pub enum Error {
 	/// An RLP decoding error.
-	Rlp(DecoderError),
+	Rlp(rlp::DecoderError),
 	/// A network error.
-	Network(NetworkError),
+	Network(network::Error),
 	/// Out of credits.
 	NoCredits,
 	/// Unrecognized packet code.
@@ -92,14 +90,14 @@ impl Error {
 	}
 }
 
-impl From<DecoderError> for Error {
-	fn from(err: DecoderError) -> Self {
+impl From<rlp::DecoderError> for Error {
+	fn from(err: rlp::DecoderError) -> Self {
 		Error::Rlp(err)
 	}
 }
 
-impl From<NetworkError> for Error {
-	fn from(err: NetworkError) -> Self {
+impl From<network::Error> for Error {
+	fn from(err: network::Error) -> Self {
 		Error::Network(err)
 	}
 }

ethcore/light/src/net/load_timer.rs

@@ -264,8 +264,9 @@ mod tests {
 
 	#[test]
 	fn file_store() {
-		let path = ::devtools::RandomTempPath::new();
-		let store = FileStore(path.as_path().clone());
+		let tempdir = ::tempdir::TempDir::new("").unwrap();
+		let path = tempdir.path().join("file");
+		let store = FileStore(path);
 
 		let mut samples = store.load();
 		assert!(samples.is_empty());

ethcore/light/src/on_demand/mod.rs

@@ -18,6 +18,7 @@
 //! 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;
@@ -28,6 +29,7 @@ use futures::{Async, Poll, Future};
 use futures::sync::oneshot::{self, Sender, Receiver, Canceled};
 use network::PeerId;
 use parking_lot::{RwLock, Mutex};
+use rand;
 
 use net::{
 	self, Handler, PeerStatus, Status, Capabilities,
@@ -90,7 +92,14 @@ impl Pending {
 			match self.requests[idx].respond_local(cache) {
 				Some(response) => {
 					self.requests.supply_response_unchecked(&response);
+
+					// update header and back-references after each from-cache
+					// response to ensure that the requests are left in a consistent
+					// state and increase the likelihood of being able to answer
+					// the next request from cache.
 					self.update_header_refs(idx, &response);
+					self.fill_unanswered();
+
 					self.responses.push(response);
 				}
 				None => break,
@@ -382,7 +391,10 @@ impl OnDemand {
 				true => None,
 			})
 			.filter_map(|pending| {
-				for (peer_id, peer) in peers.iter() { // .shuffle?
+				// the peer we dispatch to is chosen randomly
+				let num_peers = peers.len();
+				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?
 
 					if !peer.can_fulfill(&pending.required_capabilities) {

ethcore/light/src/provider.rs

@@ -34,7 +34,6 @@ use transaction_queue::TransactionQueue;
 use request;
 
 /// Defines the operations that a provider for the light subprotocol must fulfill.
-#[cfg_attr(feature = "ipc", ipc(client_ident="LightProviderClient"))]
 pub trait Provider: Send + Sync {
 	/// Provide current blockchain info.
 	fn chain_info(&self) -> BlockChainInfo;
@@ -328,7 +327,7 @@ impl<L: AsLightClient + Send + Sync> Provider for LightProvider<L> {
 	}
 
 	fn transaction_index(&self, _req: request::CompleteTransactionIndexRequest)
-		-> Option<request::TransactionIndexResponse> 
+		-> Option<request::TransactionIndexResponse>
 	{
 		None
 	}

ethcore/light/src/transaction_queue.rs

@@ -321,6 +321,11 @@ impl TransactionQueue {
 			self.by_hash.remove(&hash);
 		}
 	}
+
+	/// Get a transaction by hash.
+	pub fn get(&self, hash: &H256) -> Option<&PendingTransaction> {
+		self.by_hash.get(&hash)
+	}
 }
 
 #[cfg(test)]

ethcore/light/src/types/mod.rs

@@ -14,11 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Types used in the public (IPC) api which require custom code generation.
-#![cfg_attr(feature = "ipc", allow(dead_code, unused_assignments, unused_variables))] // codegen issues
-
-#[cfg(feature = "ipc")]
-include!(concat!(env!("OUT_DIR"), "/mod.rs.in"));
-
-#[cfg(not(feature = "ipc"))]
-include!("mod.rs.in");
+pub mod request;

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

@@ -204,7 +204,6 @@ pub enum OutputKind {
 
 /// Either a hash or a number.
 #[derive(Debug, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "ipc", binary)]
 pub enum HashOrNumber {
 	/// Block hash variant.
 	Hash(H256),

ethcore/native_contracts/Cargo.toml

@@ -6,7 +6,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 
 [dependencies]
-ethabi = "2.0"
+ethabi = "4.0"
 futures = "0.1"
 byteorder = "1.0"
 ethcore-bigint = { path = "../../util/bigint" }

ethcore/native_contracts/build.rs

@@ -26,6 +26,7 @@ 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");
@@ -53,6 +54,7 @@ fn main() {
 	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");

ethcore/native_contracts/generator/Cargo.toml

@@ -5,5 +5,5 @@ version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
-ethabi = "2.0"
+ethabi = "4.0"
 heck = "0.2"

ethcore/native_contracts/generator/src/lib.rs

@@ -21,18 +21,17 @@
 //! due to missing crates or name collisions. This will change when
 //! it can be ported to a procedural macro.
 
-use ethabi::Contract;
-use ethabi::spec::{Interface, ParamType, Error as AbiError};
-use heck::SnakeCase;
-
 extern crate ethabi;
 extern crate heck;
 
+use ethabi::{Contract, ParamType};
+use heck::SnakeCase;
+
 /// Errors in generation.
 #[derive(Debug)]
 pub enum Error {
 	/// Bad ABI.
-	Abi(AbiError),
+	Abi(ethabi::Error),
 	/// Unsupported parameter type in given function.
 	UnsupportedType(String, ParamType),
 }
@@ -41,13 +40,13 @@ pub enum Error {
 /// 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::new(Interface::load(abi.as_bytes()).map_err(Error::Abi)?);
+	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::{{Contract, Interface, Token, Event}};
+use ethabi::{{Bytes, Contract, Token, Event}};
 use bigint;
 
 type BoxFuture<A, B> = Box<Future<Item = A, Error = B> + Send>;
@@ -66,8 +65,8 @@ 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::new(Interface::load(ABI.as_bytes())
-			.expect("ABI checked at generation-time; qed"));
+		let contract = Contract::load(ABI.as_bytes())
+			.expect("ABI checked at generation-time; qed");
 		{name} {{
 			contract: contract,
 			address: address,
@@ -92,16 +91,16 @@ impl {name} {{
 fn generate_functions(contract: &Contract) -> Result<String, Error> {
 	let mut functions = String::new();
 	for function in contract.functions() {
-		let name = function.name();
+		let name = &function.name;
 		let snake_name = name.to_snake_case();
-		let inputs = function.input_params();
-		let outputs = function.output_params();
+		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, to_tokens) = input_params_codegen(&inputs)
-			.map_err(|bad_type| Error::UnsupportedType(name.into(), bad_type))?;
+		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.into(), bad_type))?;
+			.map_err(|bad_type| Error::UnsupportedType(name.clone(), bad_type))?;
 
 		functions.push_str(&format!(r##"
 /// Call the function "{abi_name}" on the contract.
@@ -114,27 +113,37 @@ pub fn {snake_name}<F, U>(&self, call: F, {params}) -> BoxFuture<{output_type},
 	    U: IntoFuture<Item=Vec<u8>, Error=String>,
 		U::Future: Send + 'static
 {{
-	let function = self.contract.function(r#"{abi_name}"#)
-		.expect("function existence checked at compile-time; qed");
 	let call_addr = self.address;
-
-	let call_future = match function.encode_call({to_tokens}) {{
+	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(format!("Error encoding call: {{:?}}", e))),
+		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)))
+		.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,
@@ -146,15 +155,17 @@ pub fn {snake_name}<F, U>(&self, call: F, {params}) -> BoxFuture<{output_type},
 
 // generate code for params in function signature and turning them into tokens.
 //
-// two pieces of code are generated: the first gives input types for the function signature,
-// and the second gives code to tokenize those inputs.
+// 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), ParamType> {
+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() {
@@ -165,11 +176,13 @@ fn input_params_codegen(inputs: &[ParamType]) -> Result<(String, String), ParamT
 		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, to_tokens))
+	Ok((params, params_names, to_tokens))
 }
 
 // generate code for outputs of the function and detokenizing them.
@@ -325,7 +338,7 @@ fn detokenize(name: &str, output_type: ParamType) -> String {
 
 #[cfg(test)]
 mod tests {
-	use ethabi::spec::ParamType;
+	use ethabi::ParamType;
 
 	#[test]
 	fn input_types() {

ethcore/native_contracts/res/secretstore_service.json

@@ -0,0 +1,8 @@
+[
+	{"constant":true,"inputs":[],"name":"serverKeyGenerationRequestsCount","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},
+	{"constant":true,"inputs":[{"name":"index","type":"uint256"}],"name":"getServerKeyId","outputs":[{"name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},
+	{"constant":false,"inputs":[{"name":"serverKeyId","type":"bytes32"},{"name":"serverKeyPublic","type":"bytes"},{"name":"v","type":"uint8"},{"name":"r","type":"bytes32"},{"name":"s","type":"bytes32"}],"name":"serverKeyGenerated","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},
+	{"constant":true,"inputs":[{"name":"serverKeyId","type":"bytes32"}],"name":"getServerKeyThreshold","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},
+	{"constant":true,"inputs":[{"name":"serverKeyId","type":"bytes32"},{"name":"authority","type":"address"}],"name":"getServerKeyConfirmationStatus","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},
+	{"anonymous":false,"inputs":[{"indexed":true,"name":"serverKeyId","type":"bytes32"},{"indexed":true,"name":"threshold","type":"uint256"}],"name":"ServerKeyRequested","type":"event"}
+]

ethcore/native_contracts/src/lib.rs

@@ -28,6 +28,7 @@ mod registry;
 mod urlhint;
 mod service_transaction;
 mod secretstore_acl_storage;
+mod secretstore_service;
 mod validator_set;
 mod validator_report;
 mod peer_set;
@@ -40,6 +41,7 @@ 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;

ethcore/native_contracts/src/secretstore_service.rs

@@ -14,8 +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/>.
 
-extern crate ethcore_ipc_codegen;
+#![allow(unused_mut, unused_variables, unused_imports)]
 
-fn main() {
-	ethcore_ipc_codegen::derive_ipc("src/service.rs.in").unwrap();
-}
+//! Secret store service contract.
+
+include!(concat!(env!("OUT_DIR"), "/secretstore_service.rs"));

ethcore/node_filter/Cargo.toml

@@ -3,7 +3,7 @@ description = "Parity smart network connections"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "node-filter"
-version = "1.8.0"
+version = "1.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
@@ -11,10 +11,12 @@ ethcore = { path = ".."}
 ethcore-util = { path = "../../util" }
 ethcore-bigint = { path = "../../util/bigint" }
 ethcore-bytes = { path = "../../util/bytes" }
-ethcore-io = { path = "../../util/io" }
 ethcore-network = { path = "../../util/network" }
-kvdb = { path = "../../util/kvdb" }
 native-contracts = { path = "../native_contracts" }
 futures = "0.1"
 log = "0.3"
 parking_lot = "0.4"
+
+[dev-dependencies]
+kvdb-memorydb = { path = "../../util/kvdb-memorydb" }
+ethcore-io = { path = "../../util/io" }

ethcore/node_filter/src/lib.rs

@@ -24,9 +24,14 @@ extern crate ethcore_network as network;
 extern crate native_contracts;
 extern crate futures;
 extern crate parking_lot;
-extern crate kvdb;
-#[cfg(test)] extern crate ethcore_io as io;
-#[macro_use] extern crate log;
+
+#[macro_use]
+extern crate log;
+
+#[cfg(test)]
+extern crate kvdb_memorydb;
+#[cfg(test)]
+extern crate ethcore_io as io;
 
 use std::sync::Weak;
 use std::collections::HashMap;
@@ -135,7 +140,7 @@ mod test {
 		let contract_addr = Address::from_str("0000000000000000000000000000000000000005").unwrap();
 		let data = include_bytes!("../res/node_filter.json");
 		let spec = Spec::load(&::std::env::temp_dir(), &data[..]).unwrap();
-		let client_db = Arc::new(::kvdb::in_memory(::ethcore::db::NUM_COLUMNS.unwrap_or(0)));
+		let client_db = Arc::new(::kvdb_memorydb::create(::ethcore::db::NUM_COLUMNS.unwrap_or(0)));
 
 		let client = Client::new(
 			ClientConfig::default(),

ethcore/res/ethereum/byzantium_test.json

@@ -26,6 +26,7 @@
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
 		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": "0x0",
 		"eip98Transition": "0xffffffffffffffff",
 		"eip140Transition": "0x0",
 		"eip211Transition": "0x0",

ethcore/res/ethereum/classic.json

@@ -15,7 +15,8 @@
 				"ecip1010ContinueTransition": 5000000,
 				"ecip1017EraRounds": 5000000,
 				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
+				"eip161dTransition": "0x7fffffffffffffff",
+				"bombDefuseTransition": 5900000
 			}
 		}
 	},

ethcore/res/ethereum/constantinople_test.json

@@ -26,6 +26,7 @@
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
 		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": "0x0",
 		"eip98Transition": "0xffffffffffffffff",
 		"eip140Transition": "0x0",
 		"eip210Transition": "0x0",

ethcore/res/ethereum/eip150_test.json

@@ -25,7 +25,8 @@
 		"eip98Transition": "0x7fffffffffffffff",
 		"eip86Transition": "0x7fffffffffffffff",
 		"eip155Transition": "0x7fffffffffffffff",
-		"maxCodeSize": 24576
+		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": "0x7fffffffffffffff"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/ethereum/eip161_test.json

@@ -25,7 +25,8 @@
 		"eip98Transition": "0x7fffffffffffffff",
 		"eip86Transition": "0x7fffffffffffffff",
 		"eip155Transition": "0x7fffffffffffffff",
-		"maxCodeSize": 24576
+		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": "0x0"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/ethereum/ellaism.json

@@ -0,0 +1,72 @@
+{
+  "name": "Ellaism",
+  "dataDir": "ellaism",
+  "engine": {
+    "Ethash": {
+      "params": {
+        "minimumDifficulty": "0x020000",
+        "difficultyBoundDivisor": "0x0800",
+        "durationLimit": "0x0d",
+        "blockReward": "0x4563918244F40000",
+        "homesteadTransition": "0x0",
+        "bombDefuseTransition": "0x0",
+        "eip150Transition": "0x0",
+        "eip160Transition": "0x0",
+        "ecip1017EraRounds": 10000000,
+
+        "eip161abcTransition": "0x7fffffffffffffff",
+        "eip161dTransition": "0x7fffffffffffffff"
+      }
+    }
+  },
+  "params": {
+    "gasLimitBoundDivisor": "0x0400",
+    "registrar": "0x3bb2bb5c6c9c9b7f4EF430b47Dc7e026310042ea",
+    "accountStartNonce": "0x00",
+    "maximumExtraDataSize": "0x20",
+    "minGasLimit": "0x1388",
+    "networkID": "0x40",
+    "chainID": "0x40",
+    "eip155Transition": "0x0",
+    "eip98Transition": "0x7fffffffffffff",
+    "eip86Transition": "0x7fffffffffffff"
+  },
+  "genesis": {
+    "seal": {
+      "ethereum": {
+        "nonce": "0x0000000000000040",
+        "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      }
+    },
+    "difficulty": "0x40000000",
+    "author": "0x0000000000000000000000000000000000000000",
+    "timestamp": "0x00",
+    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "gasLimit": "0x1388"
+  },
+  "nodes": [
+    "enode://98b48cc7149326d00a57994ad55014a095a3e5cd4f0144cd7b034fb667d8e8017082bd90047d72c4403798b8ece11a33bd2e344d6500faba30889ebcfa5316fa@172.104.163.204:30303",
+    "enode://834246cc2a7584df29ccdcf3b5366f118a0e291264980376769e809665a02c4caf0d68c43eecf8390dbeaf861823b05583807af0a62542a1f3f717046b958a76@45.77.106.33:30303",
+    "enode://d1373d7187a20d695220fafb5746a289786bad92469d6bbe800f07572f8f444479f507cfcb8fcd8f5bee5dd44efb6185df4a1e4f1a7170408ada9876ef5b3fe4@178.79.189.58:30303",
+    "enode://d8059dcb137cb52b8960ca82613eeba1d121105572decd8f1d3ea22b09070645eeab548d2a3cd2914f206e1331c7870bd2bd5a231ebac6b3d4886ec3b8e627e5@173.212.216.105:30303",
+    "enode://5a89c8664d29a321fd4cb1b55b0f0be832ce376b5e7feb14a2073fdbd9bd7b7394169ed289dd991112b42ecfb74ea36e436bc72a1c99dcdb50d96eaf3b0ed254@213.136.91.42:30303",
+    "enode://9215ad77bd081e35013cb42a8ceadff9d8e94a78fcc680dff1752a54e7484badff0904e331c4b40a68be593782e55acfd800f076d22f9d2832e8483733ade149@213.14.82.125:30303",
+    "enode://07913818dafbadf44d4fc796fa414ec1d720ecfb087eff37efbe7134556658e92351559de788fa319c291e40b915cc26d902069d03bd935553d4efa688bdbbf8@45.32.19.37:30303",
+    "enode://645a59b6e6e20ed8864767a1d0c731f89ae276ed4e04c4f10becce655532d95cbe1bc9e2da3f13a6564f9ca8fe46fab2781a380b3a89148bccac883d6068f684@45.77.159.123:30303",
+    "enode://7c2f43b2e7fded9469917311574d267427e62cd12e1864effd15f31c1246e4e955463d843acaa37309693a515df7986cb6d160b7e85a4ca2779a798a72d90850@108.61.194.191:30303",
+    "enode://5dd35866da95aea15211fb1f98684f6e8c4e355e6aa3cc17585680ed53fa164477b8c52cb6ca4b24ec4d80f3d48ff9212b53feb131d825c7945a3abaaf02d24d@178.79.189.58:60606",
+    "enode://6c585c18024eb902ca093278af73b04863ac904caabc39ac2920c23532307c572ad92afd828a990c980d272b1f26307f2409cc97aec3ff9fe866732cae49a8c2@144.217.163.224:31337",
+    "enode://edd90c4cc64528802ad52fd127d80b641ff80fd43fa5292fb111c8bd2914482dffee288fd1b0d26440c6b2c669b10a53cbcd37c895ba0d6194110e100a965b2d@188.166.179.159:30303",
+    "enode://d19783546438e8bfc11a35457ff1f47871a2ce4801b9b2dbe7606321a9ce29007305497eb8c98d7ae9dc5a913ee5533c3691b1080f7066697c4276e6140d2eac@45.77.47.184:30303",
+    "enode://13ed57615447bc9bf1da4e28249369babc00d2530d6c103c12350453e469a5e90cbcdb787c436977467f5864be6e64f2520180fc60b841c8c3daf84df9450190@104.207.152.17:30303",
+    "enode://59c228a6a0939a0b53edf6924bc7bd1384652dc1da0777495acd0707975f485f54a77c7b2dcbeece9340a43ccd9c7ea70f0cdfe48936537d238b50e5cb5dc0b2@45.77.233.0:30303",
+    "enode://9d960373335c1cc38ca696dea8f2893e2a071c8f21524f21e8aae22be032acc3b67797b1d21e866f9d832943ae7d9555b8466c6ab34f473d21e547114952df37@213.32.53.183:30303"
+  ],
+  "accounts": {
+    "0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+    "0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+    "0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+    "0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }
+  }
+}

ethcore/res/ethereum/expanse.json

@@ -6,7 +6,7 @@
 			"params": {
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
-				"difficultyIncrementDivisor": "60",
+				"difficultyIncrementDivisor": "0x3C",
 				"durationLimit": "0x3C",
 				"blockReward": "0x6f05b59d3b200000",
 				"homesteadTransition": "0x30d40",
@@ -16,7 +16,13 @@
 				"eip150Transition": "0x927C0",
 				"eip160Transition": "0x927C0",
 				"eip161abcTransition": "0x927C0",
-				"eip161dTransition": "0x927C0"
+				"eip161dTransition": "0x927C0",
+				"eip100bTransition": "0xC3500",
+				"metropolisDifficultyIncrementDivisor": "0x1E",
+				"eip649Transition": "0xC3500",
+				"eip649Reward": "0x3782DACE9D900000",
+				"expip2Transition": "0xC3500",
+				"expip2DurationLimit": "0x1E"
 			}
 		}
 	},
@@ -28,10 +34,16 @@
 		"minGasLimit": "0x1388",
 		"networkID": "0x1",
 		"chainID": "0x2",
+		"forkBlock": "0xDBBA0",
+		"forkCanonHash": "0x8e7bed51e24f5174090408664ac476b90b5e1199a947af7442f1ac88263fc8c7",
 		"subprotocolName": "exp",
 		"eip98Transition": "0x7fffffffffffff",
 		"eip86Transition": "0x7fffffffffffff",
-		"eip155Transition": "0x927C0"
+		"eip155Transition": "0x927C0",
+		"eip140Transition": "0xC3500",
+		"eip211Transition": "0xC3500",
+		"eip214Transition": "0xC3500",
+		"eip658Transition": "0xC3500"
 	},
 	"genesis": {
 		"seal": {
@@ -53,7 +65,6 @@
 		"enode://96d3919b903e7f5ad59ac2f73c43be9172d9d27e2771355db03fd194732b795829a31fe2ea6de109d0804786c39a807e155f065b4b94c6fce167becd0ac02383@45.55.22.34:42786",
 		"enode://5f6c625bf287e3c08aad568de42d868781e961cbda805c8397cfb7be97e229419bef9a5a25a75f97632787106bba8a7caf9060fab3887ad2cfbeb182ab0f433f@46.101.182.53:42786",
 		"enode://d33a8d4c2c38a08971ed975b750f21d54c927c0bf7415931e214465a8d01651ecffe4401e1db913f398383381413c78105656d665d83f385244ab302d6138414@128.199.183.48:42786",
-		"enode://df872f81e25f72356152b44cab662caf1f2e57c3a156ecd20e9ac9246272af68a2031b4239a0bc831f2c6ab34733a041464d46b3ea36dce88d6c11714446e06b@178.62.208.109:42786",
 		"enode://f6f0d6b9b7d02ec9e8e4a16e38675f3621ea5e69860c739a65c1597ca28aefb3cec7a6d84e471ac927d42a1b64c1cbdefad75e7ce8872d57548ddcece20afdd1@159.203.64.95:42786"
 	],
 	"accounts": {
@@ -61,6 +72,10 @@
 		"0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
 		"0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0xC3500", "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "0xC3500", "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "0xC3500", "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "0xC3500", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"bb94f0ceb32257275b2a7a9c094c13e469b4563e": {
 			"balance": "10000000000000000000000000"
 		},

ethcore/res/ethereum/foundation.json

@@ -152,6 +152,7 @@
 		"eip98Transition": "0x7fffffffffffff",
 		"eip86Transition": "0x7fffffffffffff",
 		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": 2675000,
 		"eip140Transition": 4370000,
 		"eip211Transition": 4370000,
 		"eip214Transition": 4370000,
@@ -173,24 +174,38 @@
 		"stateRoot": "0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544"
 	},
 	"nodes": [
-		"enode://efe4f2493f4aff2d641b1db8366b96ddacfe13e7a6e9c8f8f8cf49f9cdba0fdf3258d8c8f8d0c5db529f8123c8f1d95f36d54d590ca1bb366a5818b9a4ba521c@163.172.187.252:30303",
+		"enode://6a868ced2dec399c53f730261173638a93a40214cf299ccf4d42a76e3fa54701db410669e8006347a4b3a74fa090bb35af0320e4bc8d04cf5b7f582b1db285f5@163.172.131.191:30303",
+		"enode://66a483383882a518fcc59db6c017f9cd13c71261f13c8d7e67ed43adbbc82a932d88d2291f59be577e9425181fc08828dc916fdd053af935a9491edf9d6006ba@212.47.247.103:30303",
 		"enode://cd6611461840543d5b9c56fbf088736154c699c43973b3a1a32390cf27106f87e58a818a606ccb05f3866de95a4fe860786fea71bf891ea95f234480d3022aa3@163.172.157.114:30303",
+		"enode://78b094cb27ceeecbe311bc278f4fde8b9a265db42d268c88484c94d7a2d19b82a1bd22dfd6c2bd4d90f9b05e6d42255e6eb85de15f73848ff82ed0be9cdf5202@52.233.198.218:30303",
+		"enode://00526537cb7e1aa6cf49714f0635fd0f608904d8d0693b949eea2dcdfdb0abbe4c794003a5fe57aa662d0a9215e8dfa4d2deb6ef0101c5e185e2617721813d43@40.65.122.44:30303",
+		"enode://4a456b4b6e6ee1f51389763e51b80fe04782c762445d96c32a96ebd34bd9178c1894924d5101123eacfd4f0fc4da25b5e1ee7f18832ac0bf4c6d6ac81442d698@40.71.6.49:3030",
+		"enode://68f85e7403976aa92318eff804cbe9bc988e0f5230d9d07ae4def030cbae16603262638e272d19875b7e5c54e296ba88ab6ec6e98face9e2537346c4dce78882@52.243.47.211:30303",
+		"enode://dc72806c3aa8fda207c8c018aba8d6cf143728b3628b6ded8d5e8cdeb8aa05cbd53f710ecd014c9a8f0d1e98f2874bff8afb15a229202f510a9c0258d1f6d109@159.203.210.80:30303",
+		"enode://5a62f19d35c0da8b576c9414568c728d4744e6e9d436c0f9db27456400011414f515871f13a6b8e0468534b5116cfe765d7630f680f1707a38467940a9f62511@45.55.33.62:30303",
+		"enode://605e04a43b1156966b3a3b66b980c87b7f18522f7f712035f84576016be909a2798a438b2b17b1a8c58db314d88539a77419ca4be36148c086900fba487c9d39@188.166.255.12:30303",
+		"enode://1d1f7bcb159d308eb2f3d5e32dc5f8786d714ec696bb2f7e3d982f9bcd04c938c139432f13aadcaf5128304a8005e8606aebf5eebd9ec192a1471c13b5e31d49@138.201.223.35:30303",
+		"enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303",
+		"enode://3f1d12044546b76342d59d4a05532c14b85aa669704bfe1f864fe079415aa2c02d743e03218e57a33fb94523adb54032871a6c51b2cc5514cb7c7e35b3ed0a99@13.93.211.84:30303",
+		"enode://78de8a0916848093c73790ead81d1928bec737d565119932b98c6b100d944b7a95e94f847f689fc723399d2e31129d182f7ef3863f2b4c820abbf3ab2722344d@191.235.84.50:30303",
+		"enode://158f8aab45f6d19c6cbf4a089c2670541a8da11978a2f90dbf6a502a4a3bab80d288afdbeb7ec0ef6d92de563767f3b1ea9e8e334ca711e9f8e2df5a0385e8e6@13.75.154.138:30303",
+		"enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303",
+		"enode://979b7fa28feeb35a4741660a16076f1943202cb72b6af70d327f053e248bab9ba81760f39d0701ef1d8f89cc1fbd2cacba0710a12cd5314d5e0c9021aa3637f9@5.1.83.226:30303",
+		"enode://0cc5f5ffb5d9098c8b8c62325f3797f56509bff942704687b6530992ac706e2cb946b90a34f1f19548cd3c7baccbcaea354531e5983c7d1bc0dee16ce4b6440b@40.118.3.223:30305",
+		"enode://1c7a64d76c0334b0418c004af2f67c50e36a3be60b5e4790bdac0439d21603469a85fad36f2473c9a80eb043ae60936df905fa28f1ff614c3e5dc34f15dcd2dc@40.118.3.223:30308",
+		"enode://85c85d7143ae8bb96924f2b54f1b3e70d8c4d367af305325d30a61385a432f247d2c75c45c6b4a60335060d072d7f5b35dd1d4c45f76941f62a4f83b6e75daaf@40.118.3.223:30309",
+		"enode://de471bccee3d042261d52e9bff31458daecc406142b401d4cd848f677479f73104b9fdeb090af9583d3391b7f10cb2ba9e26865dd5fca4fcdc0fb1e3b723c786@54.94.239.50:30303",
+		"enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303",
+		"enode://4cd540b2c3292e17cff39922e864094bf8b0741fcc8c5dcea14957e389d7944c70278d872902e3d0345927f621547efa659013c400865485ab4bfa0c6596936f@138.201.144.135:30303",
+		"enode://01f76fa0561eca2b9a7e224378dd854278735f1449793c46ad0c4e79e8775d080c21dcc455be391e90a98153c3b05dcc8935c8440de7b56fe6d67251e33f4e3c@51.15.42.252:30303",
+		"enode://2c9059f05c352b29d559192fe6bca272d965c9f2290632a2cfda7f83da7d2634f3ec45ae3a72c54dd4204926fb8082dcf9686e0d7504257541c86fc8569bcf4b@163.172.171.38:30303",
+		"enode://efe4f2493f4aff2d641b1db8366b96ddacfe13e7a6e9c8f8f8cf49f9cdba0fdf3258d8c8f8d0c5db529f8123c8f1d95f36d54d590ca1bb366a5818b9a4ba521c@163.172.187.252:30303",
 		"enode://bcc7240543fe2cf86f5e9093d05753dd83343f8fda7bf0e833f65985c73afccf8f981301e13ef49c4804491eab043647374df1c4adf85766af88a624ecc3330e@136.243.154.244:30303",
 		"enode://ed4227681ca8c70beb2277b9e870353a9693f12e7c548c35df6bca6a956934d6f659999c2decb31f75ce217822eefca149ace914f1cbe461ed5a2ebaf9501455@88.212.206.70:30303",
 		"enode://cadc6e573b6bc2a9128f2f635ac0db3353e360b56deef239e9be7e7fce039502e0ec670b595f6288c0d2116812516ad6b6ff8d5728ff45eba176989e40dead1e@37.128.191.230:30303",
 		"enode://595a9a06f8b9bc9835c8723b6a82105aea5d55c66b029b6d44f229d6d135ac3ecdd3e9309360a961ea39d7bee7bac5d03564077a4e08823acc723370aace65ec@46.20.235.22:30303",
 		"enode://029178d6d6f9f8026fc0bc17d5d1401aac76ec9d86633bba2320b5eed7b312980c0a210b74b20c4f9a8b0b2bf884b111fa9ea5c5f916bb9bbc0e0c8640a0f56c@216.158.85.185:30303",
-		"enode://fdd1b9bb613cfbc200bba17ce199a9490edc752a833f88d4134bf52bb0d858aa5524cb3ec9366c7a4ef4637754b8b15b5dc913e4ed9fdb6022f7512d7b63f181@212.47.247.103:30303",
-		"enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303",
-		"enode://de471bccee3d042261d52e9bff31458daecc406142b401d4cd848f677479f73104b9fdeb090af9583d3391b7f10cb2ba9e26865dd5fca4fcdc0fb1e3b723c786@54.94.239.50:30303",
-		"enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303",
-		"enode://4cd540b2c3292e17cff39922e864094bf8b0741fcc8c5dcea14957e389d7944c70278d872902e3d0345927f621547efa659013c400865485ab4bfa0c6596936f@138.201.144.135:30303",
-
-		"enode://89d5dc2a81e574c19d0465f497c1af96732d1b61a41de89c2a37f35707689ac416529fae1038809852b235c2d30fd325abdc57c122feeefbeaaf802cc7e9580d@45.55.33.62:30303",
-		"enode://605e04a43b1156966b3a3b66b980c87b7f18522f7f712035f84576016be909a2798a438b2b17b1a8c58db314d88539a77419ca4be36148c086900fba487c9d39@188.166.255.12:30303",
-		"enode://016b20125f447a3b203a3cae953b2ede8ffe51290c071e7599294be84317635730c397b8ff74404d6be412d539ee5bb5c3c700618723d3b53958c92bd33eaa82@159.203.210.80:30303",
-		"enode://01f76fa0561eca2b9a7e224378dd854278735f1449793c46ad0c4e79e8775d080c21dcc455be391e90a98153c3b05dcc8935c8440de7b56fe6d67251e33f4e3c@51.15.42.252:30303",
-		"enode://8d91c8137890d29110b9463882f17ae4e279cd2c90cf56573187ed1c8546fca5f590a9f05e9f108eb1bd91767ed01ede4daad9e001b61727885eaa246ddb39c2@163.172.171.38:30303"
+		"enode://fdd1b9bb613cfbc200bba17ce199a9490edc752a833f88d4134bf52bb0d858aa5524cb3ec9366c7a4ef4637754b8b15b5dc913e4ed9fdb6022f7512d7b63f181@212.47.247.103:30303"
 	],
 	"accounts": {
 		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },

ethcore/res/ethereum/kovan.json

@@ -12,29 +12,38 @@
 						"0x00427feae2419c15b89d1c21af10d1b6650a4d3d",
 						"0x4Ed9B08e6354C70fE6F8CB0411b0d3246b424d6c",
 						"0x0020ee4Be0e2027d76603cB751eE069519bA81A1",
-
 						"0x0010f94b296a852aaac52ea6c5ac72e03afd032d",
-
 						"0x007733a1FE69CF3f2CF989F81C7b4cAc1693387A",
 						"0x00E6d2b931F55a3f1701c7389d592a7778897879",
 						"0x00e4a10650e5a6D6001C38ff8E64F97016a1645c",
-
 						"0x00a0a24b9f0e5ec7aa4c7389b8302fd0123194de"
 					]
 				},
 				"validateScoreTransition": 1000000,
-				"validateStepTransition": 1500000
+				"validateStepTransition": 1500000,
+				"maximumUncleCountTransition": 5067000,
+				"maximumUncleCount": 0
 			}
 		}
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x400",
 		"registrar" : "0xfAb104398BBefbd47752E7702D9fE23047E1Bca3",
-	"maximumExtraDataSize": "0x20",
+		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x2A",
+		"forkBlock": 4297256,
+		"forkCanonHash": "0x0a66d93c2f727dca618fabaf70c39b37018c73d78b939d8b11efbbd09034778f",
+		"eip155Transition": 1000000,
+		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": 6600000,
+		"validateChainIdTransition": 1000000,
 		"validateReceiptsTransition" : 1000000,
-		"eip155Transition": 1000000
+		"eip140Transition": 5067000,
+		"eip211Transition": 5067000,
+		"eip214Transition": 5067000,
+		"eip658Transition": 5067000,
+		"wasmActivationTransition": 6600000
 	},
 	"genesis": {
 		"seal": {
@@ -51,13 +60,17 @@
 		"0x0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
 		"0x0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0x0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0x0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": 5067000, "pricing": { "modexp": { "divisor": 20 } } } },
+		"0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": 5067000, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": 5067000, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": 5067000, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
 		"0x00521965e7bd230323c423d96c657db5b79d099f": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }
 	},
 	"nodes": [
-		"enode://0518a3d35d4a7b3e8c433e7ffd2355d84a1304ceb5ef349787b556197f0c87fad09daed760635b97d52179d645d3e6d16a37d2cc0a9945c2ddf585684beb39ac@40.68.248.100:30303",
-		"enode://dcf984764db421fa0cd8dc7fc02ae378545723abb94d179f55325514cc30185eaea3dcefde6e358b7cdbe970c50b7c49e841618713a9a72d6f3f59ad9949ec6b@52.165.239.18:30303",
+		"enode://56abaf065581a5985b8c5f4f88bd202526482761ba10be9bfdcd14846dd01f652ec33fde0f8c0fd1db19b59a4c04465681fcef50e11380ca88d25996191c52de@40.71.221.215:30303",
+		"enode://d07827483dc47b368eaf88454fb04b41b7452cf454e194e2bd4c14f98a3278fed5d819dbecd0d010407fc7688d941ee1e58d4f9c6354d3da3be92f55c17d7ce3@52.166.117.77:30303",
+		"enode://8fa162563a8e5a05eef3e1cd5abc5828c71344f7277bb788a395cce4a0e30baf2b34b92fe0b2dbbba2313ee40236bae2aab3c9811941b9f5a7e8e90aaa27ecba@52.165.239.18:30303",
 		"enode://7e2e7f00784f516939f94e22bdc6cf96153603ca2b5df1c7cc0f90a38e7a2f218ffb1c05b156835e8b49086d11fdd1b3e2965be16baa55204167aa9bf536a4d9@52.243.47.56:30303",
-		"enode://d51b3e98bf35addf2f1d0ea1ffc90483e24d7c60b0fb3be1701e818f3d6778c06e53fdec737a534fe222956296f9d6e909baa025916a94601897e5c7136a7d95@40.71.221.215:30303",
-		"enode://419d42e300e8fd379ff6d045d93d7e66a091441e7b3c9f1d3d10088d8634ad37721e6bf86148f78c3f1b9f1360dc566ca8ee830b2d2079bc9f7171ea6152bb64@52.166.117.77:30303"
+		"enode://0518a3d35d4a7b3e8c433e7ffd2355d84a1304ceb5ef349787b556197f0c87fad09daed760635b97d52179d645d3e6d16a37d2cc0a9945c2ddf585684beb39ac@40.68.248.100:30303"
 	]
 }

ethcore/res/ethereum/kovan_wasm_test.json

@@ -0,0 +1,74 @@
+{
+	"name": "Kovan (Test)",
+	"dataDir": "kovan-test",
+	"engine": {
+		"authorityRound": {
+			"params": {
+			"stepDuration": "4",
+			"blockReward": "0x4563918244F40000",
+				"validators" : {
+					"list": [
+						"0x00D6Cc1BA9cf89BD2e58009741f4F7325BAdc0ED",
+						"0x00427feae2419c15b89d1c21af10d1b6650a4d3d",
+						"0x4Ed9B08e6354C70fE6F8CB0411b0d3246b424d6c",
+						"0x0020ee4Be0e2027d76603cB751eE069519bA81A1",
+						"0x0010f94b296a852aaac52ea6c5ac72e03afd032d",
+						"0x007733a1FE69CF3f2CF989F81C7b4cAc1693387A",
+						"0x00E6d2b931F55a3f1701c7389d592a7778897879",
+						"0x00e4a10650e5a6D6001C38ff8E64F97016a1645c",
+						"0x00a0a24b9f0e5ec7aa4c7389b8302fd0123194de"
+					]
+				},
+				"validateScoreTransition": 1000000,
+				"validateStepTransition": 1500000,
+				"maximumUncleCountTransition": 5067000,
+				"maximumUncleCount": 0
+			}
+		}
+	},
+	"params": {
+		"gasLimitBoundDivisor": "0x400",
+		"registrar" : "0xfAb104398BBefbd47752E7702D9fE23047E1Bca3",
+		"maximumExtraDataSize": "0x20",
+		"minGasLimit": "0x1388",
+		"networkID" : "0x2A",
+		"forkBlock": 4297256,
+		"forkCanonHash": "0x0a66d93c2f727dca618fabaf70c39b37018c73d78b939d8b11efbbd09034778f",
+		"validateReceiptsTransition" : 1000000,
+		"eip155Transition": 1000000,
+		"validateChainIdTransition": 1000000,
+		"eip140Transition": 5067000,
+		"eip211Transition": 5067000,
+		"eip214Transition": 5067000,
+		"eip658Transition": 5067000,
+		"wasmActivationTransition": 10
+	},
+	"genesis": {
+		"seal": {
+			"authorityRound": {
+				"step": "0x0",
+				"signature": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+			}
+		},
+		"difficulty": "0x20000",
+		"gasLimit": "0x5B8D80"
+	},
+	"accounts": {
+		"0x0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+		"0x0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+		"0x0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0x0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": 5067000, "pricing": { "modexp": { "divisor": 20 } } } },
+		"0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": 5067000, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": 5067000, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": 5067000, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } },
+		"0x00521965e7bd230323c423d96c657db5b79d099f": { "balance": "1606938044258990275541962092341162602522202993782792835301376" }
+	},
+	"nodes": [
+		"enode://56abaf065581a5985b8c5f4f88bd202526482761ba10be9bfdcd14846dd01f652ec33fde0f8c0fd1db19b59a4c04465681fcef50e11380ca88d25996191c52de@40.71.221.215:30303",
+		"enode://d07827483dc47b368eaf88454fb04b41b7452cf454e194e2bd4c14f98a3278fed5d819dbecd0d010407fc7688d941ee1e58d4f9c6354d3da3be92f55c17d7ce3@52.166.117.77:30303",
+		"enode://8fa162563a8e5a05eef3e1cd5abc5828c71344f7277bb788a395cce4a0e30baf2b34b92fe0b2dbbba2313ee40236bae2aab3c9811941b9f5a7e8e90aaa27ecba@52.165.239.18:30303",
+		"enode://7e2e7f00784f516939f94e22bdc6cf96153603ca2b5df1c7cc0f90a38e7a2f218ffb1c05b156835e8b49086d11fdd1b3e2965be16baa55204167aa9bf536a4d9@52.243.47.56:30303",
+		"enode://0518a3d35d4a7b3e8c433e7ffd2355d84a1304ceb5ef349787b556197f0c87fad09daed760635b97d52179d645d3e6d16a37d2cc0a9945c2ddf585684beb39ac@40.68.248.100:30303"
+	]
+}

ethcore/res/ethereum/mcip3_test.json

@@ -40,7 +40,8 @@
     "eip211Transition":"0x7fffffffffffff",
     "eip214Transition":"0x7fffffffffffff",
     "eip658Transition":"0x7fffffffffffff",
-    "maxCodeSize":"0x6000"
+    "maxCodeSize":"0x6000",
+    "maxCodeSizeTransition": "0x7fffffffffffff"
   },
   "genesis":{
     "seal":{

ethcore/res/ethereum/mcip6_byz.json

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

ethcore/res/ethereum/morden.json

@@ -13,9 +13,10 @@
 				"eip160Transition": 1915000,
 				"ecip1010PauseTransition": 1915000,
 				"ecip1010ContinueTransition": 3415000,
-
+				"ecip1017EraRounds": 2000000,
 				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
+				"eip161dTransition": "0x7fffffffffffffff",
+				"bombDefuseTransition": 2300000
 			}
 		}
 	},
@@ -30,7 +31,6 @@
 		"forkBlock": "0x1b34d8",
 		"forkCanonHash": "0xf376243aeff1f256d970714c3de9fd78fa4e63cf63e32a51fe1169e375d98145",
 		"eip155Transition": 1915000,
-
 		"eip98Transition": "0x7fffffffffffff",
 		"eip86Transition": "0x7fffffffffffff"
 	},
@@ -49,11 +49,13 @@
 		"gasLimit": "0x2fefd8"
 	},
 	"nodes": [
-		"enode://e731347db0521f3476e6bbbb83375dcd7133a1601425ebd15fd10f3835fd4c304fba6282087ca5a0deeafadf0aa0d4fd56c3323331901c1f38bd181c283e3e35@128.199.55.137:30303",
-		"enode://ceb5c0f85eb994dbe9693bf46d99b03f6b838d17cc74e68d5eb003171ff39e5f120b17f965b267c319303f94d80b9d994b77062fb1486d76ce95d9f3d8fe1cb4@46.101.122.141:30303",
 		"enode://fb28713820e718066a2f5df6250ae9d07cff22f672dbf26be6c75d088f821a9ad230138ba492c533a80407d054b1436ef18e951bb65e6901553516c8dffe8ff0@104.155.176.151:30304",
 		"enode://afdc6076b9bf3e7d3d01442d6841071e84c76c73a7016cb4f35c0437df219db38565766234448f1592a07ba5295a867f0ce87b359bf50311ed0b830a2361392d@104.154.136.117:30403",
-		"enode://21101a9597b79e933e17bc94ef3506fe99a137808907aa8fefa67eea4b789792ad11fb391f38b00087f8800a2d3dff011572b62a31232133dd1591ac2d1502c8@104.198.71.200:30403"
+		"enode://21101a9597b79e933e17bc94ef3506fe99a137808907aa8fefa67eea4b789792ad11fb391f38b00087f8800a2d3dff011572b62a31232133dd1591ac2d1502c8@104.198.71.200:30403",
+		"enode://fd008499e9c4662f384b3cff23438879d31ced24e2d19504c6389bc6da6c882f9c2f8dbed972f7058d7650337f54e4ba17bb49c7d11882dd1731d26a6e62e3cb@35.187.57.94:30304",
+		"enode://30a1fd71f28aa6f66fe662af9ecc75f0a6980f06b71598f2b19d3dda04223fc0e53b47e40c9171d5014e9f5b59d9954de125782da592f5d95ea39066e2591d5d@104.237.131.102:30304",
+		"enode://7909d51011d8a153351169f21d3a7bbedb3be1e17d38c1f2fad06504dd5aa07a00f00845835d535fe702bf379c4d7209a51f4d1b723e0ca8b8732bd21fba3b30@139.162.133.42:30303",
+		"enode://a088dfb2f5305be9232e8071c5535f13718a4017e247a0b35074b807d43d99e022880c27302cdb5b1e98ad34c083dbbb483f2b17bdc66149bad037154d6ace96@139.162.127.72:30303"
 	],
 	"accounts": {
 		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },

ethcore/res/ethereum/musicoin.json

@@ -8,12 +8,12 @@
         "difficultyBoundDivisor":"0x0800",
         "durationLimit":"0x0d",
         "homesteadTransition":"0x118c30",
-        "eip100bTransition":"0x7fffffffffffff",
-        "eip150Transition":"0x7fffffffffffff",
-        "eip160Transition":"0x7fffffffffffff",
-        "eip161abcTransition":"0x7fffffffffffff",
-        "eip161dTransition":"0x7fffffffffffff",
-        "eip649Transition":"0x7fffffffffffff",
+        "eip100bTransition":"0x21e88e",
+        "eip150Transition":"0x21e88e",
+        "eip160Transition":"0x21e88e",
+        "eip161abcTransition":"0x21e88e",
+        "eip161dTransition":"0x21e88e",
+        "eip649Transition":"0x21e88e",
         "blockReward":"0x1105a0185b50a80000",
         "mcip3Transition":"0x124f81",
         "mcip3MinerReward":"0xd8d726b7177a80000",
@@ -31,15 +31,15 @@
     "maximumExtraDataSize":"0x20",
     "minGasLimit":"0x1388",
     "networkID":"0x76740f",
-    "forkBlock":"0x5b6",
-    "forkCanonHash":"0xa5e88ad9e34d113e264e307bc27e8471452c8fc13780324bb3abb96fd0558343",
+    "forkBlock":"0x1d8015",
+    "forkCanonHash":"0x380602acf82b629a0be6b5adb2b4a801e960a07dc8261bf196d21befdbb8f2f9",
     "eip86Transition":"0x7fffffffffffff",
     "eip98Transition":"0x7fffffffffffff",
-    "eip140Transition":"0x7fffffffffffff",
-    "eip155Transition":"0x7fffffffffffff",
-    "eip211Transition":"0x7fffffffffffff",
-    "eip214Transition":"0x7fffffffffffff",
-    "eip658Transition":"0x7fffffffffffff",
+    "eip140Transition":"0x21e88e",
+    "eip155Transition":"0x21e88e",
+    "eip211Transition":"0x21e88e",
+    "eip214Transition":"0x21e88e",
+    "eip658Transition":"0x21e88e",
     "maxCodeSize":"0x6000"
   },
   "genesis":{
@@ -57,12 +57,9 @@
     "gasLimit":"0x7a1200"
   },
   "nodes":[
-    "enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303",
-    "enode://3f1d12044546b76342d59d4a05532c14b85aa669704bfe1f864fe079415aa2c02d743e03218e57a33fb94523adb54032871a6c51b2cc5514cb7c7e35b3ed0a99@13.93.211.84:30303",
-    "enode://78de8a0916848093c73790ead81d1928bec737d565119932b98c6b100d944b7a95e94f847f689fc723399d2e31129d182f7ef3863f2b4c820abbf3ab2722344d@191.235.84.50:30303",
-    "enode://158f8aab45f6d19c6cbf4a089c2670541a8da11978a2f90dbf6a502a4a3bab80d288afdbeb7ec0ef6d92de563767f3b1ea9e8e334ca711e9f8e2df5a0385e8e6@13.75.154.138:30303",
-    "enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303",
-    "enode://979b7fa28feeb35a4741660a16076f1943202cb72b6af70d327f053e248bab9ba81760f39d0701ef1d8f89cc1fbd2cacba0710a12cd5314d5e0c9021aa3637f9@5.1.83.226:30303",
+    "enode://09fcd36d553044c8b499b9b9e13a228ffd99572c513f77073d41f009717c464cd4399c0e665d6aff1590324254ee4e698b2b2533b1998dd04d896b9d6aff7895@35.185.67.35:30303",
+    "enode://89e51a34770a0badf8ea18c4c4d2c361cde707abd60031d99b1ab3010363e1898230a516ddb37d974af8d8db1b322779d7fe0caae0617bed4924d1b4968cf92b@35.231.48.142:30303",
+    "enode://b58c0c71f08864c0cf7fa9dea2c4cbefae5ae7a36cc30d286603b24982d25f3ccc056b589119324c51768fc2054b8c529ecf682e06e1e9980170b93ff194ed7a@132.148.132.9:30303",
     "enode://d302f52c8789ad87ee528f1431a67f1aa646c9bec17babb4665dfb3d61de5b9119a70aa77b2147a5f28854092ba09769323c1c552a6ac6f6a34cbcf767e2d2fe@158.69.248.48:30303",
     "enode://c72564bce8331ae298fb8ece113a456e3927d7e5989c2be3e445678b3600579f722410ef9bbfe339335d676af77343cb21b5b1703b7bebc32be85fce937a2220@191.252.185.71:30303",
     "enode://e3ae4d25ee64791ff98bf17c37acf90933359f2505c00f65c84f6863231a32a94153cadb0a462e428f18f35ded6bd91cd91033d26576a28558c22678be9cfaee@5.63.158.137:35555"
@@ -119,7 +116,7 @@
     "0000000000000000000000000000000000000005":{
       "builtin":{
         "name":"modexp",
-        "activate_at":"0x7fffffffffffff",
+        "activate_at":"0x21e88e",
         "pricing":{
           "modexp":{
             "divisor":20
@@ -130,7 +127,7 @@
     "0000000000000000000000000000000000000006":{
       "builtin":{
         "name":"alt_bn128_add",
-        "activate_at":"0x7fffffffffffff",
+        "activate_at":"0x21e88e",
         "pricing":{
           "linear":{
             "base":500,
@@ -142,7 +139,7 @@
     "0000000000000000000000000000000000000007":{
       "builtin":{
         "name":"alt_bn128_mul",
-        "activate_at":"0x7fffffffffffff",
+        "activate_at":"0x21e88e",
         "pricing":{
           "linear":{
             "base":40000,
@@ -154,7 +151,7 @@
     "0000000000000000000000000000000000000008":{
       "builtin":{
         "name":"alt_bn128_pairing",
-        "activate_at":"0x7fffffffffffff",
+        "activate_at":"0x21e88e",
         "pricing":{
           "alt_bn128_pairing":{
             "base":100000,

ethcore/res/ethereum/ropsten.json

@@ -29,6 +29,7 @@
 		"forkBlock": 641350,
 		"forkCanonHash": "0x8033403e9fe5811a7b6d6b469905915de1c59207ce2172cbcf5d6ff14fa6a2eb",
 		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": 10,
 		"eip155Transition": 10,
 		"eip98Transition": "0x7fffffffffffff",
 		"eip86Transition": "0x7fffffffffffff",
@@ -52,8 +53,10 @@
 		"gasLimit": "0x1000000"
 	},
 	"nodes": [
-		"enode://20c9ad97c081d63397d7b685a412227a40e23c8bdc6688c6f37e97cfbc22d2b4d1db1510d8f61e6a8866ad7f0e17c02b14182d37ea7c3c8b9c2683aeb6b733a1@52.169.14.227:30303",
-		"enode://6ce05930c72abc632c58e2e4324f7c7ea478cec0ed4fa2528982cf34483094e9cbc9216e7aa349691242576d552a2a56aaeae426c5303ded677ce455ba1acd9d@13.84.180.240:30303"
+		"enode://6332792c4a00e3e4ee0926ed89e0d27ef985424d97b6a45bf0f23e51f0dcb5e66b875777506458aea7af6f9e4ffb69f43f3778ee73c81ed9d34c51c4b16b0b0f@52.232.243.152:30303",
+		"enode://94c15d1b9e2fe7ce56e458b9a3b672ef11894ddedd0c6f247e0f1d3487f52b66208fb4aeb8179fce6e3a749ea93ed147c37976d67af557508d199d9594c35f09@192.81.208.223:30303",
+		"enode://30b7ab30a01c124a6cceca36863ece12c4f5fa68e3ba9b0b51407ccc002eeed3b3102d20a88f1c1d3c3154e2449317b8ef95090e77b312d5cc39354f86d5d606@52.176.7.10:30303",
+		"enode://865a63255b3bb68023b6bffd5095118fcc13e79dcf014fe4e47e065c350c7cc72af2e53eff895f11ba1bbb6a2b33271c1116ee870f266618eadfc2e78aa7349c@52.176.100.77:30303"
 	],
 	"accounts": {
 		"0000000000000000000000000000000000000000": { "balance": "1" },

ethcore/res/ethereum/transition_test.json

@@ -26,6 +26,7 @@
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
 		"maxCodeSize": 24576,
+		"maxCodeSizeTransition": "0",
 		"eip98Transition": "5",
 		"eip140Transition": "5",
 		"eip211Transition": "5",

ethcore/src/account_provider/mod.rs

@@ -28,7 +28,7 @@ use ethstore::{
 	SimpleSecretStore, SecretStore, Error as SSError, EthStore, EthMultiStore,
 	random_string, SecretVaultRef, StoreAccountRef, OpaqueSecret,
 };
-use ethstore::dir::MemoryDirectory;
+use ethstore::accounts_dir::MemoryDirectory;
 use ethstore::ethkey::{Address, Message, Public, Secret, Random, Generator};
 use ethjson::misc::AccountMeta;
 use hardware_wallet::{Error as HardwareError, HardwareWalletManager, KeyPath, TransactionInfo};
@@ -178,6 +178,13 @@ impl AccountProvider {
 			}
 		}
 
+		if let Ok(accounts) = sstore.accounts() {
+			for account in accounts.into_iter().filter(|a| settings.blacklisted_accounts.contains(&a.address)) {
+				warn!("Local Account {} has a blacklisted (known to be weak) address and will be ignored",
+					account.address);
+			}
+		}
+
 		// Remove blacklisted accounts from address book.
 		let mut address_book = AddressBook::new(&sstore.local_path());
 		for addr in &settings.blacklisted_accounts {
@@ -257,9 +264,9 @@ impl AccountProvider {
 		Ok(Address::from(account.address).into())
 	}
 
-	/// Import a new presale wallet.
-	pub fn import_wallet(&self, json: &[u8], password: &str) -> Result<Address, Error> {
-		let account = self.sstore.import_wallet(SecretVaultRef::Root, json, password)?;
+	/// Import a new wallet.
+	pub fn import_wallet(&self, json: &[u8], password: &str, gen_id: bool) -> Result<Address, Error> {
+		let account = self.sstore.import_wallet(SecretVaultRef::Root, json, password, gen_id)?;
 		if self.blacklisted_accounts.contains(&account.address) {
 			self.sstore.remove_account(&account, password)?;
 			return Err(SSError::InvalidAccount.into());
@@ -269,7 +276,7 @@ impl AccountProvider {
 
 	/// Checks whether an account with a given address is present.
 	pub fn has_account(&self, address: Address) -> Result<bool, Error> {
-		Ok(self.accounts()?.iter().any(|&a| a == address))
+		Ok(self.sstore.account_ref(&address).is_ok() && !self.blacklisted_accounts.contains(&address))
 	}
 
 	/// Returns addresses of all accounts.
@@ -516,8 +523,8 @@ impl AccountProvider {
 	}
 
 	/// Returns each hardware account along with name and meta.
-	pub fn is_hardware_address(&self, address: Address) -> bool {
-		self.hardware_store.as_ref().and_then(|s| s.wallet_info(&address)).is_some()
+	pub fn is_hardware_address(&self, address: &Address) -> bool {
+		self.hardware_store.as_ref().and_then(|s| s.wallet_info(address)).is_some()
 	}
 
 	/// Returns each account along with name and meta.
@@ -589,7 +596,7 @@ impl AccountProvider {
 			}
 		}
 
-		if self.unlock_keep_secret && unlock != Unlock::OneTime {
+		if self.unlock_keep_secret && unlock == Unlock::Perm {
 			// verify password and get the secret
 			let secret = self.sstore.raw_secret(&account, &password)?;
 			self.unlocked_secrets.write().insert(account.clone(), secret);
@@ -639,14 +646,22 @@ impl AccountProvider {
 	}
 
 	/// Checks if given account is unlocked
-	pub fn is_unlocked(&self, address: Address) -> bool {
+	pub fn is_unlocked(&self, address: &Address) -> bool {
 		let unlocked = self.unlocked.read();
 		let unlocked_secrets = self.unlocked_secrets.read();
-		self.sstore.account_ref(&address)
+		self.sstore.account_ref(address)
 			.map(|r| unlocked.get(&r).is_some() || unlocked_secrets.get(&r).is_some())
 			.unwrap_or(false)
 	}
 
+	/// Checks if given account is unlocked permanently
+	pub fn is_unlocked_permanently(&self, address: &Address) -> bool {
+		let unlocked = self.unlocked.read();
+		self.sstore.account_ref(address)
+			.map(|r| unlocked.get(&r).map_or(false, |account| account.unlock == Unlock::Perm))
+			.unwrap_or(false)
+	}
+
 	/// Signs the message. If password is not provided the account must be unlocked.
 	pub fn sign(&self, address: Address, password: Option<String>, message: Message) -> Result<Signature, SignError> {
 		let account = self.sstore.account_ref(&address)?;

ethcore/src/account_provider/stores.rs

@@ -64,7 +64,7 @@ impl AddressBook {
 	/// Sets new name for given address.
 	pub fn set_name(&mut self, a: Address, name: String) {
 		{
-			let mut x = self.cache.entry(a)
+			let x = self.cache.entry(a)
 				.or_insert_with(|| AccountMeta {name: Default::default(), meta: "{}".to_owned(), uuid: None});
 			x.name = name;
 		}
@@ -74,7 +74,7 @@ impl AddressBook {
 	/// Sets new meta for given address.
 	pub fn set_meta(&mut self, a: Address, meta: String) {
 		{
-			let mut x = self.cache.entry(a)
+			let x = self.cache.entry(a)
 				.or_insert_with(|| AccountMeta {name: "Anonymous".to_owned(), meta: Default::default(), uuid: None});
 			x.meta = meta;
 		}
@@ -253,7 +253,7 @@ impl DappsSettingsStore {
 	/// Marks recent dapp as used
 	pub fn mark_dapp_used(&mut self, dapp: DappId) {
 		{
-			let mut entry = self.history.entry(dapp).or_insert_with(|| Default::default());
+			let entry = self.history.entry(dapp).or_insert_with(|| Default::default());
 			entry.last_accessed = self.time.get();
 		}
 		// Clear extraneous entries
@@ -280,7 +280,7 @@ impl DappsSettingsStore {
 	/// Sets accounts for specific dapp.
 	pub fn set_accounts(&mut self, id: DappId, accounts: Option<Vec<Address>>) {
 		{
-			let mut settings = self.settings.entry(id).or_insert_with(DappsSettings::default);
+			let settings = self.settings.entry(id).or_insert_with(DappsSettings::default);
 			settings.accounts = accounts;
 		}
 		self.settings.save(JsonSettings::write);
@@ -289,7 +289,7 @@ impl DappsSettingsStore {
 	/// Sets a default account for specific dapp.
 	pub fn set_default(&mut self, id: DappId, default: Address) {
 		{
-			let mut settings = self.settings.entry(id).or_insert_with(DappsSettings::default);
+			let settings = self.settings.entry(id).or_insert_with(DappsSettings::default);
 			settings.default = Some(default);
 		}
 		self.settings.save(JsonSettings::write);

ethcore/src/basic_types.rs

@@ -22,7 +22,6 @@ pub type LogBloom = ::log_entry::LogBloom;
 /// Constant 2048-bit datum for 0. Often used as a default.
 pub static ZERO_LOGBLOOM: LogBloom = ::bigint::hash::H2048([0x00; 256]);
 
-#[cfg_attr(feature="dev", allow(enum_variant_names))]
 /// Semantic boolean for when a seal/signature is included.
 pub enum Seal {
 	/// The seal/signature is included.

ethcore/src/block.rs

@@ -301,7 +301,6 @@ pub struct SealedBlock {
 }
 
 impl<'x> OpenBlock<'x> {
-	#[cfg_attr(feature="dev", allow(too_many_arguments))]
 	/// Create a new `OpenBlock` ready for transaction pushing.
 	pub fn new(
 		engine: &'x EthEngine,
@@ -380,8 +379,13 @@ impl<'x> OpenBlock<'x> {
 	/// NOTE Will check chain constraints and the uncle number but will NOT check
 	/// that the header itself is actually valid.
 	pub fn push_uncle(&mut self, valid_uncle_header: Header) -> Result<(), BlockError> {
-		if self.block.uncles.len() + 1 > self.engine.maximum_uncle_count() {
-			return Err(BlockError::TooManyUncles(OutOfBounds{min: None, max: Some(self.engine.maximum_uncle_count()), found: self.block.uncles.len() + 1}));
+		let max_uncles = self.engine.maximum_uncle_count(self.block.header().number());
+		if self.block.uncles.len() + 1 > max_uncles {
+			return Err(BlockError::TooManyUncles(OutOfBounds{
+				min: None,
+				max: Some(max_uncles),
+				found: self.block.uncles.len() + 1,
+			}));
 		}
 		// TODO: check number
 		// TODO: check not a direct ancestor (use last_hashes for that)
@@ -609,7 +613,6 @@ impl IsBlock for SealedBlock {
 }
 
 /// Enact the block given by block header, transactions and uncles
-#[cfg_attr(feature="dev", allow(too_many_arguments))]
 pub fn enact(
 	header: &Header,
 	transactions: &[SignedTransaction],
@@ -683,7 +686,6 @@ fn push_transactions(block: &mut OpenBlock, transactions: &[SignedTransaction])
 
 // TODO [ToDr] Pass `PreverifiedBlock` by move, this will avoid unecessary allocation
 /// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
-#[cfg_attr(feature="dev", allow(too_many_arguments))]
 pub fn enact_verified(
 	block: &PreverifiedBlock,
 	engine: &EthEngine,
@@ -726,7 +728,6 @@ mod tests {
 	use transaction::SignedTransaction;
 
 	/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
-	#[cfg_attr(feature="dev", allow(too_many_arguments))]
 	fn enact_bytes(
 		block_bytes: &[u8],
 		engine: &EthEngine,
@@ -773,7 +774,6 @@ mod tests {
 	}
 
 	/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header. Seal the block aferwards
-	#[cfg_attr(feature="dev", allow(too_many_arguments))]
 	fn enact_and_seal(
 		block_bytes: &[u8],
 		engine: &EthEngine,

ethcore/src/blockchain/block_info.rs

@@ -32,7 +32,7 @@ pub struct BlockInfo {
 }
 
 /// Describes location of newly inserted block.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum BlockLocation {
 	/// It's part of the canon chain.
 	CanonChain,
@@ -44,7 +44,7 @@ pub enum BlockLocation {
 	BranchBecomingCanonChain(BranchBecomingCanonChainData),
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct BranchBecomingCanonChainData {
 	/// Hash of the newest common ancestor with old canon chain.
 	pub ancestor: H256,

ethcore/src/blockchain/config.rs

@@ -23,8 +23,6 @@ pub struct Config {
 	pub pref_cache_size: usize,
 	/// Maximum cache size in bytes.
 	pub max_cache_size: usize,
-	/// Backing db cache_size
-	pub db_cache_size: Option<usize>,
 }
 
 impl Default for Config {
@@ -32,8 +30,6 @@ impl Default for Config {
 		Config {
 			pref_cache_size: 1 << 14,
 			max_cache_size: 1 << 20,
-			db_cache_size: None,
 		}
 	}
 }
-

ethcore/src/blockchain/extras.rs

@@ -18,7 +18,6 @@
 
 use std::ops;
 use std::io::Write;
-use bloomchain;
 use blooms::{GroupPosition, BloomGroup};
 use db::Key;
 use engines::epoch::{Transition as EpochTransition};
@@ -98,32 +97,17 @@ impl ops::Deref for LogGroupKey {
 	}
 }
 
-#[derive(Debug, PartialEq, Eq, Hash, Clone)]
-pub struct LogGroupPosition(GroupPosition);
-
-impl From<bloomchain::group::GroupPosition> for LogGroupPosition {
-	fn from(position: bloomchain::group::GroupPosition) -> Self {
-		LogGroupPosition(From::from(position))
-	}
-}
-
-impl HeapSizeOf for LogGroupPosition {
-	fn heap_size_of_children(&self) -> usize {
-		self.0.heap_size_of_children()
-	}
-}
-
-impl Key<BloomGroup> for LogGroupPosition {
+impl Key<BloomGroup> for GroupPosition {
 	type Target = LogGroupKey;
 
 	fn key(&self) -> Self::Target {
 		let mut result = [0u8; 6];
 		result[0] = ExtrasIndex::BlocksBlooms as u8;
-		result[1] = self.0.level;
-		result[2] = (self.0.index >> 24) as u8;
-		result[3] = (self.0.index >> 16) as u8;
-		result[4] = (self.0.index >> 8) as u8;
-		result[5] = self.0.index as u8;
+		result[1] = self.level;
+		result[2] = (self.index >> 24) as u8;
+		result[3] = (self.index >> 16) as u8;
+		result[4] = (self.index >> 8) as u8;
+		result[5] = self.index as u8;
 		LogGroupKey(result)
 	}
 }

ethcore/src/blockchain/generator.rs

@@ -0,0 +1,219 @@
+// 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/>.
+
+//! Blockchain generator for tests.
+
+use std::collections::VecDeque;
+use bigint::prelude::{U256, H256};
+use bloomchain::Bloom;
+
+use bytes::Bytes;
+use header::Header;
+use rlp::encode;
+use transaction::SignedTransaction;
+use views::BlockView;
+
+/// Helper structure, used for encoding blocks.
+#[derive(Default, Clone, RlpEncodable)]
+pub struct Block {
+	pub header: Header,
+	pub transactions: Vec<SignedTransaction>,
+	pub uncles: Vec<Header>
+}
+
+impl Block {
+	#[inline]
+	pub fn header(&self) -> Header {
+		self.header.clone()
+	}
+
+	#[inline]
+	pub fn hash(&self) -> H256 {
+		BlockView::new(&self.encoded()).header_view().hash()
+	}
+
+	#[inline]
+	pub fn number(&self) -> u64 {
+		self.header.number()
+	}
+
+	#[inline]
+	pub fn encoded(&self) -> Bytes {
+		encode(self).into_vec()
+	}
+}
+
+#[derive(Debug)]
+pub struct BlockOptions {
+	pub difficulty: U256,
+	pub bloom: Bloom,
+	pub transactions: Vec<SignedTransaction>,
+}
+
+impl Default for BlockOptions {
+	fn default() -> Self {
+		BlockOptions {
+			difficulty: 10.into(),
+			bloom: Bloom::default(),
+			transactions: Vec::new(),
+		}
+	}
+}
+
+#[derive(Clone)]
+pub struct BlockBuilder {
+	blocks: VecDeque<Block>,
+}
+
+impl BlockBuilder {
+	pub fn genesis() -> Self {
+		let mut blocks = VecDeque::with_capacity(1);
+		blocks.push_back(Block::default());
+
+		BlockBuilder {
+			blocks,
+		}
+	}
+
+	#[inline]
+	pub fn add_block(&self) -> Self {
+		self.add_block_with(|| BlockOptions::default())
+	}
+
+	#[inline]
+	pub fn add_blocks(&self, count: usize) -> Self {
+		self.add_blocks_with(count, || BlockOptions::default())
+	}
+
+	#[inline]
+	pub fn add_block_with<T>(&self, get_metadata: T) -> Self where T: Fn() -> BlockOptions {
+		self.add_blocks_with(1, get_metadata)
+	}
+
+	#[inline]
+	pub fn add_block_with_difficulty<T>(&self, difficulty: T) -> Self where T: Into<U256> {
+		let difficulty = difficulty.into();
+		self.add_blocks_with(1, move || BlockOptions {
+			difficulty,
+			..Default::default()
+		})
+	}
+
+	#[inline]
+	pub fn add_block_with_transactions<T>(&self, transactions: T) -> Self
+		where T: IntoIterator<Item = SignedTransaction> {
+		let transactions = transactions.into_iter().collect::<Vec<_>>();
+		self.add_blocks_with(1, || BlockOptions {
+			transactions: transactions.clone(),
+			..Default::default()
+		})
+	}
+
+	#[inline]
+	pub fn add_block_with_bloom(&self, bloom: Bloom) -> Self {
+		self.add_blocks_with(1, move || BlockOptions {
+			bloom,
+			..Default::default()
+		})
+	}
+
+	pub fn add_blocks_with<T>(&self, count: usize, get_metadata: T) -> Self where T: Fn() -> BlockOptions {
+		assert!(count > 0, "There must be at least 1 block");
+		let mut parent_hash = self.last().hash();
+		let mut parent_number = self.last().number();
+		let mut blocks = VecDeque::with_capacity(count);
+		for _ in 0..count {
+			let mut block = Block::default();
+			let metadata = get_metadata();
+			let block_number = parent_number + 1;
+			block.header.set_parent_hash(parent_hash);
+			block.header.set_number(block_number);
+			block.header.set_log_bloom(metadata.bloom);
+			block.header.set_difficulty(metadata.difficulty);
+			block.transactions = metadata.transactions;
+
+			parent_hash = block.hash();
+			parent_number = block_number;
+
+			blocks.push_back(block);
+		}
+
+		BlockBuilder {
+			blocks,
+		}
+	}
+
+	#[inline]
+	pub fn last(&self) -> &Block {
+		self.blocks.back().expect("There is always at least 1 block")
+	}
+}
+
+#[derive(Clone)]
+pub struct BlockGenerator {
+	builders: VecDeque<BlockBuilder>,
+}
+
+impl BlockGenerator {
+	pub fn new<T>(builders: T) -> Self where T: IntoIterator<Item = BlockBuilder> {
+		BlockGenerator {
+			builders: builders.into_iter().collect(),
+		}
+	}
+}
+
+impl Iterator for BlockGenerator {
+	type Item = Block;
+
+	fn next(&mut self) -> Option<Self::Item> {
+		loop {
+			match self.builders.front_mut() {
+				Some(ref mut builder) => {
+					if let Some(block) = builder.blocks.pop_front() {
+						return Some(block);
+					}
+				},
+				None => return None,
+			}
+			self.builders.pop_front();
+		}
+
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::{BlockBuilder, BlockOptions, BlockGenerator};
+
+	#[test]
+	fn test_block_builder() {
+		let genesis = BlockBuilder::genesis();
+		let block_1 = genesis.add_block();
+		let block_1001 = block_1.add_blocks(1000);
+		let block_1002 = block_1001.add_block_with(|| BlockOptions::default());
+		let generator = BlockGenerator::new(vec![genesis, block_1, block_1001, block_1002]);
+		assert_eq!(generator.count(), 1003);
+	}
+
+	#[test]
+	fn test_block_builder_fork() {
+		let genesis = BlockBuilder::genesis();
+		let block_10a = genesis.add_blocks(10);
+		let block_11b = genesis.add_blocks(11);
+		assert_eq!(block_10a.last().number(), 10);
+		assert_eq!(block_11b.last().number(), 11);
+	}
+}

ethcore/src/blockchain/generator/block.rs

@@ -1,72 +0,0 @@
-// 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 rlp::*;
-use bigint::hash::{H256, H2048};
-use bytes::Bytes;
-use header::Header;
-use transaction::SignedTransaction;
-
-use super::fork::Forkable;
-use super::bloom::WithBloom;
-use super::complete::CompleteBlock;
-use super::transaction::WithTransaction;
-
-/// Helper structure, used for encoding blocks.
-#[derive(Default)]
-pub struct Block {
-	pub header: Header,
-	pub transactions: Vec<SignedTransaction>,
-	pub uncles: Vec<Header>
-}
-
-impl Encodable for Block {
-	fn rlp_append(&self, s: &mut RlpStream) {
-		s.begin_list(3);
-		s.append(&self.header);
-		s.append_list(&self.transactions);
-		s.append_list(&self.uncles);
-	}
-}
-
-impl Forkable for Block {
-	fn fork(mut self, fork_number: usize) -> Self where Self: Sized {
-		let difficulty = self.header.difficulty().clone() - fork_number.into();
-		self.header.set_difficulty(difficulty);
-		self
-	}
-}
-
-impl WithBloom for Block {
-	fn with_bloom(mut self, bloom: H2048) -> Self where Self: Sized {
-		self.header.set_log_bloom(bloom);
-		self
-	}
-}
-
-impl WithTransaction for Block {
-	fn with_transaction(mut self, transaction: SignedTransaction) -> Self where Self: Sized {
-		self.transactions.push(transaction);
-		self
-	}
-}
-
-impl CompleteBlock for Block {
-	fn complete(mut self, parent_hash: H256) -> Bytes {
-		self.header.set_parent_hash(parent_hash);
-		encode(&self).into_vec()
-	}
-}