diff --git a/Cargo.lock b/Cargo.lock
index 2b498a216a..692f9f0890 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -127,12 +127,6 @@ dependencies = [
  "num-traits 0.2.14",
 ]
 
-[[package]]
-name = "arc-swap"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dabe5a181f83789739c194cbe5a897dde195078fac08568d09221fd6137a7ba8"
-
 [[package]]
 name = "arrayref"
 version = "0.3.6"
@@ -1215,9 +1209,9 @@ dependencies = [
  "polkadot-overseer",
  "polkadot-primitives",
  "polkadot-service",
- "sc-cli",
  "sc-client-api",
  "sc-service",
+ "sc-tracing",
  "sp-api",
  "sp-blockchain",
  "sp-consensus",
@@ -1365,6 +1359,8 @@ dependencies = [
  "sc-network",
  "sc-rpc",
  "sc-service",
+ "sc-telemetry",
+ "sc-tracing",
  "sc-transaction-pool",
  "serde",
  "sp-api",
@@ -1801,7 +1797,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1819,7 +1815,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1837,7 +1833,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1860,7 +1856,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1876,7 +1872,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "12.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1887,7 +1883,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1912,7 +1908,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -1924,7 +1920,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1936,7 +1932,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.8",
@@ -1946,7 +1942,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples 0.2.0",
@@ -1962,7 +1958,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2935,7 +2931,7 @@ dependencies = [
 [[package]]
 name = "kusama-runtime"
 version = "0.8.27"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "bitvec",
  "frame-executive",
@@ -3737,7 +3733,7 @@ dependencies = [
 [[package]]
 name = "metered-channel"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -4159,7 +4155,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4175,7 +4171,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4190,7 +4186,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4215,7 +4211,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4229,7 +4225,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4243,7 +4239,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4258,7 +4254,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4273,7 +4269,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4287,7 +4283,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4308,7 +4304,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4324,7 +4320,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4343,7 +4339,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4359,7 +4355,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4373,7 +4369,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4388,7 +4384,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4402,7 +4398,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4417,7 +4413,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4432,7 +4428,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4445,7 +4441,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4460,7 +4456,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4475,7 +4471,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4495,7 +4491,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4509,7 +4505,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4529,7 +4525,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -4540,7 +4536,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4554,7 +4550,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4571,7 +4567,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4585,7 +4581,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4601,7 +4597,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4618,7 +4614,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -4629,7 +4625,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4644,7 +4640,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4659,7 +4655,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -5115,7 +5111,7 @@ checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e"
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "futures 0.3.12",
  "parity-scale-codec",
@@ -5130,7 +5126,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "futures 0.3.12",
  "parity-scale-codec",
@@ -5149,7 +5145,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-recovery"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -5169,7 +5165,7 @@ dependencies = [
 [[package]]
 name = "polkadot-cli"
 version = "0.8.27"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "frame-benchmarking-cli",
  "futures 0.3.12",
@@ -5189,7 +5185,7 @@ dependencies = [
 [[package]]
 name = "polkadot-collator-protocol"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "futures 0.3.12",
  "polkadot-node-network-protocol",
@@ -5204,7 +5200,7 @@ dependencies = [
 [[package]]
 name = "polkadot-core-primitives"
 version = "0.7.30"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "parity-scale-codec",
  "sp-core",
@@ -5215,7 +5211,7 @@ dependencies = [
 [[package]]
 name = "polkadot-erasure-coding"
 version = "0.8.27"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -5228,7 +5224,7 @@ dependencies = [
 [[package]]
 name = "polkadot-network-bridge"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "async-trait",
  "futures 0.3.12",
@@ -5245,7 +5241,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-collation-generation"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "futures 0.3.12",
  "polkadot-erasure-coding",
@@ -5262,7 +5258,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-av-store"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "bitvec",
  "futures 0.3.12",
@@ -5284,7 +5280,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-backing"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "bitvec",
  "futures 0.3.12",
@@ -5303,7 +5299,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "futures 0.3.12",
  "polkadot-node-subsystem",
@@ -5319,7 +5315,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-candidate-selection"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "futures 0.3.12",
  "polkadot-node-subsystem",
@@ -5334,7 +5330,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-candidate-validation"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "futures 0.3.12",
  "parity-scale-codec",
@@ -5351,7 +5347,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-api"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "futures 0.3.12",
  "polkadot-node-subsystem",
@@ -5365,7 +5361,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-proposer"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -5389,7 +5385,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-provisioner"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "bitvec",
  "futures 0.3.12",
@@ -5405,7 +5401,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-runtime-api"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "futures 0.3.12",
  "polkadot-node-subsystem",
@@ -5420,7 +5416,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-jaeger"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "async-std",
  "lazy_static",
@@ -5436,7 +5432,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-network-protocol"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-jaeger",
@@ -5449,7 +5445,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-primitives"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "futures 0.3.12",
  "parity-scale-codec",
@@ -5463,7 +5459,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "async-std",
  "async-trait",
@@ -5493,7 +5489,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-test-helpers"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "async-trait",
  "futures 0.3.12",
@@ -5516,7 +5512,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-util"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "async-trait",
  "futures 0.3.12",
@@ -5542,7 +5538,7 @@ dependencies = [
 [[package]]
 name = "polkadot-overseer"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "async-trait",
  "futures 0.3.12",
@@ -5560,7 +5556,7 @@ dependencies = [
 [[package]]
 name = "polkadot-parachain"
 version = "0.8.27"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "derive_more 0.99.11",
  "futures 0.3.12",
@@ -5583,7 +5579,7 @@ dependencies = [
 [[package]]
 name = "polkadot-pov-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "futures 0.3.12",
  "polkadot-node-network-protocol",
@@ -5598,7 +5594,7 @@ dependencies = [
 [[package]]
 name = "polkadot-primitives"
 version = "0.8.27"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "bitvec",
  "frame-system",
@@ -5625,7 +5621,7 @@ dependencies = [
 [[package]]
 name = "polkadot-rpc"
 version = "0.8.27"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "jsonrpc-core",
  "pallet-transaction-payment-rpc",
@@ -5655,7 +5651,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime"
 version = "0.8.27"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "bitvec",
  "frame-executive",
@@ -5720,7 +5716,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-common"
 version = "0.8.27"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "bitvec",
  "frame-support",
@@ -5756,7 +5752,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-parachains"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "bitvec",
  "derive_more 0.99.11",
@@ -5793,7 +5789,7 @@ dependencies = [
 [[package]]
 name = "polkadot-service"
 version = "0.8.3"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "frame-benchmarking",
  "frame-system-rpc-runtime-api",
@@ -5873,7 +5869,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-distribution"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "arrayvec 0.5.2",
  "futures 0.3.12",
@@ -5891,7 +5887,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-table"
 version = "0.8.27"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -5901,7 +5897,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-client"
 version = "0.8.27"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-subsystem",
@@ -5925,7 +5921,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-runtime"
 version = "0.8.27"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "bitvec",
  "frame-executive",
@@ -5979,7 +5975,7 @@ dependencies = [
 [[package]]
 name = "polkadot-test-service"
 version = "0.8.27"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "frame-benchmarking",
  "frame-system",
@@ -6010,6 +6006,7 @@ dependencies = [
  "sc-finality-grandpa",
  "sc-network",
  "sc-service",
+ "sc-tracing",
  "sc-transaction-pool",
  "sp-arithmetic",
  "sp-authority-discovery",
@@ -6759,6 +6756,7 @@ dependencies = [
  "sc-network",
  "sc-rpc",
  "sc-service",
+ "sc-telemetry",
  "sc-tracing",
  "sc-transaction-pool",
  "serde",
@@ -6793,7 +6791,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime"
 version = "0.8.27"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "frame-executive",
  "frame-support",
@@ -6983,7 +6981,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "async-trait",
  "derive_more 0.99.11",
@@ -7011,7 +7009,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7034,7 +7032,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -7051,7 +7049,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
@@ -7072,7 +7070,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -7083,9 +7081,8 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
- "atty",
  "chrono",
  "fdlimit",
  "futures 0.3.12",
@@ -7097,7 +7094,6 @@ dependencies = [
  "rand 0.7.3",
  "regex",
  "rpassword",
- "sc-cli-proc-macro",
  "sc-client-api",
  "sc-keystore",
  "sc-network",
@@ -7118,26 +7114,12 @@ dependencies = [
  "thiserror",
  "tiny-bip39",
  "tokio 0.2.24",
- "tracing",
- "tracing-log",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "sc-cli-proc-macro"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.24",
- "quote 1.0.8",
- "syn 1.0.58",
 ]
 
 [[package]]
 name = "sc-client-api"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "derive_more 0.99.11",
  "fnv",
@@ -7171,7 +7153,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -7201,7 +7183,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -7212,7 +7194,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "derive_more 0.99.11",
  "fork-tree",
@@ -7257,7 +7239,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "derive_more 0.99.11",
  "futures 0.3.12",
@@ -7281,7 +7263,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -7294,7 +7276,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7320,7 +7302,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "log",
  "sc-client-api",
@@ -7334,7 +7316,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "derive_more 0.99.11",
  "lazy_static",
@@ -7363,7 +7345,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "derive_more 0.99.11",
  "parity-scale-codec",
@@ -7379,7 +7361,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7394,7 +7376,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7412,7 +7394,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "derive_more 0.99.11",
  "finality-grandpa",
@@ -7449,7 +7431,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "derive_more 0.99.11",
  "finality-grandpa",
@@ -7473,7 +7455,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.12",
@@ -7491,7 +7473,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "async-trait",
  "derive_more 0.99.11",
@@ -7511,7 +7493,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7530,7 +7512,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7551,6 +7533,7 @@ dependencies = [
  "linked-hash-map",
  "linked_hash_set",
  "log",
+ "lru",
  "nohash-hasher",
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -7563,8 +7546,6 @@ dependencies = [
  "sc-peerset",
  "serde",
  "serde_json",
- "slog",
- "slog_derive",
  "smallvec 1.6.1",
  "sp-arithmetic",
  "sp-blockchain",
@@ -7583,7 +7564,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -7599,7 +7580,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7626,7 +7607,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "futures 0.3.12",
  "libp2p",
@@ -7639,7 +7620,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7648,7 +7629,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "futures 0.3.12",
  "hash-db",
@@ -7682,7 +7663,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "derive_more 0.99.11",
  "futures 0.3.12",
@@ -7706,7 +7687,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "futures 0.1.30",
  "jsonrpc-core",
@@ -7724,7 +7705,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "directories 3.0.1",
  "exit-future 0.2.0",
@@ -7758,7 +7739,6 @@ dependencies = [
  "sc-transaction-pool",
  "serde",
  "serde_json",
- "slog",
  "sp-api",
  "sp-application-crypto",
  "sp-block-builder",
@@ -7788,7 +7768,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7803,7 +7783,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -7823,20 +7803,21 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
+ "chrono",
  "futures 0.3.12",
- "futures-timer 3.0.2",
  "libp2p",
  "log",
  "parking_lot 0.11.1",
  "pin-project 0.4.27",
  "rand 0.7.3",
  "serde",
- "slog",
- "slog-json",
- "slog-scope",
+ "serde_json",
+ "sp-utils",
  "take_mut",
+ "tracing",
+ "tracing-subscriber",
  "void",
  "wasm-timer",
 ]
@@ -7844,9 +7825,10 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "ansi_term 0.12.1",
+ "atty",
  "erased-serde",
  "lazy_static",
  "log",
@@ -7855,20 +7837,34 @@ dependencies = [
  "regex",
  "rustc-hash",
  "sc-telemetry",
+ "sc-tracing-proc-macro",
  "serde",
  "serde_json",
- "slog",
  "sp-tracing",
+ "thiserror",
  "tracing",
  "tracing-core",
  "tracing-log",
  "tracing-subscriber",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "sc-tracing-proc-macro"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2 1.0.24",
+ "quote 1.0.8",
+ "syn 1.0.58",
 ]
 
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "derive_more 0.99.11",
  "futures 0.3.12",
@@ -7890,7 +7886,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "futures 0.3.12",
  "futures-diagnose",
@@ -8248,50 +8244,6 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
-[[package]]
-name = "slog"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06"
-dependencies = [
- "erased-serde",
-]
-
-[[package]]
-name = "slog-json"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a"
-dependencies = [
- "chrono",
- "erased-serde",
- "serde",
- "serde_json",
- "slog",
-]
-
-[[package]]
-name = "slog-scope"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c44c89dd8b0ae4537d1ae318353eaf7840b4869c536e31c41e963d1ea523ee6"
-dependencies = [
- "arc-swap",
- "lazy_static",
- "slog",
-]
-
-[[package]]
-name = "slog_derive"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b"
-dependencies = [
- "proc-macro2 1.0.24",
- "quote 1.0.8",
- "syn 1.0.58",
-]
-
 [[package]]
 name = "smallvec"
 version = "0.6.13"
@@ -8355,7 +8307,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "log",
  "sp-core",
@@ -8367,7 +8319,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -8383,7 +8335,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -8395,7 +8347,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8407,7 +8359,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.14",
@@ -8420,7 +8372,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8432,7 +8384,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8443,7 +8395,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8455,7 +8407,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "futures 0.3.12",
  "log",
@@ -8473,7 +8425,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "serde",
  "serde_json",
@@ -8482,7 +8434,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "futures 0.3.12",
  "futures-timer 3.0.2",
@@ -8508,7 +8460,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#f977fb8a16548534481ba1dac948fa6835c1835d"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8522,7 +8474,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -8542,7 +8494,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8551,7 +8503,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8563,7 +8515,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8607,7 +8559,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -8616,7 +8568,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.8",
@@ -8626,7 +8578,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8637,7 +8589,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8654,7 +8606,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -8666,7 +8618,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "futures 0.3.12",
  "hash-db",
@@ -8690,7 +8642,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8701,7 +8653,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "async-trait",
  "derive_more 0.99.11",
@@ -8718,7 +8670,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8731,7 +8683,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -8742,7 +8694,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8752,7 +8704,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "backtrace",
 ]
@@ -8760,7 +8712,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "serde",
  "sp-core",
@@ -8769,7 +8721,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8790,7 +8742,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
@@ -8807,7 +8759,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8819,7 +8771,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "serde",
  "serde_json",
@@ -8828,7 +8780,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8841,7 +8793,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8851,7 +8803,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "hash-db",
  "log",
@@ -8873,12 +8825,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8891,7 +8843,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "log",
  "sp-core",
@@ -8904,7 +8856,7 @@ dependencies = [
 [[package]]
 name = "sp-test-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f977fb8a16548534481ba1dac948fa6835c1835d"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "parity-scale-codec",
  "parity-util-mem",
@@ -8917,7 +8869,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
@@ -8931,7 +8883,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8944,7 +8896,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "derive_more 0.99.11",
  "futures 0.3.12",
@@ -8960,7 +8912,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -8974,7 +8926,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "futures 0.3.12",
  "futures-core",
@@ -8986,7 +8938,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8998,7 +8950,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "impl-trait-for-tuples 0.2.0",
  "parity-scale-codec",
@@ -9152,7 +9104,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "platforms",
 ]
@@ -9160,7 +9112,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.12",
@@ -9183,7 +9135,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "async-std",
  "derive_more 0.99.11",
@@ -9197,7 +9149,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e813f62d94431fb220bc9f984ca12fe01c1650b2"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "futures 0.1.30",
  "futures 0.3.12",
@@ -9224,7 +9176,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f977fb8a16548534481ba1dac948fa6835c1835d"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "cfg-if 0.1.10",
  "frame-executive",
@@ -9266,7 +9218,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f977fb8a16548534481ba1dac948fa6835c1835d"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "futures 0.3.12",
  "parity-scale-codec",
@@ -9287,7 +9239,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#f977fb8a16548534481ba1dac948fa6835c1835d"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "futures 0.3.12",
  "substrate-test-utils-derive",
@@ -9297,7 +9249,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#f977fb8a16548534481ba1dac948fa6835c1835d"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "proc-macro-crate",
  "quote 1.0.8",
@@ -9323,7 +9275,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#f977fb8a16548534481ba1dac948fa6835c1835d"
+source = "git+https://github.com/paritytech/substrate?branch=master#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -9966,7 +9918,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59"
 dependencies = [
  "cfg-if 0.1.10",
- "rand 0.7.3",
+ "rand 0.6.5",
  "static_assertions",
 ]
 
@@ -10532,7 +10484,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime"
 version = "0.8.27"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "bitvec",
  "frame-executive",
@@ -10682,7 +10634,7 @@ dependencies = [
 [[package]]
 name = "xcm"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -10690,7 +10642,7 @@ dependencies = [
 [[package]]
 name = "xcm-builder"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -10706,7 +10658,7 @@ dependencies = [
 [[package]]
 name = "xcm-executor"
 version = "0.8.22"
-source = "git+https://github.com/paritytech/polkadot#036cf5e29b66fe3130d8cf0caf6a35b67320fc97"
+source = "git+https://github.com/paritytech/polkadot#a14608ae21faccee01f76361bbf9c475e8057bdd"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples 0.2.0",
diff --git a/rococo-parachains/Cargo.toml b/rococo-parachains/Cargo.toml
index d45d0a5fec..fef6370d3d 100644
--- a/rococo-parachains/Cargo.toml
+++ b/rococo-parachains/Cargo.toml
@@ -37,6 +37,7 @@ sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-executor = { 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-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/rococo-parachains/src/command.rs b/rococo-parachains/src/command.rs
index ece09e42f9..531b709a87 100644
--- a/rococo-parachains/src/command.rs
+++ b/rococo-parachains/src/command.rs
@@ -24,7 +24,7 @@ use log::info;
 use parachain_runtime::Block;
 use polkadot_parachain::primitives::AccountIdConversion;
 use sc_cli::{
-	ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, InitLoggerParams,
+	ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams,
 	KeystoreParams, NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,
 };
 use sc_service::{
@@ -217,10 +217,9 @@ pub fn run() -> Result<()> {
 			})
 		}
 		Some(Subcommand::ExportGenesisState(params)) => {
-			sc_cli::init_logger(InitLoggerParams {
-				tracing_receiver: sc_tracing::TracingReceiver::Log,
-				..Default::default()
-			})?;
+			let mut builder = sc_cli::GlobalLoggerBuilder::new("");
+			builder.with_profiling(sc_tracing::TracingReceiver::Log, "");
+			let _ = builder.init();
 
 			let block: Block = generate_genesis_block(&load_spec(
 				&params.chain.clone().unwrap_or_default(),
@@ -242,10 +241,9 @@ pub fn run() -> Result<()> {
 			Ok(())
 		}
 		Some(Subcommand::ExportGenesisWasm(params)) => {
-			sc_cli::init_logger(InitLoggerParams {
-				tracing_receiver: sc_tracing::TracingReceiver::Log,
-				..Default::default()
-			})?;
+			let mut builder = sc_cli::GlobalLoggerBuilder::new("");
+			builder.with_profiling(sc_tracing::TracingReceiver::Log, "");
+			let _ = builder.init();
 
 			let raw_wasm_blob =
 				extract_genesis_wasm(&cli.load_spec(&params.chain.clone().unwrap_or_default())?)?;
@@ -292,9 +290,12 @@ pub fn run() -> Result<()> {
 				let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));
 
 				let task_executor = config.task_executor.clone();
-				let polkadot_config =
-					SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, task_executor)
-						.map_err(|err| format!("Relay chain argument error: {}", err))?;
+				let polkadot_config = SubstrateCli::create_configuration(
+						&polkadot_cli,
+						&polkadot_cli,
+						task_executor,
+						None,
+					).map_err(|err| format!("Relay chain argument error: {}", err))?;
 				let collator = cli.run.base.validator || cli.collator;
 
 				info!("Parachain id: {:?}", id);
@@ -369,7 +370,7 @@ impl CliConfiguration<Self> for RelayChainCli {
 		self.base.base.prometheus_config(default_listen_port)
 	}
 
-	fn init<C: SubstrateCli>(&self) -> Result<()> {
+	fn init<C: SubstrateCli>(&self) -> Result<sc_telemetry::TelemetryWorker> {
 		unreachable!("PolkadotCli is never initialized; qed");
 	}
 
diff --git a/rococo-parachains/src/service.rs b/rococo-parachains/src/service.rs
index 4b829142e7..3b8d56fa9a 100644
--- a/rococo-parachains/src/service.rs
+++ b/rococo-parachains/src/service.rs
@@ -49,13 +49,13 @@ pub fn new_partial(
 		(),
 		sp_consensus::import_queue::BasicQueue<Block, PrefixedMemoryDB<BlakeTwo256>>,
 		sc_transaction_pool::FullPool<Block, TFullClient<Block, RuntimeApi, Executor>>,
-		(),
+		Option<sc_telemetry::TelemetrySpan>,
 	>,
 	sc_service::Error,
 > {
 	let inherent_data_providers = sp_inherents::InherentDataProviders::new();
 
-	let (client, backend, keystore_container, task_manager) =
+	let (client, backend, keystore_container, task_manager, telemetry_span) =
 		sc_service::new_full_parts::<Block, RuntimeApi, Executor>(&config)?;
 	let client = Arc::new(client);
 
@@ -85,7 +85,7 @@ pub fn new_partial(
 		transaction_pool,
 		inherent_data_providers,
 		select_chain: (),
-		other: (),
+		other: telemetry_span,
 	};
 
 	Ok(params)
@@ -94,7 +94,7 @@ pub fn new_partial(
 /// Start a node with the given parachain `Configuration` and relay chain `Configuration`.
 ///
 /// This is the actual implementation that is abstract over the executor and the runtime api.
-#[sc_cli::prefix_logs_with("Parachain")]
+#[sc_tracing::logging::prefix_logs_with("Parachain")]
 async fn start_node_impl<RB>(
 	parachain_config: Configuration,
 	collator_key: CollatorPair,
@@ -125,6 +125,7 @@ where
 		)?;
 
 	let params = new_partial(&parachain_config)?;
+	let telemetry_span = params.other;
 	params
 		.inherent_data_providers
 		.register_provider(sp_timestamp::InherentDataProvider)
@@ -164,18 +165,18 @@ where
 		client: client.clone(),
 		transaction_pool: transaction_pool.clone(),
 		task_manager: &mut task_manager,
-		telemetry_connection_sinks: Default::default(),
 		config: parachain_config,
 		keystore: params.keystore_container.sync_keystore(),
 		backend: backend.clone(),
 		network: network.clone(),
 		network_status_sinks,
 		system_rpc_tx,
+		telemetry_span,
 	})?;
 
 	let announce_block = {
 		let network = network.clone();
-		Arc::new(move |hash, data| network.announce_block(hash, data))
+		Arc::new(move |hash, data| network.announce_block(hash, Some(data)))
 	};
 
 	if validator {
diff --git a/service/Cargo.toml b/service/Cargo.toml
index b1e9fe1636..ddd1abe42b 100644
--- a/service/Cargo.toml
+++ b/service/Cargo.toml
@@ -13,7 +13,7 @@ cumulus-primitives = { path = "../primitives" }
 # Substrate dependencies
 sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-cli = { 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" }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/service/src/lib.rs b/service/src/lib.rs
index ef5f73d5bf..acc9a76be6 100644
--- a/service/src/lib.rs
+++ b/service/src/lib.rs
@@ -324,7 +324,7 @@ pub fn prepare_node_config(mut parachain_config: Configuration) -> Configuration
 }
 
 /// Build the Polkadot full node using the given `config`.
-#[sc_cli::prefix_logs_with("Relaychain")]
+#[sc_tracing::logging::prefix_logs_with("Relaychain")]
 pub fn build_polkadot_full_node(
 	config: Configuration,
 	collator_id: CollatorId,
diff --git a/test/service/Cargo.toml b/test/service/Cargo.toml
index 86eaa7482e..29cfa04125 100644
--- a/test/service/Cargo.toml
+++ b/test/service/Cargo.toml
@@ -14,11 +14,12 @@ sc-basic-authorship = { git = "https://github.com/paritytech/substrate", version
 sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-rpc = { 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" }
 sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/test/service/src/lib.rs b/test/service/src/lib.rs
index 6436258e9d..eb01fef058 100644
--- a/test/service/src/lib.rs
+++ b/test/service/src/lib.rs
@@ -73,13 +73,13 @@ pub fn new_partial(
 		(),
 		sp_consensus::import_queue::BasicQueue<Block, PrefixedMemoryDB<BlakeTwo256>>,
 		sc_transaction_pool::FullPool<Block, TFullClient<Block, RuntimeApi, RuntimeExecutor>>,
-		(),
+		Option<sc_telemetry::TelemetrySpan>,
 	>,
 	sc_service::Error,
 > {
 	let inherent_data_providers = sp_inherents::InherentDataProviders::new();
 
-	let (client, backend, keystore_container, task_manager) =
+	let (client, backend, keystore_container, task_manager, telemetry_span) =
 		sc_service::new_full_parts::<Block, RuntimeApi, RuntimeExecutor>(&config)?;
 	let client = Arc::new(client);
 
@@ -109,7 +109,7 @@ pub fn new_partial(
 		transaction_pool,
 		inherent_data_providers,
 		select_chain: (),
-		other: (),
+		other: telemetry_span,
 	};
 
 	Ok(params)
@@ -118,7 +118,7 @@ pub fn new_partial(
 /// Start a node with the given parachain `Configuration` and relay chain `Configuration`.
 ///
 /// This is the actual implementation that is abstract over the executor and the runtime api.
-#[sc_cli::prefix_logs_with(parachain_config.network.node_name.as_str())]
+#[sc_tracing::logging::prefix_logs_with(parachain_config.network.node_name.as_str())]
 async fn start_node_impl<RB>(
 	parachain_config: Configuration,
 	collator_key: CollatorPair,
@@ -146,6 +146,7 @@ where
 	let mut parachain_config = prepare_node_config(parachain_config);
 
 	let params = new_partial(&mut parachain_config)?;
+	let telemetry_span = params.other;
 	params
 		.inherent_data_providers
 		.register_provider(sp_timestamp::InherentDataProvider)
@@ -193,25 +194,25 @@ 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,
 		client: client.clone(),
 		transaction_pool: transaction_pool.clone(),
 		task_manager: &mut task_manager,
-		telemetry_connection_sinks: Default::default(),
 		config: parachain_config,
 		keystore: params.keystore_container.sync_keystore(),
 		backend,
 		network: network.clone(),
 		network_status_sinks,
 		system_rpc_tx,
+		telemetry_span,
 	})?;
 
 	let announce_block = {
 		let network = network.clone();
-		Arc::new(move |hash, data| network.announce_block(hash, data))
+		Arc::new(move |hash, data| network.announce_block(hash, Some(data)))
 	};
 
 	let polkadot_full_node = polkadot_full_node.with_client(polkadot_test_service::TestClient);
@@ -415,6 +416,7 @@ 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,
diff --git a/test/service/tests/integration.rs b/test/service/tests/integration.rs
index 932a229191..4505130edb 100644
--- a/test/service/tests/integration.rs
+++ b/test/service/tests/integration.rs
@@ -22,7 +22,9 @@ use substrate_test_runtime_client::AccountKeyring::*;
 
 #[substrate_test_utils::test]
 async fn test_collating_and_non_collator_mode_catching_up(task_executor: TaskExecutor) {
-	sc_cli::init_logger(Default::default()).expect("Sets up logger");
+	let mut builder = sc_cli::GlobalLoggerBuilder::new("");
+	builder.with_colors(false);
+	let _ = builder.init();
 
 	let para_id = ParaId::from(100);