From a8ae70a9dac7d523fc25b1a45b0179aa2625f851 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 11 Aug 2021 18:24:13 +0200
Subject: [PATCH] Companion for substrate/pull/9442 (#3594)

* Fix compact build

* Fix again

* fix staking miner

* fmt

* update Substrate

Co-authored-by: parity-processbot <>
---
 Cargo.lock                      | 326 +++++++++++++++-----------------
 runtime/kusama/src/lib.rs       |  14 +-
 runtime/polkadot/src/lib.rs     |  14 +-
 runtime/westend/src/lib.rs      |  19 +-
 utils/staking-miner/src/main.rs |   4 +-
 5 files changed, 185 insertions(+), 192 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 985413bae76f..6f238cdae79c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2003,7 +2003,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2021,7 +2021,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2040,7 +2040,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "Inflector",
  "chrono",
@@ -2066,7 +2066,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2079,7 +2079,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2094,7 +2094,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "14.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -2105,7 +2105,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2131,7 +2131,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -2143,7 +2143,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.0.0",
@@ -2155,7 +2155,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2165,7 +2165,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-metadata",
  "frame-support",
@@ -2186,7 +2186,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test-pallet"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2196,7 +2196,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -2213,7 +2213,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2227,7 +2227,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2236,7 +2236,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4723,7 +4723,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4738,7 +4738,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4752,7 +4752,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4775,7 +4775,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4830,7 +4830,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4908,7 +4908,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4924,7 +4924,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4939,7 +4939,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4960,7 +4960,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4977,7 +4977,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4991,7 +4991,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5013,7 +5013,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5028,7 +5028,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5047,7 +5047,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5063,7 +5063,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5078,7 +5078,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
@@ -5095,7 +5095,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5111,7 +5111,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5129,7 +5129,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5144,7 +5144,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5157,7 +5157,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5173,7 +5173,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5195,7 +5195,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5210,7 +5210,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -5224,7 +5224,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5239,7 +5239,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5259,7 +5259,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5275,7 +5275,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5288,7 +5288,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5312,7 +5312,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -5323,7 +5323,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -5332,7 +5332,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5345,7 +5345,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5363,7 +5363,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5378,7 +5378,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5394,7 +5394,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5411,7 +5411,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5422,7 +5422,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5438,7 +5438,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5453,7 +5453,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5743,12 +5743,6 @@ dependencies = [
  "crypto-mac 0.8.0",
 ]
 
-[[package]]
-name = "pdqselect"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec91767ecc0a0bbe558ce8c9da33c068066c57ecc8bb8477ef8c1ad3ef77c27"
-
 [[package]]
 name = "peeking_take_while"
 version = "0.1.2"
@@ -7963,7 +7957,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "env_logger 0.8.4",
  "hex",
@@ -8262,7 +8256,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "log",
  "sp-core",
@@ -8273,7 +8267,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8302,7 +8296,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
@@ -8325,7 +8319,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -8341,7 +8335,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8357,7 +8351,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -8368,7 +8362,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -8406,7 +8400,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more",
  "fnv",
@@ -8440,7 +8434,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -8469,7 +8463,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -8494,7 +8488,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8508,7 +8502,6 @@ dependencies = [
  "num-traits",
  "parity-scale-codec",
  "parking_lot 0.11.1",
- "pdqselect",
  "rand 0.7.3",
  "retain_mut",
  "sc-client-api",
@@ -8541,7 +8534,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more",
  "futures 0.3.16",
@@ -8565,7 +8558,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -8578,7 +8571,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-manual-seal"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -8614,7 +8607,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
@@ -8643,7 +8636,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "sc-client-api",
  "sp-authorship",
@@ -8654,7 +8647,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -8683,7 +8676,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -8700,7 +8693,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8715,7 +8708,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -8735,7 +8728,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8776,7 +8769,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -8800,7 +8793,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.16",
@@ -8818,7 +8811,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8838,7 +8831,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -8857,7 +8850,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-std",
  "async-trait",
@@ -8912,7 +8905,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "futures-timer 3.0.2",
@@ -8929,7 +8922,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -8957,7 +8950,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "libp2p",
@@ -8970,7 +8963,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -8979,7 +8972,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "hash-db",
@@ -9014,7 +9007,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more",
  "futures 0.3.16",
@@ -9039,7 +9032,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -9057,7 +9050,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "directories",
@@ -9125,7 +9118,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9140,7 +9133,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -9162,7 +9155,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "chrono",
  "futures 0.3.16",
@@ -9182,7 +9175,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -9219,7 +9212,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -9230,7 +9223,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more",
  "futures 0.3.16",
@@ -9259,7 +9252,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "derive_more",
  "futures 0.3.16",
@@ -9732,7 +9725,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "hash-db",
  "log",
@@ -9749,7 +9742,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate 1.0.0",
@@ -9761,7 +9754,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -9773,7 +9766,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -9787,7 +9780,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9799,7 +9792,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -9811,7 +9804,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9823,7 +9816,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "log",
@@ -9841,33 +9834,26 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "futures 0.3.16",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
- "parking_lot 0.11.1",
- "serde",
- "sp-api",
  "sp-core",
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
  "sp-std",
- "sp-trie",
- "sp-utils",
  "sp-version",
- "substrate-prometheus-endpoint",
  "thiserror",
- "wasm-timer",
 ]
 
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "merlin",
@@ -9889,7 +9875,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -9899,7 +9885,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -9911,7 +9897,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -9955,7 +9941,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -9964,7 +9950,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9974,7 +9960,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -9985,7 +9971,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -10002,7 +9988,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -10016,7 +10002,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "hash-db",
@@ -10041,7 +10027,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -10052,7 +10038,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -10069,7 +10055,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "ruzstd",
  "zstd",
@@ -10078,20 +10064,20 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "serde",
  "sp-arithmetic",
  "sp-core",
- "sp-npos-elections-compact",
+ "sp-npos-elections-solution-type",
  "sp-std",
 ]
 
 [[package]]
-name = "sp-npos-elections-compact"
+name = "sp-npos-elections-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -10102,7 +10088,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -10112,7 +10098,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "backtrace",
 ]
@@ -10120,7 +10106,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -10131,7 +10117,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -10152,7 +10138,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -10169,7 +10155,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.0.0",
@@ -10181,7 +10167,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "serde",
  "serde_json",
@@ -10190,7 +10176,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10203,7 +10189,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -10213,7 +10199,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "hash-db",
  "log",
@@ -10236,12 +10222,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 
 [[package]]
 name = "sp-storage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10254,7 +10240,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "log",
  "sp-core",
@@ -10267,7 +10253,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "futures-timer 3.0.2",
@@ -10284,7 +10270,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "erased-serde",
  "log",
@@ -10302,7 +10288,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -10311,7 +10297,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "log",
@@ -10326,7 +10312,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -10340,7 +10326,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "futures-core",
@@ -10352,7 +10338,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10367,7 +10353,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "parity-scale-codec",
  "proc-macro-crate 1.0.0",
@@ -10379,7 +10365,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -10564,7 +10550,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -10590,7 +10576,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "platforms",
 ]
@@ -10598,7 +10584,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.16",
@@ -10621,7 +10607,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-std",
  "derive_more",
@@ -10635,7 +10621,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "async-trait",
  "futures 0.1.29",
@@ -10664,7 +10650,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "futures 0.3.16",
  "substrate-test-utils-derive",
@@ -10674,7 +10660,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "quote",
@@ -10684,7 +10670,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -10846,7 +10832,7 @@ dependencies = [
 [[package]]
 name = "test-runner"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-system",
  "futures 0.3.16",
@@ -11486,7 +11472,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#b9d86e1ed319a096456e32790b1f48bd29b996bd"
+source = "git+https://github.com/paritytech/substrate?branch=master#09c016ba0a77f00a662dcd6ea76e5a5c777f31f4"
 dependencies = [
  "frame-try-runtime",
  "log",
diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
index 2cc4b8892227..b89d41d81d88 100644
--- a/runtime/kusama/src/lib.rs
+++ b/runtime/kusama/src/lib.rs
@@ -392,7 +392,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type OffchainRepeat = OffchainRepeat;
 	type MinerTxPriority = NposSolutionPriority;
 	type DataProvider = Staking;
-	type CompactSolution = NposCompactSolution24;
+	type Solution = NposCompactSolution24;
 	type OnChainAccuracy = Perbill;
 	type Fallback = Fallback;
 	type BenchmarkingConfig = runtime_common::elections::BenchmarkConfig;
@@ -484,7 +484,7 @@ type SlashCancelOrigin = EnsureOneOf<
 
 impl pallet_staking::Config for Runtime {
 	const MAX_NOMINATIONS: u32 =
-		<NposCompactSolution24 as sp_npos_elections::CompactSolution>::LIMIT as u32;
+		<NposCompactSolution24 as sp_npos_elections::NposSolution>::LIMIT as u32;
 	type Currency = Balances;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = CurrencyToVote;
@@ -1044,14 +1044,16 @@ impl InstanceFilter<Call> for ProxyType {
 					Call::Treasury(..) | Call::Bounties(..) |
 					Call::Tips(..) | Call::Utility(..)
 			),
-			ProxyType::Staking =>
-				matches!(c, Call::Staking(..) | Call::Session(..) | Call::Utility(..)),
+			ProxyType::Staking => {
+				matches!(c, Call::Staking(..) | Call::Session(..) | Call::Utility(..))
+			},
 			ProxyType::IdentityJudgement => matches!(
 				c,
 				Call::Identity(pallet_identity::Call::provide_judgement(..)) | Call::Utility(..)
 			),
-			ProxyType::CancelProxy =>
-				matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement(..))),
+			ProxyType::CancelProxy => {
+				matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement(..)))
+			},
 		}
 	}
 	fn is_superset(&self, o: &Self) -> bool {
diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
index 9eaf21440cf3..96df94b18e4d 100644
--- a/runtime/polkadot/src/lib.rs
+++ b/runtime/polkadot/src/lib.rs
@@ -398,7 +398,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type MinerTxPriority = NposSolutionPriority;
 	type DataProvider = Staking;
 	type OnChainAccuracy = Perbill;
-	type CompactSolution = NposCompactSolution16;
+	type Solution = NposCompactSolution16;
 	type Fallback = Fallback;
 	type BenchmarkingConfig = runtime_common::elections::BenchmarkConfig;
 	type ForceOrigin = EnsureOneOf<
@@ -443,7 +443,7 @@ type SlashCancelOrigin = EnsureOneOf<
 
 impl pallet_staking::Config for Runtime {
 	const MAX_NOMINATIONS: u32 =
-		<NposCompactSolution16 as sp_npos_elections::CompactSolution>::LIMIT as u32;
+		<NposCompactSolution16 as sp_npos_elections::NposSolution>::LIMIT as u32;
 	type Currency = Balances;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = CurrencyToVote;
@@ -994,14 +994,16 @@ impl InstanceFilter<Call> for ProxyType {
 					Call::Treasury(..) | Call::Bounties(..) |
 					Call::Tips(..) | Call::Utility(..)
 			),
-			ProxyType::Staking =>
-				matches!(c, Call::Staking(..) | Call::Session(..) | Call::Utility(..)),
+			ProxyType::Staking => {
+				matches!(c, Call::Staking(..) | Call::Session(..) | Call::Utility(..))
+			},
 			ProxyType::IdentityJudgement => matches!(
 				c,
 				Call::Identity(pallet_identity::Call::provide_judgement(..)) | Call::Utility(..)
 			),
-			ProxyType::CancelProxy =>
-				matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement(..))),
+			ProxyType::CancelProxy => {
+				matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement(..)))
+			},
 		}
 	}
 	fn is_superset(&self, o: &Self) -> bool {
diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
index 54cdeed90131..03924f55d814 100644
--- a/runtime/westend/src/lib.rs
+++ b/runtime/westend/src/lib.rs
@@ -380,7 +380,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type MinerTxPriority = NposSolutionPriority;
 	type DataProvider = Staking;
 	type OnChainAccuracy = Perbill;
-	type CompactSolution = NposCompactSolution16;
+	type Solution = NposCompactSolution16;
 	type Fallback = Fallback;
 	type BenchmarkingConfig = runtime_common::elections::BenchmarkConfig;
 	type ForceOrigin = EnsureRoot<AccountId>;
@@ -411,7 +411,7 @@ parameter_types! {
 
 impl pallet_staking::Config for Runtime {
 	const MAX_NOMINATIONS: u32 =
-		<NposCompactSolution16 as sp_npos_elections::CompactSolution>::LIMIT as u32;
+		<NposCompactSolution16 as sp_npos_elections::NposSolution>::LIMIT as u32;
 	type Currency = Balances;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = CurrencyToVote;
@@ -708,11 +708,13 @@ impl InstanceFilter<Call> for ProxyType {
 				Call::Slots(..) |
 				Call::Auctions(..) // Specifically omitting the entire XCM Pallet
 			),
-			ProxyType::Staking =>
-				matches!(c, Call::Staking(..) | Call::Session(..) | Call::Utility(..)),
+			ProxyType::Staking => {
+				matches!(c, Call::Staking(..) | Call::Session(..) | Call::Utility(..))
+			},
 			ProxyType::SudoBalances => match c {
-				Call::Sudo(pallet_sudo::Call::sudo(ref x)) =>
-					matches!(x.as_ref(), &Call::Balances(..)),
+				Call::Sudo(pallet_sudo::Call::sudo(ref x)) => {
+					matches!(x.as_ref(), &Call::Balances(..))
+				},
 				Call::Utility(..) => true,
 				_ => false,
 			},
@@ -720,8 +722,9 @@ impl InstanceFilter<Call> for ProxyType {
 				c,
 				Call::Identity(pallet_identity::Call::provide_judgement(..)) | Call::Utility(..)
 			),
-			ProxyType::CancelProxy =>
-				matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement(..))),
+			ProxyType::CancelProxy => {
+				matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement(..)))
+			},
 		}
 	}
 	fn is_superset(&self, o: &Self) -> bool {
diff --git a/utils/staking-miner/src/main.rs b/utils/staking-miner/src/main.rs
index ba804118327a..56718c9ea3ac 100644
--- a/utils/staking-miner/src/main.rs
+++ b/utils/staking-miner/src/main.rs
@@ -65,7 +65,7 @@ macro_rules! construct_runtime_prelude {
 			mod private {
 				use super::*;
 				pub(crate) fn [<create_uxt_ $runtime>](
-					raw_solution: EPM::RawSolution<EPM::CompactOf<Runtime>>,
+					raw_solution: EPM::RawSolution<EPM::SolutionOf<Runtime>>,
 					witness: u32,
 					signer: crate::signer::Signer,
 					nonce: crate::prelude::Index,
@@ -334,7 +334,7 @@ fn mine_unchecked<T: EPM::Config>(
 	ext: &mut Ext,
 	iterations: usize,
 	do_feasibility: bool,
-) -> Result<(EPM::RawSolution<EPM::CompactOf<T>>, u32), Error> {
+) -> Result<(EPM::RawSolution<EPM::SolutionOf<T>>, u32), Error> {
 	ext.execute_with(|| {
 		let (solution, _) = <EPM::Pallet<T>>::mine_solution(iterations)?;
 		if do_feasibility {