diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 1dc406ccad2fb09d7b20001b6ee34d915f90bd2f..8b336ac8c64334b372defb1ae7b867519c189bf2 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1926,7 +1926,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1944,7 +1944,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1963,7 +1963,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1989,7 +1989,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2002,7 +2002,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2017,7 +2017,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "14.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -2028,7 +2028,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2054,7 +2054,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -2066,7 +2066,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.0.0",
@@ -2078,7 +2078,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2088,7 +2088,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-metadata",
  "frame-support",
@@ -2109,7 +2109,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test-pallet"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2119,7 +2119,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "log",
@@ -2135,7 +2135,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2149,7 +2149,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2158,7 +2158,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "sp-api",
@@ -4546,7 +4546,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4561,7 +4561,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4575,7 +4575,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4598,7 +4598,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4653,7 +4653,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4731,7 +4731,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4747,7 +4747,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4762,7 +4762,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4785,7 +4785,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4802,7 +4802,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4816,7 +4816,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4838,7 +4838,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4853,7 +4853,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4872,7 +4872,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4888,7 +4888,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4903,7 +4903,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
@@ -4920,7 +4920,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4936,7 +4936,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4953,7 +4953,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4967,7 +4967,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4980,7 +4980,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4996,7 +4996,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5018,7 +5018,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5032,7 +5032,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5045,7 +5045,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5060,7 +5060,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5080,7 +5080,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5096,7 +5096,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5109,7 +5109,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5131,7 +5131,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -5142,7 +5142,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -5151,7 +5151,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5164,7 +5164,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5181,7 +5181,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5196,7 +5196,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5212,7 +5212,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5229,7 +5229,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5240,7 +5240,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5256,7 +5256,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5271,7 +5271,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7797,7 +7797,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "env_logger 0.9.0",
  "jsonrpsee-proc-macros",
@@ -8068,7 +8068,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "log",
  "sp-core",
@@ -8079,7 +8079,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8106,7 +8106,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
@@ -8129,7 +8129,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -8145,7 +8145,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8161,7 +8161,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -8172,7 +8172,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -8210,7 +8210,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "fnv",
  "futures 0.3.16",
@@ -8238,7 +8238,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -8263,7 +8263,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -8287,7 +8287,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8330,7 +8330,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "derive_more",
  "futures 0.3.16",
@@ -8354,7 +8354,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -8367,7 +8367,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-manual-seal"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -8401,7 +8401,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -8427,7 +8427,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "sc-client-api",
  "sp-authorship",
@@ -8438,7 +8438,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "lazy_static",
  "libsecp256k1 0.6.0",
@@ -8464,7 +8464,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -8481,7 +8481,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8497,7 +8497,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -8516,7 +8516,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8553,7 +8553,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -8577,7 +8577,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.16",
@@ -8594,7 +8594,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8609,7 +8609,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -8627,7 +8627,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-std",
  "async-trait",
@@ -8678,7 +8678,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
@@ -8694,7 +8694,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "bytes 1.0.1",
  "fnv",
@@ -8721,7 +8721,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "futures 0.3.16",
  "libp2p",
@@ -8734,7 +8734,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -8743,7 +8743,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "futures 0.3.16",
  "hash-db",
@@ -8774,9 +8774,8 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
- "derive_more",
  "futures 0.3.16",
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -8794,12 +8793,13 @@ dependencies = [
  "sp-runtime",
  "sp-tracing",
  "sp-version",
+ "thiserror",
 ]
 
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "futures 0.3.16",
  "jsonrpc-core",
@@ -8815,7 +8815,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-trait",
  "directories",
@@ -8879,7 +8879,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8893,7 +8893,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -8915,7 +8915,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "chrono",
  "futures 0.3.16",
@@ -8933,7 +8933,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -8964,7 +8964,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -8975,7 +8975,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "futures 0.3.16",
  "intervalier",
@@ -9002,7 +9002,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "derive_more",
  "futures 0.3.16",
@@ -9436,7 +9436,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "hash-db",
  "log",
@@ -9453,7 +9453,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate 1.0.0",
@@ -9465,7 +9465,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -9477,7 +9477,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -9491,7 +9491,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9503,7 +9503,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -9515,7 +9515,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9527,7 +9527,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "futures 0.3.16",
  "log",
@@ -9545,7 +9545,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -9564,7 +9564,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-trait",
  "merlin",
@@ -9586,7 +9586,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -9596,7 +9596,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -9608,7 +9608,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -9652,7 +9652,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -9661,7 +9661,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9671,7 +9671,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -9682,7 +9682,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -9699,7 +9699,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -9713,7 +9713,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "futures 0.3.16",
  "hash-db",
@@ -9738,7 +9738,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -9749,7 +9749,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -9766,7 +9766,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "ruzstd",
  "zstd",
@@ -9775,7 +9775,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -9788,7 +9788,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -9799,7 +9799,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -9809,7 +9809,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "backtrace",
 ]
@@ -9817,7 +9817,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -9827,7 +9827,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -9848,7 +9848,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9865,7 +9865,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.0.0",
@@ -9877,7 +9877,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "serde",
  "serde_json",
@@ -9886,7 +9886,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9899,7 +9899,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -9909,7 +9909,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "hash-db",
  "log",
@@ -9932,12 +9932,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 
 [[package]]
 name = "sp-storage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9950,7 +9950,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "log",
  "sp-core",
@@ -9963,7 +9963,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-trait",
  "futures-timer 3.0.2",
@@ -9979,7 +9979,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "erased-serde",
  "log",
@@ -9997,7 +9997,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -10006,7 +10006,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-trait",
  "log",
@@ -10021,7 +10021,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -10035,7 +10035,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
@@ -10046,7 +10046,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10061,7 +10061,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -10072,7 +10072,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -10270,7 +10270,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "platforms",
 ]
@@ -10278,7 +10278,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.16",
@@ -10300,7 +10300,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-std",
  "derive_more",
@@ -10314,7 +10314,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -10341,7 +10341,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "futures 0.3.16",
  "substrate-test-utils-derive",
@@ -10351,7 +10351,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -10362,7 +10362,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "ansi_term 0.12.1",
  "build-helper",
@@ -10517,7 +10517,7 @@ dependencies = [
 [[package]]
 name = "test-runner"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "frame-system",
  "futures 0.3.16",
@@ -10924,7 +10924,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#69e5b50896ff743f4725cb9747750c4093963a66"
+source = "git+https://github.com/paritytech/substrate?branch=master#d6847a740e3972c76ca72fc8eef56380be928ab9"
 dependencies = [
  "log",
  "parity-scale-codec",
diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index 036b8ab392fb51137d2514fc711ded809def1ab9..882a3b06a007f5329567fe966370c189f1e59761 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/runtime/kusama/src/lib.rs
@@ -676,6 +676,7 @@ parameter_types! {
 	pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);
 	pub const BountyValueMinimum: Balance = 200 * CENTS;
 	pub const MaxApprovals: u32 = 100;
+	pub const MaxAuthorities: u32 = 100_000;
 }
 
 type ApproveOrigin = EnsureOneOf<
@@ -730,7 +731,9 @@ impl pallet_offences::Config for Runtime {
 	type OnOffenceHandler = Staking;
 }
 
-impl pallet_authority_discovery::Config for Runtime {}
+impl pallet_authority_discovery::Config for Runtime {
+	type MaxAuthorities = MaxAuthorities;
+}
 
 parameter_types! {
 	pub NposSolutionPriority: TransactionPriority =
diff --git a/polkadot/runtime/parachains/Cargo.toml b/polkadot/runtime/parachains/Cargo.toml
index 8d21b98ce1a876b3ba4545cb5cb31d9a947d4790..3ca6bf8cc69df80f80be6e9c78de5d958425ce0f 100644
--- a/polkadot/runtime/parachains/Cargo.toml
+++ b/polkadot/runtime/parachains/Cargo.toml
@@ -11,7 +11,7 @@ log = { version = "0.4.14", default-features = false }
 rustc-hex = { version = "2.1.0", default-features = false }
 serde = { version = "1.0.123", features = [ "derive" ], optional = true }
 derive_more = "0.99.14"
-bitflags = "1"
+bitflags = "1.3.2"
 
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
diff --git a/polkadot/runtime/parachains/src/runtime_api_impl/v1.rs b/polkadot/runtime/parachains/src/runtime_api_impl/v1.rs
index 58afabc83d9c1b78b846eae2602679ce18f5eddf..3100a324f3c5caf8a88b380a1836b6bb84afcec3 100644
--- a/polkadot/runtime/parachains/src/runtime_api_impl/v1.rs
+++ b/polkadot/runtime/parachains/src/runtime_api_impl/v1.rs
@@ -246,8 +246,8 @@ pub fn relevant_authority_ids<T: initializer::Config + pallet_authority_discover
 	// Due to `max_validators`, the `SessionInfo` stores only the validators who are actively
 	// selected to participate in parachain consensus. We'd like all authorities for the current
 	// and next sessions to be used in authority-discovery. The two sets likely have large overlap.
-	let mut authority_ids = <pallet_authority_discovery::Pallet<T>>::current_authorities();
-	authority_ids.extend(<pallet_authority_discovery::Pallet<T>>::next_authorities());
+	let mut authority_ids = <pallet_authority_discovery::Pallet<T>>::current_authorities().to_vec();
+	authority_ids.extend(<pallet_authority_discovery::Pallet<T>>::next_authorities().to_vec());
 
 	// Due to disputes, we'd like to remain connected to authorities of the previous few sessions.
 	// For this, we don't need anyone other than the validators actively participating in consensus.
diff --git a/polkadot/runtime/parachains/src/session_info.rs b/polkadot/runtime/parachains/src/session_info.rs
index 35c7b11a01a5468ff109e956860c4d3e15a37586..3e18b16b9aab60cc854965a8c4d12c07fe7b63f5 100644
--- a/polkadot/runtime/parachains/src/session_info.rs
+++ b/polkadot/runtime/parachains/src/session_info.rs
@@ -74,7 +74,7 @@ pub trait AuthorityDiscoveryConfig {
 
 impl<T: pallet_authority_discovery::Config> AuthorityDiscoveryConfig for T {
 	fn authorities() -> Vec<AuthorityDiscoveryId> {
-		<pallet_authority_discovery::Pallet<T>>::current_authorities()
+		<pallet_authority_discovery::Pallet<T>>::current_authorities().to_vec()
 	}
 }
 
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index 8e5eb27768567628c4d4758e5625bee9553617af..b268b1b9e644bb9e3d02df66bcb29f0381ffb5cc 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/runtime/polkadot/src/lib.rs
@@ -676,6 +676,7 @@ parameter_types! {
 	pub const BountyCuratorDeposit: Permill = Permill::from_percent(50);
 	pub const BountyValueMinimum: Balance = 10 * DOLLARS;
 	pub const MaxApprovals: u32 = 100;
+	pub const MaxAuthorities: u32 = 100_000;
 }
 
 type ApproveOrigin = EnsureOneOf<
@@ -730,7 +731,9 @@ impl pallet_offences::Config for Runtime {
 	type OnOffenceHandler = Staking;
 }
 
-impl pallet_authority_discovery::Config for Runtime {}
+impl pallet_authority_discovery::Config for Runtime {
+	type MaxAuthorities = MaxAuthorities;
+}
 
 parameter_types! {
 	pub NposSolutionPriority: TransactionPriority =
diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
index c46bca567506b56f197512c74902e9edeb3f888d..9ed7da12484441504ccb537adb285311c48aad81 100644
--- a/polkadot/runtime/rococo/src/lib.rs
+++ b/polkadot/runtime/rococo/src/lib.rs
@@ -422,6 +422,7 @@ where
 
 parameter_types! {
 	pub const MaxRetries: u32 = 3;
+	pub const MaxAuthorities: u32 = 100_000;
 }
 
 impl pallet_offences::Config for Runtime {
@@ -430,7 +431,9 @@ impl pallet_offences::Config for Runtime {
 	type OnOffenceHandler = ();
 }
 
-impl pallet_authority_discovery::Config for Runtime {}
+impl pallet_authority_discovery::Config for Runtime {
+	type MaxAuthorities = MaxAuthorities;
+}
 
 parameter_types! {
 	pub const MinimumPeriod: u64 = SLOT_DURATION / 2;
diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs
index 529a44f53d09232cebcda7732c0ee9faf8b503ee..67aaa589f213731f509d35ae5446ebab1d31948e 100644
--- a/polkadot/runtime/test-runtime/src/lib.rs
+++ b/polkadot/runtime/test-runtime/src/lib.rs
@@ -310,6 +310,7 @@ parameter_types! {
 	pub storage SlashDeferDuration: pallet_staking::EraIndex = 27;
 	pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
 	pub storage MaxNominatorRewardedPerValidator: u32 = 64;
+	pub const MaxAuthorities: u32 = 100_000;
 }
 
 impl frame_election_provider_support::onchain::Config for Runtime {
@@ -413,7 +414,9 @@ impl pallet_offences::Config for Runtime {
 	type OnOffenceHandler = Staking;
 }
 
-impl pallet_authority_discovery::Config for Runtime {}
+impl pallet_authority_discovery::Config for Runtime {
+	type MaxAuthorities = MaxAuthorities;
+}
 
 parameter_types! {
 	pub storage LeasePeriod: BlockNumber = 100_000;
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 52c8a72c134e8e1224b199eb20e55c309e85fb8d..eec2d5706b75d841000177cd2eb4df4c555dede2 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -445,6 +445,7 @@ parameter_types! {
 	// One cent: $10,000 / MB
 	pub const PreimageByteDeposit: Balance = 10 * MILLICENTS;
 	pub const InstantAllowed: bool = true;
+	pub const MaxAuthorities: u32 = 100_000;
 }
 
 impl pallet_offences::Config for Runtime {
@@ -453,7 +454,9 @@ impl pallet_offences::Config for Runtime {
 	type OnOffenceHandler = Staking;
 }
 
-impl pallet_authority_discovery::Config for Runtime {}
+impl pallet_authority_discovery::Config for Runtime {
+	type MaxAuthorities = MaxAuthorities;
+}
 
 parameter_types! {
 	pub const NposSolutionPriority: TransactionPriority = TransactionPriority::max_value() / 2;