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
[ci skip] js-precompiled 20180421-190217
2018-04-23 10:28:18 +02:00 · 2018-04-21 19:03:02 +00:00 · 2018-04-20 15:08:32 +00:00 · 2018-04-20 13:43:33 +00:00 · 2018-04-20 15:21:40 +02:00 · 2018-04-16 12:21:21 +00:00
14 changed files with 72 additions and 75 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ cache:
  paths:
    - target/
  untracked: true
-linux-stable:
+linux-ubuntu:
  stage: build
  image: parity/rust:gitlab-ci
  only:
@@ -32,7 +32,7 @@ linux-stable:
    paths:
    - parity.zip
    name: "stable-x86_64-unknown-linux-gnu_parity"
-linux-stable-debian:
+linux-debian:
  stage: build
  image: parity/rust-debian:gitlab-ci
  only:
@@ -81,6 +81,7 @@ linux-i686:
    paths:
      - parity.zip
    name: "i686-unknown-linux-gnu"
+  allow_failure: true
 linux-armv7:
  stage: build
  image: parity/rust-armv7:gitlab-ci
@@ -97,6 +98,7 @@ linux-armv7:
    paths:
    - parity.zip
    name: "armv7_unknown_linux_gnueabihf_parity"
+  allow_failure: true
 linux-arm:
  stage: build
  image: parity/rust-arm:gitlab-ci
@@ -113,6 +115,7 @@ linux-arm:
    paths:
    - parity.zip
    name: "arm-unknown-linux-gnueabihf_parity"
+  allow_failure: true
 linux-aarch64:
  stage: build
  image: parity/rust-arm64:gitlab-ci
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -33,7 +33,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "app_dirs"
 version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/paritytech/app-dirs-rs#0b37f9481ce29e9d5174ad185bca695b206368eb"
 dependencies = [
 "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -286,7 +286,7 @@ dependencies = [
 "ethbloom 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore-bigint 0.2.1",
 "ethcore-bytes 0.1.0",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "ethjson 0.1.0",
 "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "keccak-hash 0.1.0",
@@ -331,7 +331,7 @@ dependencies = [

 [[package]]
 name = "crossbeam"
-version = "0.2.10"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@@ -389,7 +389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "dir"
 version = "0.1.0"
 dependencies = [
- "app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "app_dirs 1.2.1 (git+https://github.com/paritytech/app-dirs-rs)",
 "ethcore-bigint 0.2.1",
 "journaldb 0.1.0",
 ]
@@ -504,7 +504,7 @@ dependencies = [
 "bn 0.4.4 (git+https://github.com/paritytech/bn)",
 "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "common-types 0.1.0",
- "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethash 1.9.0",
 "ethcore-bigint 0.2.1",
 "ethcore-bloom-journal 0.1.0",
@@ -513,7 +513,7 @@ dependencies = [
 "ethcore-io 1.9.0",
 "ethcore-logger 1.9.0",
 "ethcore-stratum 1.9.0",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "ethjson 0.1.0",
 "ethkey 0.3.0",
 "ethstore 0.2.0",
@@ -611,7 +611,7 @@ dependencies = [
 name = "ethcore-io"
 version = "1.9.0"
 dependencies = [
- "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "mio 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -628,7 +628,7 @@ dependencies = [
 "ethcore-bytes 0.1.0",
 "ethcore-io 1.9.0",
 "ethcore-network 1.9.0",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -714,7 +714,7 @@ dependencies = [
 "ethcore-bigint 0.2.1",
 "ethcore-bytes 0.1.0",
 "ethcore-logger 1.9.0",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "ethcrypto 0.1.0",
 "ethkey 0.3.0",
 "ethsync 1.9.0",
@@ -760,7 +760,7 @@ dependencies = [

 [[package]]
 name = "ethcore-util"
-version = "1.9.6"
+version = "1.9.7"
 dependencies = [
 "ethcore-bigint 0.2.1",
 "ethcore-bytes 0.1.0",
@@ -880,7 +880,7 @@ dependencies = [
 "ethcore-io 1.9.0",
 "ethcore-light 1.9.0",
 "ethcore-network 1.9.0",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "ethkey 0.3.0",
 "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -904,7 +904,7 @@ version = "0.1.0"
 dependencies = [
 "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore-bigint 0.2.1",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "evmjit 1.9.0",
 "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "keccak-hash 0.1.0",
@@ -924,7 +924,7 @@ dependencies = [
 "ethcore 1.9.0",
 "ethcore-bigint 0.2.1",
 "ethcore-bytes 0.1.0",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "ethjson 0.1.0",
 "evm 0.1.0",
 "panic_hook 0.1.0",
@@ -1782,7 +1782,7 @@ dependencies = [
 "ethcore-bytes 0.1.0",
 "ethcore-io 1.9.0",
 "ethcore-network 1.9.0",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 "kvdb-memorydb 0.1.0",
 "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1976,10 +1976,9 @@ dependencies = [

 [[package]]
 name = "parity"
-version = "1.9.6"
+version = "1.9.7"
 dependencies = [
 "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "clap 2.29.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ctrlc 1.1.1 (git+https://github.com/paritytech/rust-ctrlc.git)",
 "daemonize 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1996,7 +1995,7 @@ dependencies = [
 "ethcore-network 1.9.0",
 "ethcore-secretstore 1.0.0",
 "ethcore-stratum 1.9.0",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "ethkey 0.3.0",
 "ethsync 1.9.0",
 "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2024,7 +2023,7 @@ dependencies = [
 "parity-rpc 1.9.0",
 "parity-rpc-client 1.4.0",
 "parity-updater 1.9.0",
- "parity-version 1.9.6",
+ "parity-version 1.9.7",
 "parity-whisper 0.1.0",
 "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "path 0.1.0",
@@ -2056,7 +2055,7 @@ dependencies = [
 "ethcore-bigint 0.2.1",
 "ethcore-bytes 0.1.0",
 "ethcore-devtools 1.9.0",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "fetch 0.1.0",
 "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2072,7 +2071,7 @@ dependencies = [
 "parity-hash-fetch 1.9.0",
 "parity-reactor 0.1.0",
 "parity-ui 1.9.0",
- "parity-version 1.9.6",
+ "parity-version 1.9.7",
 "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2118,7 +2117,7 @@ dependencies = [
 "ethabi 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore-bigint 0.2.1",
 "ethcore-bytes 0.1.0",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "fetch 0.1.0",
 "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 "keccak-hash 0.1.0",
@@ -2168,7 +2167,7 @@ name = "parity-machine"
 version = "0.1.0"
 dependencies = [
 "ethcore-bigint 0.2.1",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 ]

 [[package]]
@@ -2194,7 +2193,7 @@ dependencies = [
 "ethcore-light 1.9.0",
 "ethcore-logger 1.9.0",
 "ethcore-network 1.9.0",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "ethcrypto 0.1.0",
 "ethjson 0.1.0",
 "ethkey 0.3.0",
@@ -2220,7 +2219,7 @@ dependencies = [
 "order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-reactor 0.1.0",
 "parity-updater 1.9.0",
- "parity-version 1.9.6",
+ "parity-version 1.9.7",
 "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2301,7 +2300,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-old-precompiled"
 version = "1.9.0"
-source = "git+https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git#2aee5c0ee94f1ce93369ed4a21f1eb2942e128d8"
+source = "git+https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git#d93a4ced4d0206195a556cf72dbf4ad7b699798e"
 dependencies = [
 "parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2309,7 +2308,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.9.0"
-source = "git+https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git#fbe033deed63592faae9f9b04900fa742a6aab5d"
+source = "git+https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git#1a799d6a8d103a1383f677d3ce021ff60c5a13c1"
 dependencies = [
 "parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2322,13 +2321,13 @@ dependencies = [
 "ethcore 1.9.0",
 "ethcore-bigint 0.2.1",
 "ethcore-bytes 0.1.0",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "ethsync 1.9.0",
 "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-hash-fetch 1.9.0",
 "parity-reactor 0.1.0",
- "parity-version 1.9.6",
+ "parity-version 1.9.7",
 "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "path 0.1.0",
 "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2337,7 +2336,7 @@ dependencies = [

 [[package]]
 name = "parity-version"
-version = "1.9.6"
+version = "1.9.7"
 dependencies = [
 "ethcore-bytes 0.1.0",
 "rlp 0.2.1",
@@ -2834,7 +2833,7 @@ name = "rpc-cli"
 version = "1.4.0"
 dependencies = [
 "bigint 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "futures 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-rpc 1.9.0",
 "parity-rpc-client 1.4.0",
@@ -3565,7 +3564,7 @@ dependencies = [
 "common-types 0.1.0",
 "ethcore-bigint 0.2.1",
 "ethcore-bytes 0.1.0",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "ethjson 0.1.0",
 "keccak-hash 0.1.0",
 "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3585,18 +3584,18 @@ dependencies = [
 "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore-bigint 0.2.1",
 "ethcore-logger 1.9.0",
- "ethcore-util 1.9.6",
+ "ethcore-util 1.9.7",
 "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-wasm 0.27.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "pwasm-utils 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "vm 0.1.0",
- "wasmi 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasmi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "wasmi"
-version = "0.1.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3696,7 +3695,7 @@ dependencies = [
 "checksum aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699"
 "checksum ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455"
 "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
-"checksum app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e73a24bad9bd6a94d6395382a6c69fe071708ae4409f763c5475e14ee896313d"
+"checksum app_dirs 1.2.1 (git+https://github.com/paritytech/app-dirs-rs)" = "<none>"
 "checksum arrayvec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1c0250693b17316353df525fb088da32a8c18f84eb65d113dde31f5a76ed17b6"
 "checksum aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfdf7355d9db158df68f976ed030ab0f6578af811f5a7bb6dcf221ec24e0e0"
 "checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159"
@@ -3727,7 +3726,7 @@ dependencies = [
 "checksum cookie 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d53b80dde876f47f03cda35303e368a79b91c70b0d65ecba5fd5280944a08591"
 "checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67"
 "checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d"
-"checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
+"checksum crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "24ce9782d4d5c53674646a6a4c1863a21a8fc0cb649b3c94dfc16e45071dea19"
 "checksum crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a2f4a431c5c9f662e1200b7c7f02c34e91361150e382089a8f2dec3ba680cbda"
 "checksum crypt32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e34988f7e069e0b2f3bfc064295161e489b2d4e04a2e4248fb94360cdf00b4ec"
 "checksum ctrlc 1.1.1 (git+https://github.com/paritytech/rust-ctrlc.git)" = "<none>"
@@ -3972,7 +3971,7 @@ dependencies = [
 "checksum vergen 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c3365f36c57e5df714a34be40902b27a992eeddb9996eca52d0584611cf885d"
 "checksum version_check 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6b772017e347561807c1aa192438c5fd74242a670a6cffacc40f2defd1dc069d"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-"checksum wasmi 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dedfb4cbfba1e1921b12ed05762d9d5ae99ce40e72b98bbf271561ef487e8c7"
+"checksum wasmi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d19da510b59247935ad5f598357b3cc739912666d75d3d28318026478d95bbdb"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Parity Ethereum client"
 name = "parity"
-version = "1.9.6"
+version = "1.9.7"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
@@ -27,7 +27,6 @@ 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"
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -12,7 +12,7 @@ bloomchain = { path = "../util/bloomchain" }
 bn = { git = "https://github.com/paritytech/bn" }
 byteorder = "1.0"
 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" }
--- a/ethcore/src/engines/tendermint/mod.rs
+++ b/ethcore/src/engines/tendermint/mod.rs
@@ -27,7 +27,7 @@ mod params;

 use std::sync::{Weak, Arc};
 use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
-use std::collections::{HashSet, BTreeMap};
+use std::collections::HashSet;
 use hash::keccak;
 use bigint::prelude::{U128, U256};
 use bigint::hash::{H256, H520};
@@ -454,17 +454,6 @@ impl Engine<EthereumMachine> for Tendermint {

 	fn maximum_uncle_age(&self) -> usize { 0 }

-	/// Additional engine-specific information for the user/developer concerning `header`.
-	fn extra_info(&self, header: &Header) -> BTreeMap<String, String> {
-		let message = ConsensusMessage::new_proposal(header).expect("Invalid header.");
-		map![
-			"signature".into() => message.signature.to_string(),
-			"height".into() => message.vote_step.height.to_string(),
-			"view".into() => message.vote_step.view.to_string(),
-			"block_hash".into() => message.block_hash.as_ref().map(ToString::to_string).unwrap_or("".into())
-		]
-	}
-
 	fn populate_from_parent(&self, header: &mut Header, parent: &Header) {
 		// Chain scoring: total weight is sqrt(U256::max_value())*height - view
 		let new_difficulty = U256::from(U128::max_value())
--- a/ethcore/src/executive.rs
+++ b/ethcore/src/executive.rs
@@ -36,10 +36,21 @@ use transaction::{Action, SignedTransaction};
 use crossbeam;
 pub use executed::{Executed, ExecutionResult};

-/// Roughly estimate what stack size each level of evm depth will use
-/// TODO [todr] We probably need some more sophisticated calculations here (limit on my machine 132)
-/// Maybe something like here: `https://github.com/ethereum/libethereum/blob/4db169b8504f2b87f7d5a481819cfb959fc65f6c/libethereum/ExtVM.cpp`
-const STACK_SIZE_PER_DEPTH: usize = 24*1024;
+#[cfg(debug_assertions)]
+/// Roughly estimate what stack size each level of evm depth will use. (Debug build)
+const STACK_SIZE_PER_DEPTH: usize = 128 * 1024;
+
+#[cfg(not(debug_assertions))]
+/// Roughly estimate what stack size each level of evm depth will use.
+const STACK_SIZE_PER_DEPTH: usize = 24 * 1024;
+
+#[cfg(debug_assertions)]
+/// Entry stack overhead prior to execution. (Debug build)
+const STACK_SIZE_ENTRY_OVERHEAD: usize = 100 * 1024;
+
+#[cfg(not(debug_assertions))]
+/// Entry stack overhead prior to execution.
+const STACK_SIZE_ENTRY_OVERHEAD: usize = 20 * 1024;

 /// Returns new address created from address, nonce, and code hash
 pub fn contract_address(address_scheme: CreateContractAddress, sender: &Address, nonce: &U256, code: &[u8]) -> (Address, Option<H256>) {
@@ -334,12 +345,12 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 		tracer: &mut T,
 		vm_tracer: &mut V
 	) -> vm::Result<FinalizationResult> where T: Tracer, V: VMTracer {
-
-		let depth_threshold = ::io::LOCAL_STACK_SIZE.with(|sz| sz.get() / STACK_SIZE_PER_DEPTH);
+		let local_stack_size = ::io::LOCAL_STACK_SIZE.with(|sz| sz.get());
+		let depth_threshold = local_stack_size.saturating_sub(STACK_SIZE_ENTRY_OVERHEAD) / STACK_SIZE_PER_DEPTH;
 		let static_call = params.call_type == CallType::StaticCall;

 		// Ordinary execution - keep VM in same thread
-		if (self.depth + 1) % depth_threshold != 0 {
+		if self.depth != depth_threshold {
 			let vm_factory = self.state.vm_factory();
 			let mut ext = self.as_externalities(OriginInfo::from(&params), unconfirmed_substate, output_policy, tracer, vm_tracer, static_call);
 			trace!(target: "executive", "ext.schedule.have_delegate_call: {}", ext.schedule().have_delegate_call);
@@ -347,17 +358,15 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> {
 			return vm.exec(params, &mut ext).finalize(ext);
 		}

-		// Start in new thread to reset stack
-		// TODO [todr] No thread builder yet, so we need to reset once for a while
-		// https://github.com/aturon/crossbeam/issues/16
+		// Start in new thread with stack size needed up to max depth
 		crossbeam::scope(|scope| {
 			let vm_factory = self.state.vm_factory();
 			let mut ext = self.as_externalities(OriginInfo::from(&params), unconfirmed_substate, output_policy, tracer, vm_tracer, static_call);

-			scope.spawn(move || {
+			scope.builder().stack_size(::std::cmp::max(schedule.max_depth.saturating_sub(depth_threshold) * STACK_SIZE_PER_DEPTH, local_stack_size)).spawn(move || {
 				let mut vm = vm_factory.create(&params, &schedule);
 				vm.exec(params, &mut ext).finalize(ext)
-			})
+			}).expect("Sub-thread creation cannot fail; the host might run out of resources; qed")
 		}).join()
 	}

--- a/ethcore/wasm/Cargo.toml
+++ b/ethcore/wasm/Cargo.toml
@@ -13,4 +13,4 @@ libc = "0.2"
 pwasm-utils = "0.1"
 vm = { path = "../vm" }
 ethcore-logger = { path = "../../logger" }
-wasmi = { version = "0.1", features = ["opt-in-32bit"] }
+wasmi = { version = "0.1.3", features = ["opt-in-32bit"] }
--- a/mac/Parity.pkgproj
+++ b/mac/Parity.pkgproj
@@ -462,7 +462,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.9.6</string>
+				<string>1.9.7</string>
 			</dict>
 			<key>UUID</key>
 			<string>2DCD5B81-7BAF-4DA1-9251-6274B089FD36</string>
--- a/nsis/installer.nsi
+++ b/nsis/installer.nsi
@@ -10,7 +10,7 @@
 !define DESCRIPTION "Fast, light, robust Ethereum implementation"
 !define VERSIONMAJOR 1
 !define VERSIONMINOR 9
-!define VERSIONBUILD 6
+!define VERSIONBUILD 7
 !define ARGS ""
 !define FIRST_START_ARGS "--mode=passive ui"

--- a/parity/main.rs
+++ b/parity/main.rs
@@ -19,7 +19,6 @@
 #![warn(missing_docs)]

 extern crate ansi_term;
-extern crate app_dirs;
 extern crate ctrlc;
 extern crate docopt;
 #[macro_use]
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore utility library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-util"
-version = "1.9.6"
+version = "1.9.7"
 authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
--- a/util/dir/Cargo.toml
+++ b/util/dir/Cargo.toml
@@ -6,4 +6,4 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 ethcore-bigint = { path = "../bigint" }
 journaldb = { path = "../journaldb" }
-app_dirs = "1.1.1"
+app_dirs = { git = "https://github.com/paritytech/app-dirs-rs" }
--- a/util/io/Cargo.toml
+++ b/util/io/Cargo.toml
@@ -8,8 +8,7 @@ authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
 mio = "0.6.8"
-crossbeam = "0.2"
+crossbeam = "0.3"
 parking_lot = "0.4"
 log = "0.3"
 slab = "0.2"
-
--- a/util/version/Cargo.toml
+++ b/util/version/Cargo.toml
@@ -3,7 +3,7 @@
 [package]
 name = "parity-version"
 # NOTE: this value is used for Parity version string.
-version = "1.9.6"
+version = "1.9.7"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
Author	SHA1	Message	Date
Afri Schoedon	7919629f3d	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	2018-04-23 10:28:18 +02:00
GitLab Build Bot	e90c43309a	[ci skip] js-precompiled 20180421-190217	2018-04-21 19:03:02 +00:00
GitLab Build Bot	c48a69684f	[ci skip] js-precompiled 20180420-150741	2018-04-20 15:08:32 +00:00
GitLab Build Bot	ca436e87a7	[ci skip] js-precompiled 20180420-134106	2018-04-20 13:43:33 +00:00
Wei Tang	014d0ac160	[stable] Backports (#8449 ) * Use forked app_dirs crate for reverted Windows dir behavior (#8438) * Remove unused appdirs dependency in CLI * Use forked app_dirs crate for reverted Windows dir behavior * remove Tendermint extra_info due to seal inconsistencies (#8367) * Improve VM executor stack size estimation rules (#8439) * Improve VM executor stack size estimation rules * typo: docs add "(Debug build)" comment * Fix an off by one typo and set minimal stack size This avoids the case if `depth_threshold == max_depth`. Usually setting stack size to zero will just rebound it to platform minimal stack size, but we set it here just in case. * Use saturating_sub to avoid potential overflow * Upgrade crossbeam to 0.3	2018-04-20 15:21:40 +02:00
GitLab Build Bot	302dbd5f05	[ci skip] js-precompiled 20180416-122027	2018-04-16 12:21:21 +00:00
GitLab Build Bot	57746382d3	[ci skip] js-precompiled 20180416-111448	2018-04-16 11:15:49 +00:00