diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock index f2c36dfacdef5828107a21a003ff28ec53dfb69a..b11f3784224f1a02ecf45d4398773807b5a56865 100644 --- a/cumulus/Cargo.lock +++ b/cumulus/Cargo.lock @@ -1245,6 +1245,7 @@ dependencies = [ "sc-chain-spec", "sc-client-api", "sc-service", + "sc-telemetry", "sc-tracing", "sp-api", "sp-blockchain", @@ -1975,7 +1976,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", ] @@ -1993,7 +1994,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "3.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -2012,7 +2013,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "Inflector", "chrono", @@ -2035,7 +2036,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -2051,7 +2052,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "13.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "serde", @@ -2062,7 +2063,7 @@ dependencies = [ [[package]] name = "frame-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "bitflags", "frame-metadata", @@ -2088,7 +2089,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2100,10 +2101,10 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2 1.0.24", "quote 1.0.9", "syn 1.0.60", @@ -2112,7 +2113,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", @@ -2122,7 +2123,7 @@ dependencies = [ [[package]] name = "frame-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -2139,7 +2140,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "sp-api", @@ -2148,7 +2149,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "parity-scale-codec", @@ -3031,7 +3032,7 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99a847f9ec7bb52149b2786a17c9cb260d6effc6b8eeb8c16b343a487a7563a3" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2 1.0.24", "quote 1.0.9", "syn 1.0.60", @@ -3130,9 +3131,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.2.0-alpha" +version = "0.2.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9cd3d41f5b9a1d3e4e4c9ad49a7a34ad8e1134a1a587cd21c72f644f5c053dd" +checksum = "3cb3f732ccbeafd15cefb59c7c7b5ac6c553c2653613b63e5e7feb7f06a219e9" dependencies = [ "Inflector", "proc-macro2 1.0.24", @@ -3142,9 +3143,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.2.0-alpha" +version = "0.2.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf718f9a0d09f50621ea35f507679cf3ab66910a6d95844850076c1281a203c" +checksum = "5a8cd20c190e75dc56f7543b9d5713c3186351b301b5507ea6b85d8c403aac78" dependencies = [ "async-trait", "futures 0.3.12", @@ -3189,7 +3190,7 @@ dependencies = [ [[package]] name = "kusama-runtime" version = "0.8.29" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "bitvec", "frame-executive", @@ -3992,7 +3993,7 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -4155,7 +4156,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85ee3c48cb9d9b275ad967a0e96715badc13c6029adb92f34fa17b9ff28fd81f" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro-error", "proc-macro2 1.0.24", "quote 1.0.9", @@ -4393,7 +4394,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4409,7 +4410,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4424,7 +4425,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-benchmarking", "frame-support", @@ -4449,7 +4450,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-benchmarking", "frame-support", @@ -4464,7 +4465,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4478,7 +4479,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4494,7 +4495,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-benchmarking", "frame-support", @@ -4509,7 +4510,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4528,7 +4529,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4543,7 +4544,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-benchmarking", "frame-support", @@ -4565,7 +4566,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4581,7 +4582,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4600,7 +4601,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4616,7 +4617,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4630,7 +4631,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4645,7 +4646,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4659,7 +4660,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4675,7 +4676,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4690,7 +4691,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4703,7 +4704,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "enumflags2", "frame-support", @@ -4718,7 +4719,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-benchmarking", "frame-support", @@ -4734,7 +4735,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4754,7 +4755,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4768,7 +4769,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4790,9 +4791,9 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2 1.0.24", "quote 1.0.9", "syn 1.0.60", @@ -4801,7 +4802,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4815,7 +4816,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-benchmarking", "frame-support", @@ -4833,7 +4834,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4847,7 +4848,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4863,7 +4864,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4880,7 +4881,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -4891,7 +4892,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4906,7 +4907,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-support", "frame-system", @@ -4921,7 +4922,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "enumflags2", "frame-support", @@ -4996,7 +4997,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9029e65297c7fd6d7013f0579e193ec2b34ae78eabca854c9417504ad8a2d214" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2 1.0.24", "quote 1.0.9", "syn 1.0.60", @@ -5387,7 +5388,7 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "polkadot-approval-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "polkadot-node-network-protocol", @@ -5402,7 +5403,7 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "parity-scale-codec", @@ -5417,7 +5418,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "lru", @@ -5440,7 +5441,7 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -5460,7 +5461,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.8.29" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "frame-benchmarking-cli", "futures 0.3.12", @@ -5481,7 +5482,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "polkadot-node-network-protocol", @@ -5497,7 +5498,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.7.30" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -5509,7 +5510,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "0.8.29" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -5522,7 +5523,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "polkadot-node-network-protocol", @@ -5537,7 +5538,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "async-trait", "futures 0.3.12", @@ -5555,7 +5556,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "polkadot-erasure-coding", @@ -5572,7 +5573,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "bitvec", "derive_more 0.99.11", @@ -5585,6 +5586,7 @@ dependencies = [ "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-node-subsystem-util", "polkadot-overseer", "polkadot-primitives", "sc-client-api", @@ -5601,7 +5603,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "bitvec", "futures 0.3.12", @@ -5623,7 +5625,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "bitvec", "futures 0.3.12", @@ -5642,7 +5644,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "polkadot-node-subsystem", @@ -5658,7 +5660,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-selection" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "polkadot-node-primitives", @@ -5674,7 +5676,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "parity-scale-codec", @@ -5691,7 +5693,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "polkadot-node-subsystem", @@ -5705,7 +5707,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-proposer" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -5715,6 +5717,7 @@ dependencies = [ "sc-basic-authorship", "sc-block-builder", "sc-client-api", + "sc-telemetry", "sp-api", "sp-blockchain", "sp-consensus", @@ -5729,7 +5732,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "bitvec", "futures 0.3.12", @@ -5745,7 +5748,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "memory-lru", @@ -5763,7 +5766,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "async-std", "lazy_static", @@ -5780,7 +5783,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "parity-scale-codec", @@ -5796,7 +5799,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "parity-scale-codec", @@ -5814,7 +5817,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "async-std", "async-trait", @@ -5845,7 +5848,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-test-helpers" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "async-trait", "futures 0.3.12", @@ -5868,7 +5871,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "async-trait", "futures 0.3.12", @@ -5895,7 +5898,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "async-trait", "futures 0.3.12", @@ -5913,7 +5916,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" version = "0.8.29" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "derive_more 0.99.11", "futures 0.3.12", @@ -5940,7 +5943,7 @@ dependencies = [ [[package]] name = "polkadot-pov-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "futures 0.3.12", "polkadot-node-network-protocol", @@ -5955,7 +5958,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.8.29" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "bitvec", "frame-system", @@ -5983,7 +5986,7 @@ dependencies = [ [[package]] name = "polkadot-procmacro-subsystem-dispatch-gen" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "assert_matches", "proc-macro2 1.0.24", @@ -5994,7 +5997,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "0.8.29" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "jsonrpc-core", "pallet-transaction-payment-rpc", @@ -6024,7 +6027,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.8.29" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "bitvec", "frame-executive", @@ -6090,7 +6093,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.8.29" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "bitvec", "frame-support", @@ -6126,7 +6129,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.8.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "bitvec", "derive_more 0.99.11", @@ -6163,7 +6166,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.8.3" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "frame-benchmarking", "frame-system-rpc-runtime-api", @@ -6248,7 +6251,7 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "arrayvec 0.5.2", "futures 0.3.12", @@ -6266,7 +6269,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.8.29" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -6276,7 +6279,7 @@ dependencies = [ [[package]] name = "polkadot-test-client" version = "0.8.29" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "parity-scale-codec", "polkadot-node-subsystem", @@ -6301,7 +6304,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "0.8.29" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "bitvec", "frame-executive", @@ -6356,7 +6359,7 @@ dependencies = [ [[package]] name = "polkadot-test-service" version = "0.8.29" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "frame-benchmarking", "frame-system", @@ -6494,6 +6497,16 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-crate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" +dependencies = [ + "thiserror", + "toml", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -7092,7 +7105,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "env_logger 0.8.3", "hex-literal 0.3.1", @@ -7233,7 +7246,7 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "0.8.29" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "frame-executive", "frame-support", @@ -7418,7 +7431,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "async-trait", "derive_more 0.99.11", @@ -7446,7 +7459,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7469,7 +7482,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -7485,7 +7498,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7506,9 +7519,9 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2 1.0.24", "quote 1.0.9", "syn 1.0.60", @@ -7517,7 +7530,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "chrono", "fdlimit", @@ -7555,7 +7568,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "derive_more 0.99.11", "fnv", @@ -7589,7 +7602,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "blake2-rfc", "hash-db", @@ -7619,7 +7632,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "sc-client-api", "sp-blockchain", @@ -7630,7 +7643,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "derive_more 0.99.11", "fork-tree", @@ -7676,7 +7689,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "derive_more 0.99.11", "futures 0.3.12", @@ -7700,7 +7713,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7713,7 +7726,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7739,7 +7752,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "log", "sc-client-api", @@ -7753,7 +7766,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "derive_more 0.99.11", "lazy_static", @@ -7782,7 +7795,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "derive_more 0.99.11", "parity-scale-codec", @@ -7798,7 +7811,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "log", "parity-scale-codec", @@ -7813,7 +7826,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "log", "parity-scale-codec", @@ -7831,7 +7844,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "derive_more 0.99.11", "dyn-clone", @@ -7870,7 +7883,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "derive_more 0.99.11", "finality-grandpa", @@ -7894,7 +7907,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-warp-sync" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "derive_more 0.99.11", "futures 0.3.12", @@ -7915,7 +7928,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "ansi_term 0.12.1", "futures 0.3.12", @@ -7933,7 +7946,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "async-trait", "derive_more 0.99.11", @@ -7953,7 +7966,7 @@ dependencies = [ [[package]] name = "sc-light" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "hash-db", "lazy_static", @@ -7972,7 +7985,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "async-std", "async-trait", @@ -8025,7 +8038,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -8041,12 +8054,13 @@ dependencies = [ [[package]] name = "sc-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "bytes 0.5.6", "fnv", "futures 0.3.12", "futures-timer 3.0.2", + "hex", "hyper 0.13.9", "hyper-rustls", "log", @@ -8068,7 +8082,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "futures 0.3.12", "libp2p", @@ -8081,7 +8095,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8090,7 +8104,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "futures 0.3.12", "hash-db", @@ -8124,7 +8138,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "derive_more 0.99.11", "futures 0.3.12", @@ -8148,7 +8162,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "futures 0.1.30", "jsonrpc-core", @@ -8166,7 +8180,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "directories", "exit-future 0.2.0", @@ -8229,7 +8243,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "log", "parity-scale-codec", @@ -8244,7 +8258,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8264,7 +8278,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "chrono", "futures 0.3.12", @@ -8275,10 +8289,8 @@ dependencies = [ "rand 0.7.3", "serde", "serde_json", - "sp-utils", "take_mut", - "tracing", - "tracing-subscriber", + "thiserror", "void", "wasm-timer", ] @@ -8286,7 +8298,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "ansi_term 0.12.1", "atty", @@ -8297,7 +8309,6 @@ dependencies = [ "parking_lot 0.11.1", "regex", "rustc-hash", - "sc-telemetry", "sc-tracing-proc-macro", "serde", "serde_json", @@ -8314,9 +8325,9 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2 1.0.24", "quote 1.0.9", "syn 1.0.60", @@ -8325,7 +8336,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "derive_more 0.99.11", "futures 0.3.12", @@ -8347,7 +8358,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "futures 0.3.12", "futures-diagnose", @@ -8752,7 +8763,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "log", "sp-core", @@ -8764,7 +8775,7 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "hash-db", "log", @@ -8781,10 +8792,10 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "blake2-rfc", - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2 1.0.24", "quote 1.0.9", "syn 1.0.60", @@ -8793,7 +8804,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "serde", @@ -8805,7 +8816,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "integer-sqrt", "num-traits", @@ -8818,7 +8829,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "sp-api", @@ -8830,7 +8841,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -8841,7 +8852,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "sp-api", @@ -8853,7 +8864,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "futures 0.3.12", "log", @@ -8871,7 +8882,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "serde", "serde_json", @@ -8880,7 +8891,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -8906,7 +8917,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "sp-api", @@ -8921,10 +8932,11 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "merlin", "parity-scale-codec", + "serde", "sp-api", "sp-application-crypto", "sp-consensus", @@ -8941,7 +8953,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -8951,7 +8963,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -8963,7 +8975,7 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "base58", "blake2-rfc", @@ -9007,7 +9019,7 @@ dependencies = [ [[package]] name = "sp-database" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -9016,7 +9028,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", @@ -9026,7 +9038,7 @@ dependencies = [ [[package]] name = "sp-election-providers" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -9037,7 +9049,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "environmental", "parity-scale-codec", @@ -9048,7 +9060,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "finality-grandpa", "log", @@ -9065,7 +9077,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", @@ -9077,7 +9089,7 @@ dependencies = [ [[package]] name = "sp-io" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "futures 0.3.12", "hash-db", @@ -9101,7 +9113,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "lazy_static", "sp-core", @@ -9112,7 +9124,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "async-trait", "derive_more 0.99.11", @@ -9129,7 +9141,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "serde", @@ -9142,9 +9154,9 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2 1.0.24", "quote 1.0.9", "syn 1.0.60", @@ -9153,7 +9165,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "sp-api", "sp-core", @@ -9163,7 +9175,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "backtrace", ] @@ -9171,7 +9183,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "serde", "sp-core", @@ -9180,7 +9192,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "either", "hash256-std-hasher", @@ -9201,7 +9213,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9218,10 +9230,10 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "Inflector", - "proc-macro-crate", + "proc-macro-crate 1.0.0", "proc-macro2 1.0.24", "quote 1.0.9", "syn 1.0.60", @@ -9230,7 +9242,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "serde", "serde_json", @@ -9239,7 +9251,7 @@ dependencies = [ [[package]] name = "sp-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "sp-api", @@ -9252,7 +9264,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -9262,7 +9274,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "hash-db", "log", @@ -9284,12 +9296,12 @@ dependencies = [ [[package]] name = "sp-std" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" [[package]] name = "sp-storage" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9302,7 +9314,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "log", "sp-core", @@ -9315,7 +9327,7 @@ dependencies = [ [[package]] name = "sp-test-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -9328,7 +9340,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9342,7 +9354,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "log", "parity-scale-codec", @@ -9355,7 +9367,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "derive_more 0.99.11", "futures 0.3.12", @@ -9371,7 +9383,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "hash-db", "memory-db", @@ -9385,7 +9397,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "futures 0.3.12", "futures-core", @@ -9397,7 +9409,7 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9409,7 +9421,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9542,7 +9554,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "platforms", ] @@ -9550,7 +9562,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.12", @@ -9573,7 +9585,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "async-std", "derive_more 0.99.11", @@ -9587,7 +9599,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "futures 0.1.30", "futures 0.3.12", @@ -9599,6 +9611,7 @@ dependencies = [ "sc-consensus", "sc-executor", "sc-light", + "sc-offchain", "sc-service", "serde", "serde_json", @@ -9614,7 +9627,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "cfg-if 1.0.0", "frame-support", @@ -9655,7 +9668,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "futures 0.3.12", "parity-scale-codec", @@ -9676,7 +9689,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "futures 0.3.12", "substrate-test-utils-derive", @@ -9686,9 +9699,9 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.0.0", "quote 1.0.9", "syn 1.0.60", ] @@ -9712,7 +9725,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "ansi_term 0.12.1", "atty", @@ -9822,18 +9835,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.9", @@ -10346,7 +10359,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#ac1f7ff32bf0d0e9c328cfe083bee7492c639946" +source = "git+https://github.com/paritytech/substrate?branch=master#6ac86d545f6da8e4afc373dc0876c3e7ba79e51b" dependencies = [ "frame-try-runtime", "log", @@ -10985,7 +10998,7 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.8.29" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "bitvec", "frame-executive", @@ -11142,7 +11155,7 @@ dependencies = [ [[package]] name = "xcm" version = "0.8.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "parity-scale-codec", ] @@ -11150,7 +11163,7 @@ dependencies = [ [[package]] name = "xcm-builder" version = "0.8.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "frame-support", "parity-scale-codec", @@ -11166,7 +11179,7 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.8.22" -source = "git+https://github.com/paritytech/polkadot?branch=master#8a4fb92d497fbee2eb4f1ad2ccb3e57cda3f8685" +source = "git+https://github.com/paritytech/polkadot?branch=master#c8649e594ab80d071661fb8a48fad98da683f600" dependencies = [ "frame-support", "impl-trait-for-tuples", diff --git a/cumulus/client/network/src/lib.rs b/cumulus/client/network/src/lib.rs index 534917224d5896b129e519c41bfdce069242b5da..b5e571e417b1f2653ab6b8bee392321e733c49a0 100644 --- a/cumulus/client/network/src/lib.rs +++ b/cumulus/client/network/src/lib.rs @@ -84,7 +84,7 @@ impl BlockAnnounceData { /// /// This will not check the signature, for this you should use [`BlockAnnounceData::check_signature`]. fn validate(&self, encoded_header: Vec<u8>) -> Result<(), Validation> { - let candidate_hash = if let CompactStatement::Candidate(h) = self.statement.payload() { + let candidate_hash = if let CompactStatement::Seconded(h) = self.statement.payload() { h } else { tracing::debug!( diff --git a/cumulus/client/service/Cargo.toml b/cumulus/client/service/Cargo.toml index 428ebc4506cbfa2449b5f49350f66d043efce015..c9f4d4be86441df36da746a8ad9f89b28d4a2ed2 100644 --- a/cumulus/client/service/Cargo.toml +++ b/cumulus/client/service/Cargo.toml @@ -14,6 +14,7 @@ cumulus-primitives-core = { path = "../../primitives/core" } sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/cumulus/client/service/src/lib.rs b/cumulus/client/service/src/lib.rs index 4298b5eff6bcc0dd9601de4c902fb22d0dd77f8b..06d2513a51b5d1c6ffed2c37187572dfa13a17a7 100644 --- a/cumulus/client/service/src/lib.rs +++ b/cumulus/client/service/src/lib.rs @@ -27,6 +27,7 @@ use sc_client_api::{ Backend as BackendT, BlockBackend, BlockchainEvents, Finalizer, UsageProvider, }; use sc_service::{error::Result as ServiceResult, Configuration, Role, TaskManager}; +use sc_telemetry::TelemetryWorkerHandle; use sp_blockchain::HeaderBackend; use sp_consensus::BlockImport; use sp_core::traits::SpawnNamed; @@ -233,6 +234,7 @@ pub fn prepare_node_config(mut parachain_config: Configuration) -> Configuration pub fn build_polkadot_full_node( config: Configuration, collator_id: CollatorId, + telemetry_worker_handle: Option<TelemetryWorkerHandle>, ) -> Result<RFullNode<PClient>, polkadot_service::Error> { let is_light = matches!(config.role, Role::Light); if is_light { @@ -245,6 +247,7 @@ pub fn build_polkadot_full_node( polkadot_service::IsCollator::Yes(collator_id), None, None, + telemetry_worker_handle, ) } } diff --git a/cumulus/rococo-parachains/runtime/src/lib.rs b/cumulus/rococo-parachains/runtime/src/lib.rs index b056057149cc4808e7b29454c1fba07d814282f5..6eeee05503025a90d283d7713dd38d1a06d49115 100644 --- a/cumulus/rococo-parachains/runtime/src/lib.rs +++ b/cumulus/rococo-parachains/runtime/src/lib.rs @@ -384,7 +384,7 @@ impl_runtime_apis! { } fn random_seed() -> <Block as BlockT>::Hash { - RandomnessCollectiveFlip::random_seed() + RandomnessCollectiveFlip::random_seed().0 } } diff --git a/cumulus/rococo-parachains/src/command.rs b/cumulus/rococo-parachains/src/command.rs index a0069af5923e9daf9ca407002faac687ef3c428a..d56e0ea1f867eadef4670602de225e1660bab64c 100644 --- a/cumulus/rococo-parachains/src/command.rs +++ b/cumulus/rococo-parachains/src/command.rs @@ -216,7 +216,6 @@ pub fn run() -> Result<()> { &polkadot_cli, &polkadot_cli, config.task_executor.clone(), - None, ) .map_err(|err| format!("Relay chain argument error: {}", err))?; @@ -311,7 +310,6 @@ pub fn run() -> Result<()> { &polkadot_cli, &polkadot_cli, task_executor, - config.telemetry_handle.clone(), ) .map_err(|err| format!("Relay chain argument error: {}", err))?; let collator = cli.run.base.validator || cli.collator; @@ -388,7 +386,7 @@ impl CliConfiguration<Self> for RelayChainCli { self.base.base.prometheus_config(default_listen_port) } - fn init<C: SubstrateCli>(&self) -> Result<sc_telemetry::TelemetryWorker> { + fn init<C: SubstrateCli>(&self) -> Result<()> { unreachable!("PolkadotCli is never initialized; qed"); } diff --git a/cumulus/rococo-parachains/src/service.rs b/cumulus/rococo-parachains/src/service.rs index cfea254956468d9064817eb27761cd620a16a15d..9b21221ac9f7e38aa5d504bd1c32b00ae256dfb9 100644 --- a/cumulus/rococo-parachains/src/service.rs +++ b/cumulus/rococo-parachains/src/service.rs @@ -28,7 +28,7 @@ use rococo_parachain_primitives::Block; use sc_executor::native_executor_instance; pub use sc_executor::NativeExecutor; use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager}; -use sc_telemetry::TelemetrySpan; +use sc_telemetry::{Telemetry, TelemetryWorker, TelemetryWorkerHandle}; use sp_core::Pair; use sp_runtime::traits::BlakeTwo256; use sp_trie::PrefixedMemoryDB; @@ -54,16 +54,38 @@ pub fn new_partial( (), sp_consensus::import_queue::BasicQueue<Block, PrefixedMemoryDB<BlakeTwo256>>, sc_transaction_pool::FullPool<Block, TFullClient<Block, RuntimeApi, Executor>>, - (), + (Option<Telemetry>, Option<TelemetryWorkerHandle>), >, sc_service::Error, > { let inherent_data_providers = sp_inherents::InherentDataProviders::new(); + let telemetry = config.telemetry_endpoints.clone() + .filter(|x| !x.is_empty()) + .map(|endpoints| -> Result<_, sc_telemetry::Error> { + let worker = TelemetryWorker::new(16)?; + let telemetry = worker.handle().new_telemetry(endpoints); + Ok((worker, telemetry)) + }) + .transpose()?; + let (client, backend, keystore_container, task_manager) = - sc_service::new_full_parts::<Block, RuntimeApi, Executor>(&config)?; + sc_service::new_full_parts::<Block, RuntimeApi, Executor>( + &config, + telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), + )?; let client = Arc::new(client); + let telemetry_worker_handle = telemetry + .as_ref() + .map(|(worker, _)| worker.handle()); + + let telemetry = telemetry + .map(|(worker, telemetry)| { + task_manager.spawn_handle().spawn("telemetry", worker.run()); + telemetry + }); + let registry = config.prometheus_registry(); let transaction_pool = sc_transaction_pool::BasicPool::new_full( @@ -91,7 +113,7 @@ pub fn new_partial( transaction_pool, inherent_data_providers, select_chain: (), - other: (), + other: (telemetry, telemetry_worker_handle), }; Ok(params) @@ -122,18 +144,23 @@ where let parachain_config = prepare_node_config(parachain_config); - let polkadot_full_node = - cumulus_client_service::build_polkadot_full_node(polkadot_config, collator_key.public()) - .map_err(|e| match e { - polkadot_service::Error::Sub(x) => x, - s => format!("{}", s).into(), - })?; - let params = new_partial(¶chain_config)?; params .inherent_data_providers .register_provider(sp_timestamp::InherentDataProvider) .unwrap(); + let (mut telemetry, telemetry_worker_handle) = params.other; + + let polkadot_full_node = + cumulus_client_service::build_polkadot_full_node( + polkadot_config, + collator_key.public(), + telemetry_worker_handle, + ) + .map_err(|e| match e { + polkadot_service::Error::Sub(x) => x, + s => format!("{}", s).into(), + })?; let client = params.client.clone(); let backend = params.backend.clone(); @@ -162,9 +189,6 @@ where let rpc_client = client.clone(); let rpc_extensions_builder = Box::new(move |_, _| rpc_ext_builder(rpc_client.clone())); - let telemetry_span = TelemetrySpan::new(); - let _telemetry_span_entered = telemetry_span.enter(); - sc_service::spawn_tasks(sc_service::SpawnTasksParams { on_demand: None, remote_blockchain: None, @@ -178,7 +202,7 @@ where network: network.clone(), network_status_sinks, system_rpc_tx, - telemetry_span: Some(telemetry_span.clone()), + telemetry: telemetry.as_mut(), })?; let announce_block = { @@ -192,6 +216,7 @@ where client.clone(), transaction_pool, prometheus_registry.as_ref(), + telemetry.as_ref().map(|x| x.handle()), ); let spawner = task_manager.spawn_handle(); diff --git a/cumulus/test/runtime/src/lib.rs b/cumulus/test/runtime/src/lib.rs index 28f58e3dd03efb2432ec7e7b686ff455cab527ac..1b017fd73fc5168bb4915c4169812c2e493cfae7 100644 --- a/cumulus/test/runtime/src/lib.rs +++ b/cumulus/test/runtime/src/lib.rs @@ -333,7 +333,7 @@ impl_runtime_apis! { } fn random_seed() -> <Block as BlockT>::Hash { - RandomnessCollectiveFlip::random_seed() + RandomnessCollectiveFlip::random_seed().0 } } diff --git a/cumulus/test/service/src/lib.rs b/cumulus/test/service/src/lib.rs index 00aa807a8cb101eeeed827ad8c81ee5cb0848ce1..bdd9a263662db25429489651a5f40bda717b9420 100644 --- a/cumulus/test/service/src/lib.rs +++ b/cumulus/test/service/src/lib.rs @@ -80,7 +80,7 @@ pub fn new_partial( let inherent_data_providers = sp_inherents::InherentDataProviders::new(); let (client, backend, keystore_container, task_manager) = - sc_service::new_full_parts::<Block, RuntimeApi, RuntimeExecutor>(&config)?; + sc_service::new_full_parts::<Block, RuntimeApi, RuntimeExecutor>(&config, None)?; let client = Arc::new(client); let registry = config.prometheus_registry(); @@ -194,7 +194,7 @@ where Box::new(move |_, _| rpc_ext_builder(client.clone())) }; - let (rpc_handlers, _) = sc_service::spawn_tasks(sc_service::SpawnTasksParams { + let rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams { on_demand: None, remote_blockchain: None, rpc_extensions_builder, @@ -207,7 +207,7 @@ where network: network.clone(), network_status_sinks, system_rpc_tx, - telemetry_span: None, + telemetry: None, })?; let announce_block = { @@ -221,6 +221,7 @@ where client.clone(), transaction_pool, prometheus_registry.as_ref(), + None, ); let parachain_consensus = cumulus_client_consensus_relay_chain::RelayChainConsensus::new( para_id, @@ -423,7 +424,6 @@ pub fn node_config( rpc_cors: None, rpc_methods: Default::default(), prometheus_config: None, - telemetry_handle: None, telemetry_endpoints: None, telemetry_external_transport: None, default_heap_pages: None,