diff --git a/Cargo.lock b/Cargo.lock index 6df5f582b1..adaf91b79b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -518,6 +518,7 @@ name = "cumulus-network" version = "0.1.0" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "polkadot-network 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)", "polkadot-statement-table 0.6.0 (git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch)", "polkadot-validation 0.6.0 (git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch)", @@ -786,7 +787,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "fork-tree" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" dependencies = [ "parity-scale-codec 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2237,7 +2238,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#14d5096448d939ffe68a33bce51fcd284be7a620" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#0795094ae42fdc22203f977ff66ec2fb2686a006" 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)", @@ -2249,10 +2250,30 @@ dependencies = [ "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", ] +[[package]] +name = "polkadot-network" +version = "0.6.0" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#0795094ae42fdc22203f977ff66ec2fb2686a006" +dependencies = [ + "arrayvec 0.4.11 (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)", + "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-availability-store 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)", + "polkadot-validation 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-client 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)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", +] + [[package]] name = "polkadot-parachain" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#14d5096448d939ffe68a33bce51fcd284be7a620" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#0795094ae42fdc22203f977ff66ec2fb2686a006" 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)", @@ -2262,6 +2283,8 @@ dependencies = [ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "shared_memory 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "sr-std 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-externalities 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)", "wasmi 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2269,7 +2292,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#14d5096448d939ffe68a33bce51fcd284be7a620" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#0795094ae42fdc22203f977ff66ec2fb2686a006" 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)", @@ -2287,7 +2310,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#14d5096448d939ffe68a33bce51fcd284be7a620" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#0795094ae42fdc22203f977ff66ec2fb2686a006" 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)", @@ -2325,6 +2348,7 @@ dependencies = [ "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "srml-system 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)", + "srml-transaction-payment 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "srml-treasury 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "substrate-authority-discovery-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)", @@ -2340,7 +2364,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#14d5096448d939ffe68a33bce51fcd284be7a620" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#0795094ae42fdc22203f977ff66ec2fb2686a006" 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)", @@ -2350,7 +2374,7 @@ dependencies = [ [[package]] name = "polkadot-validation" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#14d5096448d939ffe68a33bce51fcd284be7a620" +source = "git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch#0795094ae42fdc22203f977ff66ec2fb2686a006" 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)", @@ -2375,6 +2399,7 @@ dependencies = [ "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "substrate-keystore 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-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "substrate-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "substrate-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2994,7 +3019,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "sr-api-macros" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3003,10 +3028,22 @@ dependencies = [ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "sr-arithmetic" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" +dependencies = [ + "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "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)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", +] + [[package]] name = "sr-io" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3023,16 +3060,15 @@ dependencies = [ [[package]] name = "sr-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.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)", "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", "sr-io 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)", "substrate-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", @@ -3042,7 +3078,7 @@ dependencies = [ [[package]] name = "sr-staking-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3052,7 +3088,7 @@ dependencies = [ [[package]] name = "sr-std" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3060,7 +3096,7 @@ dependencies = [ [[package]] name = "sr-version" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3072,7 +3108,7 @@ dependencies = [ [[package]] name = "srml-authority-discovery" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3089,7 +3125,7 @@ dependencies = [ [[package]] name = "srml-authorship" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3105,7 +3141,7 @@ dependencies = [ [[package]] name = "srml-babe" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3125,7 +3161,7 @@ dependencies = [ [[package]] name = "srml-balances" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3140,7 +3176,7 @@ dependencies = [ [[package]] name = "srml-collective" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3156,7 +3192,7 @@ dependencies = [ [[package]] name = "srml-democracy" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3171,7 +3207,7 @@ dependencies = [ [[package]] name = "srml-elections" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3187,7 +3223,7 @@ dependencies = [ [[package]] name = "srml-executive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3201,7 +3237,7 @@ dependencies = [ [[package]] name = "srml-finality-tracker" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3216,7 +3252,7 @@ dependencies = [ [[package]] name = "srml-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3234,7 +3270,7 @@ dependencies = [ [[package]] name = "srml-im-online" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3252,7 +3288,7 @@ dependencies = [ [[package]] name = "srml-indices" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3269,7 +3305,7 @@ dependencies = [ [[package]] name = "srml-membership" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3283,7 +3319,7 @@ dependencies = [ [[package]] name = "srml-metadata" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3294,7 +3330,7 @@ dependencies = [ [[package]] name = "srml-offences" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3309,7 +3345,7 @@ dependencies = [ [[package]] name = "srml-randomness-collective-flip" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3322,7 +3358,7 @@ dependencies = [ [[package]] name = "srml-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3341,7 +3377,7 @@ dependencies = [ [[package]] name = "srml-staking" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3361,7 +3397,7 @@ dependencies = [ [[package]] name = "srml-staking-reward-curve" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3372,7 +3408,7 @@ dependencies = [ [[package]] name = "srml-sudo" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3386,7 +3422,7 @@ dependencies = [ [[package]] name = "srml-support" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3406,7 +3442,7 @@ dependencies = [ [[package]] name = "srml-support-procedural" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3418,7 +3454,7 @@ dependencies = [ [[package]] name = "srml-support-procedural-tools" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3430,7 +3466,7 @@ dependencies = [ [[package]] name = "srml-support-procedural-tools-derive" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3440,7 +3476,7 @@ dependencies = [ [[package]] name = "srml-system" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3457,7 +3493,7 @@ dependencies = [ [[package]] name = "srml-timestamp" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3469,10 +3505,22 @@ dependencies = [ "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", ] +[[package]] +name = "srml-transaction-payment" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" +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)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)", +] + [[package]] name = "srml-treasury" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3530,7 +3578,7 @@ dependencies = [ [[package]] name = "substrate-application-crypto" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3542,7 +3590,7 @@ dependencies = [ [[package]] name = "substrate-authority-discovery-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3564,7 +3612,7 @@ dependencies = [ [[package]] name = "substrate-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3629,7 +3677,7 @@ dependencies = [ [[package]] name = "substrate-consensus-babe-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3643,7 +3691,7 @@ dependencies = [ [[package]] name = "substrate-consensus-common" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3662,7 +3710,7 @@ dependencies = [ [[package]] name = "substrate-consensus-slots" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3680,7 +3728,7 @@ dependencies = [ [[package]] name = "substrate-executor" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3704,7 +3752,7 @@ dependencies = [ [[package]] name = "substrate-externalities" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3715,7 +3763,7 @@ dependencies = [ [[package]] name = "substrate-finality-grandpa" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3744,7 +3792,7 @@ dependencies = [ [[package]] name = "substrate-finality-grandpa-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3757,7 +3805,7 @@ dependencies = [ [[package]] name = "substrate-header-metadata" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3767,7 +3815,7 @@ dependencies = [ [[package]] name = "substrate-inherents" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3778,7 +3826,7 @@ dependencies = [ [[package]] name = "substrate-keyring" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3790,7 +3838,7 @@ dependencies = [ [[package]] name = "substrate-keystore" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3805,7 +3853,7 @@ dependencies = [ [[package]] name = "substrate-network" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" dependencies = [ "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3847,7 +3895,7 @@ dependencies = [ [[package]] name = "substrate-offchain-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3856,7 +3904,7 @@ dependencies = [ [[package]] name = "substrate-panic-handler" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" dependencies = [ "backtrace 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3865,7 +3913,7 @@ dependencies = [ [[package]] name = "substrate-peerset" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3878,7 +3926,7 @@ dependencies = [ [[package]] name = "substrate-phragmen" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3887,7 +3935,7 @@ dependencies = [ [[package]] name = "substrate-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3922,7 +3970,7 @@ dependencies = [ [[package]] name = "substrate-primitives-storage" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3932,7 +3980,7 @@ dependencies = [ [[package]] name = "substrate-serializer" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3941,7 +3989,7 @@ dependencies = [ [[package]] name = "substrate-session" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3963,7 +4011,7 @@ dependencies = [ [[package]] name = "substrate-state-machine" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -3982,7 +4030,7 @@ dependencies = [ [[package]] name = "substrate-telemetry" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -4055,7 +4103,7 @@ dependencies = [ [[package]] name = "substrate-transaction-graph" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -4069,7 +4117,7 @@ dependencies = [ [[package]] name = "substrate-transaction-pool" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -4085,7 +4133,7 @@ dependencies = [ [[package]] name = "substrate-trie" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" 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)", @@ -4109,7 +4157,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "substrate-wasm-interface" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#0af06e831a9ccee90866977ef4b01519073ca16d" +source = "git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch#2866a0d840cf454ebabe8fe96a32c3376d0fc786" dependencies = [ "wasmi 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5077,6 +5125,7 @@ dependencies = [ "checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" "checksum pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea" "checksum polkadot-availability-store 0.6.0 (git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch)" = "" +"checksum polkadot-network 0.6.0 (git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch)" = "" "checksum polkadot-parachain 0.6.0 (git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch)" = "" "checksum polkadot-primitives 0.6.0 (git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch)" = "" "checksum polkadot-runtime 0.6.0 (git+https://github.com/paritytech/polkadot?branch=bkchr-cumulus-branch)" = "" @@ -5152,6 +5201,7 @@ dependencies = [ "checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" "checksum sr-api-macros 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)" = "" +"checksum sr-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)" = "" "checksum sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)" = "" "checksum sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)" = "" "checksum sr-staking-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)" = "" @@ -5183,6 +5233,7 @@ dependencies = [ "checksum srml-support-procedural-tools-derive 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)" = "" "checksum srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)" = "" "checksum srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)" = "" +"checksum srml-transaction-payment 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)" = "" "checksum srml-treasury 2.0.0 (git+https://github.com/paritytech/substrate?branch=bkchr-cumulus-branch)" = "" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5" diff --git a/network/Cargo.toml b/network/Cargo.toml index ba74fb29f4..306052e082 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -15,6 +15,7 @@ sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "bkc polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-cumulus-branch" } polkadot-statement-table = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-cumulus-branch" } polkadot-validation = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-cumulus-branch" } +polkadot-network = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-cumulus-branch" } # other deps codec = { package = "parity-scale-codec", version = "1.0.5", features = [ "derive" ] } diff --git a/network/src/lib.rs b/network/src/lib.rs index 623ffbe337..1a3f19693a 100644 --- a/network/src/lib.rs +++ b/network/src/lib.rs @@ -22,31 +22,16 @@ use substrate_client::error::{Error as ClientError}; use sr_primitives::traits::{Block as BlockT}; use substrate_consensus_common::block_validation::{Validation, BlockAnnounceValidator}; -use polkadot_primitives::{ - Hash as PHash, parachain::{CandidateReceipt, ValidatorIndex, ValidatorSignature, ValidatorId}, -}; -use polkadot_statement_table::Statement; +use polkadot_primitives::parachain::ValidatorId; +use polkadot_statement_table::{SignedStatement, Statement}; use polkadot_validation::check_statement; +use polkadot_network::gossip::{GossipStatement, GossipMessage}; use codec::{Decode, Encode}; use std::marker::PhantomData; -/// Justification that a parachain block is the parachain block candidate of one of the relay chain -/// validator. -#[derive(Encode, Decode)] -pub struct BlockCandidateJustification { - /// Receipt of the parachain block candidate of the signer. - candidate_receipt: CandidateReceipt, - /// Signer of `signature`. - signer: ValidatorIndex, - /// Signature of the Candidate statement with `candidate_receipt`. - signature: ValidatorSignature, - /// The parent block of which the candidate must be include. - relay_chain_parent_hash: PHash, -} - -/// Validate that data is a valid justification form a relay-chain validator that the block is a +/// Validate that data is a valid justification from a relay-chain validator that the block is a /// valid parachain-block candidate. pub struct JustifiedBlockAnnounceValidator { authorities: Vec, @@ -66,34 +51,59 @@ impl BlockAnnounceValidator for JustifiedBlockAnnounceValidator fn validate(&mut self, header: &B::Header, mut data: &[u8]) -> Result> { - let justification = BlockCandidateJustification::decode(&mut data) + // Check data is a gossip message. + let gossip_message = GossipMessage::decode(&mut data) .map_err(|_| Box::new(ClientError::BadJustification( - "cannot decode block candidate justification".to_string() + "cannot decode block announced justification, must be a gossip message".to_string() )) as Box<_>)?; - // Check the header in the candidate_receipt match header given header. - if header.encode() != justification.candidate_receipt.head_data.0 { + // Check message is a gossip statement. + let gossip_statement = match gossip_message { + GossipMessage::Statement(gossip_statement) => gossip_statement, + _ => return Err(Box::new(ClientError::BadJustification( + "block announced justification statement must be a gossip statement".to_string() + )) as Box<_>) + }; + + let GossipStatement { + relay_chain_leaf, + signed_statement: SignedStatement { + statement, + signature, + sender, + } + } = gossip_statement; + + // Check that the signer is a legit validator. + let signer = self.authorities.get(sender as usize) + .ok_or_else(|| Box::new(ClientError::BadJustification( + "block accounced justification signer is a validator index out of bound".to_string() + )) as Box<_>)?; + + // Check statement is correctly signed. + if !check_statement( + &statement, + &signature, + signer.clone(), + &relay_chain_leaf, + ) { return Err(Box::new(ClientError::BadJustification( - "block candidate header does not match its justification".to_string() + "block announced justification signature is invalid".to_string() )) as Box<_>) } - // Check that the signer is a legit validator. - let signer = self.authorities.get(justification.signer as usize) - .ok_or_else(|| Box::new(ClientError::BadJustification( - "block candidate justification signer is a validator index out of bound".to_string() - )) as Box<_>)?; + // Check statement is a candidate statement. + let candidate_receipt = match statement { + Statement::Candidate(candidate_receipt) => candidate_receipt, + _ => return Err(Box::new(ClientError::BadJustification( + "block announced justification statement must be a candidate statement".to_string() + )) as Box<_>) + }; - // Check statement is signed. - let statement = Statement::Candidate(justification.candidate_receipt); - if !check_statement( - &statement, - &justification.signature, - signer.clone(), - &justification.relay_chain_parent_hash - ) { + // Check the header in the candidate_receipt match header given header. + if header.encode() != candidate_receipt.head_data.0 { return Err(Box::new(ClientError::BadJustification( - "block candidate justification signature is invalid".to_string() + "block announced header does not match the one justified".to_string() )) as Box<_>) }