diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock index f7c629103b..b5042c0ebd 100644 --- a/cumulus/Cargo.lock +++ b/cumulus/Cargo.lock @@ -1535,7 +1535,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "parity-scale-codec", ] @@ -1543,7 +1543,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -1560,8 +1560,9 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ + "Inflector", "frame-benchmarking", "parity-scale-codec", "sc-cli", @@ -1578,7 +1579,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -1593,7 +1594,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "parity-scale-codec", "serde", @@ -1604,7 +1605,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "bitmask", "frame-metadata", @@ -1629,7 +1630,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1640,7 +1641,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1652,7 +1653,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1662,7 +1663,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1678,7 +1679,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "parity-scale-codec", "sp-api", @@ -2617,8 +2618,8 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "bitvec", "frame-executive", @@ -3652,7 +3653,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -3668,7 +3669,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -3683,10 +3684,12 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", + "pallet-authorship", "pallet-session", "pallet-timestamp", "parity-scale-codec", @@ -3697,6 +3700,7 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", + "sp-session", "sp-staking", "sp-std", "sp-timestamp", @@ -3705,7 +3709,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-benchmarking", "frame-support", @@ -3719,7 +3723,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -3734,7 +3738,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-benchmarking", "frame-support", @@ -3749,7 +3753,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -3763,7 +3767,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -3779,7 +3783,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -3799,7 +3803,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3815,7 +3819,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -3834,7 +3838,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -3850,7 +3854,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -3864,7 +3868,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -3879,7 +3883,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -3893,7 +3897,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -3908,7 +3912,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -3923,7 +3927,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -3936,7 +3940,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "enumflags2", "frame-support", @@ -3951,7 +3955,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-benchmarking", "frame-support", @@ -3966,7 +3970,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -3986,7 +3990,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -4000,7 +4004,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -4020,7 +4024,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -4031,7 +4035,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -4045,7 +4049,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-benchmarking", "frame-support", @@ -4062,7 +4066,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -4077,7 +4081,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4095,7 +4099,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "parity-scale-codec", @@ -4108,7 +4112,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -4122,7 +4126,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-support", "frame-system", @@ -4137,7 +4141,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "enumflags2", "frame-support", @@ -4497,8 +4501,8 @@ checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e" [[package]] name = "polkadot-availability-store" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "derive_more 0.99.7", "exit-future 0.2.0", @@ -4524,8 +4528,8 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "frame-benchmarking-cli", "futures 0.3.5", @@ -4546,8 +4550,8 @@ dependencies = [ [[package]] name = "polkadot-collator" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "futures 0.3.5", "futures-timer 2.0.2", @@ -4574,7 +4578,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.7.30" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "parity-scale-codec", "sp-core", @@ -4584,8 +4588,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "derive_more 0.15.0", "parity-scale-codec", @@ -4597,8 +4601,8 @@ dependencies = [ [[package]] name = "polkadot-network" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "arrayvec 0.4.12", "bytes 0.5.4", @@ -4613,6 +4617,7 @@ dependencies = [ "polkadot-erasure-coding", "polkadot-primitives", "polkadot-validation", + "rand 0.7.3", "sc-network", "sc-network-gossip", "sp-api", @@ -4624,8 +4629,8 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "derive_more 0.99.7", "log 0.4.8", @@ -4644,8 +4649,8 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "bitvec", "frame-system", @@ -4666,8 +4671,8 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "jsonrpc-core", "pallet-transaction-payment-rpc", @@ -4693,8 +4698,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "bitvec", "frame-executive", @@ -4757,8 +4762,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "bitvec", "frame-support", @@ -4790,8 +4795,8 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "frame-benchmarking", "frame-system-rpc-runtime-api", @@ -4842,14 +4847,15 @@ dependencies = [ "sp-runtime", "sp-session", "sp-transaction-pool", + "sp-trie", "substrate-prometheus-endpoint", "westend-runtime", ] [[package]] name = "polkadot-statement-table" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -4858,8 +4864,8 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "bitvec", "frame-executive", @@ -4909,7 +4915,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime-client" version = "2.0.0" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "futures 0.3.5", "pallet-timestamp", @@ -4931,9 +4937,10 @@ dependencies = [ [[package]] name = "polkadot-validation" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ + "ansi_term 0.12.1", "bitvec", "derive_more 0.14.1", "exit-future 0.2.0", @@ -5741,7 +5748,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "bytes 0.5.4", "derive_more 0.99.7", @@ -5768,7 +5775,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5792,7 +5799,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5809,7 +5816,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5825,7 +5832,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -5836,7 +5843,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "ansi_term 0.12.1", "atty", @@ -5858,6 +5865,7 @@ dependencies = [ "sc-service", "sc-telemetry", "sc-tracing", + "serde", "serde_json", "sp-blockchain", "sp-core", @@ -5876,7 +5884,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "fnv", @@ -5912,7 +5920,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "blake2-rfc", "hash-db", @@ -5941,7 +5949,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5952,7 +5960,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "fork-tree", @@ -5994,7 +6002,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6018,7 +6026,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6031,7 +6039,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6044,6 +6052,7 @@ dependencies = [ "sp-application-crypto", "sp-blockchain", "sp-consensus", + "sp-consensus-slots", "sp-core", "sp-inherents", "sp-runtime", @@ -6053,7 +6062,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "log 0.4.8", "sc-client-api", @@ -6067,7 +6076,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "lazy_static", @@ -6095,7 +6104,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "log 0.4.8", @@ -6112,7 +6121,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6127,7 +6136,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -6148,7 +6157,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "assert_matches", "derive_more 0.99.7", @@ -6186,7 +6195,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "finality-grandpa", @@ -6203,7 +6212,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6222,7 +6231,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "hex", @@ -6238,7 +6247,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "hash-db", "lazy_static", @@ -6257,7 +6266,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "bitflags", "bs58", @@ -6309,7 +6318,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6324,7 +6333,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "bytes 0.5.4", "fnv", @@ -6351,7 +6360,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "futures 0.3.5", "libp2p", @@ -6364,7 +6373,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6373,7 +6382,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "futures 0.3.5", "hash-db", @@ -6405,7 +6414,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6429,7 +6438,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6445,7 +6454,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "directories", @@ -6508,7 +6517,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6522,7 +6531,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6543,7 +6552,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "erased-serde", "log 0.4.8", @@ -6560,7 +6569,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6580,7 +6589,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -6985,7 +6994,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "log 0.4.8", @@ -6997,7 +7006,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "hash-db", "parity-scale-codec", @@ -7012,7 +7021,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7024,7 +7033,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "parity-scale-codec", "serde", @@ -7036,7 +7045,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7049,7 +7058,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "parity-scale-codec", "sp-api", @@ -7061,7 +7070,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7072,7 +7081,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "parity-scale-codec", "sp-api", @@ -7084,7 +7093,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "log 0.4.8", @@ -7100,7 +7109,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "serde", "serde_json", @@ -7109,7 +7118,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -7147,13 +7156,14 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "merlin", "parity-scale-codec", "sp-api", "sp-application-crypto", "sp-consensus", + "sp-consensus-slots", "sp-consensus-vrf", "sp-core", "sp-inherents", @@ -7162,10 +7172,19 @@ dependencies = [ "sp-timestamp", ] +[[package]] +name = "sp-consensus-slots" +version = "0.8.0-rc4" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" +dependencies = [ + "parity-scale-codec", + "sp-runtime", +] + [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7177,7 +7196,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "base58", "blake2-rfc", @@ -7220,7 +7239,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7229,7 +7248,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -7239,7 +7258,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "environmental", "parity-scale-codec", @@ -7250,7 +7269,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7266,7 +7285,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7276,7 +7295,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "parity-scale-codec", @@ -7288,7 +7307,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "futures 0.3.5", "hash-db", @@ -7309,7 +7328,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "lazy_static", "sp-core", @@ -7320,7 +7339,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "parity-scale-codec", "serde", @@ -7332,7 +7351,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -7343,7 +7362,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "sp-api", "sp-core", @@ -7353,7 +7372,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "backtrace", "log 0.4.8", @@ -7362,7 +7381,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "serde", "sp-core", @@ -7371,7 +7390,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "either", "hash256-std-hasher", @@ -7393,7 +7412,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7408,7 +7427,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "Inflector", "proc-macro-crate", @@ -7420,7 +7439,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "serde", "serde_json", @@ -7429,7 +7448,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "parity-scale-codec", "sp-api", @@ -7442,7 +7461,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7452,7 +7471,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "hash-db", "itertools 0.9.0", @@ -7473,12 +7492,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" [[package]] name = "sp-storage" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7503,7 +7522,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7517,7 +7536,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "log 0.4.8", "rental", @@ -7527,7 +7546,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "derive_more 0.99.7", "futures 0.3.5", @@ -7543,7 +7562,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "hash-db", "memory-db 0.21.0", @@ -7557,7 +7576,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "futures 0.3.5", "futures-core", @@ -7569,7 +7588,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7581,7 +7600,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7709,7 +7728,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "platforms", ] @@ -7717,7 +7736,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7740,7 +7759,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ "async-std", "derive_more 0.99.7", @@ -7754,10 +7773,12 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#f59ac8b044a463928637992347670008c19fe7b9" +source = "git+https://github.com/paritytech/substrate?branch=cumulus-branch#0ab1c4f945c8cfb8687c34c926ffd1761d124eba" dependencies = [ + "futures 0.1.29", "futures 0.3.5", "hash-db", + "hex", "parity-scale-codec", "sc-client-api", "sc-client-db", @@ -8961,8 +8982,8 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.8.13" -source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#fa70ad569ffef1fc66b7d5091b1cebaec57a36bb" +version = "0.8.14" +source = "git+https://github.com/paritytech/polkadot?branch=cumulus-branch#1c1aee0d8b84604cc995ffa175ef138a024029e6" dependencies = [ "bitvec", "frame-executive", diff --git a/cumulus/test/parachain/src/command.rs b/cumulus/test/parachain/src/command.rs index 9396ea8f90..964a44137e 100644 --- a/cumulus/test/parachain/src/command.rs +++ b/cumulus/test/parachain/src/command.rs @@ -34,35 +34,35 @@ use sp_runtime::{ use std::{net::SocketAddr, sync::Arc}; impl SubstrateCli for Cli { - fn impl_name() -> &'static str { - "Cumulus Test Parachain Collator" + fn impl_name() -> String { + "Cumulus Test Parachain Collator".into() } - fn impl_version() -> &'static str { - env!("SUBSTRATE_CLI_IMPL_VERSION") + fn impl_version() -> String { + env!("SUBSTRATE_CLI_IMPL_VERSION").into() } - fn description() -> &'static str { - "Cumulus test parachain collator\n\nThe command-line arguments provided first will be \ + fn description() -> String { + format!("Cumulus test parachain collator\n\nThe command-line arguments provided first will be \ passed to the parachain node, while the arguments provided after -- will be passed \ to the relaychain node.\n\n\ - cumulus-test-parachain-collator [parachain-args] -- [relaychain-args]" + {} [parachain-args] -- [relaychain-args]", Self::executable_name()) } - fn author() -> &'static str { - env!("CARGO_PKG_AUTHORS") + fn author() -> String { + env!("CARGO_PKG_AUTHORS").into() } - fn support_url() -> &'static str { - "https://github.com/paritytech/cumulus/issues/new" + fn support_url() -> String { + "https://github.com/paritytech/cumulus/issues/new".into() } fn copyright_start_year() -> i32 { 2017 } - fn executable_name() -> &'static str { - "cumulus-test-parachain-collator" + fn executable_name() -> String { + "cumulus-test-parachain-collator".into() } fn load_spec(&self, _id: &str) -> std::result::Result, String> { @@ -78,46 +78,41 @@ impl SubstrateCli for Cli { } impl SubstrateCli for PolkadotCli { - fn impl_name() -> &'static str { - "Cumulus Test Parachain Collator" + fn impl_name() -> String { + "Cumulus Test Parachain Collator".into() } - fn impl_version() -> &'static str { - env!("SUBSTRATE_CLI_IMPL_VERSION") + fn impl_version() -> String { + env!("SUBSTRATE_CLI_IMPL_VERSION").into() } - fn description() -> &'static str { + fn description() -> String { "Cumulus test parachain collator\n\nThe command-line arguments provided first will be \ passed to the parachain node, while the arguments provided after -- will be passed \ to the relaychain node.\n\n\ cumulus-test-parachain-collator [parachain-args] -- [relaychain-args]" + .into() } - fn author() -> &'static str { - env!("CARGO_PKG_AUTHORS") + fn author() -> String { + env!("CARGO_PKG_AUTHORS").into() } - fn support_url() -> &'static str { - "https://github.com/paritytech/cumulus/issues/new" + fn support_url() -> String { + "https://github.com/paritytech/cumulus/issues/new".into() } fn copyright_start_year() -> i32 { 2017 } - fn executable_name() -> &'static str { - "cumulus-test-parachain-collator" + fn executable_name() -> String { + "cumulus-test-parachain-collator".into() } fn load_spec(&self, id: &str) -> std::result::Result, String> { - Ok(match id { - "" | "local" | "dev" => Box::new(polkadot_service::PolkadotChainSpec::from_json_bytes( - &include_bytes!("../res/polkadot_chainspec.json")[..], - )?), - path => Box::new(chain_spec::ChainSpec::from_json_file( - std::path::PathBuf::from(path), - )?), - }) + polkadot_cli::Cli::from_iter([PolkadotCli::executable_name().to_string()].iter()) + .load_spec(id) } fn native_runtime_version(chain_spec: &Box) -> &'static RuntimeVersion { @@ -161,7 +156,9 @@ pub fn run() -> Result<()> { Some(Subcommand::Base(subcommand)) => { let runner = cli.create_runner(subcommand)?; - runner.run_subcommand(subcommand, |config| Ok(new_full_start!(config).0)) + runner.run_subcommand(subcommand, |config| { + Ok(new_full_start!(config).0.to_chain_ops_parts()) + }) } Some(Subcommand::ExportGenesisState(params)) => { sc_cli::init_logger(""); diff --git a/cumulus/test/parachain/src/service.rs b/cumulus/test/parachain/src/service.rs index 3f1ea94f17..01f008972a 100644 --- a/cumulus/test/parachain/src/service.rs +++ b/cumulus/test/parachain/src/service.rs @@ -17,7 +17,7 @@ use ansi_term::Color; use cumulus_collator::{prepare_collator_config, CollatorBuilder}; use cumulus_network::DelayedBlockAnnounceValidator; -use futures::FutureExt; +use futures::{FutureExt, future::ready}; use polkadot_primitives::parachain::CollatorPair; use sc_executor::native_executor_instance; pub use sc_executor::NativeExecutor; @@ -135,8 +135,12 @@ pub fn run_collator( prefix: format!("[{}] ", Color::Blue.bold().paint("Relaychain")), }; - let polkadot_future = - polkadot_collator::start_collator(builder, id, key, polkadot_config).map(|_| ()); + let (polkadot_future, task_manager) = + polkadot_collator::start_collator(builder, id, key, polkadot_config)?; + + // Make sure the polkadot task manager survives as long as the service. + let polkadot_future = polkadot_future.then(move |_| { let _ = task_manager; ready(())}); + service.task_manager.spawn_essential_handle().spawn("polkadot", polkadot_future); Ok(service.task_manager)