From 63bf63e44269ba0a075be2b27fcacfb75bc2a9a5 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Mon, 23 Nov 2020 19:23:18 +0100
Subject: [PATCH] *: Update authority discovery and remove WorkerConfig (#1953)

* *: Update authority discovery and remove WorkerConfig

With https://github.com/paritytech/substrate/pull/7545 the authority
discovery module queries and publishes addresses on an exponentially
increasing interval. Doing so should make custom configurations
obsolete, as operations are retried in a timely fashion in the first
minutes.

* */Cargo.{lock,toml}: Point to mxinden substrate auth-disc-timing

* Revert "*/Cargo.{lock,toml}: Point to mxinden substrate auth-disc-timing"

This reverts commit 0785943a1e377454f088814ef20f4432de09da7a.

* "Update Substrate"

* Revert ""Update Substrate""

This reverts commit 377b221e1853b2c383f0c416d686535b545796cb.

* Cargo.lock: Manual Substrate update

* node/test/service/src/lib: Remove unused import

* parachain/test-parachains/adder: Remove unused import

Co-authored-by: parity-processbot <>
---
 polkadot/Cargo.lock                           | 272 +++++++++---------
 polkadot/cli/src/command.rs                   |   1 -
 polkadot/node/service/src/lib.rs              |  11 +-
 polkadot/node/test/service/src/lib.rs         |   7 +-
 .../adder/collator/src/main.rs                |   6 -
 5 files changed, 139 insertions(+), 158 deletions(-)

diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index cb49d845488..524da639751 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1459,7 +1459,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1467,7 +1467,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1485,7 +1485,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "chrono",
  "frame-benchmarking",
@@ -1507,7 +1507,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1523,7 +1523,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "12.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1534,7 +1534,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1559,7 +1559,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2 1.0.24",
@@ -1570,7 +1570,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1582,7 +1582,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
@@ -1592,7 +1592,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples 0.1.3",
@@ -1608,7 +1608,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1622,7 +1622,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3749,7 +3749,7 @@ checksum = "7a1250cdd103eef6bd542b5ae82989f931fc00a41a27f60377338241594410f3"
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3765,7 +3765,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3780,7 +3780,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3805,7 +3805,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3819,7 +3819,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3835,7 +3835,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3850,7 +3850,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3865,7 +3865,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3886,7 +3886,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -3902,7 +3902,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3922,7 +3922,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3939,7 +3939,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3953,7 +3953,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3969,7 +3969,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3983,7 +3983,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3998,7 +3998,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4019,7 +4019,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4035,7 +4035,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4048,7 +4048,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4063,7 +4063,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4078,7 +4078,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4098,7 +4098,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4114,7 +4114,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4128,7 +4128,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4150,7 +4150,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -4161,7 +4161,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4175,7 +4175,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4193,7 +4193,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4210,7 +4210,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4228,7 +4228,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4241,7 +4241,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4256,7 +4256,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4272,7 +4272,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -6504,7 +6504,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "async-trait",
  "bytes 0.5.6",
@@ -6534,7 +6534,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -6557,7 +6557,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -6574,7 +6574,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "impl-trait-for-tuples 0.1.3",
  "parity-scale-codec",
@@ -6595,7 +6595,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -6606,7 +6606,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -6651,7 +6651,7 @@ dependencies = [
 [[package]]
 name = "sc-cli-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -6662,7 +6662,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "derive_more",
  "fnv",
@@ -6699,7 +6699,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -6729,7 +6729,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -6740,7 +6740,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "derive_more",
  "fork-tree",
@@ -6785,7 +6785,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "derive_more",
  "futures 0.3.8",
@@ -6809,7 +6809,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -6822,7 +6822,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -6847,7 +6847,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "log",
  "sc-client-api",
@@ -6861,7 +6861,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -6890,7 +6890,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "derive_more",
  "log",
@@ -6907,7 +6907,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -6922,7 +6922,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -6940,7 +6940,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -6977,7 +6977,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7001,7 +7001,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.8",
@@ -7019,7 +7019,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7039,7 +7039,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7058,7 +7058,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7112,7 +7112,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -7127,7 +7127,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7154,7 +7154,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "futures 0.3.8",
  "libp2p",
@@ -7167,7 +7167,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7176,7 +7176,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "futures 0.3.8",
  "hash-db",
@@ -7209,7 +7209,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "derive_more",
  "futures 0.3.8",
@@ -7233,7 +7233,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -7251,7 +7251,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "derive_more",
  "directories",
@@ -7315,7 +7315,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7329,7 +7329,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -7348,7 +7348,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -7369,7 +7369,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "erased-serde",
  "log",
@@ -7388,7 +7388,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "derive_more",
  "futures 0.3.8",
@@ -7409,7 +7409,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "derive_more",
  "futures 0.3.8",
@@ -7835,7 +7835,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "derive_more",
  "log",
@@ -7847,7 +7847,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -7862,7 +7862,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -7874,7 +7874,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -7886,7 +7886,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.12",
@@ -7899,7 +7899,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7911,7 +7911,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -7922,7 +7922,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7934,7 +7934,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "log",
  "lru",
@@ -7951,7 +7951,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "serde",
  "serde_json",
@@ -7960,7 +7960,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "futures 0.3.8",
  "futures-timer 3.0.2",
@@ -7986,7 +7986,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -8006,7 +8006,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8015,7 +8015,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8027,7 +8027,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8071,7 +8071,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "kvdb",
  "parking_lot 0.10.2",
@@ -8080,7 +8080,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
@@ -8090,7 +8090,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8101,7 +8101,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8118,7 +8118,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.10.2",
@@ -8130,7 +8130,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "futures 0.3.8",
  "hash-db",
@@ -8154,7 +8154,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8165,7 +8165,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8181,7 +8181,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8193,7 +8193,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.24",
@@ -8204,7 +8204,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8214,7 +8214,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "backtrace",
  "log",
@@ -8223,7 +8223,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "serde",
  "sp-core",
@@ -8232,7 +8232,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -8254,7 +8254,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -8270,7 +8270,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -8282,7 +8282,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "serde",
  "serde_json",
@@ -8291,7 +8291,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8304,7 +8304,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -8314,7 +8314,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "hash-db",
  "log",
@@ -8336,12 +8336,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8354,7 +8354,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "log",
  "sp-core",
@@ -8367,7 +8367,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "impl-trait-for-tuples 0.1.3",
  "parity-scale-codec",
@@ -8381,7 +8381,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8394,7 +8394,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "derive_more",
  "futures 0.3.8",
@@ -8409,7 +8409,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -8423,7 +8423,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "futures 0.3.8",
  "futures-core",
@@ -8435,7 +8435,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8447,7 +8447,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "impl-trait-for-tuples 0.1.3",
  "parity-scale-codec",
@@ -8589,7 +8589,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -8615,7 +8615,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "platforms",
 ]
@@ -8623,7 +8623,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.8",
@@ -8646,7 +8646,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "async-std",
  "derive_more",
@@ -8660,7 +8660,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.8",
@@ -8687,7 +8687,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "futures 0.3.8",
  "substrate-test-utils-derive",
@@ -8697,7 +8697,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#f16acffe37285a93b793672c63146f8ecdab7a5b"
+source = "git+https://github.com/paritytech/substrate#0840c58849bc84e7fd72627745bda243741adcd8"
 dependencies = [
  "proc-macro-crate",
  "quote 1.0.7",
diff --git a/polkadot/cli/src/command.rs b/polkadot/cli/src/command.rs
index 6d2aa1acd61..3cb84b21c5c 100644
--- a/polkadot/cli/src/command.rs
+++ b/polkadot/cli/src/command.rs
@@ -148,7 +148,6 @@ pub fn run() -> Result<()> {
 						config,
 						service::IsCollator::No,
 						grandpa_pause,
-						None,
 					).map(|full| full.task_manager),
 				}
 			})
diff --git a/polkadot/node/service/src/lib.rs b/polkadot/node/service/src/lib.rs
index d9db1a5e1b7..7c882eb4588 100644
--- a/polkadot/node/service/src/lib.rs
+++ b/polkadot/node/service/src/lib.rs
@@ -33,7 +33,7 @@ use {
 	polkadot_node_core_proposer::ProposerFactory,
 	polkadot_overseer::{AllSubsystems, BlockInfo, Overseer, OverseerHandler},
 	polkadot_primitives::v1::ParachainHost,
-	sc_authority_discovery::{Service as AuthorityDiscoveryService, WorkerConfig as AuthorityWorkerConfig},
+	sc_authority_discovery::Service as AuthorityDiscoveryService,
 	sp_blockchain::HeaderBackend,
 	sp_core::traits::SpawnNamed,
 	sp_keystore::SyncCryptoStorePtr,
@@ -474,7 +474,6 @@ pub fn new_full<RuntimeApi, Executor>(
 	mut config: Configuration,
 	is_collator: IsCollator,
 	grandpa_pause: Option<(u32, u32)>,
-	authority_discovery_config: Option<AuthorityWorkerConfig>,
 	isolation_strategy: IsolationStrategy,
 ) -> Result<NewFull<Arc<FullClient<RuntimeApi, Executor>>>, Error>
 	where
@@ -583,8 +582,7 @@ pub fn new_full<RuntimeApi, Executor>(
 				Event::Dht(e) => Some(e),
 				_ => None,
 			}});
-		let (worker, service) = sc_authority_discovery::new_worker_and_service_with_config(
-			authority_discovery_config.unwrap_or_default(),
+		let (worker, service) = sc_authority_discovery::new_worker_and_service(
 			client.clone(),
 			network.clone(),
 			Box::pin(dht_event_stream),
@@ -897,14 +895,12 @@ pub fn build_full(
 	config: Configuration,
 	is_collator: IsCollator,
 	grandpa_pause: Option<(u32, u32)>,
-	authority_discovery_config: Option<AuthorityWorkerConfig>,
 ) -> Result<NewFull<Client>, Error> {
 	if config.chain_spec.is_rococo() {
 		new_full::<rococo_runtime::RuntimeApi, RococoExecutor>(
 			config,
 			is_collator,
 			grandpa_pause,
-			authority_discovery_config,
 			Default::default(),
 		).map(|full| full.with_client(Client::Rococo))
 	} else if config.chain_spec.is_kusama() {
@@ -912,7 +908,6 @@ pub fn build_full(
 			config,
 			is_collator,
 			grandpa_pause,
-			authority_discovery_config,
 			Default::default(),
 		).map(|full| full.with_client(Client::Kusama))
 	} else if config.chain_spec.is_westend() {
@@ -920,7 +915,6 @@ pub fn build_full(
 			config,
 			is_collator,
 			grandpa_pause,
-			authority_discovery_config,
 			Default::default(),
 		).map(|full| full.with_client(Client::Westend))
 	} else {
@@ -928,7 +922,6 @@ pub fn build_full(
 			config,
 			is_collator,
 			grandpa_pause,
-			authority_discovery_config,
 			Default::default(),
 		).map(|full| full.with_client(Client::Polkadot))
 	}
diff --git a/polkadot/node/test/service/src/lib.rs b/polkadot/node/test/service/src/lib.rs
index aa46bd6d7ed..9124be38c7b 100644
--- a/polkadot/node/test/service/src/lib.rs
+++ b/polkadot/node/test/service/src/lib.rs
@@ -54,7 +54,7 @@ use sp_blockchain::HeaderBackend;
 use sp_keyring::Sr25519Keyring;
 use sp_runtime::{codec::Encode, generic, traits::IdentifyAccount, MultiSigner};
 use sp_state_machine::BasicExternalities;
-use std::{sync::Arc, time::Duration};
+use std::sync::Arc;
 use substrate_test_client::{BlockchainEventsExt, RpcHandlersExt, RpcTransactionOutput, RpcTransactionError};
 
 native_executor_instance!(
@@ -82,11 +82,6 @@ pub fn new_full(
 		config,
 		is_collator,
 		None,
-		Some(sc_authority_discovery::WorkerConfig {
-			query_interval: Duration::from_secs(1),
-			query_start_delay: Duration::from_secs(0),
-			..Default::default()
-		}),
 		polkadot_parachain::wasm_executor::IsolationStrategy::InProcess,
 	).map_err(Into::into)
 }
diff --git a/polkadot/parachain/test-parachains/adder/collator/src/main.rs b/polkadot/parachain/test-parachains/adder/collator/src/main.rs
index b41201fd460..3145bf72c11 100644
--- a/polkadot/parachain/test-parachains/adder/collator/src/main.rs
+++ b/polkadot/parachain/test-parachains/adder/collator/src/main.rs
@@ -21,7 +21,6 @@ use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProt
 use polkadot_primitives::v1::Id as ParaId;
 use sc_cli::{Result, Role, SubstrateCli};
 use sp_core::hexdisplay::HexDisplay;
-use std::time::Duration;
 use test_parachain_adder_collator::Collator;
 
 const PARA_ID: ParaId = ParaId::new(100);
@@ -60,11 +59,6 @@ fn main() -> Result<()> {
 							config,
 							polkadot_service::IsCollator::Yes(collator.collator_id()),
 							None,
-							Some(sc_authority_discovery::WorkerConfig {
-								query_interval: Duration::from_secs(1),
-								query_start_delay: Duration::from_secs(0),
-								..Default::default()
-							}),
 						)?;
 						let mut overseer_handler = full_node
 							.overseer_handler
-- 
GitLab