From c7e229bf6e7f344f6726be43bdb1b7e554805f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 18 Oct 2019 14:16:32 +0200 Subject: [PATCH] Make basic collation working --- Cargo.lock | 383 +++++++++++++++--------------- collator/Cargo.toml | 6 + collator/src/lib.rs | 148 +++++++----- consensus/src/lib.rs | 10 +- test/parachain/Cargo.toml | 9 +- test/parachain/build.rs | 16 ++ test/parachain/runtime/build.rs | 4 +- test/parachain/runtime/src/lib.rs | 18 +- test/parachain/src/chain_spec.rs | 22 +- test/parachain/src/cli.rs | 52 ++-- test/parachain/src/main.rs | 23 +- test/parachain/src/service.rs | 107 +++++++-- 12 files changed, 506 insertions(+), 292 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b98d4ce968..3363c48742 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -94,7 +94,7 @@ dependencies = [ [[package]] name = "arc-swap" -version = "0.3.11" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -132,7 +132,7 @@ name = "atty" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -143,22 +143,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "backtrace" -version = "0.3.38" +version = "0.3.40" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "backtrace-sys" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -335,7 +335,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cc" -version = "1.0.45" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "jobserver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -360,7 +360,7 @@ name = "chrono" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -372,7 +372,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -395,7 +395,7 @@ name = "clear_on_drop" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -412,7 +412,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -420,7 +420,7 @@ name = "const-random-macro" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -435,7 +435,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -552,6 +552,7 @@ dependencies = [ name = "cumulus-collator" version = "0.1.0" dependencies = [ + "cumulus-consensus 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)", @@ -562,9 +563,12 @@ dependencies = [ "polkadot-primitives 0.6.0 (git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "substrate-cli 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)", "substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", + "substrate-service 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", ] [[package]] @@ -629,15 +633,20 @@ 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)", "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)", "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)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "polkadot-collator 0.6.0 (git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch)", + "polkadot-primitives 0.6.0 (git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", + "srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-basic-authorship 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "substrate-cli 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)", + "substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "substrate-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "substrate-network 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", @@ -815,7 +824,7 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -852,7 +861,7 @@ name = "failure" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -877,7 +886,7 @@ name = "fdlimit" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -899,7 +908,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -918,7 +927,7 @@ dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", "miniz_oxide 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -945,7 +954,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#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -956,7 +965,7 @@ version = "0.2.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)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1095,7 +1104,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "c_linked_list 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "get_if_addrs-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1105,7 +1114,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1114,7 +1123,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1215,7 +1224,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "hex-literal-impl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1223,7 +1232,7 @@ name = "hex-literal-impl" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1406,7 +1415,7 @@ name = "iovec" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1433,7 +1442,7 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1639,7 +1648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.64" +version = "0.2.65" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1647,7 +1656,7 @@ name = "libloading" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2028,7 +2037,7 @@ dependencies = [ "libp2p-core 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "yamux 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "yamux 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2037,9 +2046,9 @@ version = "5.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bindgen 0.47.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2074,8 +2083,8 @@ name = "libz-sys" version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2221,7 +2230,7 @@ dependencies = [ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2246,7 +2255,7 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2293,7 +2302,7 @@ version = "0.2.3" 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)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2310,7 +2319,7 @@ version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2323,7 +2332,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2333,9 +2342,9 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2409,7 +2418,7 @@ name = "num_cpus" version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2448,7 +2457,7 @@ dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.51 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2463,8 +2472,8 @@ version = "0.9.51" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2612,7 +2621,7 @@ name = "parking_lot_core" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2624,7 +2633,7 @@ name = "parking_lot_core" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2638,7 +2647,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2653,7 +2662,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2666,7 +2675,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2674,7 +2683,7 @@ name = "paste-impl" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.5 (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.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2730,7 +2739,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#c3d88e729de1e08c31fcaed15d6881c4d1de6503" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771" 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)", @@ -2745,7 +2754,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#c3d88e729de1e08c31fcaed15d6881c4d1de6503" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771" 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)", @@ -2759,7 +2768,7 @@ dependencies = [ [[package]] name = "polkadot-collator" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#c3d88e729de1e08c31fcaed15d6881c4d1de6503" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771" 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)", @@ -2780,7 +2789,7 @@ dependencies = [ [[package]] name = "polkadot-executor" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#c3d88e729de1e08c31fcaed15d6881c4d1de6503" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771" 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)", @@ -2789,7 +2798,7 @@ dependencies = [ [[package]] name = "polkadot-network" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#c3d88e729de1e08c31fcaed15d6881c4d1de6503" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771" 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)", @@ -2809,7 +2818,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#c3d88e729de1e08c31fcaed15d6881c4d1de6503" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771" 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)", @@ -2826,7 +2835,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#c3d88e729de1e08c31fcaed15d6881c4d1de6503" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771" 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)", @@ -2844,7 +2853,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#c3d88e729de1e08c31fcaed15d6881c4d1de6503" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771" 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)", @@ -2897,7 +2906,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#c3d88e729de1e08c31fcaed15d6881c4d1de6503" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771" 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)", @@ -2938,7 +2947,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#c3d88e729de1e08c31fcaed15d6881c4d1de6503" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771" 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)", @@ -2948,7 +2957,7 @@ dependencies = [ [[package]] name = "polkadot-validation" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#c3d88e729de1e08c31fcaed15d6881c4d1de6503" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#de2f692fef389e183d3d51e3f9ebc6482d129771" 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)", @@ -3004,7 +3013,7 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3081,11 +3090,6 @@ name = "protobuf" version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "quick-error" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "quick-error" version = "1.2.2" @@ -3112,7 +3116,7 @@ name = "rand" version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3122,7 +3126,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3135,7 +3139,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3146,7 +3150,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3164,7 +3168,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3238,7 +3242,7 @@ name = "rand_jitter" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3250,7 +3254,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3337,9 +3341,9 @@ name = "ring" version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3350,7 +3354,7 @@ name = "rocksdb" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "librocksdb-sys 5.18.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3359,7 +3363,7 @@ name = "rocksdb" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "librocksdb-sys 5.18.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3368,7 +3372,7 @@ name = "rpassword" version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3482,7 +3486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3598,7 +3602,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "memrange 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3653,10 +3657,10 @@ dependencies = [ [[package]] name = "slog-scope" -version = "4.1.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "arc-swap 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", + "arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3725,7 +3729,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#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3737,7 +3741,7 @@ dependencies = [ [[package]] name = "sr-io" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3754,7 +3758,7 @@ dependencies = [ [[package]] name = "sr-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3773,7 +3777,7 @@ dependencies = [ [[package]] name = "sr-staking-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3783,7 +3787,7 @@ dependencies = [ [[package]] name = "sr-std" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3791,7 +3795,7 @@ dependencies = [ [[package]] name = "sr-version" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3803,7 +3807,7 @@ dependencies = [ [[package]] name = "srml-authority-discovery" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3820,7 +3824,7 @@ dependencies = [ [[package]] name = "srml-authorship" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3836,7 +3840,7 @@ dependencies = [ [[package]] name = "srml-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3856,7 +3860,7 @@ dependencies = [ [[package]] name = "srml-balances" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3871,7 +3875,7 @@ dependencies = [ [[package]] name = "srml-collective" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3887,7 +3891,7 @@ dependencies = [ [[package]] name = "srml-democracy" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3902,7 +3906,7 @@ dependencies = [ [[package]] name = "srml-elections" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3918,7 +3922,7 @@ dependencies = [ [[package]] name = "srml-executive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3932,7 +3936,7 @@ dependencies = [ [[package]] name = "srml-finality-tracker" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3947,7 +3951,7 @@ dependencies = [ [[package]] name = "srml-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3965,7 +3969,7 @@ dependencies = [ [[package]] name = "srml-im-online" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -3983,7 +3987,7 @@ dependencies = [ [[package]] name = "srml-indices" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4000,7 +4004,7 @@ dependencies = [ [[package]] name = "srml-membership" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4014,7 +4018,7 @@ dependencies = [ [[package]] name = "srml-metadata" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4025,7 +4029,7 @@ dependencies = [ [[package]] name = "srml-offences" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4040,7 +4044,7 @@ dependencies = [ [[package]] name = "srml-randomness-collective-flip" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4053,7 +4057,7 @@ dependencies = [ [[package]] name = "srml-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4072,7 +4076,7 @@ dependencies = [ [[package]] name = "srml-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4092,7 +4096,7 @@ dependencies = [ [[package]] name = "srml-staking-reward-curve" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4103,7 +4107,7 @@ dependencies = [ [[package]] name = "srml-sudo" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4117,7 +4121,7 @@ dependencies = [ [[package]] name = "srml-support" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4137,7 +4141,7 @@ dependencies = [ [[package]] name = "srml-support-procedural" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4149,7 +4153,7 @@ dependencies = [ [[package]] name = "srml-support-procedural-tools" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4161,7 +4165,7 @@ dependencies = [ [[package]] name = "srml-support-procedural-tools-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4171,7 +4175,7 @@ dependencies = [ [[package]] name = "srml-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4188,7 +4192,7 @@ dependencies = [ [[package]] name = "srml-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4203,7 +4207,7 @@ dependencies = [ [[package]] name = "srml-treasury" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4289,7 +4293,7 @@ dependencies = [ [[package]] name = "substrate-application-crypto" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4301,7 +4305,7 @@ dependencies = [ [[package]] name = "substrate-authority-discovery" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4323,7 +4327,7 @@ dependencies = [ [[package]] name = "substrate-authority-discovery-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4334,7 +4338,7 @@ dependencies = [ [[package]] name = "substrate-basic-authorship" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4362,7 +4366,7 @@ dependencies = [ [[package]] name = "substrate-chain-spec" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4377,7 +4381,7 @@ dependencies = [ [[package]] name = "substrate-chain-spec-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4388,14 +4392,14 @@ dependencies = [ [[package]] name = "substrate-cli" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4424,7 +4428,7 @@ dependencies = [ [[package]] name = "substrate-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4454,7 +4458,7 @@ dependencies = [ [[package]] name = "substrate-client-db" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4478,7 +4482,7 @@ dependencies = [ [[package]] name = "substrate-consensus-aura-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4490,7 +4494,7 @@ dependencies = [ [[package]] name = "substrate-consensus-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4527,7 +4531,7 @@ dependencies = [ [[package]] name = "substrate-consensus-babe-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4541,7 +4545,7 @@ dependencies = [ [[package]] name = "substrate-consensus-common" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4560,7 +4564,7 @@ dependencies = [ [[package]] name = "substrate-consensus-slots" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4578,7 +4582,7 @@ dependencies = [ [[package]] name = "substrate-consensus-uncles" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4592,7 +4596,7 @@ dependencies = [ [[package]] name = "substrate-executor" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4616,7 +4620,7 @@ dependencies = [ [[package]] name = "substrate-externalities" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4627,7 +4631,7 @@ dependencies = [ [[package]] name = "substrate-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4656,7 +4660,7 @@ dependencies = [ [[package]] name = "substrate-finality-grandpa-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4669,7 +4673,7 @@ dependencies = [ [[package]] name = "substrate-header-metadata" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4679,7 +4683,7 @@ dependencies = [ [[package]] name = "substrate-inherents" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4690,7 +4694,7 @@ dependencies = [ [[package]] name = "substrate-keyring" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4702,7 +4706,7 @@ dependencies = [ [[package]] name = "substrate-keystore" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4717,7 +4721,7 @@ dependencies = [ [[package]] name = "substrate-network" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4759,7 +4763,7 @@ dependencies = [ [[package]] name = "substrate-offchain" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4784,7 +4788,7 @@ dependencies = [ [[package]] name = "substrate-offchain-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4793,16 +4797,16 @@ dependencies = [ [[package]] name = "substrate-panic-handler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" dependencies = [ - "backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", ] [[package]] name = "substrate-peerset" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4815,7 +4819,7 @@ dependencies = [ [[package]] name = "substrate-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4824,7 +4828,7 @@ dependencies = [ [[package]] name = "substrate-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4859,7 +4863,7 @@ dependencies = [ [[package]] name = "substrate-primitives-storage" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4869,7 +4873,7 @@ dependencies = [ [[package]] name = "substrate-rpc" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4895,7 +4899,7 @@ dependencies = [ [[package]] name = "substrate-rpc-api" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4917,7 +4921,7 @@ dependencies = [ [[package]] name = "substrate-rpc-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4926,7 +4930,7 @@ dependencies = [ [[package]] name = "substrate-rpc-servers" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4941,7 +4945,7 @@ dependencies = [ [[package]] name = "substrate-serializer" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4950,7 +4954,7 @@ dependencies = [ [[package]] name = "substrate-service" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -4992,7 +4996,7 @@ dependencies = [ [[package]] name = "substrate-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -5003,7 +5007,7 @@ dependencies = [ [[package]] name = "substrate-state-db" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -5014,7 +5018,7 @@ dependencies = [ [[package]] name = "substrate-state-machine" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -5033,7 +5037,7 @@ dependencies = [ [[package]] name = "substrate-telemetry" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -5047,7 +5051,7 @@ dependencies = [ "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "slog-async 2.3.0 (git+https://github.com/paritytech/slog-async)", "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "slog-scope 4.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "slog-scope 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5055,7 +5059,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -5073,7 +5077,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -5106,7 +5110,7 @@ dependencies = [ [[package]] name = "substrate-transaction-graph" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -5120,7 +5124,7 @@ dependencies = [ [[package]] name = "substrate-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -5136,7 +5140,7 @@ dependencies = [ [[package]] name = "substrate-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" 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)", @@ -5150,7 +5154,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.3" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" [[package]] name = "substrate-wasm-builder-runner" @@ -5160,7 +5164,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#13fd9c2ee4d96a587ad73f657be395fb7551ff27" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" dependencies = [ "wasmi 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5224,7 +5228,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5245,7 +5249,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5291,7 +5295,7 @@ name = "time" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5512,7 +5516,7 @@ 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)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5814,7 +5818,7 @@ name = "wasmi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "memory_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5882,7 +5886,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5974,16 +5978,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "yamux" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" 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)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "nohash-hasher 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "quick-error 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -6023,15 +6027,15 @@ dependencies = [ "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" "checksum app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e73a24bad9bd6a94d6395382a6c69fe071708ae4409f763c5475e14ee896313d" -"checksum arc-swap 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "bc4662175ead9cd84451d5c35070517777949a2ed84551764129cedb88384841" +"checksum arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f1a1eca3195b729bbd64e292ef2f5fff6b1c28504fed762ce2b1013dde4d8e92" "checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" "checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" "checksum asn1_der 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6fce6b6a0ffdafebd82c87e79e3f40e8d2c523e5fea5566ff6b90509bf98d638" "checksum asn1_der_derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" "checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875" -"checksum backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)" = "690a62be8920ccf773ee00ef0968649b0e724cda8bd5b12286302b4ae955fdf5" -"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b" +"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" +"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" "checksum base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" "checksum bindgen 0.47.3 (registry+https://github.com/rust-lang/crates.io-index)" = "df683a55b54b41d5ea8ebfaebb5aa7e6b84e3f3006a78f010dadc9ca88469260" @@ -6055,7 +6059,7 @@ dependencies = [ "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" "checksum c_linked_list 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" -"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be" +"checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c" "checksum cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7fa24eb00d5ffab90eaeaf1092ac85c04c64aaf358ea6f84505b8116d24c6af" "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" "checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" @@ -6094,7 +6098,7 @@ dependencies = [ "checksum elastic-array 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "073be79b6538296faf81c631872676600616073817dd9a440c477ad09b408983" "checksum enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" "checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" -"checksum env_logger 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39ecdb7dd54465526f0a56d666e3b2dd5f3a218665a030b6e4ad9e70fa95d8fa" +"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" "checksum environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "34f8467a0284de039e6bd0e25c14519538462ba5beb548bb1f03e645097837a8" "checksum erased-serde 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3beee4bc16478a1b26f2e80ad819a52d24745e292f521a63c16eea5f74b7eb60" "checksum exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d8013f441e38e31c670e7f34ec8f1d5d3a2bd9d303c1ff83976ca886005e8f48" @@ -6185,7 +6189,7 @@ dependencies = [ "checksum kvdb-rocksdb 0.1.4 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)" = "" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" -"checksum libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)" = "74dfca3d9957906e8d1e6a0b641dc9a59848e793f1da2165889fd4f62d10d79c" +"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" "checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" "checksum libp2p 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4183fb4be621d97baebbbe0c499d6ae337e9e6ec955f9fa3cb29e55547dfacdb" "checksum libp2p-core 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2a7ebd9d597299512e096cc1bd58e955c03ef28f33214a33b9c7e4ace109ff41" @@ -6299,7 +6303,7 @@ dependencies = [ "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" "checksum primitive-types 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "83ef7b3b965c0eadcb6838f34f827e1dfb2939bdd5ebd43f9647e009b12b0371" "checksum proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e" -"checksum proc-macro-hack 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "114cdf1f426eb7f550f01af5f53a33c0946156f6814aec939b3bd77e844f9a9d" +"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" "checksum proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "90cf5f418035b98e655e9cdb225047638296b862b42411c4e45bb88d700f7fc0" "checksum prost 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96d14b1c185652833d24aaad41c5832b0be5616a590227c1fbff57c616754b23" @@ -6307,7 +6311,6 @@ dependencies = [ "checksum prost-derive 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e7dc378b94ac374644181a2247cebf59a6ec1c88b49ac77f3a94b86b79d0e11" "checksum prost-types 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1de482a366941c8d56d19b650fac09ca08508f2a696119ee7513ad590c8bac6f" "checksum protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40361836defdd5871ff7e84096c6f6444af7fc157f8ef1789f54f147687caa20" -"checksum quick-error 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5fb6ccf8db7bbcb9c2eae558db5ab4f3da1c2a87e4e597ed394726bc8ea6ca1d" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" @@ -6371,7 +6374,7 @@ dependencies = [ "checksum slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1cc9c640a4adbfbcc11ffb95efe5aa7af7309e002adab54b185507dbf2377b99" "checksum slog-async 2.3.0 (git+https://github.com/paritytech/slog-async)" = "" "checksum slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a" -"checksum slog-scope 4.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d1d3ec6214d46e57a7ec87c1972bbca66c59172a0cfffa5233c54726afb946bf" +"checksum slog-scope 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "53a5819e0ab73a542e42b0d8ce8bf9e0a470c8f0a370e176a18855566332a120" "checksum slog_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9eff3b513cf2e0d1a60e1aba152dc72bedc5b05585722bb3cebd7bcb1e31b98f" "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" "checksum snow 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5a64f02fd208ef15bd2d1a65861df4707e416151e1272d02c8faafad1c138100" @@ -6558,7 +6561,7 @@ dependencies = [ "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" "checksum x25519-dalek 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7ee1585dc1484373cbc1cee7aafda26634665cf449436fd6e24bfd1fad230538" "checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" -"checksum yamux 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "01bd67889938c48f0049fc60a77341039e6c3eaf16cb7693e6ead7c0ba701295" +"checksum yamux 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2758f29014c1cb7a6e74c1b1160ac8c8203be342d35b73462fc6a13cc6385423" "checksum zeroize 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4090487fa66630f7b166fba2bbb525e247a5449f41c468cc1d98f8ae6ac03120" "checksum zeroize 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "45af6a010d13e4cf5b54c94ba5a2b2eba5596b9e46bf5875612d332a1f2b3f86" "checksum zeroize_derive 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "080616bd0e31f36095288bb0acdf1f78ef02c2fa15527d7e993f2a6c7591643e" diff --git a/collator/Cargo.toml b/collator/Cargo.toml index b722f53c97..1fc605fa14 100644 --- a/collator/Cargo.toml +++ b/collator/Cargo.toml @@ -7,6 +7,9 @@ edition = "2018" [dependencies] # Substrate dependencies sr-primitives = { package = "sr-primitives", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } +substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } +substrate-client = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } +substrate-service = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } consensus-common = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } inherents = { package = "substrate-inherents", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } cli = { package = "substrate-cli", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } @@ -15,6 +18,9 @@ cli = { package = "substrate-cli", git = "https://github.com/paritytech/substrat polkadot-collator = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-cumulus-branch" } polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-cumulus-branch" } +# Cumulus dependencies +cumulus-consensus = { path = "../consensus" } + # other deps log = "0.4.8" codec = { package = "parity-scale-codec", version = "1.0.6", features = [ "derive" ] } diff --git a/collator/src/lib.rs b/collator/src/lib.rs index 99db8f870b..b933730437 100644 --- a/collator/src/lib.rs +++ b/collator/src/lib.rs @@ -19,12 +19,14 @@ use sr_primitives::traits::Block as BlockT; use consensus_common::{Environment, Proposer}; use inherents::InherentDataProviders; +use substrate_primitives::Blake2Hasher; use polkadot_collator::{ InvalidHead, ParachainContext, BuildParachainContext, Network as CollatorNetwork, VersionInfo, + TaskExecutor, PolkadotClient, }; use polkadot_primitives::{ - Hash, + Hash as PHash, Block as PBlock, parachain::{ self, BlockData, Message, Id as ParaId, OutgoingMessages, Status as ParachainStatus, CollatorPair, @@ -33,12 +35,12 @@ use polkadot_primitives::{ use codec::{Decode, Encode}; -use log::error; +use log::{error, trace}; use futures03::TryFutureExt; use futures::{Future, future::IntoFuture}; -use std::{sync::Arc, marker::PhantomData, time::Duration}; +use std::{sync::Arc, marker::PhantomData, time::Duration, fmt::Debug}; use parking_lot::Mutex; @@ -85,29 +87,30 @@ impl Clone for Collator { impl ParachainContext for Collator where Block: BlockT, - PF: Environment + 'static + Send + Sync, - PF::Error: std::fmt::Debug, - PF::Proposer: Send + Sync, - >::Create: Unpin + Send + Sync, + PF: Environment + 'static + Send, + PF::Error: Debug, + >::Create: Unpin + Send, { type ProduceCandidate = Box< dyn Future - + Send + Sync + + Send >; fn produce_candidate>( &mut self, - _relay_chain_parent: Hash, + _relay_chain_parent: PHash, status: ParachainStatus, _: I, ) -> Self::ProduceCandidate { + trace!(target: "cumulus-collator", "Producing candidate"); + let factory = self.proposer_factory.clone(); let inherent_providers = self.inherent_data_providers.clone(); let res = HeadData::::decode(&mut &status.head_data.0[..]) .map_err(|_| InvalidHead) .into_future() - .and_then(move |last_head| + .and_then(move |last_head| { factory.lock() .init(&last_head.header) .map_err(|e| { @@ -115,34 +118,41 @@ impl ParachainContext for Collator where error!("Could not create proposer: {:?}", e); InvalidHead }) - ) - .and_then(move |proposer| - inherent_providers.create_inherent_data() - .map(|id| (proposer, id)) - .map_err(|e| { - error!("Failed to create inherent data: {:?}", e); - 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); + InvalidHead + })?; + + let future = proposer.propose( + inherent_data, + Default::default(), + //TODO: Fix this. + Duration::from_secs(6), + ) + .map_err(|e| { + error!("Proposing failed: {:?}", e); + InvalidHead + }) + .compat(); + + Ok(future) }) - ) - .and_then(|(mut proposer, inherent_data)| { - proposer.propose( - inherent_data, - Default::default(), - //TODO: Fix this. - Duration::from_secs(6), - ) - .map_err(|e| { - error!("Proposing failed: {:?}", e); - InvalidHead - }) - .compat() }) + .flatten() .map(|b| { + error!("BUILDING BLOCKDATA"); let block_data = BlockData(b.encode()); let head_data = HeadData:: { header: b.deconstruct().0 }; let messages = OutgoingMessages { outgoing_messages: Vec::new() }; (block_data, parachain::HeadData(head_data.encode()), messages) + }) + .then(|r| { + trace!(target: "cumulus-collator", "Produced candidate: {:?}", r); + r }); Box::new(res) @@ -150,41 +160,66 @@ impl ParachainContext for Collator where } /// Implements `BuildParachainContext` to build a collator instance. -struct CollatorBuilder { - inherent_data_providers: InherentDataProviders, - proposer_factory: PF, - _phantom: PhantomData, +struct CollatorBuilder { + setup_parachain: SP, + _marker: PhantomData, } -impl CollatorBuilder { +impl CollatorBuilder { /// Create a new instance of self. - fn new(proposer_factory: PF, inherent_data_providers: InherentDataProviders) -> Self { + fn new(setup_parachain: SP) -> Self { Self { - inherent_data_providers, - proposer_factory, - _phantom: Default::default(), + setup_parachain, + _marker: PhantomData, } } } -impl BuildParachainContext for CollatorBuilder where - Block: BlockT, - PF: Environment + 'static + Send + Sync, - PF::Error: std::fmt::Debug, - PF::Proposer: Send + Sync, - >::Create: Unpin + Send + Sync, +impl> BuildParachainContext for CollatorBuilder + where + <>::Proposer as Proposer>::Create: Send + Unpin, + >::Error: Debug, { - type ParachainContext = Collator; + type ParachainContext = Collator; - fn build(self, network: Arc) -> Result { - Ok(Collator::new(self.proposer_factory, self.inherent_data_providers, network)) + fn build( + self, + client: Arc>, + task_executor: TaskExecutor, + network: Arc, + ) -> Result + where + B: substrate_client::backend::Backend + 'static, + E: substrate_client::CallExecutor + Clone + Send + Sync + 'static + { + let (proposer_factory, inherent_data_providers) = self.setup_parachain + .setup_parachain(client, task_executor) + .map_err(|e| error!("Error setting up the parachain: {}", e))?; + + Ok(Collator::new(proposer_factory, inherent_data_providers, network)) } } +/// Something that can setup a parachain. +pub trait SetupParachain: Send + where + <>::Proposer as Proposer>::Create: Send + Unpin, + >::Error: Debug, +{ + /// The proposer factory of the parachain to build blocks. + type ProposerFactory: Environment + Send + 'static; + + /// Setup the parachain. + fn setup_parachain( + self, + polkadot_client: P, + task_executor: TaskExecutor, + ) -> Result<(Self::ProposerFactory, InherentDataProviders), String>; +} + /// Run a collator with the given proposer factory. -pub fn run_collator( - proposer_factory: PF, - inherent_data_providers: InherentDataProviders, +pub fn run_collator( + setup_parachain: SP, para_id: ParaId, exit: E, key: Arc, @@ -192,14 +227,13 @@ pub fn run_collator( ) -> Result<(), cli::error::Error> where Block: BlockT, - PF: Environment + 'static + Send + Sync, - PF::Error: std::fmt::Debug, - PF::Proposer: Send + Sync, - >::Create: Unpin + Send + Sync, + SP: SetupParachain + Send + 'static, + <>::Proposer as Proposer>::Create: Send + Unpin, + >::Error: Debug, E: IntoFuture, E::Future: Send + Clone + Sync + 'static, { - let builder = CollatorBuilder::new(proposer_factory, inherent_data_providers); + let builder = CollatorBuilder::new(setup_parachain); polkadot_collator::run_collator(builder, para_id, exit, key, version) } @@ -273,7 +307,7 @@ mod tests { unimplemented!("Not required in tests") } - fn checked_statements(&self, _: Hash) -> + fn checked_statements(&self, _: PHash) -> Box> { unimplemented!("Not required in tests") diff --git a/consensus/src/lib.rs b/consensus/src/lib.rs index 6ef8811efb..97d3111564 100644 --- a/consensus/src/lib.rs +++ b/consensus/src/lib.rs @@ -66,12 +66,12 @@ pub struct HeadUpdate { /// Helper for the Polkadot client. This is expected to be a lightweight handle /// like an `Arc`. -pub trait PolkadotClient: Clone { +pub trait PolkadotClient: Clone + 'static { /// The error type for interacting with the Polkadot client. type Error: std::fmt::Debug + Send; /// A stream that yields finalized head-data for a certain parachain. - type Finalized: Stream> + Send; + type Finalized: Stream> + Send + Unpin; /// Get a stream of finalized heads. fn finalized_heads(&self, para_id: ParaId) -> ClientResult; @@ -85,11 +85,11 @@ pub trait PolkadotClient: Clone { } /// Spawns a future that follows the Polkadot relay chain for the given parachain. -pub fn follow_polkadot<'a, L: 'a, P: 'a>(para_id: ParaId, local: Arc, polkadot: P) - -> ClientResult + Send + 'a> +pub fn follow_polkadot(para_id: ParaId, local: Arc, polkadot: P) + -> ClientResult + Send + Unpin> where L: LocalClient + Send + Sync, - P: PolkadotClient + Send + Sync, + P: PolkadotClient, { let finalized_heads = polkadot.finalized_heads(para_id)?; diff --git a/test/parachain/Cargo.toml b/test/parachain/Cargo.toml index d76b4cca9c..92bb05ae92 100644 --- a/test/parachain/Cargo.toml +++ b/test/parachain/Cargo.toml @@ -13,6 +13,7 @@ path = 'src/main.rs' derive_more = '0.15.0' exit-future = '0.1.4' futures = '0.1.29' +futures03 = { package = "futures-preview", version = "0.3.0-alpha.19", features = ["compat"] } log = '0.4.8' parking_lot = '0.9.0' tokio = '0.1.22' @@ -26,19 +27,25 @@ ctrlc = { version = "3.1.3", features = ["termination"] } sr-primitives = { git = "https://github.com/paritytech/substrate", default_features = false, branch = "bkchr-cumulus-branch" } sr-io = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } substrate-cli = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } -primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } +substrate-primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } substrate-service = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } inherents = { package = "substrate-inherents", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } transaction-pool = { package = "substrate-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } network = { package = "substrate-network", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } substrate-client = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } +srml-timestamp = { git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } basic-authorship = { package = "substrate-basic-authorship", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } +consensus-common = { package = "substrate-consensus-common", git = "https://github.com/paritytech/substrate", branch = "bkchr-cumulus-branch" } # Cumulus dependencies cumulus-consensus = { path = "../../consensus" } cumulus-collator = { path = "../../collator" } +# Polkadot dependencies +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-cumulus-branch" } +polkadot-collator = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-cumulus-branch" } + [build-dependencies] vergen = '3.0.4' diff --git a/test/parachain/build.rs b/test/parachain/build.rs index bab46f579d..5ce23b31d6 100644 --- a/test/parachain/build.rs +++ b/test/parachain/build.rs @@ -1,3 +1,19 @@ +// Copyright 2019 Parity Technologies (UK) Ltd. +// This file is part of Cumulus. + +// Substrate is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Substrate is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Cumulus. If not, see . + use std::{env, path::PathBuf}; use vergen::{ConstantsFlags, generate_cargo_keys}; diff --git a/test/parachain/runtime/build.rs b/test/parachain/runtime/build.rs index ddbeefa112..23cb9ed670 100644 --- a/test/parachain/runtime/build.rs +++ b/test/parachain/runtime/build.rs @@ -1,5 +1,5 @@ // Copyright 2019 Parity Technologies (UK) Ltd. -// This file is part of Substrate. +// This file is part of Cumulus. // Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Substrate. If not, see . +// along with Cumulus. If not, see . use wasm_builder_runner::{build_current_project_with_rustflags, WasmBuilderSource}; diff --git a/test/parachain/runtime/src/lib.rs b/test/parachain/runtime/src/lib.rs index 0df4fc5aa0..9244ba92d6 100644 --- a/test/parachain/runtime/src/lib.rs +++ b/test/parachain/runtime/src/lib.rs @@ -1,4 +1,18 @@ -//! The Substrate Node Template runtime. This can be compiled with `#[no_std]`, ready for Wasm. +// Copyright 2019 Parity Technologies (UK) Ltd. +// This file is part of Cumulus. + +// Cumulus is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Cumulus is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Cumulus. If not, see . #![cfg_attr(not(feature = "std"), no_std)] // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. @@ -9,7 +23,7 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); use rstd::prelude::*; -use primitives::{OpaqueMetadata, crypto::key_types}; +use primitives::OpaqueMetadata; use sr_primitives::{ ApplyResult, transaction_validity::TransactionValidity, generic, create_runtime_str, impl_opaque_keys, AnySignature diff --git a/test/parachain/src/chain_spec.rs b/test/parachain/src/chain_spec.rs index b408a558af..de6ad790d3 100644 --- a/test/parachain/src/chain_spec.rs +++ b/test/parachain/src/chain_spec.rs @@ -1,4 +1,20 @@ -use primitives::{Pair, Public}; +// Copyright 2019 Parity Technologies (UK) Ltd. +// This file is part of Cumulus. + +// Cumulus is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Cumulus is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Cumulus. If not, see . + +use substrate_primitives::{Pair, Public}; use parachain_runtime::{ AccountId, BalancesConfig, GenesisConfig, SudoConfig, IndicesConfig, SystemConfig, WASM_BINARY, }; @@ -23,7 +39,7 @@ pub fn get_authority_keys_from_seed(seed: &str) -> (AccountId, AccountId) { pub fn get_chain_spec() -> ChainSpec { ChainSpec::from_genesis( "Local Testnet", - "local_testnet", + "parachain_local_testnet", || testnet_genesis( vec![ get_authority_keys_from_seed("Alice"), @@ -55,7 +71,7 @@ pub fn get_chain_spec() -> ChainSpec { } fn testnet_genesis( - initial_authorities: Vec<(AccountId, AccountId)>, + _initial_authorities: Vec<(AccountId, AccountId)>, root_key: AccountId, endowed_accounts: Vec, _enable_println: bool, diff --git a/test/parachain/src/cli.rs b/test/parachain/src/cli.rs index 7c0951e593..890dfc3f95 100644 --- a/test/parachain/src/cli.rs +++ b/test/parachain/src/cli.rs @@ -1,19 +1,35 @@ -use crate::{chain_spec, service}; +// Copyright 2019 Parity Technologies (UK) Ltd. +// This file is part of Cumulus. + +// Cumulus is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Cumulus is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Cumulus. If not, see . + +use crate::chain_spec; use parachain_runtime::Block; -pub use substrate_cli::{VersionInfo, IntoExit, error}; -use substrate_cli::{informant, parse_and_prepare, ParseAndPrepare, NoCustom}; -use substrate_service::{AbstractService, Roles as ServiceRoles, Configuration}; +pub use substrate_cli::{VersionInfo, IntoExit, error::{self, Result}}; +use substrate_cli::{parse_and_prepare, ParseAndPrepare, NoCustom}; +use substrate_service::{Roles as ServiceRoles, Configuration}; use sr_primitives::{traits::{Block as BlockT, Header as HeaderT, Hash as HashT}, BuildStorage}; use substrate_client::genesis; -use primitives::hexdisplay::HexDisplay; +use substrate_primitives::hexdisplay::HexDisplay; use codec::Encode; use log::info; -use std::{path::PathBuf, cell::RefCell}; +use std::{path::PathBuf, cell::RefCell, sync::Arc}; use structopt::StructOpt; @@ -44,7 +60,7 @@ pub fn run(args: I, exit: E, version: VersionInfo) -> error::Result<()> where I: IntoIterator, T: Into + Clone, - E: IntoExit, + E: IntoExit + Send + 'static, { type Config = Configuration<(), T>; match parse_and_prepare::( @@ -53,18 +69,26 @@ pub fn run(args: I, exit: E, version: VersionInfo) -> error::Result<()> args, ) { ParseAndPrepare::Run(cmd) => cmd.run(load_spec, exit, - |exit, _cli_args, _custom_args, config: Config<_>| { + |exit, _cli_args, _custom_args, mut config: Config<_>| { info!("{}", version.name); info!(" version {}", config.full_version()); info!(" by {}, 2019", version.author); info!("Chain specification: {}", config.chain_spec.name()); info!("Node name: {}", config.name); info!("Roles: {:?}", config.roles); - panic!(); - // match config.roles { - // ServiceRoles::LIGHT => unimplemented!("Light client not supported!"), - // _ => unimplemented!(), - // }.map_err(|e| format!("{:?}", e)) + info!("Parachain id: {:?}", crate::PARA_ID); + + // TODO + let key = Arc::new(substrate_primitives::Pair::from_seed(&[10; 32])); + + // TODO + config.network.listen_addresses = Vec::new(); + config.chain_spec = chain_spec::get_chain_spec(); + + match config.roles { + ServiceRoles::LIGHT => unimplemented!("Light client not supported!"), + _ => crate::service::run_collator(config, exit, key, version.clone()), + }.map_err(|e| format!("{:?}", e)) }), ParseAndPrepare::BuildSpec(cmd) => cmd.run(load_spec), ParseAndPrepare::ExportBlocks(cmd) => cmd.run_with_builder(|config: Config<_>| @@ -82,7 +106,7 @@ pub fn run(args: I, exit: E, version: VersionInfo) -> error::Result<()> Ok(()) } -fn load_spec(id: &str) -> Result, String> { +fn load_spec(_: &str) -> std::result::Result, String> { Ok(Some(chain_spec::get_chain_spec())) } diff --git a/test/parachain/src/main.rs b/test/parachain/src/main.rs index 2aa4549858..9008882989 100644 --- a/test/parachain/src/main.rs +++ b/test/parachain/src/main.rs @@ -1,8 +1,26 @@ -//! Substrate Node Template CLI library. +// Copyright 2019 Parity Technologies (UK) Ltd. +// This file is part of Cumulus. + +// Cumulus is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Cumulus is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Cumulus. If not, see . + +//! Cumulus test parachain collator #![warn(missing_docs)] #![warn(unused_extern_crates)] +use polkadot_primitives::parachain::Id as ParaId; + mod chain_spec; #[macro_use] mod service; @@ -10,6 +28,9 @@ mod cli; pub use substrate_cli::{VersionInfo, IntoExit, error}; +/// The parachain id of this parachain. +pub const PARA_ID: ParaId = ParaId::new(100); + fn main() -> Result<(), cli::error::Error> { let version = VersionInfo { name: "Cumulus Test Parachain Collator", diff --git a/test/parachain/src/service.rs b/test/parachain/src/service.rs index 9bc5ffa1f2..d8a5887f65 100644 --- a/test/parachain/src/service.rs +++ b/test/parachain/src/service.rs @@ -1,15 +1,34 @@ -//! Service and ServiceFactory implementation. Specialized wrapper over substrate service. +// Copyright 2019 Parity Technologies (UK) Ltd. +// This file is part of Cumulus. + +// Cumulus is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Cumulus is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Cumulus. If not, see . use std::sync::Arc; -use std::time::Duration; -use substrate_client::LongestChain; -use futures::prelude::*; -use parachain_runtime::{self, GenesisConfig, opaque::Block, RuntimeApi}; -use substrate_service::{error::{Error as ServiceError}, AbstractService, Configuration, ServiceBuilder}; -use transaction_pool::{self, txpool::{Pool as TransactionPool}}; + +use parachain_runtime::{self, GenesisConfig, opaque::Block}; + use inherents::InherentDataProviders; +use substrate_service::{AbstractService, Configuration}; use network::construct_simple_protocol; use substrate_executor::native_executor_instance; + +use futures::prelude::*; + +use futures03::FutureExt; + +use log::error; + pub use substrate_executor::NativeExecutor; // Our native executor instance. @@ -55,19 +74,73 @@ macro_rules! new_full_start { }} } -/// Builds a new service for a full client. -pub fn new_full(config: Configuration) - -> Result -{ - let is_authority = config.roles.is_authority(); - let name = config.name.clone(); - let disable_grandpa = config.disable_grandpa; - let force_authoring = config.force_authoring; - +/// Run the collator with the given `config`. +pub fn run_collator( + config: Configuration, + exit: E, + key: Arc, + version: crate::cli::VersionInfo, +) -> crate::cli::Result<()> { let (builder, inherent_data_providers) = new_full_start!(config); + inherent_data_providers.register_provider(srml_timestamp::InherentDataProvider).unwrap(); let service = builder.with_network_protocol(|_| Ok(NodeProtocol::new()))?.build()?; + let proposer_factory = basic_authorship::ProposerFactory { + client: service.client(), + transaction_pool: service.transaction_pool(), + }; - Ok(service) + let on_exit = service.on_exit(); + + let setup_parachain = SetupParachain { service, inherent_data_providers, proposer_factory, exit }; + + cumulus_collator::run_collator(setup_parachain, crate::PARA_ID, on_exit, key, version) } +struct SetupParachain { + service: S, + proposer_factory: PF, + exit: E, + inherent_data_providers: InherentDataProviders, +} + +impl cumulus_collator::SetupParachain for SetupParachain + where + S: AbstractService, + E: Send + crate::cli::IntoExit, + PF: consensus_common::Environment + Send + 'static, + >::Create: Send + Unpin, + PF::Error: std::fmt::Debug, +{ + type ProposerFactory = PF; + + fn setup_parachain( + self, + polkadot_client: P, + task_executor: polkadot_collator::TaskExecutor, + ) -> Result<(Self::ProposerFactory, InherentDataProviders), String> { + let client = self.service.client(); + + let follow = match cumulus_consensus::follow_polkadot(crate::PARA_ID, client, polkadot_client) { + Ok(follow) => follow, + Err(e) => { + return Err(format!("Could not start following polkadot: {:?}", e)); + } + }; + + task_executor.execute( + Box::new( + self.service + .map_err(|e| error!("Parachain service error: {:?}", e)) + .select(futures03::compat::Compat::new(follow.map(|_| Ok::<(), ()>(())))) + .map(|_| ()) + .map_err(|_| ()) + .select(self.exit.into_exit()) + .map(|_| ()) + .map_err(|_| ()) + ), + ).map_err(|_| "Could not spawn parachain server!")?; + + Ok((self.proposer_factory, self.inherent_data_providers)) + } +}