diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index ae69c6e059..d4c095e58c 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -451,7 +451,7 @@ dependencies = [
 [[package]]
 name = "ed25519"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -491,7 +491,7 @@ dependencies = [
 [[package]]
 name = "environmental"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 
 [[package]]
 name = "error-chain"
@@ -534,7 +534,7 @@ dependencies = [
 [[package]]
 name = "ethcore-io"
 version = "1.12.0"
-source = "git+https://github.com/paritytech/parity.git#c21c19bd6ca173d877a4157390856222e026e127"
+source = "git+https://github.com/paritytech/parity.git#e12a26dac5cb6ffd21774781c190f09a0ec23eca"
 dependencies = [
  "crossbeam 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -571,7 +571,7 @@ dependencies = [
 [[package]]
 name = "ethkey"
 version = "0.3.0"
-source = "git+https://github.com/paritytech/parity.git#c21c19bd6ca173d877a4157390856222e026e127"
+source = "git+https://github.com/paritytech/parity.git#e12a26dac5cb6ffd21774781c190f09a0ec23eca"
 dependencies = [
  "byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "edit-distance 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -631,7 +631,7 @@ dependencies = [
 [[package]]
 name = "fixed-hash"
 version = "0.2.2"
-source = "git+https://github.com/paritytech/parity-common.git#22209e14805e5764f7fe81259324d34eab179264"
+source = "git+https://github.com/paritytech/parity-common.git#abe18ea03c1faae5e9b3787b481086e796ff42fb"
 dependencies = [
  "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -732,7 +732,7 @@ dependencies = [
 [[package]]
 name = "hashdb"
 version = "0.2.1"
-source = "git+https://github.com/paritytech/parity-common.git#22209e14805e5764f7fe81259324d34eab179264"
+source = "git+https://github.com/paritytech/parity-common.git#abe18ea03c1faae5e9b3787b481086e796ff42fb"
 dependencies = [
  "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -957,7 +957,7 @@ dependencies = [
 [[package]]
 name = "kvdb"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/parity-common.git#22209e14805e5764f7fe81259324d34eab179264"
+source = "git+https://github.com/paritytech/parity-common.git#abe18ea03c1faae5e9b3787b481086e796ff42fb"
 dependencies = [
  "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common.git)",
@@ -975,7 +975,7 @@ dependencies = [
 [[package]]
 name = "kvdb-rocksdb"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/parity-common.git#22209e14805e5764f7fe81259324d34eab179264"
+source = "git+https://github.com/paritytech/parity-common.git#abe18ea03c1faae5e9b3787b481086e796ff42fb"
 dependencies = [
  "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1356,7 +1356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "mem"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/parity.git#c21c19bd6ca173d877a4157390856222e026e127"
+source = "git+https://github.com/paritytech/parity.git#e12a26dac5cb6ffd21774781c190f09a0ec23eca"
 
 [[package]]
 name = "memchr"
@@ -1379,13 +1379,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "memorydb"
 version = "0.2.1"
-source = "git+https://github.com/paritytech/parity-common.git#22209e14805e5764f7fe81259324d34eab179264"
+source = "git+https://github.com/paritytech/parity-common.git#abe18ea03c1faae5e9b3787b481086e796ff42fb"
 dependencies = [
  "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashdb 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
  "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "plain_hasher 0.2.0 (git+https://github.com/paritytech/parity-common.git)",
- "rlp 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
+ "rlp 0.2.2 (git+https://github.com/paritytech/parity-common.git)",
 ]
 
 [[package]]
@@ -1589,12 +1589,12 @@ dependencies = [
 [[package]]
 name = "parity-bytes"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/parity-common.git#22209e14805e5764f7fe81259324d34eab179264"
+source = "git+https://github.com/paritytech/parity-common.git#abe18ea03c1faae5e9b3787b481086e796ff42fb"
 
 [[package]]
 name = "parity-crypto"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/parity-common.git#22209e14805e5764f7fe81259324d34eab179264"
+source = "git+https://github.com/paritytech/parity-common.git#abe18ea03c1faae5e9b3787b481086e796ff42fb"
 dependencies = [
  "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1662,7 +1662,7 @@ dependencies = [
 [[package]]
 name = "patricia-trie"
 version = "0.2.1"
-source = "git+https://github.com/paritytech/parity-common.git#22209e14805e5764f7fe81259324d34eab179264"
+source = "git+https://github.com/paritytech/parity-common.git#abe18ea03c1faae5e9b3787b481086e796ff42fb"
 dependencies = [
  "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashdb 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
@@ -1684,7 +1684,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "plain_hasher"
 version = "0.2.0"
-source = "git+https://github.com/paritytech/parity-common.git#22209e14805e5764f7fe81259324d34eab179264"
+source = "git+https://github.com/paritytech/parity-common.git#abe18ea03c1faae5e9b3787b481086e796ff42fb"
 dependencies = [
  "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1799,7 +1799,7 @@ dependencies = [
  "polkadot-runtime 0.1.0",
  "polkadot-statement-table 0.1.0",
  "polkadot-transaction-pool 0.1.0",
- "rhododendron 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rhododendron 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "substrate-bft 0.1.0 (git+https://github.com/paritytech/substrate)",
  "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate)",
  "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
@@ -1831,7 +1831,7 @@ dependencies = [
  "polkadot-availability-store 0.1.0",
  "polkadot-consensus 0.1.0",
  "polkadot-primitives 0.1.0",
- "rhododendron 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rhododendron 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "substrate-bft 0.1.0 (git+https://github.com/paritytech/substrate)",
  "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
  "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate)",
@@ -2000,7 +2000,7 @@ dependencies = [
 [[package]]
 name = "pwasm-alloc"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "pwasm-libc 0.1.0 (git+https://github.com/paritytech/substrate)",
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2009,7 +2009,7 @@ dependencies = [
 [[package]]
 name = "pwasm-libc"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 
 [[package]]
 name = "quick-error"
@@ -2166,7 +2166,7 @@ dependencies = [
 
 [[package]]
 name = "rhododendron"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2188,13 +2188,13 @@ dependencies = [
 
 [[package]]
 name = "rlp"
-version = "0.2.1"
-source = "git+https://github.com/paritytech/parity-common.git#22209e14805e5764f7fe81259324d34eab179264"
+version = "0.2.2"
+source = "git+https://github.com/paritytech/parity-common.git#abe18ea03c1faae5e9b3787b481086e796ff42fb"
 dependencies = [
  "byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethereum-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2509,14 +2509,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "substrate-bft"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rhododendron 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rhododendron 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
  "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
  "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
@@ -2528,7 +2528,7 @@ dependencies = [
 [[package]]
 name = "substrate-cli"
 version = "0.3.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2560,7 +2560,7 @@ dependencies = [
 [[package]]
 name = "substrate-client"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2572,7 +2572,7 @@ dependencies = [
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "patricia-trie 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
- "rlp 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
+ "rlp 0.2.2 (git+https://github.com/paritytech/parity-common.git)",
  "slog 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "substrate-bft 0.1.0 (git+https://github.com/paritytech/substrate)",
  "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
@@ -2590,7 +2590,7 @@ dependencies = [
 [[package]]
 name = "substrate-client-db"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "hashdb 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
  "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common.git)",
@@ -2612,7 +2612,7 @@ dependencies = [
 [[package]]
 name = "substrate-codec"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2620,7 +2620,7 @@ dependencies = [
 [[package]]
 name = "substrate-codec-derive"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "proc-macro2 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2630,7 +2630,7 @@ dependencies = [
 [[package]]
 name = "substrate-executor"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
@@ -2656,7 +2656,7 @@ dependencies = [
 [[package]]
 name = "substrate-extrinsic-pool"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2670,7 +2670,7 @@ dependencies = [
 [[package]]
 name = "substrate-keyring"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
  "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2680,7 +2680,7 @@ dependencies = [
 [[package]]
 name = "substrate-keystore"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2696,7 +2696,7 @@ dependencies = [
 [[package]]
 name = "substrate-network"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
@@ -2718,7 +2718,7 @@ dependencies = [
 [[package]]
 name = "substrate-network-libp2p"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2741,7 +2741,7 @@ dependencies = [
 [[package]]
 name = "substrate-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2751,7 +2751,7 @@ dependencies = [
  "hashdb 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
  "patricia-trie 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
  "plain_hasher 0.2.0 (git+https://github.com/paritytech/parity-common.git)",
- "rlp 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
+ "rlp 0.2.2 (git+https://github.com/paritytech/parity-common.git)",
  "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2767,7 +2767,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 8.0.2 (git+https://github.com/paritytech/jsonrpc.git)",
@@ -2781,6 +2781,7 @@ dependencies = [
  "substrate-extrinsic-pool 0.1.0 (git+https://github.com/paritytech/substrate)",
  "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
  "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-runtime-version 0.1.0 (git+https://github.com/paritytech/substrate)",
  "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate)",
  "tokio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2788,7 +2789,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-servers"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "jsonrpc-core 8.0.2 (git+https://github.com/paritytech/jsonrpc.git)",
  "jsonrpc-http-server 8.0.1 (git+https://github.com/paritytech/jsonrpc.git)",
@@ -2803,7 +2804,7 @@ dependencies = [
 [[package]]
 name = "substrate-runtime-consensus"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2820,7 +2821,7 @@ dependencies = [
 [[package]]
 name = "substrate-runtime-council"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "integer-sqrt 0.1.0 (git+https://github.com/paritytech/integer-sqrt-rs.git)",
@@ -2844,7 +2845,7 @@ dependencies = [
 [[package]]
 name = "substrate-runtime-democracy"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2866,7 +2867,7 @@ dependencies = [
 [[package]]
 name = "substrate-runtime-executive"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2882,7 +2883,7 @@ dependencies = [
 [[package]]
 name = "substrate-runtime-io"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
  "environmental 0.1.0 (git+https://github.com/paritytech/substrate)",
@@ -2897,7 +2898,7 @@ dependencies = [
 [[package]]
 name = "substrate-runtime-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "integer-sqrt 0.1.0 (git+https://github.com/paritytech/integer-sqrt-rs.git)",
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2915,7 +2916,7 @@ dependencies = [
 [[package]]
 name = "substrate-runtime-sandbox"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
@@ -2928,7 +2929,7 @@ dependencies = [
 [[package]]
 name = "substrate-runtime-session"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2949,7 +2950,7 @@ dependencies = [
 [[package]]
 name = "substrate-runtime-staking"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2972,7 +2973,7 @@ dependencies = [
 [[package]]
 name = "substrate-runtime-std"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "pwasm-alloc 0.1.0 (git+https://github.com/paritytech/substrate)",
  "pwasm-libc 0.1.0 (git+https://github.com/paritytech/substrate)",
@@ -2982,7 +2983,7 @@ dependencies = [
 [[package]]
 name = "substrate-runtime-support"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
  "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2997,7 +2998,7 @@ dependencies = [
 [[package]]
 name = "substrate-runtime-system"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3014,7 +3015,7 @@ dependencies = [
 [[package]]
 name = "substrate-runtime-timestamp"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3032,7 +3033,7 @@ dependencies = [
 [[package]]
 name = "substrate-runtime-version"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3045,7 +3046,7 @@ dependencies = [
 [[package]]
 name = "substrate-serializer"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3054,7 +3055,7 @@ dependencies = [
 [[package]]
 name = "substrate-service"
 version = "0.3.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "exit-future 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3086,7 +3087,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-db"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3098,7 +3099,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-machine"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashdb 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
@@ -3108,7 +3109,7 @@ dependencies = [
  "memorydb 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
  "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "patricia-trie 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
- "rlp 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
+ "rlp 0.2.2 (git+https://github.com/paritytech/parity-common.git)",
  "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
  "triehash 0.2.0 (git+https://github.com/paritytech/parity-common.git)",
 ]
@@ -3116,7 +3117,7 @@ dependencies = [
 [[package]]
 name = "substrate-telemetry"
 version = "0.3.0"
-source = "git+https://github.com/paritytech/substrate#3697979e8d52673dd350103d810ec557f5959e9c"
+source = "git+https://github.com/paritytech/substrate#f3709852138d0bd2348d7e13505777c7acb7551e"
 dependencies = [
  "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3483,11 +3484,11 @@ dependencies = [
 [[package]]
 name = "triehash"
 version = "0.2.0"
-source = "git+https://github.com/paritytech/parity-common.git#22209e14805e5764f7fe81259324d34eab179264"
+source = "git+https://github.com/paritytech/parity-common.git#abe18ea03c1faae5e9b3787b481086e796ff42fb"
 dependencies = [
  "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashdb 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
- "rlp 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
+ "rlp 0.2.2 (git+https://github.com/paritytech/parity-common.git)",
 ]
 
 [[package]]
@@ -3532,7 +3533,7 @@ dependencies = [
 [[package]]
 name = "uint"
 version = "0.3.0"
-source = "git+https://github.com/paritytech/parity-common.git#22209e14805e5764f7fe81259324d34eab179264"
+source = "git+https://github.com/paritytech/parity-common.git#abe18ea03c1faae5e9b3787b481086e796ff42fb"
 dependencies = [
  "byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3982,9 +3983,9 @@ dependencies = [
 "checksum regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "747ba3b235651f6e2f67dfa8bcdcd073ddb7c243cb21c442fc12395dfcac212d"
 "checksum relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a"
 "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
-"checksum rhododendron 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3d2b4c928dfb981e491432f0809e93c99857112b0a348a93eee6b13e0bf0f0f3"
+"checksum rhododendron 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6666673554e3fe4db3f4ad029db23451ab5d912ac7c0dd026c7c445905dd4c5a"
 "checksum ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6f7d28b30a72c01b458428e0ae988d4149c20d902346902be881e3edc4bb325c"
-"checksum rlp 0.2.1 (git+https://github.com/paritytech/parity-common.git)" = "<none>"
+"checksum rlp 0.2.2 (git+https://github.com/paritytech/parity-common.git)" = "<none>"
 "checksum rlp 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "89db7f8dfdd5eb7ab3ac3ece7a07fd273a680b4b224cb231181280e8996f9f0b"
 "checksum rocksdb 0.4.5 (git+https://github.com/paritytech/rust-rocksdb)" = "<none>"
 "checksum rocksdb-sys 0.3.0 (git+https://github.com/paritytech/rust-rocksdb)" = "<none>"
diff --git a/polkadot/README.adoc b/polkadot/README.adoc
index 9751aaf526..facba04e54 100644
--- a/polkadot/README.adoc
+++ b/polkadot/README.adoc
@@ -15,7 +15,7 @@ be what used to be Polkadot, along with its branches and releases.
 Things will be a little odd for a while. Polkadot PoC-2 remains as a branch `v0.2` in the **Substrate**
 repo. Polkadot PoC-3 *will be* in branch `v0.3` in the **Polkadot** repo. To play on the ("Krumme Lancke")
 testnet, you'll want the PoC-2 code which is in the **Substrate** repo. These instructions are up to date
-with this, but if you see "substrate" and are wondering why i you need it for Polkadot, now you know.
+with this, but if you see "substrate" and are wondering why you need it for Polkadot, now you know.
 
 
 == To play
@@ -127,7 +127,7 @@ The easiest/faster option is to use the latest image.
 
 
 .First run
-Let´s first check the version we have. The first time you run this command, the polkadot docker image will be downloaded. This takes a bit of time and bandwidth, be patient:
+Let's first check the version we have. The first time you run this command, the polkadot docker image will be downloaded. This takes a bit of time and bandwidth, be patient:
 
 [source, shell]
 docker run --rm -it chevdor/polkadot:latest polkadot --version
diff --git a/polkadot/api/src/full.rs b/polkadot/api/src/full.rs
index e0568f9394..7c7cf3b69b 100644
--- a/polkadot/api/src/full.rs
+++ b/polkadot/api/src/full.rs
@@ -33,7 +33,12 @@ use primitives::parachain::{DutyRoster, Id as ParaId};
 use substrate_primitives::{KeccakHasher, RlpCodec};
 use {BlockBuilder, PolkadotApi, LocalPolkadotApi, Error, ErrorKind, Result};
 
-fn call<B, R>(client: &Client<B, LocalCallExecutor<B, NativeExecutor<LocalDispatch>>, Block>, at: &BlockId, method: &'static str, input: &[u8]) -> Result<R>
+fn call<B, R>(
+	client: &Client<B, LocalCallExecutor<B, NativeExecutor<LocalDispatch>>, Block>,
+	at: &BlockId,
+	function: &'static str,
+	input: &[u8])
+-> Result<R>
 where
 	R: Decode,
 	B: LocalBackend<Block, KeccakHasher, RlpCodec>,
@@ -52,7 +57,7 @@ where
 		let mut overlay = Default::default();
 		let execution_manager = || ExecutionManager::Both(|wasm_result, native_result| {
 			warn!("Consensus error between wasm and native runtime execution at block {:?}", at);
-			warn!("   Method {:?}", method);
+			warn!("   Function {:?}", function);
 			warn!("   Native result {:?}", native_result);
 			warn!("   Wasm result {:?}", wasm_result);
 			wasm_result
@@ -67,12 +72,12 @@ where
 		let (r, _) = client.executor().call_at_state(
 			&state,
 			&mut overlay,
-			method,
+			function,
 			input,
 			execution_manager()
 		)?;
 		Ok(R::decode(&mut &r[..])
-		   .ok_or_else(|| client::error::Error::from(client::error::ErrorKind::CallResultDecode(method)))?)
+		   .ok_or_else(|| client::error::Error::from(client::error::ErrorKind::CallResultDecode(function)))?)
 	})
 }
 
@@ -111,13 +116,12 @@ impl<B: LocalBackend<Block, KeccakHasher, RlpCodec>> PolkadotApi for Client<B, L
 	}
 
 	fn evaluate_block(&self, at: &BlockId, block: Block) -> Result<bool> {
-		use substrate_executor::error::ErrorKind as ExecErrorKind;
 		let encoded = block.encode();
 		let res: Result<()> = call(self, at, "execute_block", &encoded);
 		match res {
 			Ok(()) => Ok(true),
 			Err(err) => match err.kind() {
-				&ErrorKind::Executor(ExecErrorKind::Runtime) => Ok(false),
+				&ErrorKind::Execution(_) => Ok(false),
 				_ => Err(err)
 			}
 		}
diff --git a/polkadot/api/src/lib.rs b/polkadot/api/src/lib.rs
index 1265faf961..9f139faa89 100644
--- a/polkadot/api/src/lib.rs
+++ b/polkadot/api/src/lib.rs
@@ -60,6 +60,11 @@ error_chain! {
 			description("Unknown block")
 			display("Unknown block {}", b)
 		}
+		/// Execution error.
+		Execution(e: String) {
+			description("Execution error")
+			display("Execution error: {}", e)
+		}
 		/// Some other error.
 		// TODO: allow to be specified as associated type of PolkadotApi
 		Other(e: Box<::std::error::Error + Send>) {
@@ -67,16 +72,14 @@ error_chain! {
 			display("Other error: {}", e.description())
 		}
 	}
-
-	links {
-		Executor(substrate_executor::error::Error, substrate_executor::error::ErrorKind);
-	}
 }
 
 impl From<client::error::Error> for Error {
 	fn from(e: client::error::Error) -> Error {
 		match e {
 			client::error::Error(client::error::ErrorKind::UnknownBlock(b), _) => Error::from_kind(ErrorKind::UnknownBlock(b)),
+			client::error::Error(client::error::ErrorKind::Execution(e), _) =>
+				Error::from_kind(ErrorKind::Execution(format!("{}", e))),
 			other => Error::from_kind(ErrorKind::Other(Box::new(other) as Box<_>)),
 		}
 	}
diff --git a/polkadot/consensus/src/service.rs b/polkadot/consensus/src/service.rs
index d0c92962be..b7302b5d43 100644
--- a/polkadot/consensus/src/service.rs
+++ b/polkadot/consensus/src/service.rs
@@ -224,7 +224,11 @@ impl Service {
 				interval.map_err(|e| debug!("Timer error: {:?}", e)).for_each(move |_| {
 					if let Ok(best_block) = c.best_block_header() {
 						let hash = best_block.hash();
-						if hash == prev_best && s.live_agreement() != Some(hash) {
+						let last_agreement = s.last_agreement();
+						let can_build_upon = last_agreement
+							.map_or(true, |x| !x.live || x.parent_hash != hash);
+
+						if hash == prev_best && can_build_upon {
 							debug!("Starting consensus round after a timeout");
 							start_bft(best_block, s.clone());
 						}