diff --git a/Cargo.lock b/Cargo.lock
index 6b4b5e8b76a9..3082e891fd21 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,14 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+[[package]]
+name = "Inflector"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "adder"
 version = "0.6.15"
@@ -7,7 +16,7 @@ dependencies = [
  "dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "polkadot-parachain 0.6.15",
- "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-wasm-builder-runner 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -960,7 +969,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "fork-tree"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -3867,7 +3876,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "sr-api-macros"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3879,7 +3888,7 @@ dependencies = [
 [[package]]
 name = "sr-arithmetic"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3892,16 +3901,16 @@ dependencies = [
 [[package]]
 name = "sr-io"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-externalities 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "substrate-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3910,7 +3919,7 @@ dependencies = [
 [[package]]
 name = "sr-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3928,7 +3937,7 @@ dependencies = [
 [[package]]
 name = "sr-staking-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -3938,15 +3947,12 @@ dependencies = [
 [[package]]
 name = "sr-std"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
-dependencies = [
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 
 [[package]]
 name = "sr-version"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3958,7 +3964,7 @@ dependencies = [
 [[package]]
 name = "srml-authority-discovery"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3975,7 +3981,7 @@ dependencies = [
 [[package]]
 name = "srml-authorship"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3991,7 +3997,7 @@ dependencies = [
 [[package]]
 name = "srml-babe"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4011,7 +4017,7 @@ dependencies = [
 [[package]]
 name = "srml-balances"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4026,7 +4032,7 @@ dependencies = [
 [[package]]
 name = "srml-collective"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4042,7 +4048,7 @@ dependencies = [
 [[package]]
 name = "srml-democracy"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4057,7 +4063,7 @@ dependencies = [
 [[package]]
 name = "srml-elections-phragmen"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -4070,7 +4076,7 @@ dependencies = [
 [[package]]
 name = "srml-executive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4084,7 +4090,7 @@ dependencies = [
 [[package]]
 name = "srml-finality-tracker"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4099,7 +4105,7 @@ dependencies = [
 [[package]]
 name = "srml-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4117,7 +4123,7 @@ dependencies = [
 [[package]]
 name = "srml-im-online"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4136,7 +4142,7 @@ dependencies = [
 [[package]]
 name = "srml-indices"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4153,7 +4159,7 @@ dependencies = [
 [[package]]
 name = "srml-membership"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4167,7 +4173,7 @@ dependencies = [
 [[package]]
 name = "srml-metadata"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4178,7 +4184,7 @@ dependencies = [
 [[package]]
 name = "srml-nicks"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4192,7 +4198,7 @@ dependencies = [
 [[package]]
 name = "srml-offences"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4207,7 +4213,7 @@ dependencies = [
 [[package]]
 name = "srml-randomness-collective-flip"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4220,7 +4226,7 @@ dependencies = [
 [[package]]
 name = "srml-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4239,7 +4245,7 @@ dependencies = [
 [[package]]
 name = "srml-staking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4259,7 +4265,7 @@ dependencies = [
 [[package]]
 name = "srml-staking-reward-curve"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4270,7 +4276,7 @@ dependencies = [
 [[package]]
 name = "srml-sudo"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4284,7 +4290,7 @@ dependencies = [
 [[package]]
 name = "srml-support"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4300,12 +4306,13 @@ dependencies = [
  "srml-support-procedural 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
 ]
 
 [[package]]
 name = "srml-support-procedural"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4317,7 +4324,7 @@ dependencies = [
 [[package]]
 name = "srml-support-procedural-tools"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4329,7 +4336,7 @@ dependencies = [
 [[package]]
 name = "srml-support-procedural-tools-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4339,7 +4346,7 @@ dependencies = [
 [[package]]
 name = "srml-system"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4356,7 +4363,7 @@ dependencies = [
 [[package]]
 name = "srml-system-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4374,7 +4381,7 @@ dependencies = [
 [[package]]
 name = "srml-system-rpc-runtime-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -4383,7 +4390,7 @@ dependencies = [
 [[package]]
 name = "srml-timestamp"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4398,7 +4405,7 @@ dependencies = [
 [[package]]
 name = "srml-transaction-payment"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -4411,7 +4418,7 @@ dependencies = [
 [[package]]
 name = "srml-transaction-payment-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4428,7 +4435,7 @@ dependencies = [
 [[package]]
 name = "srml-transaction-payment-rpc-runtime-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4440,7 +4447,7 @@ dependencies = [
 [[package]]
 name = "srml-treasury"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4530,7 +4537,7 @@ dependencies = [
 [[package]]
 name = "substrate-application-crypto"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4542,7 +4549,7 @@ dependencies = [
 [[package]]
 name = "substrate-authority-discovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4564,7 +4571,7 @@ dependencies = [
 [[package]]
 name = "substrate-authority-discovery-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -4586,7 +4593,7 @@ dependencies = [
 [[package]]
 name = "substrate-chain-spec"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4601,7 +4608,7 @@ dependencies = [
 [[package]]
 name = "substrate-chain-spec-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4612,7 +4619,7 @@ dependencies = [
 [[package]]
 name = "substrate-cli"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4648,7 +4655,7 @@ dependencies = [
 [[package]]
 name = "substrate-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4678,7 +4685,7 @@ dependencies = [
 [[package]]
 name = "substrate-client-db"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)",
@@ -4702,7 +4709,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-babe"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -4740,7 +4747,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-babe-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "schnorrkel 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4754,7 +4761,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-common"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4773,7 +4780,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-slots"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-timer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4791,7 +4798,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-uncles"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -4805,7 +4812,7 @@ dependencies = [
 [[package]]
 name = "substrate-debug-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4815,7 +4822,7 @@ dependencies = [
 [[package]]
 name = "substrate-executor"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "cranelift-codegen 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cranelift-entity 0.46.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4834,6 +4841,7 @@ dependencies = [
  "substrate-externalities 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "substrate-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -4847,7 +4855,7 @@ dependencies = [
 [[package]]
 name = "substrate-externalities"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "primitive-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4858,7 +4866,7 @@ dependencies = [
 [[package]]
 name = "substrate-finality-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "finality-grandpa 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -4887,7 +4895,7 @@ dependencies = [
 [[package]]
 name = "substrate-finality-grandpa-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4900,7 +4908,7 @@ dependencies = [
 [[package]]
 name = "substrate-header-metadata"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4910,7 +4918,7 @@ dependencies = [
 [[package]]
 name = "substrate-inherents"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4921,7 +4929,7 @@ dependencies = [
 [[package]]
 name = "substrate-keyring"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -4933,7 +4941,7 @@ dependencies = [
 [[package]]
 name = "substrate-keystore"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4948,7 +4956,7 @@ dependencies = [
 [[package]]
 name = "substrate-network"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4990,7 +4998,7 @@ dependencies = [
 [[package]]
 name = "substrate-offchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5017,7 +5025,7 @@ dependencies = [
 [[package]]
 name = "substrate-offchain-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -5026,7 +5034,7 @@ dependencies = [
 [[package]]
 name = "substrate-panic-handler"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5035,7 +5043,7 @@ dependencies = [
 [[package]]
 name = "substrate-peerset"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5048,7 +5056,7 @@ dependencies = [
 [[package]]
 name = "substrate-phragmen"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -5058,7 +5066,7 @@ dependencies = [
 [[package]]
 name = "substrate-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 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)",
@@ -5086,6 +5094,7 @@ dependencies = [
  "substrate-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-externalities 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "substrate-primitives-storage 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "substrate-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "tiny-bip39 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "twox-hash 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5096,7 +5105,7 @@ dependencies = [
 [[package]]
 name = "substrate-primitives-storage"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5107,7 +5116,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5133,7 +5142,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5155,7 +5164,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -5164,7 +5173,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-servers"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-http-server 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5176,10 +5185,37 @@ dependencies = [
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
 ]
 
+[[package]]
+name = "substrate-runtime-interface"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
+dependencies = [
+ "environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "primitive-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "static_assertions 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "substrate-externalities 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "substrate-runtime-interface-proc-macro 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "substrate-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+]
+
+[[package]]
+name = "substrate-runtime-interface-proc-macro"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
+dependencies = [
+ "Inflector 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "substrate-serializer"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5188,7 +5224,7 @@ dependencies = [
 [[package]]
 name = "substrate-service"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5228,7 +5264,7 @@ dependencies = [
 [[package]]
 name = "substrate-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
  "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
@@ -5239,7 +5275,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-db"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5250,7 +5286,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-machine"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5269,7 +5305,7 @@ dependencies = [
 [[package]]
 name = "substrate-telemetry"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5291,7 +5327,7 @@ dependencies = [
 [[package]]
 name = "substrate-transaction-graph"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5305,7 +5341,7 @@ dependencies = [
 [[package]]
 name = "substrate-transaction-pool"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5321,7 +5357,7 @@ dependencies = [
 [[package]]
 name = "substrate-trie"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "memory-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5340,8 +5376,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "substrate-wasm-interface"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#a6fdd1f71b72704e80c8c2571080d42634fb35d2"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#5216fe11175d2ff8bc63bad8aea0096c0dbdeaf5"
 dependencies = [
+ "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasmi 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -6315,6 +6352,7 @@ dependencies = [
 ]
 
 [metadata]
+"checksum Inflector 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
 "checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
 "checksum aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee"
 "checksum aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d"
@@ -6776,6 +6814,8 @@ dependencies = [
 "checksum substrate-rpc-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
 "checksum substrate-rpc-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
 "checksum substrate-rpc-servers 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
+"checksum substrate-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
+"checksum substrate-runtime-interface-proc-macro 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
 "checksum substrate-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
 "checksum substrate-service 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
 "checksum substrate-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
diff --git a/Cargo.toml b/Cargo.toml
index 0e212bac894f..c66731d5b968 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ path = "src/main.rs"
 
 [package]
 name = "polkadot"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
 edition = "2018"
diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml
index e109bd6835ad..612d42f129ca 100644
--- a/availability-store/Cargo.toml
+++ b/availability-store/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-availability-store"
 description = "Persistent database for parachain data"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 6460b9e96aee..018d73822a6f 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-cli"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Polkadot node implementation in Rust."
 edition = "2018"
diff --git a/collator/Cargo.toml b/collator/Cargo.toml
index 57115f77223c..aa8ee0ccc205 100644
--- a/collator/Cargo.toml
+++ b/collator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-collator"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Collator node implementation"
 edition = "2018"
diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml
index a74978cf0255..0d453e23aa7c 100644
--- a/erasure-coding/Cargo.toml
+++ b/erasure-coding/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-erasure-coding"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
diff --git a/executor/Cargo.toml b/executor/Cargo.toml
index 3e75ff192b4a..d845f3316eac 100644
--- a/executor/Cargo.toml
+++ b/executor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-executor"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Polkadot node implementation in Rust."
 edition = "2018"
diff --git a/network/Cargo.toml b/network/Cargo.toml
index 58cdc1d06e82..f828ec49bff0 100644
--- a/network/Cargo.toml
+++ b/network/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-network"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Polkadot-specific networking protocol"
 edition = "2018"
diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml
index 1bfa436f3777..c45328e1ea97 100644
--- a/parachain/Cargo.toml
+++ b/parachain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-parachain"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Types and utilities for creating and working with parachains"
 edition = "2018"
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index 84bd73bdfb13..ce212cbc314b 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-primitives"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 64ea5ba733fb..a73894935185 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-rpc"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 3317f46d99aa..722d231b18ff 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-runtime"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 build = "build.rs"
diff --git a/runtime/src/claims.rs b/runtime/src/claims.rs
index 3859376ac7ae..6f40d9c41b01 100644
--- a/runtime/src/claims.rs
+++ b/runtime/src/claims.rs
@@ -17,7 +17,7 @@
 //! Module to process claims from Ethereum addresses.
 
 use rstd::prelude::*;
-use sr_io::{keccak_256, secp256k1_ecdsa_recover};
+use sr_io::{hashing::keccak_256, crypto::secp256k1_ecdsa_recover};
 use srml_support::{decl_event, decl_storage, decl_module};
 use srml_support::traits::{Currency, Get};
 use system::ensure_none;
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 61932c7f18ca..3fa96a27920a 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -729,7 +729,6 @@ impl_runtime_apis! {
 
 	impl substrate_session::SessionKeys<Block> for Runtime {
 		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
-			let seed = seed.as_ref().map(|s| rstd::str::from_utf8(&s).expect("Seed is an utf8 string"));
 			SessionKeys::generate(seed)
 		}
 	}
diff --git a/service/Cargo.toml b/service/Cargo.toml
index 54a078a940bf..6e7142d13e2c 100644
--- a/service/Cargo.toml
+++ b/service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-service"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml
index c1809618786e..b65ed0138657 100644
--- a/statement-table/Cargo.toml
+++ b/statement-table/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-statement-table"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
diff --git a/test-parachains/adder/Cargo.toml b/test-parachains/adder/Cargo.toml
index 33d09cf2d3c0..edf2db190fa3 100644
--- a/test-parachains/adder/Cargo.toml
+++ b/test-parachains/adder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "adder"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Test parachain which adds to a number as its state transition"
 edition = "2018"
@@ -13,10 +13,10 @@ tiny-keccak = "1.5.0"
 dlmalloc = { version = "0.1.3", features = [ "global" ] }
 
 # We need to make sure the global allocator is disabled until we have support of full substrate externalities
-rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false, features = [ "no_global_allocator" ] }
+runtime-io = { package = "sr-io", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false, features = [ "disable_allocator" ] }
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.2" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4" }
 
 [features]
 default = [ "std" ]
diff --git a/test-parachains/halt/Cargo.toml b/test-parachains/halt/Cargo.toml
index e3f975bf8500..689753f369f2 100644
--- a/test-parachains/halt/Cargo.toml
+++ b/test-parachains/halt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "halt"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Test parachain which executes forever"
 edition = "2018"
diff --git a/validation/Cargo.toml b/validation/Cargo.toml
index ff1ef6ddd736..7b22078690f6 100644
--- a/validation/Cargo.toml
+++ b/validation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-validation"
-version = "0.6.15"
+version = "0.6.16"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"