Make collator generate the correct block data

cumulus/Cargo.lock

@@ -553,6 +553,7 @@ name = "cumulus-collator"
 version = "0.1.0"
 dependencies = [
  "cumulus-consensus 0.1.0",
+ "cumulus-runtime 0.1.0",
  "cumulus-test-runtime 0.1.0",
  "futures 0.1.29 (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)",
@@ -954,7 +955,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=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1154,7 +1155,7 @@ dependencies = [
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "http 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1397,8 +1398,11 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "integer-sqrt"
@@ -2739,7 +2743,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "polkadot-availability-store"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771"
+source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#70ce0c6374007aaf873f2497363cd1e804c698e9"
 dependencies = [
  "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=616b40150ded71f57f650067fcbc5c99d7c343e6)",
  "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=616b40150ded71f57f650067fcbc5c99d7c343e6)",
@@ -2754,7 +2758,7 @@ dependencies = [
 [[package]]
 name = "polkadot-cli"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771"
+source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#70ce0c6374007aaf873f2497363cd1e804c698e9"
 dependencies = [
  "exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2768,7 +2772,7 @@ dependencies = [
 [[package]]
 name = "polkadot-collator"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771"
+source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#70ce0c6374007aaf873f2497363cd1e804c698e9"
 dependencies = [
  "futures 0.1.29 (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)",
@@ -2789,7 +2793,7 @@ dependencies = [
 [[package]]
 name = "polkadot-executor"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771"
+source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#70ce0c6374007aaf873f2497363cd1e804c698e9"
 dependencies = [
  "polkadot-runtime 0.6.0 (git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch)",
  "substrate-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)",
@@ -2798,7 +2802,7 @@ dependencies = [
 [[package]]
 name = "polkadot-network"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771"
+source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#70ce0c6374007aaf873f2497363cd1e804c698e9"
 dependencies = [
  "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2818,7 +2822,7 @@ dependencies = [
 [[package]]
 name = "polkadot-parachain"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771"
+source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#70ce0c6374007aaf873f2497363cd1e804c698e9"
 dependencies = [
  "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2835,7 +2839,7 @@ dependencies = [
 [[package]]
 name = "polkadot-primitives"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771"
+source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#70ce0c6374007aaf873f2497363cd1e804c698e9"
 dependencies = [
  "bitvec 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2853,7 +2857,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771"
+source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#70ce0c6374007aaf873f2497363cd1e804c698e9"
 dependencies = [
  "bitvec 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2906,7 +2910,7 @@ dependencies = [
 [[package]]
 name = "polkadot-service"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771"
+source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#70ce0c6374007aaf873f2497363cd1e804c698e9"
 dependencies = [
  "exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2947,7 +2951,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-table"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771"
+source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#70ce0c6374007aaf873f2497363cd1e804c698e9"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "polkadot-primitives 0.6.0 (git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch)",
@@ -2957,7 +2961,7 @@ dependencies = [
 [[package]]
 name = "polkadot-validation"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771"
+source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#70ce0c6374007aaf873f2497363cd1e804c698e9"
 dependencies = [
  "bitvec 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3729,7 +3733,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=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -3741,7 +3745,7 @@ dependencies = [
 [[package]]
 name = "sr-io"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libsecp256k1 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3758,7 +3762,7 @@ dependencies = [
 [[package]]
 name = "sr-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3777,7 +3781,7 @@ dependencies = [
 [[package]]
 name = "sr-staking-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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=bkchr-cumulus-branch)",
@@ -3787,7 +3791,7 @@ dependencies = [
 [[package]]
 name = "sr-std"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -3795,7 +3799,7 @@ dependencies = [
 [[package]]
 name = "sr-version"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "impl-serde 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)",
@@ -3807,7 +3811,7 @@ dependencies = [
 [[package]]
 name = "srml-authority-discovery"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3824,7 +3828,7 @@ dependencies = [
 [[package]]
 name = "srml-authorship"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "impl-trait-for-tuples 0.1.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)",
@@ -3840,7 +3844,7 @@ dependencies = [
 [[package]]
 name = "srml-babe"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -3860,7 +3864,7 @@ dependencies = [
 [[package]]
 name = "srml-balances"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -3875,7 +3879,7 @@ dependencies = [
 [[package]]
 name = "srml-collective"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -3891,7 +3895,7 @@ dependencies = [
 [[package]]
 name = "srml-democracy"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -3906,7 +3910,7 @@ dependencies = [
 [[package]]
 name = "srml-elections"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -3922,7 +3926,7 @@ dependencies = [
 [[package]]
 name = "srml-executive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3936,7 +3940,7 @@ dependencies = [
 [[package]]
 name = "srml-finality-tracker"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "impl-trait-for-tuples 0.1.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)",
@@ -3951,7 +3955,7 @@ dependencies = [
 [[package]]
 name = "srml-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3969,7 +3973,7 @@ dependencies = [
 [[package]]
 name = "srml-im-online"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3987,7 +3991,7 @@ dependencies = [
 [[package]]
 name = "srml-indices"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4004,7 +4008,7 @@ dependencies = [
 [[package]]
 name = "srml-membership"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4018,7 +4022,7 @@ dependencies = [
 [[package]]
 name = "srml-metadata"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4029,7 +4033,7 @@ dependencies = [
 [[package]]
 name = "srml-offences"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4044,7 +4048,7 @@ dependencies = [
 [[package]]
 name = "srml-randomness-collective-flip"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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 +4061,7 @@ dependencies = [
 [[package]]
 name = "srml-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "impl-trait-for-tuples 0.1.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)",
@@ -4076,7 +4080,7 @@ dependencies = [
 [[package]]
 name = "srml-staking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4096,7 +4100,7 @@ dependencies = [
 [[package]]
 name = "srml-staking-reward-curve"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4107,7 +4111,7 @@ dependencies = [
 [[package]]
 name = "srml-sudo"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4121,7 +4125,7 @@ dependencies = [
 [[package]]
 name = "srml-support"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4141,7 +4145,7 @@ dependencies = [
 [[package]]
 name = "srml-support-procedural"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4153,7 +4157,7 @@ dependencies = [
 [[package]]
 name = "srml-support-procedural-tools"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4165,7 +4169,7 @@ dependencies = [
 [[package]]
 name = "srml-support-procedural-tools-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4175,7 +4179,7 @@ dependencies = [
 [[package]]
 name = "srml-system"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "impl-trait-for-tuples 0.1.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)",
@@ -4192,7 +4196,7 @@ dependencies = [
 [[package]]
 name = "srml-timestamp"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "impl-trait-for-tuples 0.1.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)",
@@ -4207,7 +4211,7 @@ dependencies = [
 [[package]]
 name = "srml-treasury"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4293,7 +4297,7 @@ dependencies = [
 [[package]]
 name = "substrate-application-crypto"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4305,7 +4309,7 @@ dependencies = [
 [[package]]
 name = "substrate-authority-discovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4327,7 +4331,7 @@ dependencies = [
 [[package]]
 name = "substrate-authority-discovery-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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=bkchr-cumulus-branch)",
@@ -4338,7 +4342,7 @@ dependencies = [
 [[package]]
 name = "substrate-basic-authorship"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4366,7 +4370,7 @@ dependencies = [
 [[package]]
 name = "substrate-chain-spec"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4381,7 +4385,7 @@ dependencies = [
 [[package]]
 name = "substrate-chain-spec-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4392,7 +4396,7 @@ dependencies = [
 [[package]]
 name = "substrate-cli"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4428,7 +4432,7 @@ dependencies = [
 [[package]]
 name = "substrate-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4458,7 +4462,7 @@ dependencies = [
 [[package]]
 name = "substrate-client-db"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4482,7 +4486,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-aura-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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=bkchr-cumulus-branch)",
@@ -4494,7 +4498,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-babe"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4531,7 +4535,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-babe-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4545,7 +4549,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-common"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4564,7 +4568,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-slots"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4582,7 +4586,7 @@ dependencies = [
 [[package]]
 name = "substrate-consensus-uncles"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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=bkchr-cumulus-branch)",
@@ -4596,7 +4600,7 @@ dependencies = [
 [[package]]
 name = "substrate-executor"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4620,7 +4624,7 @@ dependencies = [
 [[package]]
 name = "substrate-externalities"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "primitive-types 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4631,7 +4635,7 @@ dependencies = [
 [[package]]
 name = "substrate-finality-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "finality-grandpa 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)",
@@ -4660,7 +4664,7 @@ dependencies = [
 [[package]]
 name = "substrate-finality-grandpa-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4673,7 +4677,7 @@ dependencies = [
 [[package]]
 name = "substrate-header-metadata"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4683,7 +4687,7 @@ dependencies = [
 [[package]]
 name = "substrate-inherents"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4694,7 +4698,7 @@ dependencies = [
 [[package]]
 name = "substrate-keyring"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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=bkchr-cumulus-branch)",
@@ -4706,7 +4710,7 @@ dependencies = [
 [[package]]
 name = "substrate-keystore"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4721,7 +4725,7 @@ dependencies = [
 [[package]]
 name = "substrate-network"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4763,7 +4767,7 @@ dependencies = [
 [[package]]
 name = "substrate-offchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4788,7 +4792,7 @@ dependencies = [
 [[package]]
 name = "substrate-offchain-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)",
  "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)",
@@ -4797,7 +4801,7 @@ dependencies = [
 [[package]]
 name = "substrate-panic-handler"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4806,7 +4810,7 @@ dependencies = [
 [[package]]
 name = "substrate-peerset"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4819,7 +4823,7 @@ dependencies = [
 [[package]]
 name = "substrate-phragmen"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)",
  "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)",
@@ -4828,7 +4832,7 @@ dependencies = [
 [[package]]
 name = "substrate-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4863,7 +4867,7 @@ dependencies = [
 [[package]]
 name = "substrate-primitives-storage"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "impl-serde 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4873,7 +4877,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4899,7 +4903,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4921,7 +4925,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
  "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)",
@@ -4930,7 +4934,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-servers"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "jsonrpc-core 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-http-server 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4945,7 +4949,7 @@ dependencies = [
 [[package]]
 name = "substrate-serializer"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4954,7 +4958,7 @@ dependencies = [
 [[package]]
 name = "substrate-service"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -4996,7 +5000,7 @@ dependencies = [
 [[package]]
 name = "substrate-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)",
  "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)",
@@ -5007,7 +5011,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-db"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -5018,7 +5022,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-machine"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -5037,7 +5041,7 @@ dependencies = [
 [[package]]
 name = "substrate-telemetry"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -5059,7 +5063,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -5077,7 +5081,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5110,7 +5114,7 @@ dependencies = [
 [[package]]
 name = "substrate-transaction-graph"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -5124,7 +5128,7 @@ dependencies = [
 [[package]]
 name = "substrate-transaction-pool"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -5140,7 +5144,7 @@ dependencies = [
 [[package]]
 name = "substrate-trie"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 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)",
@@ -5154,7 +5158,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder-runner"
 version = "1.0.3"
-source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 
 [[package]]
 name = "substrate-wasm-builder-runner"
@@ -5164,7 +5168,7 @@ 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=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d"
+source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#6192d8bc275a105f588ae35977170c716ffd3949"
 dependencies = [
  "wasmi 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -6162,7 +6166,7 @@ dependencies = [
 "checksum impl-codec 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3fa0086251524c50fd53b32e7b05eb6d79e2f97221eaf0c53c0ca9c3096f21d3"
 "checksum impl-serde 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bbb1ea6188aca47a0eaeeb330d8a82f16cd500f30b897062d23922568727333a"
 "checksum impl-trait-for-tuples 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6947b372790f8948f439bb6aaa6baabdf80be1a207a477ff072f83fb793e428f"
-"checksum indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a61202fbe46c4a951e9404a720a0180bcf3212c750d735cb5c4ba4dc551299f3"
+"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
 "checksum integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ea155abb3ba6f382a75f1418988c05fe82959ed9ce727de427f9cfd425b0c903"
 "checksum interleaved-ordered 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "141340095b15ed7491bd3d4ced9d20cebfb826174b6bb03386381f62b01e3d77"
 "checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"

cumulus/collator/Cargo.toml

@@ -20,6 +20,7 @@ polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch =
 
 # Cumulus dependencies
 cumulus-consensus = { path = "../consensus" }
+cumulus-runtime = { path = "../runtime" }
 
 # other deps
 log = "0.4.8"

cumulus/collator/src/lib.rs

@@ -16,7 +16,9 @@
 
 //! Cumulus Collator implementation for Substrate.
 
-use sr_primitives::traits::Block as BlockT;
+use cumulus_runtime::ParachainBlockData;
+
+use sr_primitives::traits::{Block as BlockT, Header as HeaderT};
 use consensus_common::{Environment, Proposer};
 use inherents::InherentDataProviders;
 use substrate_primitives::Blake2Hasher;
@@ -37,7 +39,7 @@ use codec::{Decode, Encode};
 
 use log::{error, trace};
 
-use futures03::TryFutureExt;
+use futures03::{TryFutureExt, future};
 use futures::{Future, future::IntoFuture};
 
 use std::{sync::Arc, marker::PhantomData, time::Duration, fmt::Debug};
@@ -85,11 +87,10 @@ impl<Block, PF> Clone for Collator<Block, PF> {
 	}
 }
 
-impl<Block, PF> ParachainContext for Collator<Block, PF> where
+impl<Block, PF> ParachainContext for Collator<Block, PF>
+	where
 		Block: BlockT,
 		PF: Environment<Block> + 'static + Send,
-	PF::Error: Debug,
-	<PF::Proposer as Proposer<Block>>::Create: Unpin + Send,
 {
 	type ProduceCandidate = Box<
 		dyn Future<Item=(BlockData, parachain::HeadData, OutgoingMessages), Error=InvalidHead>
@@ -111,6 +112,8 @@ impl<Block, PF> ParachainContext for Collator<Block, PF> where
 			.map_err(|_| InvalidHead)
 			.into_future()
 			.and_then(move |last_head| {
+				let parent_state_root = *last_head.header.state_root();
+
 				factory.lock()
 					.init(&last_head.header)
 					.map_err(|e| {
@@ -119,7 +122,6 @@ impl<Block, PF> ParachainContext for Collator<Block, PF> where
 						InvalidHead
 					})
 					.and_then(|mut proposer| {
-						error!("PROPOSING");
 						let inherent_data = inherent_providers.create_inherent_data()
 							.map_err(|e| {
 								error!("Failed to create inherent data: {:?}", e);
@@ -131,11 +133,35 @@ impl<Block, PF> ParachainContext for Collator<Block, PF> where
 							Default::default(),
 							//TODO: Fix this.
 							Duration::from_secs(6),
+							true,
 						)
 						.map_err(|e| {
 							error!("Proposing failed: {:?}", e);
 							InvalidHead
 						})
+						.and_then(move |(block, proof)| {
+							let res = match proof {
+								Some(proof) => {
+									let (header, extrinsics) = block.deconstruct();
+
+									// Create the parachain block data for the validators.
+									Ok(
+										ParachainBlockData::<Block>::new(
+											header,
+											extrinsics,
+											proof,
+											parent_state_root,
+										)
+									)
+								}
+								None => {
+									error!("Proposer did not return the requested proof.");
+									Err(InvalidHead)
+								}
+							};
+
+							future::ready(res)
+						})
 						.compat();
 
 						Ok(future)
@@ -143,9 +169,8 @@ impl<Block, PF> ParachainContext for Collator<Block, PF> where
 			})
 			.flatten()
 			.map(|b| {
-				error!("BUILDING BLOCKDATA");
 				let block_data = BlockData(b.encode());
-				let head_data = HeadData::<Block> { header: b.deconstruct().0 };
+				let head_data = HeadData::<Block> { header: b.into_header() };
 				let messages = OutgoingMessages { outgoing_messages: Vec::new() };
 
 				(block_data, parachain::HeadData(head_data.encode()), messages)
@@ -175,11 +200,7 @@ impl<Block, SP> CollatorBuilder<Block, SP> {
 	}
 }
 
-impl<Block: BlockT, SP: SetupParachain<Block>> BuildParachainContext for CollatorBuilder<Block, SP>
+impl<Block: BlockT, SP: SetupParachain<Block>> BuildParachainContext for CollatorBuilder<Block, SP> {
-	where
-		<<SP::ProposerFactory as Environment<Block>>::Proposer as Proposer<Block>>::Create: Send + Unpin,
-		<SP::ProposerFactory as Environment<Block>>::Error: Debug,
-{
 	type ParachainContext = Collator<Block, SP::ProposerFactory>;
 
 	fn build<B, E>(
@@ -201,11 +222,7 @@ impl<Block: BlockT, SP: SetupParachain<Block>> BuildParachainContext for Collato
 }
 
 /// Something that can setup a parachain.
-pub trait SetupParachain<Block: BlockT>: Send
+pub trait SetupParachain<Block: BlockT>: Send {
-	where
-		<<Self::ProposerFactory as Environment<Block>>::Proposer as Proposer<Block>>::Create: Send + Unpin,
-		<Self::ProposerFactory as Environment<Block>>::Error: Debug,
-{
 	/// The proposer factory of the parachain to build blocks.
 	type ProposerFactory: Environment<Block> + Send + 'static;
 
@@ -228,8 +245,6 @@ pub fn run_collator<Block, SP, E>(
 where
 	Block: BlockT,
 	SP: SetupParachain<Block> + Send + 'static,
-	<<SP::ProposerFactory as Environment<Block>>::Proposer as Proposer<Block>>::Create: Send + Unpin,
-	<SP::ProposerFactory as Environment<Block>>::Error: Debug,
 	E: IntoFuture<Item=(), Error=()>,
 	E::Future: Send + Clone + Sync + 'static,
 {

cumulus/runtime/src/lib.rs

@@ -41,6 +41,7 @@ pub struct ParachainBlockData<B: BlockT> {
 	extrinsics: Vec<<B as BlockT>::Extrinsic>,
 	/// The data that is required to emulate the storage accesses executed by all extrinsics.
 	witness_data: WitnessData,
+	/// The storage root of the witness data.
 	witness_data_storage_root: <B as BlockT>::Hash,
 }
 
@@ -58,4 +59,9 @@ impl<B: BlockT> ParachainBlockData<B> {
 			witness_data_storage_root,
 		}
 	}
+
+	/// Convert `self` into the stored header.
+	pub fn into_header(self) -> B::Header {
+		self.header
+	}
 }

cumulus/test/parachain/src/service.rs

@@ -109,8 +109,6 @@ impl<S, PF, E> cumulus_collator::SetupParachain<Block> for SetupParachain<S, PF,
 		S: AbstractService,
 		E: Send + crate::cli::IntoExit,
 		PF: consensus_common::Environment<Block> + Send + 'static,
-		<PF::Proposer as consensus_common::Proposer<Block>>::Create: Send + Unpin,
-		PF::Error: std::fmt::Debug,
 {
 	type ProposerFactory = PF;